12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675 |
- --- valgrind-3.7.0.orig/configure 2011-11-05 12:24:39.000000000 +0100
- +++ valgrind-3.7.0/configure 2013-07-23 12:31:28.000000000 +0200
- @@ -1,13 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
- -# Generated by GNU Autoconf 2.65 for Valgrind 3.7.0.
- +# Generated by GNU Autoconf 2.69 for Valgrind 3.7.0.
- #
- # Report bugs to <valgrind-users@lists.sourceforge.net>.
- #
- #
- -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
- -# Inc.
- +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
- #
- #
- # This configure script is free software; the Free Software Foundation
- @@ -91,6 +89,7 @@ fi
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
- +as_myself=
- case $0 in #((
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- @@ -135,6 +134,31 @@ export LANGUAGE
- # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
- +# Use a proper internal environment variable to ensure we don't fall
- + # into an infinite loop, continuously re-executing ourselves.
- + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
- + _as_can_reexec=no; export _as_can_reexec;
- + # We cannot yet assume a decent shell, so we have to provide a
- +# neutralization value for shells without unset; and this also
- +# works around shells that cannot unset nonexistent variables.
- +# Preserve -v and -x to the replacement shell.
- +BASH_ENV=/dev/null
- +ENV=/dev/null
- +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- +case $- in # ((((
- + *v*x* | *x*v* ) as_opts=-vx ;;
- + *v* ) as_opts=-v ;;
- + *x* ) as_opts=-x ;;
- + * ) as_opts= ;;
- +esac
- +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
- +# Admittedly, this is quite paranoid, since all the known shells bail
- +# out after a failed `exec'.
- +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
- +as_fn_exit 255
- + fi
- + # We don't want this to propagate to other subprocesses.
- + { _as_can_reexec=; unset _as_can_reexec;}
- if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
- emulate sh
- @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test
- else
- exitcode=1; echo positional parameters were not saved.
- fi
- -test x\$exitcode = x0 || exit 1"
- +test x\$exitcode = x0 || exit 1
- +test -x / || exit 1"
- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
- @@ -213,14 +238,25 @@ IFS=$as_save_IFS
-
-
- if test "x$CONFIG_SHELL" != x; then :
- - # We cannot yet assume a decent shell, so we have to provide a
- - # neutralization value for shells without unset; and this also
- - # works around shells that cannot unset nonexistent variables.
- - BASH_ENV=/dev/null
- - ENV=/dev/null
- - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- - export CONFIG_SHELL
- - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- + export CONFIG_SHELL
- + # We cannot yet assume a decent shell, so we have to provide a
- +# neutralization value for shells without unset; and this also
- +# works around shells that cannot unset nonexistent variables.
- +# Preserve -v and -x to the replacement shell.
- +BASH_ENV=/dev/null
- +ENV=/dev/null
- +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- +case $- in # ((((
- + *v*x* | *x*v* ) as_opts=-vx ;;
- + *v* ) as_opts=-v ;;
- + *x* ) as_opts=-x ;;
- + * ) as_opts= ;;
- +esac
- +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
- +# Admittedly, this is quite paranoid, since all the known shells bail
- +# out after a failed `exec'.
- +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
- +exit 255
- fi
-
- if test x$as_have_required = xno; then :
- @@ -319,10 +355,18 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
- } # as_fn_mkdir_p
- +
- +# as_fn_executable_p FILE
- +# -----------------------
- +# Test if FILE is an executable regular file.
- +as_fn_executable_p ()
- +{
- + test -f "$1" && test -x "$1"
- +} # as_fn_executable_p
- # as_fn_append VAR VALUE
- # ----------------------
- # Append the text in VALUE to the end of the definition contained in VAR. Take
- @@ -359,19 +403,19 @@ else
- fi # as_fn_arith
-
-
- -# as_fn_error ERROR [LINENO LOG_FD]
- -# ---------------------------------
- +# as_fn_error STATUS ERROR [LINENO LOG_FD]
- +# ----------------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
- -# script with status $?, using 1 if that was 0.
- +# script with STATUS, using 1 if that was 0.
- as_fn_error ()
- {
- - as_status=$?; test $as_status -eq 0 && as_status=1
- - if test "$3"; then
- - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- + as_status=$1; test $as_status -eq 0 && as_status=1
- + if test "$4"; then
- + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- - $as_echo "$as_me: error: $1" >&2
- + $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
- } # as_fn_error
-
- @@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
- chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
- + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
- + # already done that, so ensure we don't try to do so again and fall
- + # in an infinite loop. This has already happened in practice.
- + _as_can_reexec=no; export _as_can_reexec
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- @@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- - # In both cases, we have to default to `cp -p'.
- + # In both cases, we have to default to `cp -pR'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- - as_ln_s='cp -p'
- + as_ln_s='cp -pR'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- - as_ln_s='cp -p'
- + as_ln_s='cp -pR'
- fi
- else
- - as_ln_s='cp -p'
- + as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
- @@ -499,28 +547,8 @@ else
- as_mkdir_p=false
- fi
-
- -if test -x / >/dev/null 2>&1; then
- - as_test_x='test -x'
- -else
- - if ls -dL / >/dev/null 2>&1; then
- - as_ls_L_option=L
- - else
- - as_ls_L_option=
- - fi
- - as_test_x='
- - eval sh -c '\''
- - if test -d "$1"; then
- - test -d "$1/.";
- - else
- - case $1 in #(
- - -*)set "./$1";;
- - esac;
- - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- - ???[sx]*):;;*)false;;esac;fi
- - '\'' sh
- - '
- -fi
- -as_executable_p=$as_test_x
- +as_test_x='test -x'
- +as_executable_p=as_fn_executable_p
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- @@ -533,7 +561,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
- exec 6>&1
-
- # Name of the host.
- -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
- @@ -595,9 +623,7 @@ ac_includes_default="\
- #endif"
-
- ac_header_list=
- -ac_subst_vars='am__EXEEXT_FALSE
- -am__EXEEXT_TRUE
- -LTLIBOBJS
- +ac_subst_vars='LTLIBOBJS
- HAVE_BUILTIN_ATOMIC_CXX_FALSE
- HAVE_BUILTIN_ATOMIC_CXX_TRUE
- HAVE_BUILTIN_ATOMIC_FALSE
- @@ -700,6 +726,7 @@ VGCONF_PLATFORM_PRI_CAPS
- VGCONF_ARCH_SEC
- VGCONF_ARCH_PRI
- VGCONF_OS
- +VGCONF_PLATFORM_ARM_ARCH
- host_os
- host_vendor
- host_cpu
- @@ -896,8 +923,9 @@ do
- fi
-
- case $ac_option in
- - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- - *) ac_optarg=yes ;;
- + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- + *=) ac_optarg= ;;
- + *) ac_optarg=yes ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
- @@ -942,7 +970,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- - as_fn_error "invalid feature name: $ac_useropt"
- + as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- @@ -968,7 +996,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- - as_fn_error "invalid feature name: $ac_useropt"
- + as_fn_error $? "invalid feature name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- @@ -1172,7 +1200,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- - as_fn_error "invalid package name: $ac_useropt"
- + as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- @@ -1188,7 +1216,7 @@ do
- ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- - as_fn_error "invalid package name: $ac_useropt"
- + as_fn_error $? "invalid package name: $ac_useropt"
- ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
- case $ac_user_opts in
- @@ -1218,8 +1246,8 @@ do
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- - -*) as_fn_error "unrecognized option: \`$ac_option'
- -Try \`$0 --help' for more information."
- + -*) as_fn_error $? "unrecognized option: \`$ac_option'
- +Try \`$0 --help' for more information"
- ;;
-
- *=*)
- @@ -1227,7 +1255,7 @@ Try \`$0 --help' for more information."
- # Reject names that are not valid shell variable names.
- case $ac_envvar in #(
- '' | [0-9]* | *[!_$as_cr_alnum]* )
- - as_fn_error "invalid variable name: \`$ac_envvar'" ;;
- + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
- esac
- eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
- @@ -1237,7 +1265,7 @@ Try \`$0 --help' for more information."
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
- ;;
-
- esac
- @@ -1245,13 +1273,13 @@ done
-
- if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- - as_fn_error "missing argument to $ac_option"
- + as_fn_error $? "missing argument to $ac_option"
- fi
-
- if test -n "$ac_unrecognized_opts"; then
- case $enable_option_checking in
- no) ;;
- - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
- + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
- esac
- fi
- @@ -1274,7 +1302,7 @@ do
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
- - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
- + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
- done
-
- # There might be people who depend on the old broken behavior: `$host'
- @@ -1288,8 +1316,6 @@ target=$target_alias
- if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- - If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
- @@ -1304,9 +1330,9 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- - as_fn_error "working directory cannot be determined"
- + as_fn_error $? "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- - as_fn_error "pwd does not report name of working directory"
- + as_fn_error $? "pwd does not report name of working directory"
-
-
- # Find the source files, if location was not specified.
- @@ -1345,11 +1371,11 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
- + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
- - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
- + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
- pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
- @@ -1389,7 +1415,7 @@ Configuration:
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- - -q, --quiet, --silent do not print \`checking...' messages
- + -q, --quiet, --silent do not print \`checking ...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- @@ -1550,9 +1576,9 @@ test -n "$ac_init_help" && exit $ac_stat
- if $ac_init_version; then
- cat <<\_ACEOF
- Valgrind configure 3.7.0
- -generated by GNU Autoconf 2.65
- +generated by GNU Autoconf 2.69
-
- -Copyright (C) 2009 Free Software Foundation, Inc.
- +Copyright (C) 2012 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
- @@ -1596,7 +1622,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
- fi
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_compile
- @@ -1622,7 +1648,7 @@ $as_echo "$ac_try_echo"; } >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- - test $ac_status = 0; } >/dev/null && {
- + test $ac_status = 0; } > conftest.i && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then :
- @@ -1633,7 +1659,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
- fi
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_cpp
- @@ -1671,7 +1697,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
- fi
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_cxx_try_compile
- @@ -1703,7 +1729,7 @@ $as_echo "$ac_try_echo"; } >&5
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- - $as_test_x conftest$ac_exeext
- + test -x conftest$ac_exeext
- }; then :
- ac_retval=0
- else
- @@ -1717,7 +1743,7 @@ fi
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_link
- @@ -1730,10 +1756,10 @@ fi
- ac_fn_c_check_header_mongrel ()
- {
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- + if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
- -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- fi
- eval ac_res=\$$3
- @@ -1769,7 +1795,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
- else
- ac_header_preproc=no
- fi
- -rm -f conftest.err conftest.$ac_ext
- +rm -f conftest.err conftest.i conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
- $as_echo "$ac_header_preproc" >&6; }
-
- @@ -1792,17 +1818,15 @@ $as_echo "$as_me: WARNING: $2: see the A
- $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
- $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- -( cat <<\_ASBOX
- -## --------------------------------------------------- ##
- +( $as_echo "## --------------------------------------------------- ##
- ## Report this to valgrind-users@lists.sourceforge.net ##
- -## --------------------------------------------------- ##
- -_ASBOX
- +## --------------------------------------------------- ##"
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
- -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=\$ac_header_compiler"
- @@ -1811,7 +1835,7 @@ eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- fi
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_header_mongrel
-
- @@ -1852,7 +1876,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- ac_retval=$ac_status
- fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_c_try_run
- @@ -1866,7 +1890,7 @@ ac_fn_c_check_header_compile ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
- -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -1884,7 +1908,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_header_compile
-
- @@ -1897,7 +1921,7 @@ ac_fn_c_check_member ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
- $as_echo_n "checking for $2.$3... " >&6; }
- -if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${$4+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -1941,7 +1965,7 @@ fi
- eval ac_res=\$$4
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_member
-
- @@ -1954,7 +1978,7 @@ ac_fn_c_check_type ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
- -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- eval "$3=no"
- @@ -1995,7 +2019,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_type
-
- @@ -2007,7 +2031,7 @@ ac_fn_c_check_func ()
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
- $as_echo_n "checking for $2... " >&6; }
- -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -2062,7 +2086,7 @@ fi
- eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
- } # ac_fn_c_check_func
-
- @@ -2093,7 +2117,7 @@ $as_echo "$ac_try_echo"; } >&5
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- - $as_test_x conftest$ac_exeext
- + test -x conftest$ac_exeext
- }; then :
- ac_retval=0
- else
- @@ -2107,7 +2131,7 @@ fi
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
- } # ac_fn_cxx_try_link
- @@ -2116,7 +2140,7 @@ This file contains any messages produced
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by Valgrind $as_me 3.7.0, which was
- -generated by GNU Autoconf 2.65. Invocation command line was
- +generated by GNU Autoconf 2.69. Invocation command line was
-
- $ $0 $@
-
- @@ -2226,11 +2250,9 @@ trap 'exit_status=$?
- {
- echo
-
- - cat <<\_ASBOX
- -## ---------------- ##
- + $as_echo "## ---------------- ##
- ## Cache variables. ##
- -## ---------------- ##
- -_ASBOX
- +## ---------------- ##"
- echo
- # The following way of writing the cache mishandles newlines in values,
- (
- @@ -2264,11 +2286,9 @@ $as_echo "$as_me: WARNING: cache variabl
- )
- echo
-
- - cat <<\_ASBOX
- -## ----------------- ##
- + $as_echo "## ----------------- ##
- ## Output variables. ##
- -## ----------------- ##
- -_ASBOX
- +## ----------------- ##"
- echo
- for ac_var in $ac_subst_vars
- do
- @@ -2281,11 +2301,9 @@ _ASBOX
- echo
-
- if test -n "$ac_subst_files"; then
- - cat <<\_ASBOX
- -## ------------------- ##
- + $as_echo "## ------------------- ##
- ## File substitutions. ##
- -## ------------------- ##
- -_ASBOX
- +## ------------------- ##"
- echo
- for ac_var in $ac_subst_files
- do
- @@ -2299,11 +2317,9 @@ _ASBOX
- fi
-
- if test -s confdefs.h; then
- - cat <<\_ASBOX
- -## ----------- ##
- + $as_echo "## ----------- ##
- ## confdefs.h. ##
- -## ----------- ##
- -_ASBOX
- +## ----------- ##"
- echo
- cat confdefs.h
- echo
- @@ -2358,7 +2374,12 @@ _ACEOF
- ac_site_file1=NONE
- ac_site_file2=NONE
- if test -n "$CONFIG_SITE"; then
- - ac_site_file1=$CONFIG_SITE
- + # We do not want a PATH search for config.site.
- + case $CONFIG_SITE in #((
- + -*) ac_site_file1=./$CONFIG_SITE;;
- + */*) ac_site_file1=$CONFIG_SITE;;
- + *) ac_site_file1=./$CONFIG_SITE;;
- + esac
- elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
- @@ -2373,7 +2394,11 @@ do
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- - . "$ac_site_file"
- + . "$ac_site_file" \
- + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- +as_fn_error $? "failed to load site script $ac_site_file
- +See \`config.log' for more details" "$LINENO" 5; }
- fi
- done
-
- @@ -2452,7 +2477,7 @@ if $ac_cache_corrupted; then
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
- ## -------------------- ##
- ## Main body of script. ##
- @@ -2468,20 +2493,26 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
- ac_config_headers="$ac_config_headers config.h"
-
- -am__api_version='1.11'
- +am__api_version='1.10'
-
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- - for ac_t in install-sh install.sh shtool; do
- - if test -f "$ac_dir/$ac_t"; then
- - ac_aux_dir=$ac_dir
- - ac_install_sh="$ac_aux_dir/$ac_t -c"
- - break 2
- - fi
- - done
- + if test -f "$ac_dir/install-sh"; then
- + ac_aux_dir=$ac_dir
- + ac_install_sh="$ac_aux_dir/install-sh -c"
- + break
- + elif test -f "$ac_dir/install.sh"; then
- + ac_aux_dir=$ac_dir
- + ac_install_sh="$ac_aux_dir/install.sh -c"
- + break
- + elif test -f "$ac_dir/shtool"; then
- + ac_aux_dir=$ac_dir
- + ac_install_sh="$ac_aux_dir/shtool install -c"
- + break
- + fi
- done
- if test -z "$ac_aux_dir"; then
- - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
-
- # These three variables are undocumented and unsupported,
- @@ -2510,7 +2541,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
- $as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
- -if test "${ac_cv_path_install+set}" = set; then :
- +if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- @@ -2530,7 +2561,7 @@ case $as_dir/ in #((
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- @@ -2591,29 +2622,16 @@ $as_echo_n "checking whether build envir
- # Just in case
- sleep 1
- echo timestamp > conftest.file
- -# Reject unsafe characters in $srcdir or the absolute working directory
- -# name. Accept space and tab only in the latter.
- -am_lf='
- -'
- -case `pwd` in
- - *[\\\"\#\$\&\'\`$am_lf]*)
- - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
- -esac
- -case $srcdir in
- - *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
- -esac
- -
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments. Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
- - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- - set X `ls -t "$srcdir/configure" conftest.file`
- + set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- @@ -2623,7 +2641,7 @@ if (
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- - as_fn_error "ls -t appears to fail. Make sure there is not a broken
- + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
-
- @@ -2633,7 +2651,7 @@ then
- # Ok.
- :
- else
- - as_fn_error "newly created file is older than distributed files!
- + as_fn_error $? "newly created file is older than distributed files!
- Check your system clock" "$LINENO" 5
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- @@ -2651,14 +2669,7 @@ program_transform_name=`$as_echo "$progr
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-
- -if test x"${MISSING+set}" != xset; then
- - case $am_aux_dir in
- - *\ * | *\ *)
- - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
- - *)
- - MISSING="\${SHELL} $am_aux_dir/missing" ;;
- - esac
- -fi
- +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
- @@ -2668,14 +2679,7 @@ else
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
- -if test x"${install_sh}" != xset; then
- - case $am_aux_dir in
- - *\ * | *\ *)
- - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- - *)
- - install_sh="\${SHELL} $am_aux_dir/install-sh"
- - esac
- -fi
- +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
- # Installed binaries are usually stripped using `strip' when the user
- # run `make install-strip'. However `strip' might not be the right
- @@ -2687,7 +2691,7 @@ if test "$cross_compiling" != no; then
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_STRIP+set}" = set; then :
- +if ${ac_cv_prog_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$STRIP"; then
- @@ -2699,7 +2703,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -2727,7 +2731,7 @@ if test -z "$ac_cv_prog_STRIP"; then
- set dummy strip; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
- +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_STRIP"; then
- @@ -2739,7 +2743,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -2780,7 +2784,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
- $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
- if test -z "$MKDIR_P"; then
- - if test "${ac_cv_path_mkdir+set}" = set; then :
- + if ${ac_cv_path_mkdir+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- @@ -2790,7 +2794,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- @@ -2831,7 +2835,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_AWK+set}" = set; then :
- +if ${ac_cv_prog_AWK+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$AWK"; then
- @@ -2843,7 +2847,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_AWK="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -2871,7 +2875,7 @@ done
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
- -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat >conftest.make <<\_ACEOF
- @@ -2879,7 +2883,7 @@ SHELL = /bin/sh
- all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- -# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
- case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- @@ -2913,7 +2917,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
- + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
- fi
- fi
-
- @@ -2970,7 +2974,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
-
-
-
- -
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
- # Check whether --enable-maintainer-mode was given.
- @@ -3020,7 +3023,7 @@ if test -n "$ac_tool_prefix"; then
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_CC+set}" = set; then :
- +if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- @@ -3032,7 +3035,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -3060,7 +3063,7 @@ if test -z "$ac_cv_prog_CC"; then
- set dummy gcc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- +if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
- @@ -3072,7 +3075,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -3113,7 +3116,7 @@ if test -z "$CC"; then
- set dummy ${ac_tool_prefix}cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_CC+set}" = set; then :
- +if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- @@ -3125,7 +3128,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -3153,7 +3156,7 @@ if test -z "$CC"; then
- set dummy cc; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_CC+set}" = set; then :
- +if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- @@ -3166,7 +3169,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- @@ -3212,7 +3215,7 @@ if test -z "$CC"; then
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_CC+set}" = set; then :
- +if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CC"; then
- @@ -3224,7 +3227,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -3256,7 +3259,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
- +if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CC"; then
- @@ -3268,7 +3271,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -3310,8 +3313,8 @@ fi
-
- test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- -as_fn_error "no acceptable C compiler found in \$PATH
- -See \`config.log' for more details." "$LINENO" 5; }
- +as_fn_error $? "no acceptable C compiler found in \$PATH
- +See \`config.log' for more details" "$LINENO" 5; }
-
- # Provide some information about the compiler.
- $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- @@ -3425,9 +3428,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- -{ as_fn_set_status 77
- -as_fn_error "C compiler cannot create executables
- -See \`config.log' for more details." "$LINENO" 5; }; }
- +as_fn_error 77 "C compiler cannot create executables
- +See \`config.log' for more details" "$LINENO" 5; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- @@ -3469,8 +3471,8 @@ done
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- -as_fn_error "cannot compute suffix of executables: cannot compile and link
- -See \`config.log' for more details." "$LINENO" 5; }
- +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
- +See \`config.log' for more details" "$LINENO" 5; }
- fi
- rm -f conftest conftest$ac_cv_exeext
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- @@ -3527,9 +3529,9 @@ $as_echo "$ac_try_echo"; } >&5
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- -as_fn_error "cannot run C compiled programs.
- +as_fn_error $? "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- -See \`config.log' for more details." "$LINENO" 5; }
- +See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
- fi
- @@ -3540,7 +3542,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_ex
- ac_clean_files=$ac_clean_files_save
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
- -if test "${ac_cv_objext+set}" = set; then :
- +if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -3580,8 +3582,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
-
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- -as_fn_error "cannot compute suffix of object files: cannot compile
- -See \`config.log' for more details." "$LINENO" 5; }
- +as_fn_error $? "cannot compute suffix of object files: cannot compile
- +See \`config.log' for more details" "$LINENO" 5; }
- fi
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
- @@ -3591,7 +3593,7 @@ OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
- -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
- +if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -3628,7 +3630,7 @@ ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
- -if test "${ac_cv_prog_cc_g+set}" = set; then :
- +if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_c_werror_flag=$ac_c_werror_flag
- @@ -3706,7 +3708,7 @@ else
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
- -if test "${ac_cv_prog_cc_c89+set}" = set; then :
- +if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_cv_prog_cc_c89=no
- @@ -3715,8 +3717,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- /* end confdefs.h. */
- #include <stdarg.h>
- #include <stdio.h>
- -#include <sys/types.h>
- -#include <sys/stat.h>
- +struct stat;
- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
- struct buf { int x; };
- FILE * (*rcsopen) (struct buf *, struct stat *, int);
- @@ -3808,7 +3809,7 @@ ac_config_commands="$ac_config_commands
- am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
- - @echo this is the am__doit target
- + @echo done
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
- @@ -3819,24 +3820,24 @@ am__quote=
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
- -# Ignore all kinds of additional output from `make'.
- -case `$am_make -s -f confmf 2> /dev/null` in #(
- -*the\ am__doit\ target*)
- - am__include=include
- - am__quote=
- - _am_result=GNU
- - ;;
- -esac
- +# We grep out `Entering directory' and `Leaving directory'
- +# messages which can occur if `w' ends up in MAKEFLAGS.
- +# In particular we don't look at `^make:' because GNU make might
- +# be invoked under some other name (usually "gmake"), in which
- +# case it prints its new name instead of `make'.
- +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- + am__include=include
- + am__quote=
- + _am_result=GNU
- +fi
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- - case `$am_make -s -f confmf 2> /dev/null` in #(
- - *the\ am__doit\ target*)
- - am__include=.include
- - am__quote="\""
- - _am_result=BSD
- - ;;
- - esac
- + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- + am__include=.include
- + am__quote="\""
- + _am_result=BSD
- + fi
- fi
-
-
- @@ -3867,7 +3868,7 @@ depcc="$CC" am_compiler_list=
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
- -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
- +if ${am_cv_CC_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- @@ -3999,7 +4000,7 @@ $as_echo_n "checking whether cc understa
- fi
- set dummy $CC; ac_cc=`$as_echo "$2" |
- sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
- -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
- +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -4128,7 +4129,7 @@ if test -n "$CPP" && test -d "$CPP"; the
- CPP=
- fi
- if test -z "$CPP"; then
- - if test "${ac_cv_prog_CPP+set}" = set; then :
- + if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- # Double quotes because CPP needs to be expanded
- @@ -4158,7 +4159,7 @@ else
- # Broken: fails on valid input.
- continue
- fi
- -rm -f conftest.err conftest.$ac_ext
- +rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- @@ -4174,11 +4175,11 @@ else
- ac_preproc_ok=:
- break
- fi
- -rm -f conftest.err conftest.$ac_ext
- +rm -f conftest.err conftest.i conftest.$ac_ext
-
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- -rm -f conftest.err conftest.$ac_ext
- +rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
- break
- fi
- @@ -4217,7 +4218,7 @@ else
- # Broken: fails on valid input.
- continue
- fi
- -rm -f conftest.err conftest.$ac_ext
- +rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- @@ -4233,18 +4234,18 @@ else
- ac_preproc_ok=:
- break
- fi
- -rm -f conftest.err conftest.$ac_ext
- +rm -f conftest.err conftest.i conftest.$ac_ext
-
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- -rm -f conftest.err conftest.$ac_ext
- +rm -f conftest.i conftest.err conftest.$ac_ext
- if $ac_preproc_ok; then :
-
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- -as_fn_error "C preprocessor \"$CPP\" fails sanity check
- -See \`config.log' for more details." "$LINENO" 5; }
- +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
- +See \`config.log' for more details" "$LINENO" 5; }
- fi
-
- ac_ext=c
- @@ -4269,7 +4270,7 @@ if test -z "$CXX"; then
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_CXX+set}" = set; then :
- +if ${ac_cv_prog_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$CXX"; then
- @@ -4281,7 +4282,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -4313,7 +4314,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
- +if ${ac_cv_prog_ac_ct_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_CXX"; then
- @@ -4325,7 +4326,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -4391,7 +4392,7 @@ done
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
- $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
- -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
- +if ${ac_cv_cxx_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -4428,7 +4429,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
- ac_save_CXXFLAGS=$CXXFLAGS
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
- $as_echo_n "checking whether $CXX accepts -g... " >&6; }
- -if test "${ac_cv_prog_cxx_g+set}" = set; then :
- +if ${ac_cv_prog_cxx_g+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
- @@ -4514,7 +4515,7 @@ depcc="$CXX" am_compiler_list=
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
- -if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
- +if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- @@ -4655,7 +4656,7 @@ if test -n "$ac_tool_prefix"; then
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_RANLIB+set}" = set; then :
- +if ${ac_cv_prog_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$RANLIB"; then
- @@ -4667,7 +4668,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -4695,7 +4696,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
- set dummy ranlib; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
- +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_RANLIB"; then
- @@ -4707,7 +4708,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -4747,7 +4748,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
- $as_echo_n "checking for a sed that does not truncate output... " >&6; }
- -if test "${ac_cv_path_SED+set}" = set; then :
- +if ${ac_cv_path_SED+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- @@ -4767,7 +4768,7 @@ do
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
- + as_fn_executable_p "$ac_path_SED" || continue
- # Check for GNU ac_path_SED and select it if it is found.
- # Check for GNU $ac_path_SED
- case `"$ac_path_SED" --version 2>&1` in
- @@ -4802,7 +4803,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
- - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
- + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
- else
- ac_cv_path_SED=$SED
- @@ -4824,7 +4825,7 @@ do
- set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_path_AR+set}" = set; then :
- +if ${ac_cv_path_AR+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $AR in
- @@ -4838,7 +4839,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -4869,7 +4870,7 @@ fi
-
- # Check for the compiler support
- if test "${GCC}" != "yes" ; then
- - as_fn_error "Valgrind relies on GCC to be compiled" "$LINENO" 5
- + as_fn_error $? "Valgrind relies on GCC to be compiled" "$LINENO" 5
- fi
-
- # figure out where perl lives
- @@ -4877,7 +4878,7 @@ fi
- set dummy perl; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_path_PERL+set}" = set; then :
- +if ${ac_cv_path_PERL+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $PERL in
- @@ -4891,7 +4892,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -4919,7 +4920,7 @@ fi
- set dummy gdb; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- -if test "${ac_cv_path_GDB+set}" = set; then :
- +if ${ac_cv_path_GDB+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- case $GDB in
- @@ -4933,7 +4934,7 @@ do
- IFS=$as_save_IFS
- 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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GDB="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- @@ -4974,7 +4975,7 @@ depcc="$CCAS" am_compiler_list=
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
- -if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
- +if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- @@ -5156,7 +5157,7 @@ $as_echo "ok (clang-${gcc_version})" >&6
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${gcc_version})" >&5
- $as_echo "no (${gcc_version})" >&6; }
- - as_fn_error "please use gcc >= 3.0 or clang >= 2.9" "$LINENO" 5
- + as_fn_error $? "please use gcc >= 3.0 or clang >= 2.9" "$LINENO" 5
- ;;
- esac
-
- @@ -5168,29 +5169,31 @@ esac
- # configure-time, and distinguishes them from the VGA_*/VGO_*/VGP_*
- # variables used when compiling C files.
-
- +VGCONF_PLATFORM_ARM_ARCH=
- +
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
- + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
- -if test "${ac_cv_build+set}" = set; then :
- +if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_build_alias=$build_alias
- test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
- - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
- -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
- +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
- @@ -5208,14 +5211,14 @@ case $build_os in *\ *) build_os=`echo "
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
- $as_echo_n "checking host system type... " >&6; }
- -if test "${ac_cv_host+set}" = set; then :
- +if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "x$host_alias" = x; then
- ac_cv_host=$ac_cv_build
- else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
-
- fi
- @@ -5223,7 +5226,7 @@ fi
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
- -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
- +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
- @@ -5280,18 +5283,32 @@ $as_echo "ok (${host_cpu})" >&6; }
- ;;
-
- armv7*)
- - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${host_cpu})" >&5
- -$as_echo "ok (${host_cpu})" >&6; }
- - ARCH_MAX="arm"
- - ;;
- + # This means we use a armv7 toolchain - at least Cortex-A8
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (${host_cpu} using armv7 codepath)" >&5
- +$as_echo "ok (${host_cpu} using armv7 codepath)" >&6; }
- + ARCH_MAX="arm"
- + VGCONF_PLATFORM_ARM_ARCH="-march=armv7 -mcpu=cortex-a8"
- + ;;
- +
- + arm*)
- + # Generic arm toolchain - we will target armv6
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: (${host_cpu}) - no armv7 toolchain specified, will enforce armv6 when compiling" >&5
- +$as_echo "(${host_cpu}) - no armv7 toolchain specified, will enforce armv6 when compiling" >&6; }
- + ARCH_MAX="arm"
- + VGCONF_PLATFORM_ARM_ARCH="-march=armv6"
- +
- +$as_echo "#define ARM_ARCH_V6 1" >>confdefs.h
- +
- + ;;
-
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${host_cpu})" >&5
- $as_echo "no (${host_cpu})" >&6; }
- - as_fn_error "Unsupported host architecture. Sorry" "$LINENO" 5
- + as_fn_error $? "Unsupported host architecture. Sorry" "$LINENO" 5
- ;;
- esac
-
- +
- #----------------------------------------------------------------------------
-
- # Sometimes it's convenient to subvert the bi-arch build system and
- @@ -5305,7 +5322,7 @@ esac
- # Check if a 64-bit only build has been requested
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a 64-bit only build" >&5
- $as_echo_n "checking for a 64-bit only build... " >&6; }
- -if test "${vg_cv_only64bit+set}" = set; then :
- +if ${vg_cv_only64bit+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- # Check whether --enable-only64bit was given.
- @@ -5322,7 +5339,7 @@ $as_echo "$vg_cv_only64bit" >&6; }
- # Check if a 32-bit only build has been requested
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a 32-bit only build" >&5
- $as_echo_n "checking for a 32-bit only build... " >&6; }
- -if test "${vg_cv_only32bit+set}" = set; then :
- +if ${vg_cv_only32bit+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- # Check whether --enable-only32bit was given.
- @@ -5338,7 +5355,7 @@ $as_echo "$vg_cv_only32bit" >&6; }
-
- # Stay sane
- if test x$vg_cv_only64bit = xyes -a x$vg_cv_only32bit = xyes; then
- - as_fn_error "Nonsensical: both --enable-only64bit and --enable-only32bit." "$LINENO" 5
- + as_fn_error $? "Nonsensical: both --enable-only64bit and --enable-only32bit." "$LINENO" 5
- fi
-
- #----------------------------------------------------------------------------
- @@ -5384,7 +5401,7 @@ $as_echo "#define KERNEL_2_4 1" >>confde
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported (${kernel})" >&5
- $as_echo "unsupported (${kernel})" >&6; }
- - as_fn_error "Valgrind works on kernels 2.4, 2.6" "$LINENO" 5
- + as_fn_error $? "Valgrind works on kernels 2.4, 2.6" "$LINENO" 5
- ;;
- esac
-
- @@ -5456,7 +5473,7 @@ $as_echo "#define DARWIN_VERS DARWIN_10_
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported (${kernel})" >&5
- $as_echo "unsupported (${kernel})" >&6; }
- - as_fn_error "Valgrind works on Darwin 10.x and 11.x (Mac OS X 10.6/7)" "$LINENO" 5
- + as_fn_error $? "Valgrind works on Darwin 10.x and 11.x (Mac OS X 10.6/7)" "$LINENO" 5
- ;;
- esac
- ;;
- @@ -5464,7 +5481,7 @@ $as_echo "unsupported (${kernel})" >&6;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${host_os})" >&5
- $as_echo "no (${host_os})" >&6; }
- - as_fn_error "Valgrind is operating system specific. Sorry." "$LINENO" 5
- + as_fn_error $? "Valgrind is operating system specific. Sorry." "$LINENO" 5
- ;;
- esac
-
- @@ -5512,7 +5529,7 @@ rm -f core conftest.err conftest.$ac_obj
- esac
-
- if test x$vg_cv_only64bit = xyes -a x$vg_cv_only32bit = xyes; then
- - as_fn_error "--enable-only32bit was specified but system does not support 32 bit builds" "$LINENO" 5
- + as_fn_error $? "--enable-only32bit was specified but system does not support 32 bit builds" "$LINENO" 5
- fi
-
- #----------------------------------------------------------------------------
- @@ -5719,7 +5736,7 @@ $as_echo "ok (${ARCH_MAX}-${VGCONF_OS})"
- valt_load_address_sec_inner="0xUNSET"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (${ARCH_MAX}-${VGCONF_OS})" >&5
- $as_echo "no (${ARCH_MAX}-${VGCONF_OS})" >&6; }
- - as_fn_error "Valgrind is platform specific. Sorry. Please consider doing a port." "$LINENO" 5
- + as_fn_error $? "Valgrind is platform specific. Sorry. Please consider doing a port." "$LINENO" 5
- ;;
- esac
-
- @@ -5903,7 +5920,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for use as an inner Valgrind" >&5
- $as_echo_n "checking for use as an inner Valgrind... " >&6; }
- -if test "${vg_cv_inner+set}" = set; then :
- +if ${vg_cv_inner+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- # Check whether --enable-inner was given.
- @@ -5955,7 +5972,7 @@ _ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- -if test "${ac_cv_path_GREP+set}" = set; then :
- +if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test -z "$GREP"; then
- @@ -5969,7 +5986,7 @@ do
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- + as_fn_executable_p "$ac_path_GREP" || continue
- # Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
- case `"$ac_path_GREP" --version 2>&1` in
- @@ -6004,7 +6021,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_GREP=$GREP
- @@ -6018,7 +6035,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
- $as_echo_n "checking for egrep... " >&6; }
- -if test "${ac_cv_path_EGREP+set}" = set; then :
- +if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- @@ -6035,7 +6052,7 @@ do
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- + as_fn_executable_p "$ac_path_EGREP" || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
- case `"$ac_path_EGREP" --version 2>&1` in
- @@ -6070,7 +6087,7 @@ esac
- done
- IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
- else
- ac_cv_path_EGREP=$EGREP
- @@ -6085,7 +6102,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
- -if test "${ac_cv_header_stdc+set}" = set; then :
- +if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -6202,8 +6219,7 @@ do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
- -eval as_val=\$$as_ac_Header
- - if test "x$as_val" = x""yes; then :
- +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- @@ -6214,7 +6230,7 @@ done
-
-
- ac_fn_c_check_header_mongrel "$LINENO" "features.h" "ac_cv_header_features_h" "$ac_includes_default"
- -if test "x$ac_cv_header_features_h" = x""yes; then :
- +if test "x$ac_cv_header_features_h" = xyes; then :
-
- fi
-
- @@ -6392,11 +6408,11 @@ $as_echo "#define GLIBC_2_13 1" >>confde
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
- - 2.14)
- - { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.14 family" >&5
- -$as_echo "2.14 family" >&6; }
- + 2.17)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
- +$as_echo "2.17 family" >&6; }
-
- -$as_echo "#define GLIBC_2_14 1" >>confdefs.h
- +$as_echo "#define GLIBC_2_17 1" >>confdefs.h
-
- DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- @@ -6422,8 +6438,8 @@ $as_echo "#define BIONIC_LIBC 1" >>confd
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
- - as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
- - as_fn_error "or Darwin libc" "$LINENO" 5
- + as_fn_error $? "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
- + as_fn_error $? "or Darwin libc" "$LINENO" 5
- ;;
- esac
-
- @@ -6747,7 +6763,7 @@ rm -f core conftest.err conftest.$ac_obj
-
- ac_fn_c_check_member "$LINENO" "pthread_mutex_t" "__m_kind" "ac_cv_member_pthread_mutex_t___m_kind" "#include <pthread.h>
- "
- -if test "x$ac_cv_member_pthread_mutex_t___m_kind" = x""yes; then :
- +if test "x$ac_cv_member_pthread_mutex_t___m_kind" = xyes; then :
-
- $as_echo "#define HAVE_PTHREAD_MUTEX_T__M_KIND 1" >>confdefs.h
-
- @@ -6760,7 +6776,7 @@ fi
-
- ac_fn_c_check_member "$LINENO" "pthread_mutex_t" "__data.__kind" "ac_cv_member_pthread_mutex_t___data___kind" "#include <pthread.h>
- "
- -if test "x$ac_cv_member_pthread_mutex_t___data___kind" = x""yes; then :
- +if test "x$ac_cv_member_pthread_mutex_t___data___kind" = xyes; then :
-
- $as_echo "#define HAVE_PTHREAD_MUTEX_T__DATA__KIND 1" >>confdefs.h
-
- @@ -7913,7 +7929,7 @@ rm -f core conftest.err conftest.$ac_obj
- # Cross-compiling: check whether linking a program using TLS succeeds.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS support" >&5
- $as_echo_n "checking for TLS support... " >&6; }
- -if test "${vg_cv_tls+set}" = set; then :
- +if ${vg_cv_tls+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- # Check whether --enable-tls was given.
- @@ -7962,7 +7978,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
- -if test "${ac_cv_header_stdc+set}" = set; then :
- +if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -8090,8 +8106,7 @@ for ac_header in \
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
- -eval as_val=\$$as_ac_Header
- - if test "x$as_val" = x""yes; then :
- +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- @@ -8141,7 +8156,7 @@ rm -f core conftest.err conftest.$ac_obj
- #----------------------------------------------------------------------------
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
- $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
- -if test "${ac_cv_type_uid_t+set}" = set; then :
- +if ${ac_cv_type_uid_t+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -8170,7 +8185,7 @@ $as_echo "#define gid_t int" >>confdefs.
- fi
-
- ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
- -if test "x$ac_cv_type_off_t" = x""yes; then :
- +if test "x$ac_cv_type_off_t" = xyes; then :
-
- else
-
- @@ -8181,7 +8196,7 @@ _ACEOF
- fi
-
- ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
- -if test "x$ac_cv_type_size_t" = x""yes; then :
- +if test "x$ac_cv_type_size_t" = xyes; then :
-
- else
-
- @@ -8193,7 +8208,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
- $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
- -if test "${ac_cv_header_time+set}" = set; then :
- +if ${ac_cv_header_time+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -8233,7 +8248,7 @@ fi
- #----------------------------------------------------------------------------
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
- $as_echo_n "checking for working memcmp... " >&6; }
- -if test "${ac_cv_func_memcmp_working+set}" = set; then :
- +if ${ac_cv_func_memcmp_working+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
- @@ -8301,8 +8316,7 @@ do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
- "
- -eval as_val=\$$as_ac_Header
- - if test "x$as_val" = x""yes; then :
- +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- @@ -8321,7 +8335,7 @@ done
- for ac_func in getpagesize
- do :
- ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
- -if test "x$ac_cv_func_getpagesize" = x""yes; then :
- +if test "x$ac_cv_func_getpagesize" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_GETPAGESIZE 1
- _ACEOF
- @@ -8331,7 +8345,7 @@ done
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
- $as_echo_n "checking for working mmap... " >&6; }
- -if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
- +if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
- @@ -8498,7 +8512,7 @@ rm -f conftest.mmap conftest.txt
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
- $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
- -if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
- +if ${ac_cv_lib_pthread_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- @@ -8532,7 +8546,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
- $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
- -if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
- +if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBPTHREAD 1
- _ACEOF
- @@ -8543,7 +8557,7 @@ fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
- $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
- -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
- +if ${ac_cv_lib_rt_clock_gettime+:} false; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- @@ -8577,7 +8591,7 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
- $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
- -if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
- +if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBRT 1
- _ACEOF
- @@ -8620,8 +8634,7 @@ for ac_func in \
- do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
- -eval as_val=\$$as_ac_var
- - if test "x$as_val" = x""yes; then :
- +if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- @@ -9133,10 +9146,21 @@ $as_echo "$as_me: WARNING: cache variabl
- :end' >>confcache
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
- if test -w "$cache_file"; then
- - test "x$cache_file" != "x/dev/null" &&
- + if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
- $as_echo "$as_me: updating cache $cache_file" >&6;}
- - cat confcache >$cache_file
- + if test ! -f "$cache_file" || test -h "$cache_file"; then
- + cat confcache >"$cache_file"
- + else
- + case $cache_file in #(
- + */* | ?:*)
- + mv -f confcache "$cache_file"$$ &&
- + mv -f "$cache_file"$$ "$cache_file" ;; #(
- + *)
- + mv -f confcache "$cache_file" ;;
- + esac
- + fi
- + fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
- $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- @@ -9152,6 +9176,7 @@ DEFS=-DHAVE_CONFIG_H
-
- ac_libobjs=
- ac_ltlibobjs=
- +U=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
- ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- @@ -9166,180 +9191,172 @@ LIBOBJS=$ac_libobjs
- LTLIBOBJS=$ac_ltlibobjs
-
-
- - if test -n "$EXEEXT"; then
- - am__EXEEXT_TRUE=
- - am__EXEEXT_FALSE='#'
- -else
- - am__EXEEXT_TRUE='#'
- - am__EXEEXT_FALSE=
- -fi
- -
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
- + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- - as_fn_error "conditional \"AMDEP\" was never defined.
- + as_fn_error $? "conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- - as_fn_error "conditional \"am__fastdepCC\" was never defined.
- + as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- - as_fn_error "conditional \"am__fastdepCXX\" was never defined.
- + as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
- - as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
- + as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_ARCHS_INCLUDE_X86_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_X86_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_X86\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_X86\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_ARCHS_INCLUDE_AMD64_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_AMD64_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_AMD64\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_AMD64\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_ARCHS_INCLUDE_PPC32_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_PPC32_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_PPC32\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_PPC32\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_ARCHS_INCLUDE_PPC64_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_PPC64_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_PPC64\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_PPC64\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_ARCHS_INCLUDE_ARM_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_ARM_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_ARM\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_ARM\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_ARCHS_INCLUDE_S390X_TRUE}" && test -z "${VGCONF_ARCHS_INCLUDE_S390X_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_ARCHS_INCLUDE_S390X\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_ARCHS_INCLUDE_S390X\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_X86_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_X86_LINUX_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_LINUX\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC32_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_PPC64_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_ARM_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_ARM_LINUX_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_ARM_LINUX\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_ARM_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_S390X_LINUX_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_S390X_LINUX_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_S390X_LINUX\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_S390X_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_X86_DARWIN_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_X86_DARWIN_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_DARWIN\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_X86_DARWIN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN_TRUE}" && test -z "${VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_OS_IS_LINUX_TRUE}" && test -z "${VGCONF_OS_IS_LINUX_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_OS_IS_LINUX\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_OS_IS_LINUX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_OS_IS_DARWIN_TRUE}" && test -z "${VGCONF_OS_IS_DARWIN_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_OS_IS_DARWIN\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_OS_IS_DARWIN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_HAVE_PLATFORM_SEC_TRUE}" && test -z "${VGCONF_HAVE_PLATFORM_SEC_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_HAVE_PLATFORM_SEC\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_HAVE_PLATFORM_SEC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATVARIANT_IS_VANILLA_TRUE}" && test -z "${VGCONF_PLATVARIANT_IS_VANILLA_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATVARIANT_IS_VANILLA\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATVARIANT_IS_VANILLA\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${VGCONF_PLATVARIANT_IS_ANDROID_TRUE}" && test -z "${VGCONF_PLATVARIANT_IS_ANDROID_FALSE}"; then
- - as_fn_error "conditional \"VGCONF_PLATVARIANT_IS_ANDROID\" was never defined.
- + as_fn_error $? "conditional \"VGCONF_PLATVARIANT_IS_ANDROID\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAS_ALTIVEC_TRUE}" && test -z "${HAS_ALTIVEC_FALSE}"; then
- - as_fn_error "conditional \"HAS_ALTIVEC\" was never defined.
- + as_fn_error $? "conditional \"HAS_ALTIVEC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAS_VSX_TRUE}" && test -z "${HAS_VSX_FALSE}"; then
- - as_fn_error "conditional \"HAS_VSX\" was never defined.
- + as_fn_error $? "conditional \"HAS_VSX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PTHREAD_CREATE_GLIBC_2_0_TRUE}" && test -z "${HAVE_PTHREAD_CREATE_GLIBC_2_0_FALSE}"; then
- - as_fn_error "conditional \"HAVE_PTHREAD_CREATE_GLIBC_2_0\" was never defined.
- + as_fn_error $? "conditional \"HAVE_PTHREAD_CREATE_GLIBC_2_0\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_SSE3_TESTS_TRUE}" && test -z "${BUILD_SSE3_TESTS_FALSE}"; then
- - as_fn_error "conditional \"BUILD_SSE3_TESTS\" was never defined.
- + as_fn_error $? "conditional \"BUILD_SSE3_TESTS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_SSSE3_TESTS_TRUE}" && test -z "${BUILD_SSSE3_TESTS_FALSE}"; then
- - as_fn_error "conditional \"BUILD_SSSE3_TESTS\" was never defined.
- + as_fn_error $? "conditional \"BUILD_SSSE3_TESTS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_PCLMULQDQ_TESTS_TRUE}" && test -z "${BUILD_PCLMULQDQ_TESTS_FALSE}"; then
- - as_fn_error "conditional \"BUILD_PCLMULQDQ_TESTS\" was never defined.
- + as_fn_error $? "conditional \"BUILD_PCLMULQDQ_TESTS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_LZCNT_TESTS_TRUE}" && test -z "${BUILD_LZCNT_TESTS_FALSE}"; then
- - as_fn_error "conditional \"BUILD_LZCNT_TESTS\" was never defined.
- + as_fn_error $? "conditional \"BUILD_LZCNT_TESTS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_SSE42_TESTS_TRUE}" && test -z "${BUILD_SSE42_TESTS_FALSE}"; then
- - as_fn_error "conditional \"BUILD_SSE42_TESTS\" was never defined.
- + as_fn_error $? "conditional \"BUILD_SSE42_TESTS\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PTHREAD_BARRIER_TRUE}" && test -z "${HAVE_PTHREAD_BARRIER_FALSE}"; then
- - as_fn_error "conditional \"HAVE_PTHREAD_BARRIER\" was never defined.
- + as_fn_error $? "conditional \"HAVE_PTHREAD_BARRIER\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PTHREAD_MUTEX_TIMEDLOCK_TRUE}" && test -z "${HAVE_PTHREAD_MUTEX_TIMEDLOCK_FALSE}"; then
- - as_fn_error "conditional \"HAVE_PTHREAD_MUTEX_TIMEDLOCK\" was never defined.
- + as_fn_error $? "conditional \"HAVE_PTHREAD_MUTEX_TIMEDLOCK\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_PTHREAD_SPINLOCK_TRUE}" && test -z "${HAVE_PTHREAD_SPINLOCK_FALSE}"; then
- - as_fn_error "conditional \"HAVE_PTHREAD_SPINLOCK\" was never defined.
- + as_fn_error $? "conditional \"HAVE_PTHREAD_SPINLOCK\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_MPIWRAP_PRI_TRUE}" && test -z "${BUILD_MPIWRAP_PRI_FALSE}"; then
- - as_fn_error "conditional \"BUILD_MPIWRAP_PRI\" was never defined.
- + as_fn_error $? "conditional \"BUILD_MPIWRAP_PRI\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${BUILD_MPIWRAP_SEC_TRUE}" && test -z "${BUILD_MPIWRAP_SEC_FALSE}"; then
- - as_fn_error "conditional \"BUILD_MPIWRAP_SEC\" was never defined.
- + as_fn_error $? "conditional \"BUILD_MPIWRAP_SEC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_BOOST_1_35_TRUE}" && test -z "${HAVE_BOOST_1_35_FALSE}"; then
- - as_fn_error "conditional \"HAVE_BOOST_1_35\" was never defined.
- + as_fn_error $? "conditional \"HAVE_BOOST_1_35\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_OPENMP_TRUE}" && test -z "${HAVE_OPENMP_FALSE}"; then
- - as_fn_error "conditional \"HAVE_OPENMP\" was never defined.
- + as_fn_error $? "conditional \"HAVE_OPENMP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_BUILTIN_ATOMIC_TRUE}" && test -z "${HAVE_BUILTIN_ATOMIC_FALSE}"; then
- - as_fn_error "conditional \"HAVE_BUILTIN_ATOMIC\" was never defined.
- + as_fn_error $? "conditional \"HAVE_BUILTIN_ATOMIC\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${HAVE_BUILTIN_ATOMIC_CXX_TRUE}" && test -z "${HAVE_BUILTIN_ATOMIC_CXX_FALSE}"; then
- - as_fn_error "conditional \"HAVE_BUILTIN_ATOMIC_CXX\" was never defined.
- + as_fn_error $? "conditional \"HAVE_BUILTIN_ATOMIC_CXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-
- -: ${CONFIG_STATUS=./config.status}
- +: "${CONFIG_STATUS=./config.status}"
- ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
- @@ -9440,6 +9457,7 @@ fi
- IFS=" "" $as_nl"
-
- # Find who we are. Look in the path if we contain no directory separator.
- +as_myself=
- case $0 in #((
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- @@ -9485,19 +9503,19 @@ export LANGUAGE
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
- -# as_fn_error ERROR [LINENO LOG_FD]
- -# ---------------------------------
- +# as_fn_error STATUS ERROR [LINENO LOG_FD]
- +# ----------------------------------------
- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
- # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
- -# script with status $?, using 1 if that was 0.
- +# script with STATUS, using 1 if that was 0.
- as_fn_error ()
- {
- - as_status=$?; test $as_status -eq 0 && as_status=1
- - if test "$3"; then
- - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
- + as_status=$1; test $as_status -eq 0 && as_status=1
- + if test "$4"; then
- + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
- fi
- - $as_echo "$as_me: error: $1" >&2
- + $as_echo "$as_me: error: $2" >&2
- as_fn_exit $as_status
- } # as_fn_error
-
- @@ -9635,16 +9653,16 @@ if (echo >conf$$.file) 2>/dev/null; then
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- - # In both cases, we have to default to `cp -p'.
- + # In both cases, we have to default to `cp -pR'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- - as_ln_s='cp -p'
- + as_ln_s='cp -pR'
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- - as_ln_s='cp -p'
- + as_ln_s='cp -pR'
- fi
- else
- - as_ln_s='cp -p'
- + as_ln_s='cp -pR'
- fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
- @@ -9693,7 +9711,7 @@ $as_echo X"$as_dir" |
- test -d "$as_dir" && break
- done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
- } # as_fn_mkdir_p
- @@ -9704,28 +9722,16 @@ else
- as_mkdir_p=false
- fi
-
- -if test -x / >/dev/null 2>&1; then
- - as_test_x='test -x'
- -else
- - if ls -dL / >/dev/null 2>&1; then
- - as_ls_L_option=L
- - else
- - as_ls_L_option=
- - fi
- - as_test_x='
- - eval sh -c '\''
- - if test -d "$1"; then
- - test -d "$1/.";
- - else
- - case $1 in #(
- - -*)set "./$1";;
- - esac;
- - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- - ???[sx]*):;;*)false;;esac;fi
- - '\'' sh
- - '
- -fi
- -as_executable_p=$as_test_x
- +
- +# as_fn_executable_p FILE
- +# -----------------------
- +# Test if FILE is an executable regular file.
- +as_fn_executable_p ()
- +{
- + test -f "$1" && test -x "$1"
- +} # as_fn_executable_p
- +as_test_x='test -x'
- +as_executable_p=as_fn_executable_p
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- @@ -9747,7 +9753,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # values after options handling.
- ac_log="
- This file was extended by Valgrind $as_me 3.7.0, which was
- -generated by GNU Autoconf 2.65. Invocation command line was
- +generated by GNU Autoconf 2.69. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
- @@ -9813,10 +9819,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- Valgrind config.status 3.7.0
- -configured by $0, generated by GNU Autoconf 2.65,
- +configured by $0, generated by GNU Autoconf 2.69,
- with options \\"\$ac_cs_config\\"
-
- -Copyright (C) 2009 Free Software Foundation, Inc.
- +Copyright (C) 2012 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
-
- @@ -9834,11 +9840,16 @@ ac_need_defaults=:
- while test $# != 0
- do
- case $1 in
- - --*=*)
- + --*=?*)
- ac_option=`expr "X$1" : 'X\([^=]*\)='`
- ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
- + --*=)
- + ac_option=`expr "X$1" : 'X\([^=]*\)='`
- + ac_optarg=
- + ac_shift=:
- + ;;
- *)
- ac_option=$1
- ac_optarg=$2
- @@ -9860,6 +9871,7 @@ do
- $ac_shift
- case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
- + '') as_fn_error $? "missing file argument" ;;
- esac
- as_fn_append CONFIG_FILES " '$ac_optarg'"
- ac_need_defaults=false;;
- @@ -9872,7 +9884,7 @@ do
- ac_need_defaults=false;;
- --he | --h)
- # Conflict between --help and --header
- - as_fn_error "ambiguous option: \`$1'
- + as_fn_error $? "ambiguous option: \`$1'
- Try \`$0 --help' for more information.";;
- --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
- @@ -9881,7 +9893,7 @@ Try \`$0 --help' for more information.";
- ac_cs_silent=: ;;
-
- # This is an error.
- - -*) as_fn_error "unrecognized option: \`$1'
- + -*) as_fn_error $? "unrecognized option: \`$1'
- Try \`$0 --help' for more information." ;;
-
- *) as_fn_append ac_config_targets " $1"
- @@ -9901,7 +9913,7 @@ fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- if \$ac_cs_recheck; then
- - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
- CONFIG_SHELL='$SHELL'
- @@ -10008,7 +10020,7 @@ do
- "coregrind/link_tool_exe_linux") CONFIG_FILES="$CONFIG_FILES coregrind/link_tool_exe_linux" ;;
- "coregrind/link_tool_exe_darwin") CONFIG_FILES="$CONFIG_FILES coregrind/link_tool_exe_darwin" ;;
-
- - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
- esac
- done
-
- @@ -10031,9 +10043,10 @@ fi
- # after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
- - tmp=
- + tmp= ac_tmp=
- trap 'exit_status=$?
- - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
- + : "${ac_tmp:=$tmp}"
- + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
- ' 0
- trap 'as_fn_exit 1' 1 2 13 15
- }
- @@ -10041,12 +10054,13 @@ $debug ||
-
- {
- tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- - test -n "$tmp" && test -d "$tmp"
- + test -d "$tmp"
- } ||
- {
- tmp=./conf$$-$RANDOM
- (umask 077 && mkdir "$tmp")
- -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
- +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
- +ac_tmp=$tmp
-
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
- @@ -10063,12 +10077,12 @@ if test "x$ac_cr" = x; then
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
- - ac_cs_awk_cr='\r'
- + ac_cs_awk_cr='\\r'
- else
- ac_cs_awk_cr=$ac_cr
- fi
-
- -echo 'BEGIN {' >"$tmp/subs1.awk" &&
- +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
- _ACEOF
-
-
- @@ -10077,18 +10091,18 @@ _ACEOF
- echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
- echo "_ACEOF"
- } >conf$$subs.sh ||
- - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- . ./conf$$subs.sh ||
- - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
- ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
- if test $ac_delim_n = $ac_delim_num; then
- break
- elif $ac_last_try; then
- - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- @@ -10096,7 +10110,7 @@ done
- rm -f conf$$subs.sh
-
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
- +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
- _ACEOF
- sed -n '
- h
- @@ -10144,7 +10158,7 @@ t delim
- rm -f conf$$subs.awk
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- _ACAWK
- -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
- +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
- for (key in S) S_is_set[key] = 1
- FS = ""
-
- @@ -10176,21 +10190,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
- sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
- else
- cat
- -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
- - || as_fn_error "could not setup config files machinery" "$LINENO" 5
- +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
- + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
- _ACEOF
-
- -# VPATH may cause trouble with some makes, so we remove $(srcdir),
- -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
- +# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
- +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
- # trailing colons and then remove the whole line if VPATH becomes empty
- # (actually we leave an empty line to preserve line numbers).
- if test "x$srcdir" = x.; then
- - ac_vpsub='/^[ ]*VPATH[ ]*=/{
- -s/:*\$(srcdir):*/:/
- -s/:*\${srcdir}:*/:/
- -s/:*@srcdir@:*/:/
- -s/^\([^=]*=[ ]*\):*/\1/
- + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
- +h
- +s///
- +s/^/:/
- +s/[ ]*$/:/
- +s/:\$(srcdir):/:/g
- +s/:\${srcdir}:/:/g
- +s/:@srcdir@:/:/g
- +s/^:*//
- s/:*$//
- +x
- +s/\(=[ ]*\).*/\1/
- +G
- +s/\n//
- s/^[^=]*=[ ]*$//
- }'
- fi
- @@ -10202,7 +10224,7 @@ fi # test -n "$CONFIG_FILES"
- # No need to generate them if there are no CONFIG_HEADERS.
- # This happens for instance with `./config.status Makefile'.
- if test -n "$CONFIG_HEADERS"; then
- -cat >"$tmp/defines.awk" <<\_ACAWK ||
- +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
- BEGIN {
- _ACEOF
-
- @@ -10214,11 +10236,11 @@ _ACEOF
- # handling of long lines.
- ac_delim='%!_!# '
- for ac_last_try in false false :; do
- - ac_t=`sed -n "/$ac_delim/p" confdefs.h`
- - if test -z "$ac_t"; then
- + ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
- + if test -z "$ac_tt"; then
- break
- elif $ac_last_try; then
- - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
- + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
- @@ -10303,7 +10325,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- - as_fn_error "could not setup config headers machinery" "$LINENO" 5
- + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
-
-
- @@ -10316,7 +10338,7 @@ do
- esac
- case $ac_mode$ac_tag in
- :[FHL]*:*);;
- - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
- + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
- :[FH]-) ac_tag=-:-;;
- :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
- @@ -10335,7 +10357,7 @@ do
- for ac_f
- do
- case $ac_f in
- - -) ac_f="$tmp/stdin";;
- + -) ac_f="$ac_tmp/stdin";;
- *) # Look for the file first in the build tree, then in the source tree
- # (if the path is not absolute). The absolute path cannot be DOS-style,
- # because $ac_f cannot contain `:'.
- @@ -10344,7 +10366,7 @@ do
- [\\/$]*) false;;
- *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- esac ||
- - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
- esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
- as_fn_append ac_file_inputs " '$ac_f'"
- @@ -10370,8 +10392,8 @@ $as_echo "$as_me: creating $ac_file" >&6
- esac
-
- case $ac_tag in
- - *:-:* | *:-) cat >"$tmp/stdin" \
- - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
- + *:-:* | *:-) cat >"$ac_tmp/stdin" \
- + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
- esac
- ;;
- esac
- @@ -10507,23 +10529,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
- s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- "
- -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
- - || as_fn_error "could not create $ac_file" "$LINENO" 5
- +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
- + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
- - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
- - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
- + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
- + "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- -which seems to be undefined. Please make sure it is defined." >&5
- +which seems to be undefined. Please make sure it is defined" >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- -which seems to be undefined. Please make sure it is defined." >&2;}
- +which seems to be undefined. Please make sure it is defined" >&2;}
-
- - rm -f "$tmp/stdin"
- + rm -f "$ac_tmp/stdin"
- case $ac_file in
- - -) cat "$tmp/out" && rm -f "$tmp/out";;
- - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
- + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
- + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
- esac \
- - || as_fn_error "could not create $ac_file" "$LINENO" 5
- + || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
- :H)
- #
- @@ -10532,21 +10555,21 @@ which seems to be undefined. Please mak
- if test x"$ac_file" != x-; then
- {
- $as_echo "/* $configure_input */" \
- - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
- - } >"$tmp/config.h" \
- - || as_fn_error "could not create $ac_file" "$LINENO" 5
- - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
- + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
- + } >"$ac_tmp/config.h" \
- + || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
- else
- rm -f "$ac_file"
- - mv "$tmp/config.h" "$ac_file" \
- - || as_fn_error "could not create $ac_file" "$LINENO" 5
- + mv "$ac_tmp/config.h" "$ac_file" \
- + || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- fi
- else
- $as_echo "/* $configure_input */" \
- - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
- - || as_fn_error "could not create -" "$LINENO" 5
- + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
- + || as_fn_error $? "could not create -" "$LINENO" 5
- fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
- @@ -10698,7 +10721,7 @@ _ACEOF
- ac_clean_files=$ac_clean_files_save
-
- test $ac_write_fail = 0 ||
- - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
- + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
- # configure is writing to config.log, and then calls config.status.
- @@ -10719,7 +10742,7 @@ if test "$no_create" != yes; then
- exec 5>>config.log
- # Use ||, not &&, to avoid exiting from the if with $? = 1, which
- # would make configure fail if this is the last instruction.
- - $ac_cs_success || as_fn_exit $?
- + $ac_cs_success || as_fn_exit 1
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|