0008-Use-libtool-2.4.patch 1.1 MB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584358535863587358835893590359135923593359435953596359735983599360036013602360336043605360636073608360936103611361236133614361536163617361836193620362136223623362436253626362736283629363036313632363336343635363636373638363936403641364236433644364536463647364836493650365136523653365436553656365736583659366036613662366336643665366636673668366936703671367236733674367536763677367836793680368136823683368436853686368736883689369036913692369336943695369636973698369937003701370237033704370537063707370837093710371137123713371437153716371737183719372037213722372337243725372637273728372937303731373237333734373537363737373837393740374137423743374437453746374737483749375037513752375337543755375637573758375937603761376237633764376537663767376837693770377137723773377437753776377737783779378037813782378337843785378637873788378937903791379237933794379537963797379837993800380138023803380438053806380738083809381038113812381338143815381638173818381938203821382238233824382538263827382838293830383138323833383438353836383738383839384038413842384338443845384638473848384938503851385238533854385538563857385838593860386138623863386438653866386738683869387038713872387338743875387638773878387938803881388238833884388538863887388838893890389138923893389438953896389738983899390039013902390339043905390639073908390939103911391239133914391539163917391839193920392139223923392439253926392739283929393039313932393339343935393639373938393939403941394239433944394539463947394839493950395139523953395439553956395739583959396039613962396339643965396639673968396939703971397239733974397539763977397839793980398139823983398439853986398739883989399039913992399339943995399639973998399940004001400240034004400540064007400840094010401140124013401440154016401740184019402040214022402340244025402640274028402940304031403240334034403540364037403840394040404140424043404440454046404740484049405040514052405340544055405640574058405940604061406240634064406540664067406840694070407140724073407440754076407740784079408040814082408340844085408640874088408940904091409240934094409540964097409840994100410141024103410441054106410741084109411041114112411341144115411641174118411941204121412241234124412541264127412841294130413141324133413441354136413741384139414041414142414341444145414641474148414941504151415241534154415541564157415841594160416141624163416441654166416741684169417041714172417341744175417641774178417941804181418241834184418541864187418841894190419141924193419441954196419741984199420042014202420342044205420642074208420942104211421242134214421542164217421842194220422142224223422442254226422742284229423042314232423342344235423642374238423942404241424242434244424542464247424842494250425142524253425442554256425742584259426042614262426342644265426642674268426942704271427242734274427542764277427842794280428142824283428442854286428742884289429042914292429342944295429642974298429943004301430243034304430543064307430843094310431143124313431443154316431743184319432043214322432343244325432643274328432943304331433243334334433543364337433843394340434143424343434443454346434743484349435043514352435343544355435643574358435943604361436243634364436543664367436843694370437143724373437443754376437743784379438043814382438343844385438643874388438943904391439243934394439543964397439843994400440144024403440444054406440744084409441044114412441344144415441644174418441944204421442244234424442544264427442844294430443144324433443444354436443744384439444044414442444344444445444644474448444944504451445244534454445544564457445844594460446144624463446444654466446744684469447044714472447344744475447644774478447944804481448244834484448544864487448844894490449144924493449444954496449744984499450045014502450345044505450645074508450945104511451245134514451545164517451845194520452145224523452445254526452745284529453045314532453345344535453645374538453945404541454245434544454545464547454845494550455145524553455445554556455745584559456045614562456345644565456645674568456945704571457245734574457545764577457845794580458145824583458445854586458745884589459045914592459345944595459645974598459946004601460246034604460546064607460846094610461146124613461446154616461746184619462046214622462346244625462646274628462946304631463246334634463546364637463846394640464146424643464446454646464746484649465046514652465346544655465646574658465946604661466246634664466546664667466846694670467146724673467446754676467746784679468046814682468346844685468646874688468946904691469246934694469546964697469846994700470147024703470447054706470747084709471047114712471347144715471647174718471947204721472247234724472547264727472847294730473147324733473447354736473747384739474047414742474347444745474647474748474947504751475247534754475547564757475847594760476147624763476447654766476747684769477047714772477347744775477647774778477947804781478247834784478547864787478847894790479147924793479447954796479747984799480048014802480348044805480648074808480948104811481248134814481548164817481848194820482148224823482448254826482748284829483048314832483348344835483648374838483948404841484248434844484548464847484848494850485148524853485448554856485748584859486048614862486348644865486648674868486948704871487248734874487548764877487848794880488148824883488448854886488748884889489048914892489348944895489648974898489949004901490249034904490549064907490849094910491149124913491449154916491749184919492049214922492349244925492649274928492949304931493249334934493549364937493849394940494149424943494449454946494749484949495049514952495349544955495649574958495949604961496249634964496549664967496849694970497149724973497449754976497749784979498049814982498349844985498649874988498949904991499249934994499549964997499849995000500150025003500450055006500750085009501050115012501350145015501650175018501950205021502250235024502550265027502850295030503150325033503450355036503750385039504050415042504350445045504650475048504950505051505250535054505550565057505850595060506150625063506450655066506750685069507050715072507350745075507650775078507950805081508250835084508550865087508850895090509150925093509450955096509750985099510051015102510351045105510651075108510951105111511251135114511551165117511851195120512151225123512451255126512751285129513051315132513351345135513651375138513951405141514251435144514551465147514851495150515151525153515451555156515751585159516051615162516351645165516651675168516951705171517251735174517551765177517851795180518151825183518451855186518751885189519051915192519351945195519651975198519952005201520252035204520552065207520852095210521152125213521452155216521752185219522052215222522352245225522652275228522952305231523252335234523552365237523852395240524152425243524452455246524752485249525052515252525352545255525652575258525952605261526252635264526552665267526852695270527152725273527452755276527752785279528052815282528352845285528652875288528952905291529252935294529552965297529852995300530153025303530453055306530753085309531053115312531353145315531653175318531953205321532253235324532553265327532853295330533153325333533453355336533753385339534053415342534353445345534653475348534953505351535253535354535553565357535853595360536153625363536453655366536753685369537053715372537353745375537653775378537953805381538253835384538553865387538853895390539153925393539453955396539753985399540054015402540354045405540654075408540954105411541254135414541554165417541854195420542154225423542454255426542754285429543054315432543354345435543654375438543954405441544254435444544554465447544854495450545154525453545454555456545754585459546054615462546354645465546654675468546954705471547254735474547554765477547854795480548154825483548454855486548754885489549054915492549354945495549654975498549955005501550255035504550555065507550855095510551155125513551455155516551755185519552055215522552355245525552655275528552955305531553255335534553555365537553855395540554155425543554455455546554755485549555055515552555355545555555655575558555955605561556255635564556555665567556855695570557155725573557455755576557755785579558055815582558355845585558655875588558955905591559255935594559555965597559855995600560156025603560456055606560756085609561056115612561356145615561656175618561956205621562256235624562556265627562856295630563156325633563456355636563756385639564056415642564356445645564656475648564956505651565256535654565556565657565856595660566156625663566456655666566756685669567056715672567356745675567656775678567956805681568256835684568556865687568856895690569156925693569456955696569756985699570057015702570357045705570657075708570957105711571257135714571557165717571857195720572157225723572457255726572757285729573057315732573357345735573657375738573957405741574257435744574557465747574857495750575157525753575457555756575757585759576057615762576357645765576657675768576957705771577257735774577557765777577857795780578157825783578457855786578757885789579057915792579357945795579657975798579958005801580258035804580558065807580858095810581158125813581458155816581758185819582058215822582358245825582658275828582958305831583258335834583558365837583858395840584158425843584458455846584758485849585058515852585358545855585658575858585958605861586258635864586558665867586858695870587158725873587458755876587758785879588058815882588358845885588658875888588958905891589258935894589558965897589858995900590159025903590459055906590759085909591059115912591359145915591659175918591959205921592259235924592559265927592859295930593159325933593459355936593759385939594059415942594359445945594659475948594959505951595259535954595559565957595859595960596159625963596459655966596759685969597059715972597359745975597659775978597959805981598259835984598559865987598859895990599159925993599459955996599759985999600060016002600360046005600660076008600960106011601260136014601560166017601860196020602160226023602460256026602760286029603060316032603360346035603660376038603960406041604260436044604560466047604860496050605160526053605460556056605760586059606060616062606360646065606660676068606960706071607260736074607560766077607860796080608160826083608460856086608760886089609060916092609360946095609660976098609961006101610261036104610561066107610861096110611161126113611461156116611761186119612061216122612361246125612661276128612961306131613261336134613561366137613861396140614161426143614461456146614761486149615061516152615361546155615661576158615961606161616261636164616561666167616861696170617161726173617461756176617761786179618061816182618361846185618661876188618961906191619261936194619561966197619861996200620162026203620462056206620762086209621062116212621362146215621662176218621962206221622262236224622562266227622862296230623162326233623462356236623762386239624062416242624362446245624662476248624962506251625262536254625562566257625862596260626162626263626462656266626762686269627062716272627362746275627662776278627962806281628262836284628562866287628862896290629162926293629462956296629762986299630063016302630363046305630663076308630963106311631263136314631563166317631863196320632163226323632463256326632763286329633063316332633363346335633663376338633963406341634263436344634563466347634863496350635163526353635463556356635763586359636063616362636363646365636663676368636963706371637263736374637563766377637863796380638163826383638463856386638763886389639063916392639363946395639663976398639964006401640264036404640564066407640864096410641164126413641464156416641764186419642064216422642364246425642664276428642964306431643264336434643564366437643864396440644164426443644464456446644764486449645064516452645364546455645664576458645964606461646264636464646564666467646864696470647164726473647464756476647764786479648064816482648364846485648664876488648964906491649264936494649564966497649864996500650165026503650465056506650765086509651065116512651365146515651665176518651965206521652265236524652565266527652865296530653165326533653465356536653765386539654065416542654365446545654665476548654965506551655265536554655565566557655865596560656165626563656465656566656765686569657065716572657365746575657665776578657965806581658265836584658565866587658865896590659165926593659465956596659765986599660066016602660366046605660666076608660966106611661266136614661566166617661866196620662166226623662466256626662766286629663066316632663366346635663666376638663966406641664266436644664566466647664866496650665166526653665466556656665766586659666066616662666366646665666666676668666966706671667266736674667566766677667866796680668166826683668466856686668766886689669066916692669366946695669666976698669967006701670267036704670567066707670867096710671167126713671467156716671767186719672067216722672367246725672667276728672967306731673267336734673567366737673867396740674167426743674467456746674767486749675067516752675367546755675667576758675967606761676267636764676567666767676867696770677167726773677467756776677767786779678067816782678367846785678667876788678967906791679267936794679567966797679867996800680168026803680468056806680768086809681068116812681368146815681668176818681968206821682268236824682568266827682868296830683168326833683468356836683768386839684068416842684368446845684668476848684968506851685268536854685568566857685868596860686168626863686468656866686768686869687068716872687368746875687668776878687968806881688268836884688568866887688868896890689168926893689468956896689768986899690069016902690369046905690669076908690969106911691269136914691569166917691869196920692169226923692469256926692769286929693069316932693369346935693669376938693969406941694269436944694569466947694869496950695169526953695469556956695769586959696069616962696369646965696669676968696969706971697269736974697569766977697869796980698169826983698469856986698769886989699069916992699369946995699669976998699970007001700270037004700570067007700870097010701170127013701470157016701770187019702070217022702370247025702670277028702970307031703270337034703570367037703870397040704170427043704470457046704770487049705070517052705370547055705670577058705970607061706270637064706570667067706870697070707170727073707470757076707770787079708070817082708370847085708670877088708970907091709270937094709570967097709870997100710171027103710471057106710771087109711071117112711371147115711671177118711971207121712271237124712571267127712871297130713171327133713471357136713771387139714071417142714371447145714671477148714971507151715271537154715571567157715871597160716171627163716471657166716771687169717071717172717371747175717671777178717971807181718271837184718571867187718871897190719171927193719471957196719771987199720072017202720372047205720672077208720972107211721272137214721572167217721872197220722172227223722472257226722772287229723072317232723372347235723672377238723972407241724272437244724572467247724872497250725172527253725472557256725772587259726072617262726372647265726672677268726972707271727272737274727572767277727872797280728172827283728472857286728772887289729072917292729372947295729672977298729973007301730273037304730573067307730873097310731173127313731473157316731773187319732073217322732373247325732673277328732973307331733273337334733573367337733873397340734173427343734473457346734773487349735073517352735373547355735673577358735973607361736273637364736573667367736873697370737173727373737473757376737773787379738073817382738373847385738673877388738973907391739273937394739573967397739873997400740174027403740474057406740774087409741074117412741374147415741674177418741974207421742274237424742574267427742874297430743174327433743474357436743774387439744074417442744374447445744674477448744974507451745274537454745574567457745874597460746174627463746474657466746774687469747074717472747374747475747674777478747974807481748274837484748574867487748874897490749174927493749474957496749774987499750075017502750375047505750675077508750975107511751275137514751575167517751875197520752175227523752475257526752775287529753075317532753375347535753675377538753975407541754275437544754575467547754875497550755175527553755475557556755775587559756075617562756375647565756675677568756975707571757275737574757575767577757875797580758175827583758475857586758775887589759075917592759375947595759675977598759976007601760276037604760576067607760876097610761176127613761476157616761776187619762076217622762376247625762676277628762976307631763276337634763576367637763876397640764176427643764476457646764776487649765076517652765376547655765676577658765976607661766276637664766576667667766876697670767176727673767476757676767776787679768076817682768376847685768676877688768976907691769276937694769576967697769876997700770177027703770477057706770777087709771077117712771377147715771677177718771977207721772277237724772577267727772877297730773177327733773477357736773777387739774077417742774377447745774677477748774977507751775277537754775577567757775877597760776177627763776477657766776777687769777077717772777377747775777677777778777977807781778277837784778577867787778877897790779177927793779477957796779777987799780078017802780378047805780678077808780978107811781278137814781578167817781878197820782178227823782478257826782778287829783078317832783378347835783678377838783978407841784278437844784578467847784878497850785178527853785478557856785778587859786078617862786378647865786678677868786978707871787278737874787578767877787878797880788178827883788478857886788778887889789078917892789378947895789678977898789979007901790279037904790579067907790879097910791179127913791479157916791779187919792079217922792379247925792679277928792979307931793279337934793579367937793879397940794179427943794479457946794779487949795079517952795379547955795679577958795979607961796279637964796579667967796879697970797179727973797479757976797779787979798079817982798379847985798679877988798979907991799279937994799579967997799879998000800180028003800480058006800780088009801080118012801380148015801680178018801980208021802280238024802580268027802880298030803180328033803480358036803780388039804080418042804380448045804680478048804980508051805280538054805580568057805880598060806180628063806480658066806780688069807080718072807380748075807680778078807980808081808280838084808580868087808880898090809180928093809480958096809780988099810081018102810381048105810681078108810981108111811281138114811581168117811881198120812181228123812481258126812781288129813081318132813381348135813681378138813981408141814281438144814581468147814881498150815181528153815481558156815781588159816081618162816381648165816681678168816981708171817281738174817581768177817881798180818181828183818481858186818781888189819081918192819381948195819681978198819982008201820282038204820582068207820882098210821182128213821482158216821782188219822082218222822382248225822682278228822982308231823282338234823582368237823882398240824182428243824482458246824782488249825082518252825382548255825682578258825982608261826282638264826582668267826882698270827182728273827482758276827782788279828082818282828382848285828682878288828982908291829282938294829582968297829882998300830183028303830483058306830783088309831083118312831383148315831683178318831983208321832283238324832583268327832883298330833183328333833483358336833783388339834083418342834383448345834683478348834983508351835283538354835583568357835883598360836183628363836483658366836783688369837083718372837383748375837683778378837983808381838283838384838583868387838883898390839183928393839483958396839783988399840084018402840384048405840684078408840984108411841284138414841584168417841884198420842184228423842484258426842784288429843084318432843384348435843684378438843984408441844284438444844584468447844884498450845184528453845484558456845784588459846084618462846384648465846684678468846984708471847284738474847584768477847884798480848184828483848484858486848784888489849084918492849384948495849684978498849985008501850285038504850585068507850885098510851185128513851485158516851785188519852085218522852385248525852685278528852985308531853285338534853585368537853885398540854185428543854485458546854785488549855085518552855385548555855685578558855985608561856285638564856585668567856885698570857185728573857485758576857785788579858085818582858385848585858685878588858985908591859285938594859585968597859885998600860186028603860486058606860786088609861086118612861386148615861686178618861986208621862286238624862586268627862886298630863186328633863486358636863786388639864086418642864386448645864686478648864986508651865286538654865586568657865886598660866186628663866486658666866786688669867086718672867386748675867686778678867986808681868286838684868586868687868886898690869186928693869486958696869786988699870087018702870387048705870687078708870987108711871287138714871587168717871887198720872187228723872487258726872787288729873087318732873387348735873687378738873987408741874287438744874587468747874887498750875187528753875487558756875787588759876087618762876387648765876687678768876987708771877287738774877587768777877887798780878187828783878487858786878787888789879087918792879387948795879687978798879988008801880288038804880588068807880888098810881188128813881488158816881788188819882088218822882388248825882688278828882988308831883288338834883588368837883888398840884188428843884488458846884788488849885088518852885388548855885688578858885988608861886288638864886588668867886888698870887188728873887488758876887788788879888088818882888388848885888688878888888988908891889288938894889588968897889888998900890189028903890489058906890789088909891089118912891389148915891689178918891989208921892289238924892589268927892889298930893189328933893489358936893789388939894089418942894389448945894689478948894989508951895289538954895589568957895889598960896189628963896489658966896789688969897089718972897389748975897689778978897989808981898289838984898589868987898889898990899189928993899489958996899789988999900090019002900390049005900690079008900990109011901290139014901590169017901890199020902190229023902490259026902790289029903090319032903390349035903690379038903990409041904290439044904590469047904890499050905190529053905490559056905790589059906090619062906390649065906690679068906990709071907290739074907590769077907890799080908190829083908490859086908790889089909090919092909390949095909690979098909991009101910291039104910591069107910891099110911191129113911491159116911791189119912091219122912391249125912691279128912991309131913291339134913591369137913891399140914191429143914491459146914791489149915091519152915391549155915691579158915991609161916291639164916591669167916891699170917191729173917491759176917791789179918091819182918391849185918691879188918991909191919291939194919591969197919891999200920192029203920492059206920792089209921092119212921392149215921692179218921992209221922292239224922592269227922892299230923192329233923492359236923792389239924092419242924392449245924692479248924992509251925292539254925592569257925892599260926192629263926492659266926792689269927092719272927392749275927692779278927992809281928292839284928592869287928892899290929192929293929492959296929792989299930093019302930393049305930693079308930993109311931293139314931593169317931893199320932193229323932493259326932793289329933093319332933393349335933693379338933993409341934293439344934593469347934893499350935193529353935493559356935793589359936093619362936393649365936693679368936993709371937293739374937593769377937893799380938193829383938493859386938793889389939093919392939393949395939693979398939994009401940294039404940594069407940894099410941194129413941494159416941794189419942094219422942394249425942694279428942994309431943294339434943594369437943894399440944194429443944494459446944794489449945094519452945394549455945694579458945994609461946294639464946594669467946894699470947194729473947494759476947794789479948094819482948394849485948694879488948994909491949294939494949594969497949894999500950195029503950495059506950795089509951095119512951395149515951695179518951995209521952295239524952595269527952895299530953195329533953495359536953795389539954095419542954395449545954695479548954995509551955295539554955595569557955895599560956195629563956495659566956795689569957095719572957395749575957695779578957995809581958295839584958595869587958895899590959195929593959495959596959795989599960096019602960396049605960696079608960996109611961296139614961596169617961896199620962196229623962496259626962796289629963096319632963396349635963696379638963996409641964296439644964596469647964896499650965196529653965496559656965796589659966096619662966396649665966696679668966996709671967296739674967596769677967896799680968196829683968496859686968796889689969096919692969396949695969696979698969997009701970297039704970597069707970897099710971197129713971497159716971797189719972097219722972397249725972697279728972997309731973297339734973597369737973897399740974197429743974497459746974797489749975097519752975397549755975697579758975997609761976297639764976597669767976897699770977197729773977497759776977797789779978097819782978397849785978697879788978997909791979297939794979597969797979897999800980198029803980498059806980798089809981098119812981398149815981698179818981998209821982298239824982598269827982898299830983198329833983498359836983798389839984098419842984398449845984698479848984998509851985298539854985598569857985898599860986198629863986498659866986798689869987098719872987398749875987698779878987998809881988298839884988598869887988898899890989198929893989498959896989798989899990099019902990399049905990699079908990999109911991299139914991599169917991899199920992199229923992499259926992799289929993099319932993399349935993699379938993999409941994299439944994599469947994899499950995199529953995499559956995799589959996099619962996399649965996699679968996999709971997299739974997599769977997899799980998199829983998499859986998799889989999099919992999399949995999699979998999910000100011000210003100041000510006100071000810009100101001110012100131001410015100161001710018100191002010021100221002310024100251002610027100281002910030100311003210033100341003510036100371003810039100401004110042100431004410045100461004710048100491005010051100521005310054100551005610057100581005910060100611006210063100641006510066100671006810069100701007110072100731007410075100761007710078100791008010081100821008310084100851008610087100881008910090100911009210093100941009510096100971009810099101001010110102101031010410105101061010710108101091011010111101121011310114101151011610117101181011910120101211012210123101241012510126101271012810129101301013110132101331013410135101361013710138101391014010141101421014310144101451014610147101481014910150101511015210153101541015510156101571015810159101601016110162101631016410165101661016710168101691017010171101721017310174101751017610177101781017910180101811018210183101841018510186101871018810189101901019110192101931019410195101961019710198101991020010201102021020310204102051020610207102081020910210102111021210213102141021510216102171021810219102201022110222102231022410225102261022710228102291023010231102321023310234102351023610237102381023910240102411024210243102441024510246102471024810249102501025110252102531025410255102561025710258102591026010261102621026310264102651026610267102681026910270102711027210273102741027510276102771027810279102801028110282102831028410285102861028710288102891029010291102921029310294102951029610297102981029910300103011030210303103041030510306103071030810309103101031110312103131031410315103161031710318103191032010321103221032310324103251032610327103281032910330103311033210333103341033510336103371033810339103401034110342103431034410345103461034710348103491035010351103521035310354103551035610357103581035910360103611036210363103641036510366103671036810369103701037110372103731037410375103761037710378103791038010381103821038310384103851038610387103881038910390103911039210393103941039510396103971039810399104001040110402104031040410405104061040710408104091041010411104121041310414104151041610417104181041910420104211042210423104241042510426104271042810429104301043110432104331043410435104361043710438104391044010441104421044310444104451044610447104481044910450104511045210453104541045510456104571045810459104601046110462104631046410465104661046710468104691047010471104721047310474104751047610477104781047910480104811048210483104841048510486104871048810489104901049110492104931049410495104961049710498104991050010501105021050310504105051050610507105081050910510105111051210513105141051510516105171051810519105201052110522105231052410525105261052710528105291053010531105321053310534105351053610537105381053910540105411054210543105441054510546105471054810549105501055110552105531055410555105561055710558105591056010561105621056310564105651056610567105681056910570105711057210573105741057510576105771057810579105801058110582105831058410585105861058710588105891059010591105921059310594105951059610597105981059910600106011060210603106041060510606106071060810609106101061110612106131061410615106161061710618106191062010621106221062310624106251062610627106281062910630106311063210633106341063510636106371063810639106401064110642106431064410645106461064710648106491065010651106521065310654106551065610657106581065910660106611066210663106641066510666106671066810669106701067110672106731067410675106761067710678106791068010681106821068310684106851068610687106881068910690106911069210693106941069510696106971069810699107001070110702107031070410705107061070710708107091071010711107121071310714107151071610717107181071910720107211072210723107241072510726107271072810729107301073110732107331073410735107361073710738107391074010741107421074310744107451074610747107481074910750107511075210753107541075510756107571075810759107601076110762107631076410765107661076710768107691077010771107721077310774107751077610777107781077910780107811078210783107841078510786107871078810789107901079110792107931079410795107961079710798107991080010801108021080310804108051080610807108081080910810108111081210813108141081510816108171081810819108201082110822108231082410825108261082710828108291083010831108321083310834108351083610837108381083910840108411084210843108441084510846108471084810849108501085110852108531085410855108561085710858108591086010861108621086310864108651086610867108681086910870108711087210873108741087510876108771087810879108801088110882108831088410885108861088710888108891089010891108921089310894108951089610897108981089910900109011090210903109041090510906109071090810909109101091110912109131091410915109161091710918109191092010921109221092310924109251092610927109281092910930109311093210933109341093510936109371093810939109401094110942109431094410945109461094710948109491095010951109521095310954109551095610957109581095910960109611096210963109641096510966109671096810969109701097110972109731097410975109761097710978109791098010981109821098310984109851098610987109881098910990109911099210993109941099510996109971099810999110001100111002110031100411005110061100711008110091101011011110121101311014110151101611017110181101911020110211102211023110241102511026110271102811029110301103111032110331103411035110361103711038110391104011041110421104311044110451104611047110481104911050110511105211053110541105511056110571105811059110601106111062110631106411065110661106711068110691107011071110721107311074110751107611077110781107911080110811108211083110841108511086110871108811089110901109111092110931109411095110961109711098110991110011101111021110311104111051110611107111081110911110111111111211113111141111511116111171111811119111201112111122111231112411125111261112711128111291113011131111321113311134111351113611137111381113911140111411114211143111441114511146111471114811149111501115111152111531115411155111561115711158111591116011161111621116311164111651116611167111681116911170111711117211173111741117511176111771117811179111801118111182111831118411185111861118711188111891119011191111921119311194111951119611197111981119911200112011120211203112041120511206112071120811209112101121111212112131121411215112161121711218112191122011221112221122311224112251122611227112281122911230112311123211233112341123511236112371123811239112401124111242112431124411245112461124711248112491125011251112521125311254112551125611257112581125911260112611126211263112641126511266112671126811269112701127111272112731127411275112761127711278112791128011281112821128311284112851128611287112881128911290112911129211293112941129511296112971129811299113001130111302113031130411305113061130711308113091131011311113121131311314113151131611317113181131911320113211132211323113241132511326113271132811329113301133111332113331133411335113361133711338113391134011341113421134311344113451134611347113481134911350113511135211353113541135511356113571135811359113601136111362113631136411365113661136711368113691137011371113721137311374113751137611377113781137911380113811138211383113841138511386113871138811389113901139111392113931139411395113961139711398113991140011401114021140311404114051140611407114081140911410114111141211413114141141511416114171141811419114201142111422114231142411425114261142711428114291143011431114321143311434114351143611437114381143911440114411144211443114441144511446114471144811449114501145111452114531145411455114561145711458114591146011461114621146311464114651146611467114681146911470114711147211473114741147511476114771147811479114801148111482114831148411485114861148711488114891149011491114921149311494114951149611497114981149911500115011150211503115041150511506115071150811509115101151111512115131151411515115161151711518115191152011521115221152311524115251152611527115281152911530115311153211533115341153511536115371153811539115401154111542115431154411545115461154711548115491155011551115521155311554115551155611557115581155911560115611156211563115641156511566115671156811569115701157111572115731157411575115761157711578115791158011581115821158311584115851158611587115881158911590115911159211593115941159511596115971159811599116001160111602116031160411605116061160711608116091161011611116121161311614116151161611617116181161911620116211162211623116241162511626116271162811629116301163111632116331163411635116361163711638116391164011641116421164311644116451164611647116481164911650116511165211653116541165511656116571165811659116601166111662116631166411665116661166711668116691167011671116721167311674116751167611677116781167911680116811168211683116841168511686116871168811689116901169111692116931169411695116961169711698116991170011701117021170311704117051170611707117081170911710117111171211713117141171511716117171171811719117201172111722117231172411725117261172711728117291173011731117321173311734117351173611737117381173911740117411174211743117441174511746117471174811749117501175111752117531175411755117561175711758117591176011761117621176311764117651176611767117681176911770117711177211773117741177511776117771177811779117801178111782117831178411785117861178711788117891179011791117921179311794117951179611797117981179911800118011180211803118041180511806118071180811809118101181111812118131181411815118161181711818118191182011821118221182311824118251182611827118281182911830118311183211833118341183511836118371183811839118401184111842118431184411845118461184711848118491185011851118521185311854118551185611857118581185911860118611186211863118641186511866118671186811869118701187111872118731187411875118761187711878118791188011881118821188311884118851188611887118881188911890118911189211893118941189511896118971189811899119001190111902119031190411905119061190711908119091191011911119121191311914119151191611917119181191911920119211192211923119241192511926119271192811929119301193111932119331193411935119361193711938119391194011941119421194311944119451194611947119481194911950119511195211953119541195511956119571195811959119601196111962119631196411965119661196711968119691197011971119721197311974119751197611977119781197911980119811198211983119841198511986119871198811989119901199111992119931199411995119961199711998119991200012001120021200312004120051200612007120081200912010120111201212013120141201512016120171201812019120201202112022120231202412025120261202712028120291203012031120321203312034120351203612037120381203912040120411204212043120441204512046120471204812049120501205112052120531205412055120561205712058120591206012061120621206312064120651206612067120681206912070120711207212073120741207512076120771207812079120801208112082120831208412085120861208712088120891209012091120921209312094120951209612097120981209912100121011210212103121041210512106121071210812109121101211112112121131211412115121161211712118121191212012121121221212312124121251212612127121281212912130121311213212133121341213512136121371213812139121401214112142121431214412145121461214712148121491215012151121521215312154121551215612157121581215912160121611216212163121641216512166121671216812169121701217112172121731217412175121761217712178121791218012181121821218312184121851218612187121881218912190121911219212193121941219512196121971219812199122001220112202122031220412205122061220712208122091221012211122121221312214122151221612217122181221912220122211222212223122241222512226122271222812229122301223112232122331223412235122361223712238122391224012241122421224312244122451224612247122481224912250122511225212253122541225512256122571225812259122601226112262122631226412265122661226712268122691227012271122721227312274122751227612277122781227912280122811228212283122841228512286122871228812289122901229112292122931229412295122961229712298122991230012301123021230312304123051230612307123081230912310123111231212313123141231512316123171231812319123201232112322123231232412325123261232712328123291233012331123321233312334123351233612337123381233912340123411234212343123441234512346123471234812349123501235112352123531235412355123561235712358123591236012361123621236312364123651236612367123681236912370123711237212373123741237512376123771237812379123801238112382123831238412385123861238712388123891239012391123921239312394123951239612397123981239912400124011240212403124041240512406124071240812409124101241112412124131241412415124161241712418124191242012421124221242312424124251242612427124281242912430124311243212433124341243512436124371243812439124401244112442124431244412445124461244712448124491245012451124521245312454124551245612457124581245912460124611246212463124641246512466124671246812469124701247112472124731247412475124761247712478124791248012481124821248312484124851248612487124881248912490124911249212493124941249512496124971249812499125001250112502125031250412505125061250712508125091251012511125121251312514125151251612517125181251912520125211252212523125241252512526125271252812529125301253112532125331253412535125361253712538125391254012541125421254312544125451254612547125481254912550125511255212553125541255512556125571255812559125601256112562125631256412565125661256712568125691257012571125721257312574125751257612577125781257912580125811258212583125841258512586125871258812589125901259112592125931259412595125961259712598125991260012601126021260312604126051260612607126081260912610126111261212613126141261512616126171261812619126201262112622126231262412625126261262712628126291263012631126321263312634126351263612637126381263912640126411264212643126441264512646126471264812649126501265112652126531265412655126561265712658126591266012661126621266312664126651266612667126681266912670126711267212673126741267512676126771267812679126801268112682126831268412685126861268712688126891269012691126921269312694126951269612697126981269912700127011270212703127041270512706127071270812709127101271112712127131271412715127161271712718127191272012721127221272312724127251272612727127281272912730127311273212733127341273512736127371273812739127401274112742127431274412745127461274712748127491275012751127521275312754127551275612757127581275912760127611276212763127641276512766127671276812769127701277112772127731277412775127761277712778127791278012781127821278312784127851278612787127881278912790127911279212793127941279512796127971279812799128001280112802128031280412805128061280712808128091281012811128121281312814128151281612817128181281912820128211282212823128241282512826128271282812829128301283112832128331283412835128361283712838128391284012841128421284312844128451284612847128481284912850128511285212853128541285512856128571285812859128601286112862128631286412865128661286712868128691287012871128721287312874128751287612877128781287912880128811288212883128841288512886128871288812889128901289112892128931289412895128961289712898128991290012901129021290312904129051290612907129081290912910129111291212913129141291512916129171291812919129201292112922129231292412925129261292712928129291293012931129321293312934129351293612937129381293912940129411294212943129441294512946129471294812949129501295112952129531295412955129561295712958129591296012961129621296312964129651296612967129681296912970129711297212973129741297512976129771297812979129801298112982129831298412985129861298712988129891299012991129921299312994129951299612997129981299913000130011300213003130041300513006130071300813009130101301113012130131301413015130161301713018130191302013021130221302313024130251302613027130281302913030130311303213033130341303513036130371303813039130401304113042130431304413045130461304713048130491305013051130521305313054130551305613057130581305913060130611306213063130641306513066130671306813069130701307113072130731307413075130761307713078130791308013081130821308313084130851308613087130881308913090130911309213093130941309513096130971309813099131001310113102131031310413105131061310713108131091311013111131121311313114131151311613117131181311913120131211312213123131241312513126131271312813129131301313113132131331313413135131361313713138131391314013141131421314313144131451314613147131481314913150131511315213153131541315513156131571315813159131601316113162131631316413165131661316713168131691317013171131721317313174131751317613177131781317913180131811318213183131841318513186131871318813189131901319113192131931319413195131961319713198131991320013201132021320313204132051320613207132081320913210132111321213213132141321513216132171321813219132201322113222132231322413225132261322713228132291323013231132321323313234132351323613237132381323913240132411324213243132441324513246132471324813249132501325113252132531325413255132561325713258132591326013261132621326313264132651326613267132681326913270132711327213273132741327513276132771327813279132801328113282132831328413285132861328713288132891329013291132921329313294132951329613297132981329913300133011330213303133041330513306133071330813309133101331113312133131331413315133161331713318133191332013321133221332313324133251332613327133281332913330133311333213333133341333513336133371333813339133401334113342133431334413345133461334713348133491335013351133521335313354133551335613357133581335913360133611336213363133641336513366133671336813369133701337113372133731337413375133761337713378133791338013381133821338313384133851338613387133881338913390133911339213393133941339513396133971339813399134001340113402134031340413405134061340713408134091341013411134121341313414134151341613417134181341913420134211342213423134241342513426134271342813429134301343113432134331343413435134361343713438134391344013441134421344313444134451344613447134481344913450134511345213453134541345513456134571345813459134601346113462134631346413465134661346713468134691347013471134721347313474134751347613477134781347913480134811348213483134841348513486134871348813489134901349113492134931349413495134961349713498134991350013501135021350313504135051350613507135081350913510135111351213513135141351513516135171351813519135201352113522135231352413525135261352713528135291353013531135321353313534135351353613537135381353913540135411354213543135441354513546135471354813549135501355113552135531355413555135561355713558135591356013561135621356313564135651356613567135681356913570135711357213573135741357513576135771357813579135801358113582135831358413585135861358713588135891359013591135921359313594135951359613597135981359913600136011360213603136041360513606136071360813609136101361113612136131361413615136161361713618136191362013621136221362313624136251362613627136281362913630136311363213633136341363513636136371363813639136401364113642136431364413645136461364713648136491365013651136521365313654136551365613657136581365913660136611366213663136641366513666136671366813669136701367113672136731367413675136761367713678136791368013681136821368313684136851368613687136881368913690136911369213693136941369513696136971369813699137001370113702137031370413705137061370713708137091371013711137121371313714137151371613717137181371913720137211372213723137241372513726137271372813729137301373113732137331373413735137361373713738137391374013741137421374313744137451374613747137481374913750137511375213753137541375513756137571375813759137601376113762137631376413765137661376713768137691377013771137721377313774137751377613777137781377913780137811378213783137841378513786137871378813789137901379113792137931379413795137961379713798137991380013801138021380313804138051380613807138081380913810138111381213813138141381513816138171381813819138201382113822138231382413825138261382713828138291383013831138321383313834138351383613837138381383913840138411384213843138441384513846138471384813849138501385113852138531385413855138561385713858138591386013861138621386313864138651386613867138681386913870138711387213873138741387513876138771387813879138801388113882138831388413885138861388713888138891389013891138921389313894138951389613897138981389913900139011390213903139041390513906139071390813909139101391113912139131391413915139161391713918139191392013921139221392313924139251392613927139281392913930139311393213933139341393513936139371393813939139401394113942139431394413945139461394713948139491395013951139521395313954139551395613957139581395913960139611396213963139641396513966139671396813969139701397113972139731397413975139761397713978139791398013981139821398313984139851398613987139881398913990139911399213993139941399513996139971399813999140001400114002140031400414005140061400714008140091401014011140121401314014140151401614017140181401914020140211402214023140241402514026140271402814029140301403114032140331403414035140361403714038140391404014041140421404314044140451404614047140481404914050140511405214053140541405514056140571405814059140601406114062140631406414065140661406714068140691407014071140721407314074140751407614077140781407914080140811408214083140841408514086140871408814089140901409114092140931409414095140961409714098140991410014101141021410314104141051410614107141081410914110141111411214113141141411514116141171411814119141201412114122141231412414125141261412714128141291413014131141321413314134141351413614137141381413914140141411414214143141441414514146141471414814149141501415114152141531415414155141561415714158141591416014161141621416314164141651416614167141681416914170141711417214173141741417514176141771417814179141801418114182141831418414185141861418714188141891419014191141921419314194141951419614197141981419914200142011420214203142041420514206142071420814209142101421114212142131421414215142161421714218142191422014221142221422314224142251422614227142281422914230142311423214233142341423514236142371423814239142401424114242142431424414245142461424714248142491425014251142521425314254142551425614257142581425914260142611426214263142641426514266142671426814269142701427114272142731427414275142761427714278142791428014281142821428314284142851428614287142881428914290142911429214293142941429514296142971429814299143001430114302143031430414305143061430714308143091431014311143121431314314143151431614317143181431914320143211432214323143241432514326143271432814329143301433114332143331433414335143361433714338143391434014341143421434314344143451434614347143481434914350143511435214353143541435514356143571435814359143601436114362143631436414365143661436714368143691437014371143721437314374143751437614377143781437914380143811438214383143841438514386143871438814389143901439114392143931439414395143961439714398143991440014401144021440314404144051440614407144081440914410144111441214413144141441514416144171441814419144201442114422144231442414425144261442714428144291443014431144321443314434144351443614437144381443914440144411444214443144441444514446144471444814449144501445114452144531445414455144561445714458144591446014461144621446314464144651446614467144681446914470144711447214473144741447514476144771447814479144801448114482144831448414485144861448714488144891449014491144921449314494144951449614497144981449914500145011450214503145041450514506145071450814509145101451114512145131451414515145161451714518145191452014521145221452314524145251452614527145281452914530145311453214533145341453514536145371453814539145401454114542145431454414545145461454714548145491455014551145521455314554145551455614557145581455914560145611456214563145641456514566145671456814569145701457114572145731457414575145761457714578145791458014581145821458314584145851458614587145881458914590145911459214593145941459514596145971459814599146001460114602146031460414605146061460714608146091461014611146121461314614146151461614617146181461914620146211462214623146241462514626146271462814629146301463114632146331463414635146361463714638146391464014641146421464314644146451464614647146481464914650146511465214653146541465514656146571465814659146601466114662146631466414665146661466714668146691467014671146721467314674146751467614677146781467914680146811468214683146841468514686146871468814689146901469114692146931469414695146961469714698146991470014701147021470314704147051470614707147081470914710147111471214713147141471514716147171471814719147201472114722147231472414725147261472714728147291473014731147321473314734147351473614737147381473914740147411474214743147441474514746147471474814749147501475114752147531475414755147561475714758147591476014761147621476314764147651476614767147681476914770147711477214773147741477514776147771477814779147801478114782147831478414785147861478714788147891479014791147921479314794147951479614797147981479914800148011480214803148041480514806148071480814809148101481114812148131481414815148161481714818148191482014821148221482314824148251482614827148281482914830148311483214833148341483514836148371483814839148401484114842148431484414845148461484714848148491485014851148521485314854148551485614857148581485914860148611486214863148641486514866148671486814869148701487114872148731487414875148761487714878148791488014881148821488314884148851488614887148881488914890148911489214893148941489514896148971489814899149001490114902149031490414905149061490714908149091491014911149121491314914149151491614917149181491914920149211492214923149241492514926149271492814929149301493114932149331493414935149361493714938149391494014941149421494314944149451494614947149481494914950149511495214953149541495514956149571495814959149601496114962149631496414965149661496714968149691497014971149721497314974149751497614977149781497914980149811498214983149841498514986149871498814989149901499114992149931499414995149961499714998149991500015001150021500315004150051500615007150081500915010150111501215013150141501515016150171501815019150201502115022150231502415025150261502715028150291503015031150321503315034150351503615037150381503915040150411504215043150441504515046150471504815049150501505115052150531505415055150561505715058150591506015061150621506315064150651506615067150681506915070150711507215073150741507515076150771507815079150801508115082150831508415085150861508715088150891509015091150921509315094150951509615097150981509915100151011510215103151041510515106151071510815109151101511115112151131511415115151161511715118151191512015121151221512315124151251512615127151281512915130151311513215133151341513515136151371513815139151401514115142151431514415145151461514715148151491515015151151521515315154151551515615157151581515915160151611516215163151641516515166151671516815169151701517115172151731517415175151761517715178151791518015181151821518315184151851518615187151881518915190151911519215193151941519515196151971519815199152001520115202152031520415205152061520715208152091521015211152121521315214152151521615217152181521915220152211522215223152241522515226152271522815229152301523115232152331523415235152361523715238152391524015241152421524315244152451524615247152481524915250152511525215253152541525515256152571525815259152601526115262152631526415265152661526715268152691527015271152721527315274152751527615277152781527915280152811528215283152841528515286152871528815289152901529115292152931529415295152961529715298152991530015301153021530315304153051530615307153081530915310153111531215313153141531515316153171531815319153201532115322153231532415325153261532715328153291533015331153321533315334153351533615337153381533915340153411534215343153441534515346153471534815349153501535115352153531535415355153561535715358153591536015361153621536315364153651536615367153681536915370153711537215373153741537515376153771537815379153801538115382153831538415385153861538715388153891539015391153921539315394153951539615397153981539915400154011540215403154041540515406154071540815409154101541115412154131541415415154161541715418154191542015421154221542315424154251542615427154281542915430154311543215433154341543515436154371543815439154401544115442154431544415445154461544715448154491545015451154521545315454154551545615457154581545915460154611546215463154641546515466154671546815469154701547115472154731547415475154761547715478154791548015481154821548315484154851548615487154881548915490154911549215493154941549515496154971549815499155001550115502155031550415505155061550715508155091551015511155121551315514155151551615517155181551915520155211552215523155241552515526155271552815529155301553115532155331553415535155361553715538155391554015541155421554315544155451554615547155481554915550155511555215553155541555515556155571555815559155601556115562155631556415565155661556715568155691557015571155721557315574155751557615577155781557915580155811558215583155841558515586155871558815589155901559115592155931559415595155961559715598155991560015601156021560315604156051560615607156081560915610156111561215613156141561515616156171561815619156201562115622156231562415625156261562715628156291563015631156321563315634156351563615637156381563915640156411564215643156441564515646156471564815649156501565115652156531565415655156561565715658156591566015661156621566315664156651566615667156681566915670156711567215673156741567515676156771567815679156801568115682156831568415685156861568715688156891569015691156921569315694156951569615697156981569915700157011570215703157041570515706157071570815709157101571115712157131571415715157161571715718157191572015721157221572315724157251572615727157281572915730157311573215733157341573515736157371573815739157401574115742157431574415745157461574715748157491575015751157521575315754157551575615757157581575915760157611576215763157641576515766157671576815769157701577115772157731577415775157761577715778157791578015781157821578315784157851578615787157881578915790157911579215793157941579515796157971579815799158001580115802158031580415805158061580715808158091581015811158121581315814158151581615817158181581915820158211582215823158241582515826158271582815829158301583115832158331583415835158361583715838158391584015841158421584315844158451584615847158481584915850158511585215853158541585515856158571585815859158601586115862158631586415865158661586715868158691587015871158721587315874158751587615877158781587915880158811588215883158841588515886158871588815889158901589115892158931589415895158961589715898158991590015901159021590315904159051590615907159081590915910159111591215913159141591515916159171591815919159201592115922159231592415925159261592715928159291593015931159321593315934159351593615937159381593915940159411594215943159441594515946159471594815949159501595115952159531595415955159561595715958159591596015961159621596315964159651596615967159681596915970159711597215973159741597515976159771597815979159801598115982159831598415985159861598715988159891599015991159921599315994159951599615997159981599916000160011600216003160041600516006160071600816009160101601116012160131601416015160161601716018160191602016021160221602316024160251602616027160281602916030160311603216033160341603516036160371603816039160401604116042160431604416045160461604716048160491605016051160521605316054160551605616057160581605916060160611606216063160641606516066160671606816069160701607116072160731607416075160761607716078160791608016081160821608316084160851608616087160881608916090160911609216093160941609516096160971609816099161001610116102161031610416105161061610716108161091611016111161121611316114161151611616117161181611916120161211612216123161241612516126161271612816129161301613116132161331613416135161361613716138161391614016141161421614316144161451614616147161481614916150161511615216153161541615516156161571615816159161601616116162161631616416165161661616716168161691617016171161721617316174161751617616177161781617916180161811618216183161841618516186161871618816189161901619116192161931619416195161961619716198161991620016201162021620316204162051620616207162081620916210162111621216213162141621516216162171621816219162201622116222162231622416225162261622716228162291623016231162321623316234162351623616237162381623916240162411624216243162441624516246162471624816249162501625116252162531625416255162561625716258162591626016261162621626316264162651626616267162681626916270162711627216273162741627516276162771627816279162801628116282162831628416285162861628716288162891629016291162921629316294162951629616297162981629916300163011630216303163041630516306163071630816309163101631116312163131631416315163161631716318163191632016321163221632316324163251632616327163281632916330163311633216333163341633516336163371633816339163401634116342163431634416345163461634716348163491635016351163521635316354163551635616357163581635916360163611636216363163641636516366163671636816369163701637116372163731637416375163761637716378163791638016381163821638316384163851638616387163881638916390163911639216393163941639516396163971639816399164001640116402164031640416405164061640716408164091641016411164121641316414164151641616417164181641916420164211642216423164241642516426164271642816429164301643116432164331643416435164361643716438164391644016441164421644316444164451644616447164481644916450164511645216453164541645516456164571645816459164601646116462164631646416465164661646716468164691647016471164721647316474164751647616477164781647916480164811648216483164841648516486164871648816489164901649116492164931649416495164961649716498164991650016501165021650316504165051650616507165081650916510165111651216513165141651516516165171651816519165201652116522165231652416525165261652716528165291653016531165321653316534165351653616537165381653916540165411654216543165441654516546165471654816549165501655116552165531655416555165561655716558165591656016561165621656316564165651656616567165681656916570165711657216573165741657516576165771657816579165801658116582165831658416585165861658716588165891659016591165921659316594165951659616597165981659916600166011660216603166041660516606166071660816609166101661116612166131661416615166161661716618166191662016621166221662316624166251662616627166281662916630166311663216633166341663516636166371663816639166401664116642166431664416645166461664716648166491665016651166521665316654166551665616657166581665916660166611666216663166641666516666166671666816669166701667116672166731667416675166761667716678166791668016681166821668316684166851668616687166881668916690166911669216693166941669516696166971669816699167001670116702167031670416705167061670716708167091671016711167121671316714167151671616717167181671916720167211672216723167241672516726167271672816729167301673116732167331673416735167361673716738167391674016741167421674316744167451674616747167481674916750167511675216753167541675516756167571675816759167601676116762167631676416765167661676716768167691677016771167721677316774167751677616777167781677916780167811678216783167841678516786167871678816789167901679116792167931679416795167961679716798167991680016801168021680316804168051680616807168081680916810168111681216813168141681516816168171681816819168201682116822168231682416825168261682716828168291683016831168321683316834168351683616837168381683916840168411684216843168441684516846168471684816849168501685116852168531685416855168561685716858168591686016861168621686316864168651686616867168681686916870168711687216873168741687516876168771687816879168801688116882168831688416885168861688716888168891689016891168921689316894168951689616897168981689916900169011690216903169041690516906169071690816909169101691116912169131691416915169161691716918169191692016921169221692316924169251692616927169281692916930169311693216933169341693516936169371693816939169401694116942169431694416945169461694716948169491695016951169521695316954169551695616957169581695916960169611696216963169641696516966169671696816969169701697116972169731697416975169761697716978169791698016981169821698316984169851698616987169881698916990169911699216993169941699516996169971699816999170001700117002170031700417005170061700717008170091701017011170121701317014170151701617017170181701917020170211702217023170241702517026170271702817029170301703117032170331703417035170361703717038170391704017041170421704317044170451704617047170481704917050170511705217053170541705517056170571705817059170601706117062170631706417065170661706717068170691707017071170721707317074170751707617077170781707917080170811708217083170841708517086170871708817089170901709117092170931709417095170961709717098170991710017101171021710317104171051710617107171081710917110171111711217113171141711517116171171711817119171201712117122171231712417125171261712717128171291713017131171321713317134171351713617137171381713917140171411714217143171441714517146171471714817149171501715117152171531715417155171561715717158171591716017161171621716317164171651716617167171681716917170171711717217173171741717517176171771717817179171801718117182171831718417185171861718717188171891719017191171921719317194171951719617197171981719917200172011720217203172041720517206172071720817209172101721117212172131721417215172161721717218172191722017221172221722317224172251722617227172281722917230172311723217233172341723517236172371723817239172401724117242172431724417245172461724717248172491725017251172521725317254172551725617257172581725917260172611726217263172641726517266172671726817269172701727117272172731727417275172761727717278172791728017281172821728317284172851728617287172881728917290172911729217293172941729517296172971729817299173001730117302173031730417305173061730717308173091731017311173121731317314173151731617317173181731917320173211732217323173241732517326173271732817329173301733117332173331733417335173361733717338173391734017341173421734317344173451734617347173481734917350173511735217353173541735517356173571735817359173601736117362173631736417365173661736717368173691737017371173721737317374173751737617377173781737917380173811738217383173841738517386173871738817389173901739117392173931739417395173961739717398173991740017401174021740317404174051740617407174081740917410174111741217413174141741517416174171741817419174201742117422174231742417425174261742717428174291743017431174321743317434174351743617437174381743917440174411744217443174441744517446174471744817449174501745117452174531745417455174561745717458174591746017461174621746317464174651746617467174681746917470174711747217473174741747517476174771747817479174801748117482174831748417485174861748717488174891749017491174921749317494174951749617497174981749917500175011750217503175041750517506175071750817509175101751117512175131751417515175161751717518175191752017521175221752317524175251752617527175281752917530175311753217533175341753517536175371753817539175401754117542175431754417545175461754717548175491755017551175521755317554175551755617557175581755917560175611756217563175641756517566175671756817569175701757117572175731757417575175761757717578175791758017581175821758317584175851758617587175881758917590175911759217593175941759517596175971759817599176001760117602176031760417605176061760717608176091761017611176121761317614176151761617617176181761917620176211762217623176241762517626176271762817629176301763117632176331763417635176361763717638176391764017641176421764317644176451764617647176481764917650176511765217653176541765517656176571765817659176601766117662176631766417665176661766717668176691767017671176721767317674176751767617677176781767917680176811768217683176841768517686176871768817689176901769117692176931769417695176961769717698176991770017701177021770317704177051770617707177081770917710177111771217713177141771517716177171771817719177201772117722177231772417725177261772717728177291773017731177321773317734177351773617737177381773917740177411774217743177441774517746177471774817749177501775117752177531775417755177561775717758177591776017761177621776317764177651776617767177681776917770177711777217773177741777517776177771777817779177801778117782177831778417785177861778717788177891779017791177921779317794177951779617797177981779917800178011780217803178041780517806178071780817809178101781117812178131781417815178161781717818178191782017821178221782317824178251782617827178281782917830178311783217833178341783517836178371783817839178401784117842178431784417845178461784717848178491785017851178521785317854178551785617857178581785917860178611786217863178641786517866178671786817869178701787117872178731787417875178761787717878178791788017881178821788317884178851788617887178881788917890178911789217893178941789517896178971789817899179001790117902179031790417905179061790717908179091791017911179121791317914179151791617917179181791917920179211792217923179241792517926179271792817929179301793117932179331793417935179361793717938179391794017941179421794317944179451794617947179481794917950179511795217953179541795517956179571795817959179601796117962179631796417965179661796717968179691797017971179721797317974179751797617977179781797917980179811798217983179841798517986179871798817989179901799117992179931799417995179961799717998179991800018001180021800318004180051800618007180081800918010180111801218013180141801518016180171801818019180201802118022180231802418025180261802718028180291803018031180321803318034180351803618037180381803918040180411804218043180441804518046180471804818049180501805118052180531805418055180561805718058180591806018061180621806318064180651806618067180681806918070180711807218073180741807518076180771807818079180801808118082180831808418085180861808718088180891809018091180921809318094180951809618097180981809918100181011810218103181041810518106181071810818109181101811118112181131811418115181161811718118181191812018121181221812318124181251812618127181281812918130181311813218133181341813518136181371813818139181401814118142181431814418145181461814718148181491815018151181521815318154181551815618157181581815918160181611816218163181641816518166181671816818169181701817118172181731817418175181761817718178181791818018181181821818318184181851818618187181881818918190181911819218193181941819518196181971819818199182001820118202182031820418205182061820718208182091821018211182121821318214182151821618217182181821918220182211822218223182241822518226182271822818229182301823118232182331823418235182361823718238182391824018241182421824318244182451824618247182481824918250182511825218253182541825518256182571825818259182601826118262182631826418265182661826718268182691827018271182721827318274182751827618277182781827918280182811828218283182841828518286182871828818289182901829118292182931829418295182961829718298182991830018301183021830318304183051830618307183081830918310183111831218313183141831518316183171831818319183201832118322183231832418325183261832718328183291833018331183321833318334183351833618337183381833918340183411834218343183441834518346183471834818349183501835118352183531835418355183561835718358183591836018361183621836318364183651836618367183681836918370183711837218373183741837518376183771837818379183801838118382183831838418385183861838718388183891839018391183921839318394183951839618397183981839918400184011840218403184041840518406184071840818409184101841118412184131841418415184161841718418184191842018421184221842318424184251842618427184281842918430184311843218433184341843518436184371843818439184401844118442184431844418445184461844718448184491845018451184521845318454184551845618457184581845918460184611846218463184641846518466184671846818469184701847118472184731847418475184761847718478184791848018481184821848318484184851848618487184881848918490184911849218493184941849518496184971849818499185001850118502185031850418505185061850718508185091851018511185121851318514185151851618517185181851918520185211852218523185241852518526185271852818529185301853118532185331853418535185361853718538185391854018541185421854318544185451854618547185481854918550185511855218553185541855518556185571855818559185601856118562185631856418565185661856718568185691857018571185721857318574185751857618577185781857918580185811858218583185841858518586185871858818589185901859118592185931859418595185961859718598185991860018601186021860318604186051860618607186081860918610186111861218613186141861518616186171861818619186201862118622186231862418625186261862718628186291863018631186321863318634186351863618637186381863918640186411864218643186441864518646186471864818649186501865118652186531865418655186561865718658186591866018661186621866318664186651866618667186681866918670186711867218673186741867518676186771867818679186801868118682186831868418685186861868718688186891869018691186921869318694186951869618697186981869918700187011870218703187041870518706187071870818709187101871118712187131871418715187161871718718187191872018721187221872318724187251872618727187281872918730187311873218733187341873518736187371873818739187401874118742187431874418745187461874718748187491875018751187521875318754187551875618757187581875918760187611876218763187641876518766187671876818769187701877118772187731877418775187761877718778187791878018781187821878318784187851878618787187881878918790187911879218793187941879518796187971879818799188001880118802188031880418805188061880718808188091881018811188121881318814188151881618817188181881918820188211882218823188241882518826188271882818829188301883118832188331883418835188361883718838188391884018841188421884318844188451884618847188481884918850188511885218853188541885518856188571885818859188601886118862188631886418865188661886718868188691887018871188721887318874188751887618877188781887918880188811888218883188841888518886188871888818889188901889118892188931889418895188961889718898188991890018901189021890318904189051890618907189081890918910189111891218913189141891518916189171891818919189201892118922189231892418925189261892718928189291893018931189321893318934189351893618937189381893918940189411894218943189441894518946189471894818949189501895118952189531895418955189561895718958189591896018961189621896318964189651896618967189681896918970189711897218973189741897518976189771897818979189801898118982189831898418985189861898718988189891899018991189921899318994189951899618997189981899919000190011900219003190041900519006190071900819009190101901119012190131901419015190161901719018190191902019021190221902319024190251902619027190281902919030190311903219033190341903519036190371903819039190401904119042190431904419045190461904719048190491905019051190521905319054190551905619057190581905919060190611906219063190641906519066190671906819069190701907119072190731907419075190761907719078190791908019081190821908319084190851908619087190881908919090190911909219093190941909519096190971909819099191001910119102191031910419105191061910719108191091911019111191121911319114191151911619117191181911919120191211912219123191241912519126191271912819129191301913119132191331913419135191361913719138191391914019141191421914319144191451914619147191481914919150191511915219153191541915519156191571915819159191601916119162191631916419165191661916719168191691917019171191721917319174191751917619177191781917919180191811918219183191841918519186191871918819189191901919119192191931919419195191961919719198191991920019201192021920319204192051920619207192081920919210192111921219213192141921519216192171921819219192201922119222192231922419225192261922719228192291923019231192321923319234192351923619237192381923919240192411924219243192441924519246192471924819249192501925119252192531925419255192561925719258192591926019261192621926319264192651926619267192681926919270192711927219273192741927519276192771927819279192801928119282192831928419285192861928719288192891929019291192921929319294192951929619297192981929919300193011930219303193041930519306193071930819309193101931119312193131931419315193161931719318193191932019321193221932319324193251932619327193281932919330193311933219333193341933519336193371933819339193401934119342193431934419345193461934719348193491935019351193521935319354193551935619357193581935919360193611936219363193641936519366193671936819369193701937119372193731937419375193761937719378193791938019381193821938319384193851938619387193881938919390193911939219393193941939519396193971939819399194001940119402194031940419405194061940719408194091941019411194121941319414194151941619417194181941919420194211942219423194241942519426194271942819429194301943119432194331943419435194361943719438194391944019441194421944319444194451944619447194481944919450194511945219453194541945519456194571945819459194601946119462194631946419465194661946719468194691947019471194721947319474194751947619477194781947919480194811948219483194841948519486194871948819489194901949119492194931949419495194961949719498194991950019501195021950319504195051950619507195081950919510195111951219513195141951519516195171951819519195201952119522195231952419525195261952719528195291953019531195321953319534195351953619537195381953919540195411954219543195441954519546195471954819549195501955119552195531955419555195561955719558195591956019561195621956319564195651956619567195681956919570195711957219573195741957519576195771957819579195801958119582195831958419585195861958719588195891959019591195921959319594195951959619597195981959919600196011960219603196041960519606196071960819609196101961119612196131961419615196161961719618196191962019621196221962319624196251962619627196281962919630196311963219633196341963519636196371963819639196401964119642196431964419645196461964719648196491965019651196521965319654196551965619657196581965919660196611966219663196641966519666196671966819669196701967119672196731967419675196761967719678196791968019681196821968319684196851968619687196881968919690196911969219693196941969519696196971969819699197001970119702197031970419705197061970719708197091971019711197121971319714197151971619717197181971919720197211972219723197241972519726197271972819729197301973119732197331973419735197361973719738197391974019741197421974319744197451974619747197481974919750197511975219753197541975519756197571975819759197601976119762197631976419765197661976719768197691977019771197721977319774197751977619777197781977919780197811978219783197841978519786197871978819789197901979119792197931979419795197961979719798197991980019801198021980319804198051980619807198081980919810198111981219813198141981519816198171981819819198201982119822198231982419825198261982719828198291983019831198321983319834198351983619837198381983919840198411984219843198441984519846198471984819849198501985119852198531985419855198561985719858198591986019861198621986319864198651986619867198681986919870198711987219873198741987519876198771987819879198801988119882198831988419885198861988719888198891989019891198921989319894198951989619897198981989919900199011990219903199041990519906199071990819909199101991119912199131991419915199161991719918199191992019921199221992319924199251992619927199281992919930199311993219933199341993519936199371993819939199401994119942199431994419945199461994719948199491995019951199521995319954199551995619957199581995919960199611996219963199641996519966199671996819969199701997119972199731997419975199761997719978199791998019981199821998319984199851998619987199881998919990199911999219993199941999519996199971999819999200002000120002200032000420005200062000720008200092001020011200122001320014200152001620017200182001920020200212002220023200242002520026200272002820029200302003120032200332003420035200362003720038200392004020041200422004320044200452004620047200482004920050200512005220053200542005520056200572005820059200602006120062200632006420065200662006720068200692007020071200722007320074200752007620077200782007920080200812008220083200842008520086200872008820089200902009120092200932009420095200962009720098200992010020101201022010320104201052010620107201082010920110201112011220113201142011520116201172011820119201202012120122201232012420125201262012720128201292013020131201322013320134201352013620137201382013920140201412014220143201442014520146201472014820149201502015120152201532015420155201562015720158201592016020161201622016320164201652016620167201682016920170201712017220173201742017520176201772017820179201802018120182201832018420185201862018720188201892019020191201922019320194201952019620197201982019920200202012020220203202042020520206202072020820209202102021120212202132021420215202162021720218202192022020221202222022320224202252022620227202282022920230202312023220233202342023520236202372023820239202402024120242202432024420245202462024720248202492025020251202522025320254202552025620257202582025920260202612026220263202642026520266202672026820269202702027120272202732027420275202762027720278202792028020281202822028320284202852028620287202882028920290202912029220293202942029520296202972029820299203002030120302203032030420305203062030720308203092031020311203122031320314203152031620317203182031920320203212032220323203242032520326203272032820329203302033120332203332033420335203362033720338203392034020341203422034320344203452034620347203482034920350203512035220353203542035520356203572035820359203602036120362203632036420365203662036720368203692037020371203722037320374203752037620377203782037920380203812038220383203842038520386203872038820389203902039120392203932039420395203962039720398203992040020401204022040320404204052040620407204082040920410204112041220413204142041520416204172041820419204202042120422204232042420425204262042720428204292043020431204322043320434204352043620437204382043920440204412044220443204442044520446204472044820449204502045120452204532045420455204562045720458204592046020461204622046320464204652046620467204682046920470204712047220473204742047520476204772047820479204802048120482204832048420485204862048720488204892049020491204922049320494204952049620497204982049920500205012050220503205042050520506205072050820509205102051120512205132051420515205162051720518205192052020521205222052320524205252052620527205282052920530205312053220533205342053520536205372053820539205402054120542205432054420545205462054720548205492055020551205522055320554205552055620557205582055920560205612056220563205642056520566205672056820569205702057120572205732057420575205762057720578205792058020581205822058320584205852058620587205882058920590205912059220593205942059520596205972059820599206002060120602206032060420605206062060720608206092061020611206122061320614206152061620617206182061920620206212062220623206242062520626206272062820629206302063120632206332063420635206362063720638206392064020641206422064320644206452064620647206482064920650206512065220653206542065520656206572065820659206602066120662206632066420665206662066720668206692067020671206722067320674206752067620677206782067920680206812068220683206842068520686206872068820689206902069120692206932069420695206962069720698206992070020701207022070320704207052070620707207082070920710207112071220713207142071520716207172071820719207202072120722207232072420725207262072720728207292073020731207322073320734207352073620737207382073920740207412074220743207442074520746207472074820749207502075120752207532075420755207562075720758207592076020761207622076320764207652076620767207682076920770207712077220773207742077520776207772077820779207802078120782207832078420785207862078720788207892079020791207922079320794207952079620797207982079920800208012080220803208042080520806208072080820809208102081120812208132081420815208162081720818208192082020821208222082320824208252082620827208282082920830208312083220833208342083520836208372083820839208402084120842208432084420845208462084720848208492085020851208522085320854208552085620857208582085920860208612086220863208642086520866208672086820869208702087120872208732087420875208762087720878208792088020881208822088320884208852088620887208882088920890208912089220893208942089520896208972089820899209002090120902209032090420905209062090720908209092091020911209122091320914209152091620917209182091920920209212092220923209242092520926209272092820929209302093120932209332093420935209362093720938209392094020941209422094320944209452094620947209482094920950209512095220953209542095520956209572095820959209602096120962209632096420965209662096720968209692097020971209722097320974209752097620977209782097920980209812098220983209842098520986209872098820989209902099120992209932099420995209962099720998209992100021001210022100321004210052100621007210082100921010210112101221013210142101521016210172101821019210202102121022210232102421025210262102721028210292103021031210322103321034210352103621037210382103921040210412104221043210442104521046210472104821049210502105121052210532105421055210562105721058210592106021061210622106321064210652106621067210682106921070210712107221073210742107521076210772107821079210802108121082210832108421085210862108721088210892109021091210922109321094210952109621097210982109921100211012110221103211042110521106211072110821109211102111121112211132111421115211162111721118211192112021121211222112321124211252112621127211282112921130211312113221133211342113521136211372113821139211402114121142211432114421145211462114721148211492115021151211522115321154211552115621157211582115921160211612116221163211642116521166211672116821169211702117121172211732117421175211762117721178211792118021181211822118321184211852118621187211882118921190211912119221193211942119521196211972119821199212002120121202212032120421205212062120721208212092121021211212122121321214212152121621217212182121921220212212122221223212242122521226212272122821229212302123121232212332123421235212362123721238212392124021241212422124321244212452124621247212482124921250212512125221253212542125521256212572125821259212602126121262212632126421265212662126721268212692127021271212722127321274212752127621277212782127921280212812128221283212842128521286212872128821289212902129121292212932129421295212962129721298212992130021301213022130321304213052130621307213082130921310213112131221313213142131521316213172131821319213202132121322213232132421325213262132721328213292133021331213322133321334213352133621337213382133921340213412134221343213442134521346213472134821349213502135121352213532135421355213562135721358213592136021361213622136321364213652136621367213682136921370213712137221373213742137521376213772137821379213802138121382213832138421385213862138721388213892139021391213922139321394213952139621397213982139921400214012140221403214042140521406214072140821409214102141121412214132141421415214162141721418214192142021421214222142321424214252142621427214282142921430214312143221433214342143521436214372143821439214402144121442214432144421445214462144721448214492145021451214522145321454214552145621457214582145921460214612146221463214642146521466214672146821469214702147121472214732147421475214762147721478214792148021481214822148321484214852148621487214882148921490214912149221493214942149521496214972149821499215002150121502215032150421505215062150721508215092151021511215122151321514215152151621517215182151921520215212152221523215242152521526215272152821529215302153121532215332153421535215362153721538215392154021541215422154321544215452154621547215482154921550215512155221553215542155521556215572155821559215602156121562215632156421565215662156721568215692157021571215722157321574215752157621577215782157921580215812158221583215842158521586215872158821589215902159121592215932159421595215962159721598215992160021601216022160321604216052160621607216082160921610216112161221613216142161521616216172161821619216202162121622216232162421625216262162721628216292163021631216322163321634216352163621637216382163921640216412164221643216442164521646216472164821649216502165121652216532165421655216562165721658216592166021661216622166321664216652166621667216682166921670216712167221673216742167521676216772167821679216802168121682216832168421685216862168721688216892169021691216922169321694216952169621697216982169921700217012170221703217042170521706217072170821709217102171121712217132171421715217162171721718217192172021721217222172321724217252172621727217282172921730217312173221733217342173521736217372173821739217402174121742217432174421745217462174721748217492175021751217522175321754217552175621757217582175921760217612176221763217642176521766217672176821769217702177121772217732177421775217762177721778217792178021781217822178321784217852178621787217882178921790217912179221793217942179521796217972179821799218002180121802218032180421805218062180721808218092181021811218122181321814218152181621817218182181921820218212182221823218242182521826218272182821829218302183121832218332183421835218362183721838218392184021841218422184321844218452184621847218482184921850218512185221853218542185521856218572185821859218602186121862218632186421865218662186721868218692187021871218722187321874218752187621877218782187921880218812188221883218842188521886218872188821889218902189121892218932189421895218962189721898218992190021901219022190321904219052190621907219082190921910219112191221913219142191521916219172191821919219202192121922219232192421925219262192721928219292193021931219322193321934219352193621937219382193921940219412194221943219442194521946219472194821949219502195121952219532195421955219562195721958219592196021961219622196321964219652196621967219682196921970219712197221973219742197521976219772197821979219802198121982219832198421985219862198721988219892199021991219922199321994219952199621997219982199922000220012200222003220042200522006220072200822009220102201122012220132201422015220162201722018220192202022021220222202322024220252202622027220282202922030220312203222033220342203522036220372203822039220402204122042220432204422045220462204722048220492205022051220522205322054220552205622057220582205922060220612206222063220642206522066220672206822069220702207122072220732207422075220762207722078220792208022081220822208322084220852208622087220882208922090220912209222093220942209522096220972209822099221002210122102221032210422105221062210722108221092211022111221122211322114221152211622117221182211922120221212212222123221242212522126221272212822129221302213122132221332213422135221362213722138221392214022141221422214322144221452214622147221482214922150221512215222153221542215522156221572215822159221602216122162221632216422165221662216722168221692217022171221722217322174221752217622177221782217922180221812218222183221842218522186221872218822189221902219122192221932219422195221962219722198221992220022201222022220322204222052220622207222082220922210222112221222213222142221522216222172221822219222202222122222222232222422225222262222722228222292223022231222322223322234222352223622237222382223922240222412224222243222442224522246222472224822249222502225122252222532225422255222562225722258222592226022261222622226322264222652226622267222682226922270222712227222273222742227522276222772227822279222802228122282222832228422285222862228722288222892229022291222922229322294222952229622297222982229922300223012230222303223042230522306223072230822309223102231122312223132231422315223162231722318223192232022321223222232322324223252232622327223282232922330223312233222333223342233522336223372233822339223402234122342223432234422345223462234722348223492235022351223522235322354223552235622357223582235922360223612236222363223642236522366223672236822369223702237122372223732237422375223762237722378223792238022381223822238322384223852238622387223882238922390223912239222393223942239522396223972239822399224002240122402224032240422405224062240722408224092241022411224122241322414224152241622417224182241922420224212242222423224242242522426224272242822429224302243122432224332243422435224362243722438224392244022441224422244322444224452244622447224482244922450224512245222453224542245522456224572245822459224602246122462224632246422465224662246722468224692247022471224722247322474224752247622477224782247922480224812248222483224842248522486224872248822489224902249122492224932249422495224962249722498224992250022501225022250322504225052250622507225082250922510225112251222513225142251522516225172251822519225202252122522225232252422525225262252722528225292253022531225322253322534225352253622537225382253922540225412254222543225442254522546225472254822549225502255122552225532255422555225562255722558225592256022561225622256322564225652256622567225682256922570225712257222573225742257522576225772257822579225802258122582225832258422585225862258722588225892259022591225922259322594225952259622597225982259922600226012260222603226042260522606226072260822609226102261122612226132261422615226162261722618226192262022621226222262322624226252262622627226282262922630226312263222633226342263522636226372263822639226402264122642226432264422645226462264722648226492265022651226522265322654226552265622657226582265922660226612266222663226642266522666226672266822669226702267122672226732267422675226762267722678226792268022681226822268322684226852268622687226882268922690226912269222693226942269522696226972269822699227002270122702227032270422705227062270722708227092271022711227122271322714227152271622717227182271922720227212272222723227242272522726227272272822729227302273122732227332273422735227362273722738227392274022741227422274322744227452274622747227482274922750227512275222753227542275522756227572275822759227602276122762227632276422765227662276722768227692277022771227722277322774227752277622777227782277922780227812278222783227842278522786227872278822789227902279122792227932279422795227962279722798227992280022801228022280322804228052280622807228082280922810228112281222813228142281522816228172281822819228202282122822228232282422825228262282722828228292283022831228322283322834228352283622837228382283922840228412284222843228442284522846228472284822849228502285122852228532285422855228562285722858228592286022861228622286322864228652286622867228682286922870228712287222873228742287522876228772287822879228802288122882228832288422885228862288722888228892289022891228922289322894228952289622897228982289922900229012290222903229042290522906229072290822909229102291122912229132291422915229162291722918229192292022921229222292322924229252292622927229282292922930229312293222933229342293522936229372293822939229402294122942229432294422945229462294722948229492295022951229522295322954229552295622957229582295922960229612296222963229642296522966229672296822969229702297122972229732297422975229762297722978229792298022981229822298322984229852298622987229882298922990229912299222993229942299522996229972299822999230002300123002230032300423005230062300723008230092301023011230122301323014230152301623017230182301923020230212302223023230242302523026230272302823029230302303123032230332303423035230362303723038230392304023041230422304323044230452304623047230482304923050230512305223053230542305523056230572305823059230602306123062230632306423065230662306723068230692307023071230722307323074230752307623077230782307923080230812308223083230842308523086230872308823089230902309123092230932309423095230962309723098230992310023101231022310323104231052310623107231082310923110231112311223113231142311523116231172311823119231202312123122231232312423125231262312723128231292313023131231322313323134231352313623137231382313923140231412314223143231442314523146231472314823149231502315123152231532315423155231562315723158231592316023161231622316323164231652316623167231682316923170231712317223173231742317523176231772317823179231802318123182231832318423185231862318723188231892319023191231922319323194231952319623197231982319923200232012320223203232042320523206232072320823209232102321123212232132321423215232162321723218232192322023221232222322323224232252322623227232282322923230232312323223233232342323523236232372323823239232402324123242232432324423245232462324723248232492325023251232522325323254232552325623257232582325923260232612326223263232642326523266232672326823269232702327123272232732327423275232762327723278232792328023281232822328323284232852328623287232882328923290232912329223293232942329523296232972329823299233002330123302233032330423305233062330723308233092331023311233122331323314233152331623317233182331923320233212332223323233242332523326233272332823329233302333123332233332333423335233362333723338233392334023341233422334323344233452334623347233482334923350233512335223353233542335523356233572335823359233602336123362233632336423365233662336723368233692337023371233722337323374233752337623377233782337923380233812338223383233842338523386233872338823389233902339123392233932339423395233962339723398233992340023401234022340323404234052340623407234082340923410234112341223413234142341523416234172341823419234202342123422234232342423425234262342723428234292343023431234322343323434234352343623437234382343923440234412344223443234442344523446234472344823449234502345123452234532345423455234562345723458234592346023461234622346323464234652346623467234682346923470234712347223473234742347523476234772347823479234802348123482234832348423485234862348723488234892349023491234922349323494234952349623497234982349923500235012350223503235042350523506235072350823509235102351123512235132351423515235162351723518235192352023521235222352323524235252352623527235282352923530235312353223533235342353523536235372353823539235402354123542235432354423545235462354723548235492355023551235522355323554235552355623557235582355923560235612356223563235642356523566235672356823569235702357123572235732357423575235762357723578235792358023581235822358323584235852358623587235882358923590235912359223593235942359523596235972359823599236002360123602236032360423605236062360723608236092361023611236122361323614236152361623617236182361923620236212362223623236242362523626236272362823629236302363123632236332363423635236362363723638236392364023641236422364323644236452364623647236482364923650236512365223653236542365523656236572365823659236602366123662236632366423665236662366723668236692367023671236722367323674236752367623677236782367923680236812368223683236842368523686236872368823689236902369123692236932369423695236962369723698236992370023701237022370323704237052370623707237082370923710237112371223713237142371523716237172371823719237202372123722237232372423725237262372723728237292373023731237322373323734237352373623737237382373923740237412374223743237442374523746237472374823749237502375123752237532375423755237562375723758237592376023761237622376323764237652376623767237682376923770237712377223773237742377523776237772377823779237802378123782237832378423785237862378723788237892379023791237922379323794237952379623797237982379923800238012380223803238042380523806238072380823809238102381123812238132381423815238162381723818238192382023821238222382323824238252382623827238282382923830238312383223833238342383523836238372383823839238402384123842238432384423845238462384723848238492385023851238522385323854238552385623857238582385923860238612386223863238642386523866238672386823869238702387123872238732387423875238762387723878238792388023881238822388323884238852388623887238882388923890238912389223893238942389523896238972389823899239002390123902239032390423905239062390723908239092391023911239122391323914239152391623917239182391923920239212392223923239242392523926239272392823929239302393123932239332393423935239362393723938239392394023941239422394323944239452394623947239482394923950239512395223953239542395523956239572395823959239602396123962239632396423965239662396723968239692397023971239722397323974239752397623977239782397923980239812398223983239842398523986239872398823989239902399123992239932399423995239962399723998239992400024001240022400324004240052400624007240082400924010240112401224013240142401524016240172401824019240202402124022240232402424025240262402724028240292403024031240322403324034240352403624037240382403924040240412404224043240442404524046240472404824049240502405124052240532405424055240562405724058240592406024061240622406324064240652406624067240682406924070240712407224073240742407524076240772407824079240802408124082240832408424085240862408724088240892409024091240922409324094240952409624097240982409924100241012410224103241042410524106241072410824109241102411124112241132411424115241162411724118241192412024121241222412324124241252412624127241282412924130241312413224133241342413524136241372413824139241402414124142241432414424145241462414724148241492415024151241522415324154241552415624157241582415924160241612416224163241642416524166241672416824169241702417124172241732417424175241762417724178241792418024181241822418324184241852418624187241882418924190241912419224193241942419524196241972419824199242002420124202242032420424205242062420724208242092421024211242122421324214242152421624217242182421924220242212422224223242242422524226242272422824229242302423124232242332423424235242362423724238242392424024241242422424324244242452424624247242482424924250242512425224253242542425524256242572425824259242602426124262242632426424265242662426724268242692427024271242722427324274242752427624277242782427924280242812428224283242842428524286242872428824289242902429124292242932429424295242962429724298242992430024301243022430324304243052430624307243082430924310243112431224313243142431524316243172431824319243202432124322243232432424325243262432724328243292433024331243322433324334243352433624337243382433924340243412434224343243442434524346243472434824349243502435124352243532435424355243562435724358243592436024361243622436324364243652436624367243682436924370243712437224373243742437524376243772437824379243802438124382243832438424385243862438724388243892439024391243922439324394243952439624397243982439924400244012440224403244042440524406244072440824409244102441124412244132441424415244162441724418244192442024421244222442324424244252442624427244282442924430244312443224433244342443524436244372443824439244402444124442244432444424445244462444724448244492445024451244522445324454244552445624457244582445924460244612446224463244642446524466244672446824469244702447124472244732447424475244762447724478244792448024481244822448324484244852448624487244882448924490244912449224493244942449524496244972449824499245002450124502245032450424505245062450724508245092451024511245122451324514245152451624517245182451924520245212452224523245242452524526245272452824529245302453124532245332453424535245362453724538245392454024541245422454324544245452454624547245482454924550245512455224553245542455524556245572455824559245602456124562245632456424565245662456724568245692457024571245722457324574245752457624577245782457924580245812458224583245842458524586245872458824589245902459124592245932459424595245962459724598245992460024601246022460324604246052460624607246082460924610246112461224613246142461524616246172461824619246202462124622246232462424625246262462724628246292463024631246322463324634246352463624637246382463924640246412464224643246442464524646246472464824649246502465124652246532465424655246562465724658246592466024661246622466324664246652466624667246682466924670246712467224673246742467524676246772467824679246802468124682246832468424685246862468724688246892469024691246922469324694246952469624697246982469924700247012470224703247042470524706247072470824709247102471124712247132471424715247162471724718247192472024721247222472324724247252472624727247282472924730247312473224733247342473524736247372473824739247402474124742247432474424745247462474724748247492475024751247522475324754247552475624757247582475924760247612476224763247642476524766247672476824769247702477124772247732477424775247762477724778247792478024781247822478324784247852478624787247882478924790247912479224793247942479524796247972479824799248002480124802248032480424805248062480724808248092481024811248122481324814248152481624817248182481924820248212482224823248242482524826248272482824829248302483124832248332483424835248362483724838248392484024841248422484324844248452484624847248482484924850248512485224853248542485524856248572485824859248602486124862248632486424865248662486724868248692487024871248722487324874248752487624877248782487924880248812488224883248842488524886248872488824889248902489124892248932489424895248962489724898248992490024901249022490324904249052490624907249082490924910249112491224913249142491524916249172491824919249202492124922249232492424925249262492724928249292493024931249322493324934249352493624937249382493924940249412494224943249442494524946249472494824949249502495124952249532495424955249562495724958249592496024961249622496324964249652496624967249682496924970249712497224973249742497524976249772497824979249802498124982249832498424985249862498724988249892499024991249922499324994249952499624997249982499925000250012500225003250042500525006250072500825009250102501125012250132501425015250162501725018250192502025021250222502325024250252502625027250282502925030250312503225033250342503525036250372503825039250402504125042250432504425045250462504725048250492505025051250522505325054250552505625057250582505925060250612506225063250642506525066250672506825069250702507125072250732507425075250762507725078250792508025081250822508325084250852508625087250882508925090250912509225093250942509525096250972509825099251002510125102251032510425105251062510725108251092511025111251122511325114251152511625117251182511925120251212512225123251242512525126251272512825129251302513125132251332513425135251362513725138251392514025141251422514325144251452514625147251482514925150251512515225153251542515525156251572515825159251602516125162251632516425165251662516725168251692517025171251722517325174251752517625177251782517925180251812518225183251842518525186251872518825189251902519125192251932519425195251962519725198251992520025201252022520325204252052520625207252082520925210252112521225213252142521525216252172521825219252202522125222252232522425225252262522725228252292523025231252322523325234252352523625237252382523925240252412524225243252442524525246252472524825249252502525125252252532525425255252562525725258252592526025261252622526325264252652526625267252682526925270252712527225273252742527525276252772527825279252802528125282252832528425285252862528725288252892529025291252922529325294252952529625297252982529925300253012530225303253042530525306253072530825309253102531125312253132531425315253162531725318253192532025321253222532325324253252532625327253282532925330253312533225333253342533525336253372533825339253402534125342253432534425345253462534725348253492535025351253522535325354253552535625357253582535925360253612536225363253642536525366253672536825369253702537125372253732537425375253762537725378253792538025381253822538325384253852538625387253882538925390253912539225393253942539525396253972539825399254002540125402254032540425405254062540725408254092541025411254122541325414254152541625417254182541925420254212542225423254242542525426254272542825429254302543125432254332543425435254362543725438254392544025441254422544325444254452544625447254482544925450254512545225453254542545525456254572545825459254602546125462254632546425465254662546725468254692547025471254722547325474254752547625477254782547925480254812548225483254842548525486254872548825489254902549125492254932549425495254962549725498254992550025501255022550325504255052550625507255082550925510255112551225513255142551525516255172551825519255202552125522255232552425525255262552725528255292553025531255322553325534255352553625537255382553925540255412554225543255442554525546255472554825549255502555125552255532555425555255562555725558255592556025561255622556325564255652556625567255682556925570255712557225573255742557525576255772557825579255802558125582255832558425585255862558725588255892559025591255922559325594255952559625597255982559925600256012560225603256042560525606256072560825609256102561125612256132561425615256162561725618256192562025621256222562325624256252562625627256282562925630256312563225633256342563525636256372563825639256402564125642256432564425645256462564725648256492565025651256522565325654256552565625657256582565925660256612566225663256642566525666256672566825669256702567125672256732567425675256762567725678256792568025681256822568325684256852568625687256882568925690256912569225693256942569525696256972569825699257002570125702257032570425705257062570725708257092571025711257122571325714257152571625717257182571925720257212572225723257242572525726257272572825729257302573125732257332573425735257362573725738257392574025741257422574325744257452574625747257482574925750257512575225753257542575525756257572575825759257602576125762257632576425765257662576725768257692577025771257722577325774257752577625777257782577925780257812578225783257842578525786257872578825789257902579125792257932579425795257962579725798257992580025801258022580325804258052580625807258082580925810258112581225813258142581525816258172581825819258202582125822258232582425825258262582725828258292583025831258322583325834258352583625837258382583925840258412584225843258442584525846258472584825849258502585125852258532585425855258562585725858258592586025861258622586325864258652586625867258682586925870258712587225873258742587525876258772587825879258802588125882258832588425885258862588725888258892589025891258922589325894258952589625897258982589925900259012590225903259042590525906259072590825909259102591125912259132591425915259162591725918259192592025921259222592325924259252592625927259282592925930259312593225933259342593525936259372593825939259402594125942259432594425945259462594725948259492595025951259522595325954259552595625957259582595925960259612596225963259642596525966259672596825969259702597125972259732597425975259762597725978259792598025981259822598325984259852598625987259882598925990259912599225993259942599525996259972599825999260002600126002260032600426005260062600726008260092601026011260122601326014260152601626017260182601926020260212602226023260242602526026260272602826029260302603126032260332603426035260362603726038260392604026041260422604326044260452604626047260482604926050260512605226053260542605526056260572605826059260602606126062260632606426065260662606726068260692607026071260722607326074260752607626077260782607926080260812608226083260842608526086260872608826089260902609126092260932609426095260962609726098260992610026101261022610326104261052610626107261082610926110261112611226113261142611526116261172611826119261202612126122261232612426125261262612726128261292613026131261322613326134261352613626137261382613926140261412614226143261442614526146261472614826149261502615126152261532615426155261562615726158261592616026161261622616326164261652616626167261682616926170261712617226173261742617526176261772617826179261802618126182261832618426185261862618726188261892619026191261922619326194261952619626197261982619926200262012620226203262042620526206262072620826209262102621126212262132621426215262162621726218262192622026221262222622326224262252622626227262282622926230262312623226233262342623526236262372623826239262402624126242262432624426245262462624726248262492625026251262522625326254262552625626257262582625926260262612626226263262642626526266262672626826269262702627126272262732627426275262762627726278262792628026281262822628326284262852628626287262882628926290262912629226293262942629526296262972629826299263002630126302263032630426305263062630726308263092631026311263122631326314263152631626317263182631926320263212632226323263242632526326263272632826329263302633126332263332633426335263362633726338263392634026341263422634326344263452634626347263482634926350263512635226353263542635526356263572635826359263602636126362263632636426365263662636726368263692637026371263722637326374263752637626377263782637926380263812638226383263842638526386263872638826389263902639126392263932639426395263962639726398263992640026401264022640326404264052640626407264082640926410264112641226413264142641526416264172641826419264202642126422264232642426425264262642726428264292643026431264322643326434264352643626437264382643926440264412644226443264442644526446264472644826449264502645126452264532645426455264562645726458264592646026461264622646326464264652646626467264682646926470264712647226473264742647526476264772647826479264802648126482264832648426485264862648726488264892649026491264922649326494264952649626497264982649926500265012650226503265042650526506265072650826509265102651126512265132651426515265162651726518265192652026521265222652326524265252652626527265282652926530265312653226533265342653526536265372653826539265402654126542265432654426545265462654726548265492655026551265522655326554265552655626557265582655926560265612656226563265642656526566265672656826569265702657126572265732657426575265762657726578265792658026581265822658326584265852658626587265882658926590265912659226593265942659526596265972659826599266002660126602266032660426605266062660726608266092661026611266122661326614266152661626617266182661926620266212662226623266242662526626266272662826629266302663126632266332663426635266362663726638266392664026641266422664326644266452664626647266482664926650266512665226653266542665526656266572665826659266602666126662266632666426665266662666726668266692667026671266722667326674266752667626677266782667926680266812668226683266842668526686266872668826689266902669126692266932669426695266962669726698266992670026701267022670326704267052670626707267082670926710267112671226713267142671526716267172671826719267202672126722267232672426725267262672726728267292673026731267322673326734267352673626737267382673926740267412674226743267442674526746267472674826749267502675126752267532675426755267562675726758267592676026761267622676326764267652676626767267682676926770267712677226773267742677526776267772677826779267802678126782267832678426785267862678726788267892679026791267922679326794267952679626797267982679926800268012680226803268042680526806268072680826809268102681126812268132681426815268162681726818268192682026821268222682326824268252682626827268282682926830268312683226833268342683526836268372683826839268402684126842268432684426845268462684726848268492685026851268522685326854268552685626857268582685926860268612686226863268642686526866268672686826869268702687126872268732687426875268762687726878268792688026881268822688326884268852688626887268882688926890268912689226893268942689526896268972689826899269002690126902269032690426905269062690726908269092691026911269122691326914269152691626917269182691926920269212692226923269242692526926269272692826929269302693126932269332693426935269362693726938269392694026941269422694326944269452694626947269482694926950269512695226953269542695526956269572695826959269602696126962269632696426965269662696726968269692697026971269722697326974269752697626977269782697926980269812698226983269842698526986269872698826989269902699126992269932699426995269962699726998269992700027001270022700327004270052700627007270082700927010270112701227013270142701527016270172701827019270202702127022270232702427025270262702727028270292703027031270322703327034270352703627037270382703927040270412704227043270442704527046270472704827049270502705127052270532705427055270562705727058270592706027061270622706327064270652706627067270682706927070270712707227073270742707527076270772707827079270802708127082270832708427085270862708727088270892709027091270922709327094270952709627097270982709927100271012710227103271042710527106271072710827109271102711127112271132711427115271162711727118271192712027121271222712327124271252712627127271282712927130271312713227133271342713527136271372713827139271402714127142271432714427145271462714727148271492715027151271522715327154271552715627157271582715927160271612716227163271642716527166271672716827169271702717127172271732717427175271762717727178271792718027181271822718327184271852718627187271882718927190271912719227193271942719527196271972719827199272002720127202272032720427205272062720727208272092721027211272122721327214272152721627217272182721927220272212722227223272242722527226272272722827229272302723127232272332723427235272362723727238272392724027241272422724327244272452724627247272482724927250272512725227253272542725527256272572725827259272602726127262272632726427265272662726727268272692727027271272722727327274272752727627277272782727927280272812728227283272842728527286272872728827289272902729127292272932729427295272962729727298272992730027301273022730327304273052730627307273082730927310273112731227313273142731527316273172731827319273202732127322273232732427325273262732727328273292733027331273322733327334273352733627337273382733927340273412734227343273442734527346273472734827349273502735127352273532735427355273562735727358273592736027361273622736327364273652736627367273682736927370273712737227373273742737527376273772737827379273802738127382273832738427385273862738727388273892739027391273922739327394273952739627397273982739927400274012740227403274042740527406274072740827409274102741127412274132741427415274162741727418274192742027421274222742327424274252742627427274282742927430274312743227433274342743527436274372743827439274402744127442274432744427445274462744727448274492745027451274522745327454274552745627457274582745927460274612746227463274642746527466274672746827469274702747127472274732747427475274762747727478274792748027481274822748327484274852748627487274882748927490274912749227493274942749527496274972749827499275002750127502275032750427505275062750727508275092751027511275122751327514275152751627517275182751927520275212752227523275242752527526275272752827529275302753127532275332753427535275362753727538275392754027541275422754327544275452754627547275482754927550275512755227553275542755527556275572755827559275602756127562275632756427565275662756727568275692757027571275722757327574275752757627577275782757927580275812758227583275842758527586275872758827589275902759127592275932759427595275962759727598275992760027601276022760327604276052760627607276082760927610276112761227613276142761527616276172761827619276202762127622276232762427625276262762727628276292763027631276322763327634276352763627637276382763927640276412764227643276442764527646276472764827649276502765127652276532765427655276562765727658276592766027661276622766327664276652766627667276682766927670276712767227673276742767527676276772767827679276802768127682276832768427685276862768727688276892769027691276922769327694276952769627697276982769927700277012770227703277042770527706277072770827709277102771127712277132771427715277162771727718277192772027721277222772327724277252772627727277282772927730277312773227733277342773527736277372773827739277402774127742277432774427745277462774727748277492775027751277522775327754277552775627757277582775927760277612776227763277642776527766277672776827769277702777127772277732777427775277762777727778277792778027781277822778327784277852778627787277882778927790277912779227793277942779527796277972779827799278002780127802278032780427805278062780727808278092781027811278122781327814278152781627817278182781927820278212782227823278242782527826278272782827829278302783127832278332783427835278362783727838278392784027841278422784327844278452784627847278482784927850278512785227853278542785527856278572785827859278602786127862278632786427865278662786727868278692787027871278722787327874278752787627877278782787927880278812788227883278842788527886278872788827889278902789127892278932789427895278962789727898278992790027901279022790327904279052790627907279082790927910279112791227913279142791527916279172791827919279202792127922279232792427925279262792727928279292793027931279322793327934279352793627937279382793927940279412794227943279442794527946279472794827949279502795127952279532795427955279562795727958279592796027961279622796327964279652796627967279682796927970279712797227973279742797527976279772797827979279802798127982279832798427985279862798727988279892799027991279922799327994279952799627997279982799928000280012800228003280042800528006280072800828009280102801128012280132801428015280162801728018280192802028021280222802328024280252802628027280282802928030280312803228033280342803528036280372803828039280402804128042280432804428045280462804728048280492805028051280522805328054280552805628057280582805928060280612806228063280642806528066280672806828069280702807128072280732807428075280762807728078280792808028081280822808328084280852808628087280882808928090280912809228093280942809528096280972809828099281002810128102281032810428105281062810728108281092811028111281122811328114281152811628117281182811928120281212812228123281242812528126281272812828129281302813128132281332813428135281362813728138281392814028141281422814328144281452814628147281482814928150281512815228153281542815528156281572815828159281602816128162281632816428165281662816728168281692817028171281722817328174281752817628177281782817928180281812818228183281842818528186281872818828189281902819128192281932819428195281962819728198281992820028201282022820328204282052820628207282082820928210282112821228213282142821528216282172821828219282202822128222282232822428225282262822728228282292823028231282322823328234282352823628237282382823928240282412824228243282442824528246282472824828249282502825128252282532825428255282562825728258282592826028261282622826328264282652826628267282682826928270282712827228273282742827528276282772827828279282802828128282282832828428285282862828728288282892829028291282922829328294282952829628297282982829928300283012830228303283042830528306283072830828309283102831128312283132831428315283162831728318283192832028321283222832328324283252832628327283282832928330283312833228333283342833528336283372833828339283402834128342283432834428345283462834728348283492835028351283522835328354283552835628357283582835928360283612836228363283642836528366283672836828369283702837128372283732837428375283762837728378283792838028381283822838328384283852838628387283882838928390283912839228393283942839528396283972839828399284002840128402284032840428405284062840728408284092841028411284122841328414284152841628417284182841928420284212842228423284242842528426284272842828429284302843128432284332843428435284362843728438284392844028441284422844328444284452844628447284482844928450284512845228453284542845528456284572845828459284602846128462284632846428465284662846728468284692847028471284722847328474284752847628477284782847928480284812848228483284842848528486284872848828489284902849128492284932849428495284962849728498284992850028501285022850328504285052850628507285082850928510285112851228513285142851528516285172851828519285202852128522285232852428525285262852728528285292853028531285322853328534285352853628537285382853928540285412854228543285442854528546285472854828549285502855128552285532855428555285562855728558285592856028561285622856328564285652856628567285682856928570285712857228573285742857528576285772857828579285802858128582285832858428585285862858728588285892859028591285922859328594285952859628597285982859928600286012860228603286042860528606286072860828609286102861128612286132861428615286162861728618286192862028621286222862328624286252862628627286282862928630286312863228633286342863528636286372863828639286402864128642286432864428645286462864728648286492865028651286522865328654286552865628657286582865928660286612866228663286642866528666286672866828669286702867128672286732867428675286762867728678286792868028681286822868328684286852868628687286882868928690286912869228693286942869528696286972869828699287002870128702287032870428705287062870728708287092871028711287122871328714287152871628717287182871928720287212872228723287242872528726287272872828729287302873128732287332873428735287362873728738287392874028741287422874328744287452874628747287482874928750287512875228753287542875528756287572875828759287602876128762287632876428765287662876728768287692877028771287722877328774287752877628777287782877928780287812878228783287842878528786287872878828789287902879128792287932879428795287962879728798287992880028801288022880328804288052880628807288082880928810288112881228813288142881528816288172881828819288202882128822288232882428825288262882728828288292883028831288322883328834288352883628837288382883928840288412884228843288442884528846288472884828849288502885128852288532885428855288562885728858288592886028861288622886328864288652886628867288682886928870288712887228873288742887528876288772887828879288802888128882288832888428885288862888728888288892889028891288922889328894288952889628897288982889928900289012890228903289042890528906289072890828909289102891128912289132891428915289162891728918289192892028921289222892328924289252892628927289282892928930289312893228933289342893528936289372893828939289402894128942289432894428945289462894728948289492895028951289522895328954289552895628957289582895928960289612896228963289642896528966289672896828969289702897128972289732897428975289762897728978289792898028981289822898328984289852898628987289882898928990289912899228993289942899528996289972899828999290002900129002290032900429005290062900729008290092901029011290122901329014290152901629017290182901929020290212902229023290242902529026290272902829029290302903129032290332903429035290362903729038290392904029041290422904329044290452904629047290482904929050290512905229053290542905529056290572905829059290602906129062290632906429065290662906729068290692907029071290722907329074290752907629077290782907929080290812908229083290842908529086290872908829089290902909129092290932909429095290962909729098290992910029101291022910329104291052910629107291082910929110291112911229113291142911529116291172911829119291202912129122291232912429125291262912729128291292913029131291322913329134291352913629137291382913929140291412914229143291442914529146291472914829149291502915129152291532915429155291562915729158291592916029161291622916329164291652916629167291682916929170291712917229173291742917529176291772917829179291802918129182291832918429185291862918729188291892919029191291922919329194291952919629197291982919929200292012920229203292042920529206292072920829209292102921129212292132921429215292162921729218292192922029221292222922329224292252922629227292282922929230292312923229233292342923529236292372923829239292402924129242292432924429245292462924729248292492925029251292522925329254292552925629257292582925929260292612926229263292642926529266292672926829269292702927129272292732927429275292762927729278292792928029281292822928329284292852928629287292882928929290292912929229293292942929529296292972929829299293002930129302293032930429305293062930729308293092931029311293122931329314293152931629317293182931929320293212932229323293242932529326293272932829329293302933129332293332933429335293362933729338293392934029341293422934329344293452934629347293482934929350293512935229353293542935529356293572935829359293602936129362293632936429365293662936729368293692937029371293722937329374293752937629377293782937929380293812938229383293842938529386293872938829389293902939129392293932939429395293962939729398293992940029401294022940329404294052940629407294082940929410294112941229413294142941529416294172941829419294202942129422294232942429425294262942729428294292943029431294322943329434294352943629437294382943929440294412944229443294442944529446294472944829449294502945129452294532945429455294562945729458294592946029461294622946329464294652946629467294682946929470294712947229473294742947529476294772947829479294802948129482294832948429485294862948729488294892949029491294922949329494294952949629497294982949929500295012950229503295042950529506295072950829509295102951129512295132951429515295162951729518295192952029521295222952329524295252952629527295282952929530295312953229533295342953529536295372953829539295402954129542295432954429545295462954729548295492955029551295522955329554295552955629557295582955929560295612956229563295642956529566295672956829569295702957129572295732957429575295762957729578295792958029581295822958329584295852958629587295882958929590295912959229593295942959529596295972959829599296002960129602296032960429605296062960729608296092961029611296122961329614296152961629617296182961929620296212962229623296242962529626296272962829629296302963129632296332963429635296362963729638296392964029641296422964329644296452964629647296482964929650296512965229653296542965529656296572965829659296602966129662296632966429665296662966729668296692967029671296722967329674296752967629677296782967929680296812968229683296842968529686296872968829689296902969129692296932969429695296962969729698296992970029701297022970329704297052970629707297082970929710297112971229713297142971529716297172971829719297202972129722297232972429725297262972729728297292973029731297322973329734297352973629737297382973929740297412974229743297442974529746297472974829749297502975129752297532975429755297562975729758297592976029761297622976329764297652976629767297682976929770297712977229773297742977529776297772977829779297802978129782297832978429785297862978729788297892979029791297922979329794297952979629797297982979929800298012980229803298042980529806298072980829809298102981129812298132981429815298162981729818298192982029821298222982329824298252982629827298282982929830298312983229833298342983529836298372983829839298402984129842298432984429845298462984729848298492985029851298522985329854298552985629857298582985929860298612986229863298642986529866298672986829869298702987129872298732987429875298762987729878298792988029881298822988329884298852988629887298882988929890298912989229893298942989529896298972989829899299002990129902299032990429905299062990729908299092991029911299122991329914299152991629917299182991929920299212992229923299242992529926299272992829929299302993129932299332993429935299362993729938299392994029941299422994329944299452994629947299482994929950299512995229953299542995529956299572995829959299602996129962299632996429965299662996729968299692997029971299722997329974299752997629977299782997929980299812998229983299842998529986299872998829989299902999129992299932999429995299962999729998299993000030001300023000330004300053000630007300083000930010300113001230013300143001530016300173001830019300203002130022300233002430025300263002730028300293003030031300323003330034300353003630037300383003930040300413004230043300443004530046300473004830049300503005130052300533005430055300563005730058300593006030061300623006330064300653006630067300683006930070300713007230073300743007530076300773007830079300803008130082300833008430085300863008730088300893009030091300923009330094300953009630097300983009930100301013010230103301043010530106301073010830109301103011130112301133011430115301163011730118301193012030121301223012330124301253012630127301283012930130301313013230133301343013530136301373013830139301403014130142301433014430145301463014730148301493015030151301523015330154301553015630157301583015930160301613016230163301643016530166301673016830169301703017130172301733017430175301763017730178301793018030181301823018330184301853018630187301883018930190301913019230193301943019530196301973019830199302003020130202302033020430205302063020730208302093021030211302123021330214302153021630217302183021930220302213022230223302243022530226302273022830229302303023130232302333023430235302363023730238302393024030241302423024330244302453024630247302483024930250302513025230253302543025530256302573025830259302603026130262302633026430265302663026730268302693027030271302723027330274302753027630277302783027930280302813028230283302843028530286302873028830289302903029130292302933029430295302963029730298302993030030301303023030330304303053030630307303083030930310303113031230313303143031530316303173031830319303203032130322303233032430325303263032730328303293033030331303323033330334303353033630337303383033930340303413034230343303443034530346303473034830349303503035130352303533035430355303563035730358303593036030361303623036330364303653036630367303683036930370303713037230373303743037530376303773037830379303803038130382303833038430385303863038730388303893039030391303923039330394303953039630397303983039930400304013040230403304043040530406304073040830409304103041130412304133041430415304163041730418304193042030421304223042330424304253042630427304283042930430304313043230433304343043530436304373043830439304403044130442304433044430445304463044730448304493045030451304523045330454304553045630457304583045930460304613046230463304643046530466304673046830469304703047130472304733047430475304763047730478304793048030481304823048330484304853048630487304883048930490304913049230493304943049530496304973049830499305003050130502305033050430505305063050730508305093051030511305123051330514305153051630517305183051930520305213052230523305243052530526305273052830529305303053130532305333053430535305363053730538305393054030541305423054330544305453054630547305483054930550305513055230553305543055530556305573055830559305603056130562305633056430565305663056730568305693057030571305723057330574305753057630577305783057930580305813058230583305843058530586305873058830589305903059130592305933059430595305963059730598305993060030601306023060330604306053060630607306083060930610306113061230613306143061530616306173061830619306203062130622306233062430625306263062730628306293063030631306323063330634306353063630637306383063930640306413064230643306443064530646306473064830649306503065130652306533065430655306563065730658306593066030661306623066330664306653066630667306683066930670306713067230673306743067530676306773067830679306803068130682306833068430685306863068730688306893069030691306923069330694306953069630697306983069930700307013070230703307043070530706307073070830709307103071130712307133071430715307163071730718307193072030721307223072330724307253072630727307283072930730307313073230733307343073530736307373073830739307403074130742307433074430745307463074730748307493075030751307523075330754307553075630757307583075930760307613076230763307643076530766307673076830769307703077130772307733077430775307763077730778307793078030781307823078330784307853078630787307883078930790307913079230793307943079530796307973079830799308003080130802308033080430805308063080730808308093081030811308123081330814308153081630817308183081930820308213082230823308243082530826308273082830829308303083130832308333083430835308363083730838308393084030841308423084330844308453084630847308483084930850308513085230853308543085530856308573085830859308603086130862308633086430865308663086730868308693087030871308723087330874308753087630877308783087930880308813088230883308843088530886308873088830889308903089130892308933089430895308963089730898308993090030901309023090330904309053090630907309083090930910309113091230913309143091530916309173091830919309203092130922309233092430925309263092730928309293093030931309323093330934309353093630937309383093930940309413094230943309443094530946309473094830949309503095130952309533095430955309563095730958309593096030961309623096330964309653096630967309683096930970309713097230973309743097530976309773097830979309803098130982309833098430985309863098730988309893099030991309923099330994309953099630997309983099931000310013100231003310043100531006310073100831009310103101131012310133101431015310163101731018310193102031021310223102331024310253102631027310283102931030310313103231033310343103531036310373103831039310403104131042310433104431045310463104731048310493105031051310523105331054310553105631057310583105931060310613106231063310643106531066310673106831069310703107131072310733107431075310763107731078310793108031081310823108331084310853108631087310883108931090310913109231093310943109531096310973109831099311003110131102311033110431105311063110731108311093111031111311123111331114311153111631117311183111931120311213112231123311243112531126311273112831129311303113131132311333113431135311363113731138311393114031141311423114331144311453114631147311483114931150311513115231153311543115531156311573115831159311603116131162311633116431165311663116731168311693117031171311723117331174311753117631177311783117931180311813118231183311843118531186311873118831189311903119131192311933119431195311963119731198311993120031201312023120331204312053120631207312083120931210312113121231213312143121531216312173121831219312203122131222312233122431225312263122731228312293123031231312323123331234312353123631237312383123931240312413124231243312443124531246312473124831249312503125131252312533125431255312563125731258312593126031261312623126331264312653126631267312683126931270312713127231273312743127531276312773127831279312803128131282312833128431285312863128731288312893129031291312923129331294312953129631297312983129931300313013130231303313043130531306313073130831309313103131131312313133131431315313163131731318313193132031321313223132331324313253132631327313283132931330313313133231333313343133531336313373133831339313403134131342313433134431345313463134731348313493135031351313523135331354313553135631357313583135931360313613136231363313643136531366313673136831369313703137131372313733137431375313763137731378313793138031381313823138331384313853138631387313883138931390313913139231393313943139531396313973139831399314003140131402314033140431405314063140731408314093141031411314123141331414314153141631417314183141931420314213142231423314243142531426314273142831429314303143131432314333143431435314363143731438314393144031441314423144331444314453144631447314483144931450314513145231453314543145531456314573145831459314603146131462314633146431465314663146731468314693147031471314723147331474314753147631477314783147931480314813148231483314843148531486314873148831489314903149131492314933149431495314963149731498314993150031501315023150331504315053150631507315083150931510315113151231513315143151531516315173151831519315203152131522315233152431525315263152731528315293153031531315323153331534315353153631537315383153931540315413154231543315443154531546315473154831549315503155131552315533155431555315563155731558315593156031561315623156331564315653156631567315683156931570315713157231573315743157531576315773157831579315803158131582315833158431585315863158731588315893159031591315923159331594315953159631597315983159931600316013160231603316043160531606316073160831609316103161131612316133161431615316163161731618316193162031621316223162331624316253162631627316283162931630316313163231633316343163531636316373163831639316403164131642316433164431645316463164731648316493165031651316523165331654316553165631657316583165931660316613166231663316643166531666316673166831669316703167131672316733167431675316763167731678316793168031681316823168331684316853168631687316883168931690316913169231693316943169531696316973169831699317003170131702317033170431705317063170731708317093171031711317123171331714317153171631717317183171931720317213172231723317243172531726317273172831729317303173131732317333173431735317363173731738317393174031741
  1. From 0f45262ef0d656c576adbb0b0f42b8f417895008 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Sun, 14 Feb 2016 17:04:07 +0000
  4. Subject: [PATCH] Use libtool 2.4
  5. get libtool sysroot support
  6. Upstream-Status: Pending
  7. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  8. ---
  9. bfd/Makefile.in | 3 +
  10. bfd/configure | 1333 +++++++++---
  11. bfd/configure.ac | 2 +-
  12. binutils/Makefile.in | 3 +
  13. binutils/configure | 1331 +++++++++---
  14. gas/Makefile.in | 3 +
  15. gas/configure | 1331 +++++++++---
  16. gdbsupport/Makefile.in | 1 +
  17. gprof/Makefile.in | 3 +
  18. gprof/configure | 1331 +++++++++---
  19. gprofng/Makefile.in | 2 +
  20. gprofng/configure | 1701 ++++++++++++----
  21. gprofng/doc/Makefile.in | 2 +
  22. gprofng/gp-display-html/Makefile.in | 2 +
  23. gprofng/libcollector/Makefile.in | 2 +
  24. gprofng/libcollector/configure | 1703 ++++++++++++----
  25. gprofng/src/Makefile.in | 2 +
  26. ld/Makefile.in | 3 +
  27. ld/configure | 1704 ++++++++++++----
  28. libbacktrace/Makefile.in | 3 +
  29. libbacktrace/configure | 1331 +++++++++---
  30. libctf/Makefile.in | 2 +
  31. libctf/configure | 1330 +++++++++---
  32. libtool.m4 | 1093 ++++++----
  33. ltmain.sh | 2925 ++++++++++++++++++---------
  34. ltoptions.m4 | 2 +-
  35. ltversion.m4 | 12 +-
  36. lt~obsolete.m4 | 2 +-
  37. opcodes/Makefile.in | 3 +
  38. opcodes/configure | 1331 +++++++++---
  39. sim/Makefile.in | 3 +
  40. zlib/Makefile.in | 204 +-
  41. zlib/aclocal.m4 | 218 +-
  42. zlib/configure | 1554 +++++++++-----
  43. 34 files changed, 14804 insertions(+), 5671 deletions(-)
  44. diff --git a/bfd/Makefile.in b/bfd/Makefile.in
  45. index a26f74d7199..6edacdfeb0e 100644
  46. --- a/bfd/Makefile.in
  47. +++ b/bfd/Makefile.in
  48. @@ -346,6 +346,7 @@ DATADIRNAME = @DATADIRNAME@
  49. DEBUGDIR = @DEBUGDIR@
  50. DEFS = @DEFS@
  51. DEPDIR = @DEPDIR@
  52. +DLLTOOL = @DLLTOOL@
  53. DSYMUTIL = @DSYMUTIL@
  54. DUMPBIN = @DUMPBIN@
  55. ECHO_C = @ECHO_C@
  56. @@ -380,6 +381,7 @@ LN_S = @LN_S@
  57. LTLIBOBJS = @LTLIBOBJS@
  58. MAINT = @MAINT@
  59. MAKEINFO = @MAKEINFO@
  60. +MANIFEST_TOOL = @MANIFEST_TOOL@
  61. MKDIR_P = @MKDIR_P@
  62. MKINSTALLDIRS = @MKINSTALLDIRS@
  63. MSGFMT = @MSGFMT@
  64. @@ -421,6 +423,7 @@ abs_builddir = @abs_builddir@
  65. abs_srcdir = @abs_srcdir@
  66. abs_top_builddir = @abs_top_builddir@
  67. abs_top_srcdir = @abs_top_srcdir@
  68. +ac_ct_AR = @ac_ct_AR@
  69. ac_ct_CC = @ac_ct_CC@
  70. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  71. all_backends = @all_backends@
  72. diff --git a/bfd/configure b/bfd/configure
  73. index 4f591b750d8..d90db11744b 100755
  74. --- a/bfd/configure
  75. +++ b/bfd/configure
  76. @@ -702,6 +702,9 @@ OTOOL
  77. LIPO
  78. NMEDIT
  79. DSYMUTIL
  80. +MANIFEST_TOOL
  81. +ac_ct_AR
  82. +DLLTOOL
  83. OBJDUMP
  84. LN_S
  85. NM
  86. @@ -820,6 +823,7 @@ enable_static
  87. with_pic
  88. enable_fast_install
  89. with_gnu_ld
  90. +with_libtool_sysroot
  91. enable_libtool_lock
  92. enable_plugins
  93. enable_largefile
  94. @@ -1504,6 +1508,8 @@ Optional Packages:
  95. --with-pic try to use only PIC/non-PIC objects [default=use
  96. both]
  97. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  98. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  99. + (or the compiler's sysroot if not specified).
  100. --with-mmap try using mmap for BFD input files if available
  101. --with-separate-debug-dir=DIR
  102. Look for global separate debug info in DIR
  103. @@ -5024,8 +5030,8 @@ esac
  104. -macro_version='2.2.7a'
  105. -macro_revision='1.3134'
  106. +macro_version='2.4'
  107. +macro_revision='1.3293'
  108. @@ -5065,7 +5071,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  109. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  110. $as_echo_n "checking how to print strings... " >&6; }
  111. # Test print first, because it will be a builtin if present.
  112. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  113. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  114. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  115. ECHO='print -r --'
  116. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  117. @@ -5758,8 +5764,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  118. # Try some XSI features
  119. xsi_shell=no
  120. ( _lt_dummy="a/b/c"
  121. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  122. - = c,a/b,, \
  123. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  124. + = c,a/b,b/c, \
  125. && eval 'test $(( 1 + 1 )) -eq 2 \
  126. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  127. && xsi_shell=yes
  128. @@ -5808,6 +5814,80 @@ esac
  129. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  130. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  131. +if ${lt_cv_to_host_file_cmd+:} false; then :
  132. + $as_echo_n "(cached) " >&6
  133. +else
  134. + case $host in
  135. + *-*-mingw* )
  136. + case $build in
  137. + *-*-mingw* ) # actually msys
  138. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  139. + ;;
  140. + *-*-cygwin* )
  141. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  142. + ;;
  143. + * ) # otherwise, assume *nix
  144. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  145. + ;;
  146. + esac
  147. + ;;
  148. + *-*-cygwin* )
  149. + case $build in
  150. + *-*-mingw* ) # actually msys
  151. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  152. + ;;
  153. + *-*-cygwin* )
  154. + lt_cv_to_host_file_cmd=func_convert_file_noop
  155. + ;;
  156. + * ) # otherwise, assume *nix
  157. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  158. + ;;
  159. + esac
  160. + ;;
  161. + * ) # unhandled hosts (and "normal" native builds)
  162. + lt_cv_to_host_file_cmd=func_convert_file_noop
  163. + ;;
  164. +esac
  165. +
  166. +fi
  167. +
  168. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  169. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  170. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  171. +
  172. +
  173. +
  174. +
  175. +
  176. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  177. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  178. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  179. + $as_echo_n "(cached) " >&6
  180. +else
  181. + #assume ordinary cross tools, or native build.
  182. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  183. +case $host in
  184. + *-*-mingw* )
  185. + case $build in
  186. + *-*-mingw* ) # actually msys
  187. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  188. + ;;
  189. + esac
  190. + ;;
  191. +esac
  192. +
  193. +fi
  194. +
  195. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  196. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  197. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  198. +
  199. +
  200. +
  201. +
  202. +
  203. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  204. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  205. if ${lt_cv_ld_reload_flag+:} false; then :
  206. @@ -5824,6 +5904,11 @@ case $reload_flag in
  207. esac
  208. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  209. case $host_os in
  210. + cygwin* | mingw* | pw32* | cegcc*)
  211. + if test "$GCC" != yes; then
  212. + reload_cmds=false
  213. + fi
  214. + ;;
  215. darwin*)
  216. if test "$GCC" = yes; then
  217. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  218. @@ -5992,7 +6077,8 @@ mingw* | pw32*)
  219. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  220. lt_cv_file_magic_cmd='func_win32_libid'
  221. else
  222. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  223. + # Keep this pattern in sync with the one in func_win32_libid.
  224. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  225. lt_cv_file_magic_cmd='$OBJDUMP -f'
  226. fi
  227. ;;
  228. @@ -6146,6 +6232,21 @@ esac
  229. fi
  230. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  231. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  232. +
  233. +file_magic_glob=
  234. +want_nocaseglob=no
  235. +if test "$build" = "$host"; then
  236. + case $host_os in
  237. + mingw* | pw32*)
  238. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  239. + want_nocaseglob=yes
  240. + else
  241. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  242. + fi
  243. + ;;
  244. + esac
  245. +fi
  246. +
  247. file_magic_cmd=$lt_cv_file_magic_cmd
  248. deplibs_check_method=$lt_cv_deplibs_check_method
  249. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  250. @@ -6161,6 +6262,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  251. +
  252. +
  253. +
  254. +
  255. +
  256. +
  257. +
  258. +
  259. +
  260. +
  261. +if test -n "$ac_tool_prefix"; then
  262. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  263. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  264. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  265. +$as_echo_n "checking for $ac_word... " >&6; }
  266. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  267. + $as_echo_n "(cached) " >&6
  268. +else
  269. + if test -n "$DLLTOOL"; then
  270. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  271. +else
  272. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  273. +for as_dir in $PATH
  274. +do
  275. + IFS=$as_save_IFS
  276. + test -z "$as_dir" && as_dir=.
  277. + for ac_exec_ext in '' $ac_executable_extensions; do
  278. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  279. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  280. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  281. + break 2
  282. + fi
  283. +done
  284. + done
  285. +IFS=$as_save_IFS
  286. +
  287. +fi
  288. +fi
  289. +DLLTOOL=$ac_cv_prog_DLLTOOL
  290. +if test -n "$DLLTOOL"; then
  291. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  292. +$as_echo "$DLLTOOL" >&6; }
  293. +else
  294. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  295. +$as_echo "no" >&6; }
  296. +fi
  297. +
  298. +
  299. +fi
  300. +if test -z "$ac_cv_prog_DLLTOOL"; then
  301. + ac_ct_DLLTOOL=$DLLTOOL
  302. + # Extract the first word of "dlltool", so it can be a program name with args.
  303. +set dummy dlltool; ac_word=$2
  304. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  305. +$as_echo_n "checking for $ac_word... " >&6; }
  306. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  307. + $as_echo_n "(cached) " >&6
  308. +else
  309. + if test -n "$ac_ct_DLLTOOL"; then
  310. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  311. +else
  312. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  313. +for as_dir in $PATH
  314. +do
  315. + IFS=$as_save_IFS
  316. + test -z "$as_dir" && as_dir=.
  317. + for ac_exec_ext in '' $ac_executable_extensions; do
  318. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  319. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  320. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  321. + break 2
  322. + fi
  323. +done
  324. + done
  325. +IFS=$as_save_IFS
  326. +
  327. +fi
  328. +fi
  329. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  330. +if test -n "$ac_ct_DLLTOOL"; then
  331. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  332. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  333. +else
  334. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  335. +$as_echo "no" >&6; }
  336. +fi
  337. +
  338. + if test "x$ac_ct_DLLTOOL" = x; then
  339. + DLLTOOL="false"
  340. + else
  341. + case $cross_compiling:$ac_tool_warned in
  342. +yes:)
  343. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  344. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  345. +ac_tool_warned=yes ;;
  346. +esac
  347. + DLLTOOL=$ac_ct_DLLTOOL
  348. + fi
  349. +else
  350. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  351. +fi
  352. +
  353. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  354. +
  355. +
  356. +
  357. +
  358. +
  359. +
  360. +
  361. +
  362. +
  363. +
  364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  365. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  366. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  367. + $as_echo_n "(cached) " >&6
  368. +else
  369. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  370. +
  371. +case $host_os in
  372. +cygwin* | mingw* | pw32* | cegcc*)
  373. + # two different shell functions defined in ltmain.sh
  374. + # decide which to use based on capabilities of $DLLTOOL
  375. + case `$DLLTOOL --help 2>&1` in
  376. + *--identify-strict*)
  377. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  378. + ;;
  379. + *)
  380. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  381. + ;;
  382. + esac
  383. + ;;
  384. +*)
  385. + # fallback: assume linklib IS sharedlib
  386. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  387. + ;;
  388. +esac
  389. +
  390. +fi
  391. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  392. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  393. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  394. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  395. +
  396. +
  397. +
  398. +
  399. +
  400. +
  401. +
  402. plugin_option=
  403. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  404. for plugin in $plugin_names; do
  405. @@ -6175,8 +6427,10 @@ for plugin in $plugin_names; do
  406. done
  407. if test -n "$ac_tool_prefix"; then
  408. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  409. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  410. + for ac_prog in ar
  411. + do
  412. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  413. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  414. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  415. $as_echo_n "checking for $ac_word... " >&6; }
  416. if ${ac_cv_prog_AR+:} false; then :
  417. @@ -6192,7 +6446,7 @@ do
  418. test -z "$as_dir" && as_dir=.
  419. for ac_exec_ext in '' $ac_executable_extensions; do
  420. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  421. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  422. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  423. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  424. break 2
  425. fi
  426. @@ -6212,11 +6466,15 @@ $as_echo "no" >&6; }
  427. fi
  428. + test -n "$AR" && break
  429. + done
  430. fi
  431. -if test -z "$ac_cv_prog_AR"; then
  432. +if test -z "$AR"; then
  433. ac_ct_AR=$AR
  434. - # Extract the first word of "ar", so it can be a program name with args.
  435. -set dummy ar; ac_word=$2
  436. + for ac_prog in ar
  437. +do
  438. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  439. +set dummy $ac_prog; ac_word=$2
  440. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  441. $as_echo_n "checking for $ac_word... " >&6; }
  442. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  443. @@ -6232,7 +6490,7 @@ do
  444. test -z "$as_dir" && as_dir=.
  445. for ac_exec_ext in '' $ac_executable_extensions; do
  446. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  447. - ac_cv_prog_ac_ct_AR="ar"
  448. + ac_cv_prog_ac_ct_AR="$ac_prog"
  449. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  450. break 2
  451. fi
  452. @@ -6251,6 +6509,10 @@ else
  453. $as_echo "no" >&6; }
  454. fi
  455. +
  456. + test -n "$ac_ct_AR" && break
  457. +done
  458. +
  459. if test "x$ac_ct_AR" = x; then
  460. AR="false"
  461. else
  462. @@ -6262,25 +6524,20 @@ ac_tool_warned=yes ;;
  463. esac
  464. AR=$ac_ct_AR
  465. fi
  466. -else
  467. - AR="$ac_cv_prog_AR"
  468. fi
  469. -test -z "$AR" && AR=ar
  470. -if test -n "$plugin_option"; then
  471. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  472. - touch conftest.c
  473. - $AR $plugin_option rc conftest.a conftest.c
  474. - if test "$?" != 0; then
  475. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  476. + touch conftest.c
  477. + $AR $plugin_option rc conftest.a conftest.c
  478. + if test "$?" != 0; then
  479. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  480. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  481. - else
  482. - AR="$AR $plugin_option"
  483. - fi
  484. - rm -f conftest.*
  485. + else
  486. + AR="$AR $plugin_option"
  487. fi
  488. -fi
  489. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  490. + rm -f conftest.*
  491. +: ${AR=ar}
  492. +: ${AR_FLAGS=cru}
  493. +
  494. @@ -6291,6 +6548,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  495. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  496. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  497. +if ${lt_cv_ar_at_file+:} false; then :
  498. + $as_echo_n "(cached) " >&6
  499. +else
  500. + lt_cv_ar_at_file=no
  501. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  502. +/* end confdefs.h. */
  503. +
  504. +int
  505. +main ()
  506. +{
  507. +
  508. + ;
  509. + return 0;
  510. +}
  511. +_ACEOF
  512. +if ac_fn_c_try_compile "$LINENO"; then :
  513. + echo conftest.$ac_objext > conftest.lst
  514. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  515. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  516. + (eval $lt_ar_try) 2>&5
  517. + ac_status=$?
  518. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  519. + test $ac_status = 0; }
  520. + if test "$ac_status" -eq 0; then
  521. + # Ensure the archiver fails upon bogus file names.
  522. + rm -f conftest.$ac_objext libconftest.a
  523. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  524. + (eval $lt_ar_try) 2>&5
  525. + ac_status=$?
  526. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  527. + test $ac_status = 0; }
  528. + if test "$ac_status" -ne 0; then
  529. + lt_cv_ar_at_file=@
  530. + fi
  531. + fi
  532. + rm -f conftest.* libconftest.a
  533. +
  534. +fi
  535. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  536. +
  537. +fi
  538. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  539. +$as_echo "$lt_cv_ar_at_file" >&6; }
  540. +
  541. +if test "x$lt_cv_ar_at_file" = xno; then
  542. + archiver_list_spec=
  543. +else
  544. + archiver_list_spec=$lt_cv_ar_at_file
  545. +fi
  546. +
  547. +
  548. +
  549. +
  550. +
  551. +
  552. if test -n "$ac_tool_prefix"; then
  553. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  554. @@ -6631,8 +6945,8 @@ esac
  555. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  556. # Transform an extracted symbol line into symbol name and symbol address
  557. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  558. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  559. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  560. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  561. # Handle CRLF in mingw tool chain
  562. opt_cr=
  563. @@ -6668,6 +6982,7 @@ for ac_symprfx in "" "_"; do
  564. else
  565. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  566. fi
  567. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  568. # Check to see that the pipe works correctly.
  569. pipe_works=no
  570. @@ -6709,6 +7024,18 @@ _LT_EOF
  571. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  572. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  573. cat <<_LT_EOF > conftest.$ac_ext
  574. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  575. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  576. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  577. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  578. +# define LT_DLSYM_CONST
  579. +#elif defined(__osf__)
  580. +/* This system does not cope well with relocations in const data. */
  581. +# define LT_DLSYM_CONST
  582. +#else
  583. +# define LT_DLSYM_CONST const
  584. +#endif
  585. +
  586. #ifdef __cplusplus
  587. extern "C" {
  588. #endif
  589. @@ -6720,7 +7047,7 @@ _LT_EOF
  590. cat <<_LT_EOF >> conftest.$ac_ext
  591. /* The mapping between symbol names and symbols. */
  592. -const struct {
  593. +LT_DLSYM_CONST struct {
  594. const char *name;
  595. void *address;
  596. }
  597. @@ -6746,8 +7073,8 @@ static const void *lt_preloaded_setup() {
  598. _LT_EOF
  599. # Now try linking the two files.
  600. mv conftest.$ac_objext conftstm.$ac_objext
  601. - lt_save_LIBS="$LIBS"
  602. - lt_save_CFLAGS="$CFLAGS"
  603. + lt_globsym_save_LIBS=$LIBS
  604. + lt_globsym_save_CFLAGS=$CFLAGS
  605. LIBS="conftstm.$ac_objext"
  606. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  607. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  608. @@ -6757,8 +7084,8 @@ _LT_EOF
  609. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  610. pipe_works=yes
  611. fi
  612. - LIBS="$lt_save_LIBS"
  613. - CFLAGS="$lt_save_CFLAGS"
  614. + LIBS=$lt_globsym_save_LIBS
  615. + CFLAGS=$lt_globsym_save_CFLAGS
  616. else
  617. echo "cannot find nm_test_func in $nlist" >&5
  618. fi
  619. @@ -6795,6 +7122,14 @@ else
  620. $as_echo "ok" >&6; }
  621. fi
  622. +# Response file support.
  623. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  624. + nm_file_list_spec='@'
  625. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  626. + nm_file_list_spec='@'
  627. +fi
  628. +
  629. +
  630. @@ -6813,6 +7148,47 @@ fi
  631. +
  632. +
  633. +
  634. +
  635. +
  636. +
  637. +
  638. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  639. +$as_echo_n "checking for sysroot... " >&6; }
  640. +
  641. +# Check whether --with-libtool-sysroot was given.
  642. +if test "${with_libtool_sysroot+set}" = set; then :
  643. + withval=$with_libtool_sysroot;
  644. +else
  645. + with_libtool_sysroot=no
  646. +fi
  647. +
  648. +
  649. +lt_sysroot=
  650. +case ${with_libtool_sysroot} in #(
  651. + yes)
  652. + if test "$GCC" = yes; then
  653. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  654. + fi
  655. + ;; #(
  656. + /*)
  657. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  658. + ;; #(
  659. + no|'')
  660. + ;; #(
  661. + *)
  662. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  663. +$as_echo "${with_libtool_sysroot}" >&6; }
  664. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  665. + ;;
  666. +esac
  667. +
  668. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  669. +$as_echo "${lt_sysroot:-no}" >&6; }
  670. +
  671. +
  672. @@ -7022,6 +7398,123 @@ esac
  673. need_locks="$enable_libtool_lock"
  674. +if test -n "$ac_tool_prefix"; then
  675. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  676. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  677. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  678. +$as_echo_n "checking for $ac_word... " >&6; }
  679. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  680. + $as_echo_n "(cached) " >&6
  681. +else
  682. + if test -n "$MANIFEST_TOOL"; then
  683. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  684. +else
  685. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  686. +for as_dir in $PATH
  687. +do
  688. + IFS=$as_save_IFS
  689. + test -z "$as_dir" && as_dir=.
  690. + for ac_exec_ext in '' $ac_executable_extensions; do
  691. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  692. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  693. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  694. + break 2
  695. + fi
  696. +done
  697. + done
  698. +IFS=$as_save_IFS
  699. +
  700. +fi
  701. +fi
  702. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  703. +if test -n "$MANIFEST_TOOL"; then
  704. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  705. +$as_echo "$MANIFEST_TOOL" >&6; }
  706. +else
  707. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  708. +$as_echo "no" >&6; }
  709. +fi
  710. +
  711. +
  712. +fi
  713. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  714. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  715. + # Extract the first word of "mt", so it can be a program name with args.
  716. +set dummy mt; ac_word=$2
  717. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  718. +$as_echo_n "checking for $ac_word... " >&6; }
  719. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  720. + $as_echo_n "(cached) " >&6
  721. +else
  722. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  723. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  724. +else
  725. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  726. +for as_dir in $PATH
  727. +do
  728. + IFS=$as_save_IFS
  729. + test -z "$as_dir" && as_dir=.
  730. + for ac_exec_ext in '' $ac_executable_extensions; do
  731. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  732. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  733. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  734. + break 2
  735. + fi
  736. +done
  737. + done
  738. +IFS=$as_save_IFS
  739. +
  740. +fi
  741. +fi
  742. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  743. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  744. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  745. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  746. +else
  747. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  748. +$as_echo "no" >&6; }
  749. +fi
  750. +
  751. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  752. + MANIFEST_TOOL=":"
  753. + else
  754. + case $cross_compiling:$ac_tool_warned in
  755. +yes:)
  756. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  757. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  758. +ac_tool_warned=yes ;;
  759. +esac
  760. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  761. + fi
  762. +else
  763. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  764. +fi
  765. +
  766. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  767. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  768. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  769. +if ${lt_cv_path_mainfest_tool+:} false; then :
  770. + $as_echo_n "(cached) " >&6
  771. +else
  772. + lt_cv_path_mainfest_tool=no
  773. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  774. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  775. + cat conftest.err >&5
  776. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  777. + lt_cv_path_mainfest_tool=yes
  778. + fi
  779. + rm -f conftest*
  780. +fi
  781. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  782. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  783. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  784. + MANIFEST_TOOL=:
  785. +fi
  786. +
  787. +
  788. +
  789. +
  790. +
  791. case $host_os in
  792. rhapsody* | darwin*)
  793. @@ -7585,6 +8078,8 @@ _LT_EOF
  794. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  795. echo "$AR cru libconftest.a conftest.o" >&5
  796. $AR cru libconftest.a conftest.o 2>&5
  797. + echo "$RANLIB libconftest.a" >&5
  798. + $RANLIB libconftest.a 2>&5
  799. cat > conftest.c << _LT_EOF
  800. int main() { return 0;}
  801. _LT_EOF
  802. @@ -8136,8 +8631,6 @@ fi
  803. lt_prog_compiler_pic=
  804. lt_prog_compiler_static=
  805. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  806. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  807. if test "$GCC" = yes; then
  808. lt_prog_compiler_wl='-Wl,'
  809. @@ -8303,6 +8796,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  810. lt_prog_compiler_pic='--shared'
  811. lt_prog_compiler_static='--static'
  812. ;;
  813. + nagfor*)
  814. + # NAG Fortran compiler
  815. + lt_prog_compiler_wl='-Wl,-Wl,,'
  816. + lt_prog_compiler_pic='-PIC'
  817. + lt_prog_compiler_static='-Bstatic'
  818. + ;;
  819. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  820. # Portland Group compilers (*not* the Pentium gcc compiler,
  821. # which looks to be a dead project)
  822. @@ -8365,7 +8864,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  823. lt_prog_compiler_pic='-KPIC'
  824. lt_prog_compiler_static='-Bstatic'
  825. case $cc_basename in
  826. - f77* | f90* | f95*)
  827. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  828. lt_prog_compiler_wl='-Qoption ld ';;
  829. *)
  830. lt_prog_compiler_wl='-Wl,';;
  831. @@ -8422,13 +8921,17 @@ case $host_os in
  832. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  833. ;;
  834. esac
  835. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  836. -$as_echo "$lt_prog_compiler_pic" >&6; }
  837. -
  838. -
  839. -
  840. -
  841. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  842. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  843. +if ${lt_cv_prog_compiler_pic+:} false; then :
  844. + $as_echo_n "(cached) " >&6
  845. +else
  846. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  847. +fi
  848. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  849. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  850. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  851. #
  852. # Check to make sure the PIC flag actually works.
  853. @@ -8489,6 +8992,11 @@ fi
  854. +
  855. +
  856. +
  857. +
  858. +
  859. #
  860. # Check to make sure the static flag actually works.
  861. #
  862. @@ -8839,7 +9347,8 @@ _LT_EOF
  863. allow_undefined_flag=unsupported
  864. always_export_symbols=no
  865. enable_shared_with_static_runtimes=yes
  866. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  867. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  868. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  869. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  870. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  871. @@ -8938,12 +9447,12 @@ _LT_EOF
  872. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  873. hardcode_libdir_flag_spec=
  874. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  875. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  876. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  877. if test "x$supports_anon_versioning" = xyes; then
  878. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  879. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  880. echo "local: *; };" >> $output_objdir/$libname.ver~
  881. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  882. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  883. fi
  884. ;;
  885. esac
  886. @@ -8957,8 +9466,8 @@ _LT_EOF
  887. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  888. wlarc=
  889. else
  890. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  891. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  892. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  893. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  894. fi
  895. ;;
  896. @@ -8976,8 +9485,8 @@ _LT_EOF
  897. _LT_EOF
  898. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  899. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  900. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  901. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  902. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  903. else
  904. ld_shlibs=no
  905. fi
  906. @@ -9023,8 +9532,8 @@ _LT_EOF
  907. *)
  908. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  909. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  910. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  911. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  912. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  913. else
  914. ld_shlibs=no
  915. fi
  916. @@ -9154,7 +9663,13 @@ _LT_EOF
  917. allow_undefined_flag='-berok'
  918. # Determine the default libpath from the value encoded in an
  919. # empty executable.
  920. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  921. + if test "${lt_cv_aix_libpath+set}" = set; then
  922. + aix_libpath=$lt_cv_aix_libpath
  923. +else
  924. + if ${lt_cv_aix_libpath_+:} false; then :
  925. + $as_echo_n "(cached) " >&6
  926. +else
  927. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  928. /* end confdefs.h. */
  929. int
  930. @@ -9167,22 +9682,29 @@ main ()
  931. _ACEOF
  932. if ac_fn_c_try_link "$LINENO"; then :
  933. -lt_aix_libpath_sed='
  934. - /Import File Strings/,/^$/ {
  935. - /^0/ {
  936. - s/^0 *\(.*\)$/\1/
  937. - p
  938. - }
  939. - }'
  940. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  941. -# Check for a 64-bit object if we didn't find anything.
  942. -if test -z "$aix_libpath"; then
  943. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  944. -fi
  945. + lt_aix_libpath_sed='
  946. + /Import File Strings/,/^$/ {
  947. + /^0/ {
  948. + s/^0 *\([^ ]*\) *$/\1/
  949. + p
  950. + }
  951. + }'
  952. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  953. + # Check for a 64-bit object if we didn't find anything.
  954. + if test -z "$lt_cv_aix_libpath_"; then
  955. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  956. + fi
  957. fi
  958. rm -f core conftest.err conftest.$ac_objext \
  959. conftest$ac_exeext conftest.$ac_ext
  960. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  961. + if test -z "$lt_cv_aix_libpath_"; then
  962. + lt_cv_aix_libpath_="/usr/lib:/lib"
  963. + fi
  964. +
  965. +fi
  966. +
  967. + aix_libpath=$lt_cv_aix_libpath_
  968. +fi
  969. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  970. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  971. @@ -9194,7 +9716,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  972. else
  973. # Determine the default libpath from the value encoded in an
  974. # empty executable.
  975. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  976. + if test "${lt_cv_aix_libpath+set}" = set; then
  977. + aix_libpath=$lt_cv_aix_libpath
  978. +else
  979. + if ${lt_cv_aix_libpath_+:} false; then :
  980. + $as_echo_n "(cached) " >&6
  981. +else
  982. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  983. /* end confdefs.h. */
  984. int
  985. @@ -9207,22 +9735,29 @@ main ()
  986. _ACEOF
  987. if ac_fn_c_try_link "$LINENO"; then :
  988. -lt_aix_libpath_sed='
  989. - /Import File Strings/,/^$/ {
  990. - /^0/ {
  991. - s/^0 *\(.*\)$/\1/
  992. - p
  993. - }
  994. - }'
  995. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  996. -# Check for a 64-bit object if we didn't find anything.
  997. -if test -z "$aix_libpath"; then
  998. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  999. -fi
  1000. + lt_aix_libpath_sed='
  1001. + /Import File Strings/,/^$/ {
  1002. + /^0/ {
  1003. + s/^0 *\([^ ]*\) *$/\1/
  1004. + p
  1005. + }
  1006. + }'
  1007. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  1008. + # Check for a 64-bit object if we didn't find anything.
  1009. + if test -z "$lt_cv_aix_libpath_"; then
  1010. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  1011. + fi
  1012. fi
  1013. rm -f core conftest.err conftest.$ac_objext \
  1014. conftest$ac_exeext conftest.$ac_ext
  1015. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1016. + if test -z "$lt_cv_aix_libpath_"; then
  1017. + lt_cv_aix_libpath_="/usr/lib:/lib"
  1018. + fi
  1019. +
  1020. +fi
  1021. +
  1022. + aix_libpath=$lt_cv_aix_libpath_
  1023. +fi
  1024. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  1025. # Warning - without using the other run time loading flags,
  1026. @@ -9267,20 +9802,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1027. # Microsoft Visual C++.
  1028. # hardcode_libdir_flag_spec is actually meaningless, as there is
  1029. # no search path for DLLs.
  1030. - hardcode_libdir_flag_spec=' '
  1031. - allow_undefined_flag=unsupported
  1032. - # Tell ltmain to make .lib files, not .a files.
  1033. - libext=lib
  1034. - # Tell ltmain to make .dll files, not .so files.
  1035. - shrext_cmds=".dll"
  1036. - # FIXME: Setting linknames here is a bad hack.
  1037. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  1038. - # The linker will automatically build a .lib file if we build a DLL.
  1039. - old_archive_from_new_cmds='true'
  1040. - # FIXME: Should let the user specify the lib program.
  1041. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  1042. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  1043. - enable_shared_with_static_runtimes=yes
  1044. + case $cc_basename in
  1045. + cl*)
  1046. + # Native MSVC
  1047. + hardcode_libdir_flag_spec=' '
  1048. + allow_undefined_flag=unsupported
  1049. + always_export_symbols=yes
  1050. + file_list_spec='@'
  1051. + # Tell ltmain to make .lib files, not .a files.
  1052. + libext=lib
  1053. + # Tell ltmain to make .dll files, not .so files.
  1054. + shrext_cmds=".dll"
  1055. + # FIXME: Setting linknames here is a bad hack.
  1056. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  1057. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  1058. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  1059. + else
  1060. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  1061. + fi~
  1062. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  1063. + linknames='
  1064. + # The linker will not automatically build a static lib if we build a DLL.
  1065. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  1066. + enable_shared_with_static_runtimes=yes
  1067. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  1068. + # Don't use ranlib
  1069. + old_postinstall_cmds='chmod 644 $oldlib'
  1070. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  1071. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  1072. + case $lt_outputfile in
  1073. + *.exe|*.EXE) ;;
  1074. + *)
  1075. + lt_outputfile="$lt_outputfile.exe"
  1076. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  1077. + ;;
  1078. + esac~
  1079. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  1080. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  1081. + $RM "$lt_outputfile.manifest";
  1082. + fi'
  1083. + ;;
  1084. + *)
  1085. + # Assume MSVC wrapper
  1086. + hardcode_libdir_flag_spec=' '
  1087. + allow_undefined_flag=unsupported
  1088. + # Tell ltmain to make .lib files, not .a files.
  1089. + libext=lib
  1090. + # Tell ltmain to make .dll files, not .so files.
  1091. + shrext_cmds=".dll"
  1092. + # FIXME: Setting linknames here is a bad hack.
  1093. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  1094. + # The linker will automatically build a .lib file if we build a DLL.
  1095. + old_archive_from_new_cmds='true'
  1096. + # FIXME: Should let the user specify the lib program.
  1097. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  1098. + enable_shared_with_static_runtimes=yes
  1099. + ;;
  1100. + esac
  1101. ;;
  1102. darwin* | rhapsody*)
  1103. @@ -9341,7 +9919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1104. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  1105. freebsd* | dragonfly*)
  1106. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  1107. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  1108. hardcode_libdir_flag_spec='-R$libdir'
  1109. hardcode_direct=yes
  1110. hardcode_shlibpath_var=no
  1111. @@ -9349,7 +9927,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1112. hpux9*)
  1113. if test "$GCC" = yes; then
  1114. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  1115. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  1116. else
  1117. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  1118. fi
  1119. @@ -9365,7 +9943,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1120. hpux10*)
  1121. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  1122. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1123. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1124. else
  1125. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  1126. fi
  1127. @@ -9389,10 +9967,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1128. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  1129. ;;
  1130. ia64*)
  1131. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  1132. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  1133. ;;
  1134. *)
  1135. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1136. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1137. ;;
  1138. esac
  1139. else
  1140. @@ -9471,23 +10049,36 @@ fi
  1141. irix5* | irix6* | nonstopux*)
  1142. if test "$GCC" = yes; then
  1143. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  1144. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  1145. # Try to use the -exported_symbol ld option, if it does not
  1146. # work, assume that -exports_file does not work either and
  1147. # implicitly export all symbols.
  1148. - save_LDFLAGS="$LDFLAGS"
  1149. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  1150. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1151. + # This should be the same for all languages, so no per-tag cache variable.
  1152. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  1153. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  1154. +if ${lt_cv_irix_exported_symbol+:} false; then :
  1155. + $as_echo_n "(cached) " >&6
  1156. +else
  1157. + save_LDFLAGS="$LDFLAGS"
  1158. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  1159. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1160. /* end confdefs.h. */
  1161. -int foo(void) {}
  1162. +int foo (void) { return 0; }
  1163. _ACEOF
  1164. if ac_fn_c_try_link "$LINENO"; then :
  1165. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  1166. -
  1167. + lt_cv_irix_exported_symbol=yes
  1168. +else
  1169. + lt_cv_irix_exported_symbol=no
  1170. fi
  1171. rm -f core conftest.err conftest.$ac_objext \
  1172. conftest$ac_exeext conftest.$ac_ext
  1173. - LDFLAGS="$save_LDFLAGS"
  1174. + LDFLAGS="$save_LDFLAGS"
  1175. +fi
  1176. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  1177. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  1178. + if test "$lt_cv_irix_exported_symbol" = yes; then
  1179. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  1180. + fi
  1181. else
  1182. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  1183. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  1184. @@ -9572,7 +10163,7 @@ rm -f core conftest.err conftest.$ac_objext \
  1185. osf4* | osf5*) # as osf3* with the addition of -msym flag
  1186. if test "$GCC" = yes; then
  1187. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  1188. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  1189. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  1190. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  1191. else
  1192. allow_undefined_flag=' -expect_unresolved \*'
  1193. @@ -9591,9 +10182,9 @@ rm -f core conftest.err conftest.$ac_objext \
  1194. no_undefined_flag=' -z defs'
  1195. if test "$GCC" = yes; then
  1196. wlarc='${wl}'
  1197. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  1198. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  1199. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  1200. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  1201. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  1202. else
  1203. case `$CC -V 2>&1` in
  1204. *"Compilers 5.0"*)
  1205. @@ -10169,8 +10760,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  1206. need_version=no
  1207. need_lib_prefix=no
  1208. - case $GCC,$host_os in
  1209. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  1210. + case $GCC,$cc_basename in
  1211. + yes,*)
  1212. + # gcc
  1213. library_names_spec='$libname.dll.a'
  1214. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  1215. postinstall_cmds='base_file=`basename \${file}`~
  1216. @@ -10203,13 +10795,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  1217. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  1218. ;;
  1219. esac
  1220. + dynamic_linker='Win32 ld.exe'
  1221. + ;;
  1222. +
  1223. + *,cl*)
  1224. + # Native MSVC
  1225. + libname_spec='$name'
  1226. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  1227. + library_names_spec='${libname}.dll.lib'
  1228. +
  1229. + case $build_os in
  1230. + mingw*)
  1231. + sys_lib_search_path_spec=
  1232. + lt_save_ifs=$IFS
  1233. + IFS=';'
  1234. + for lt_path in $LIB
  1235. + do
  1236. + IFS=$lt_save_ifs
  1237. + # Let DOS variable expansion print the short 8.3 style file name.
  1238. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  1239. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  1240. + done
  1241. + IFS=$lt_save_ifs
  1242. + # Convert to MSYS style.
  1243. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  1244. + ;;
  1245. + cygwin*)
  1246. + # Convert to unix form, then to dos form, then back to unix form
  1247. + # but this time dos style (no spaces!) so that the unix form looks
  1248. + # like /cygdrive/c/PROGRA~1:/cygdr...
  1249. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  1250. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  1251. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  1252. + ;;
  1253. + *)
  1254. + sys_lib_search_path_spec="$LIB"
  1255. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  1256. + # It is most probably a Windows format PATH.
  1257. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  1258. + else
  1259. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  1260. + fi
  1261. + # FIXME: find the short name or the path components, as spaces are
  1262. + # common. (e.g. "Program Files" -> "PROGRA~1")
  1263. + ;;
  1264. + esac
  1265. +
  1266. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  1267. + postinstall_cmds='base_file=`basename \${file}`~
  1268. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  1269. + dldir=$destdir/`dirname \$dlpath`~
  1270. + test -d \$dldir || mkdir -p \$dldir~
  1271. + $install_prog $dir/$dlname \$dldir/$dlname'
  1272. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  1273. + dlpath=$dir/\$dldll~
  1274. + $RM \$dlpath'
  1275. + shlibpath_overrides_runpath=yes
  1276. + dynamic_linker='Win32 link.exe'
  1277. ;;
  1278. *)
  1279. + # Assume MSVC wrapper
  1280. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  1281. + dynamic_linker='Win32 ld.exe'
  1282. ;;
  1283. esac
  1284. - dynamic_linker='Win32 ld.exe'
  1285. # FIXME: first we should search . and the directory the executable is in
  1286. shlibpath_var=PATH
  1287. ;;
  1288. @@ -11087,7 +11737,7 @@ else
  1289. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  1290. lt_status=$lt_dlunknown
  1291. cat > conftest.$ac_ext <<_LT_EOF
  1292. -#line 11090 "configure"
  1293. +#line $LINENO "configure"
  1294. #include "confdefs.h"
  1295. #if HAVE_DLFCN_H
  1296. @@ -11131,10 +11781,10 @@ else
  1297. /* When -fvisbility=hidden is used, assume the code has been annotated
  1298. correspondingly for the symbols needed. */
  1299. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  1300. -void fnord () __attribute__((visibility("default")));
  1301. +int fnord () __attribute__((visibility("default")));
  1302. #endif
  1303. -void fnord () { int i=42; }
  1304. +int fnord () { return 42; }
  1305. int main ()
  1306. {
  1307. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  1308. @@ -11193,7 +11843,7 @@ else
  1309. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  1310. lt_status=$lt_dlunknown
  1311. cat > conftest.$ac_ext <<_LT_EOF
  1312. -#line 11196 "configure"
  1313. +#line $LINENO "configure"
  1314. #include "confdefs.h"
  1315. #if HAVE_DLFCN_H
  1316. @@ -11237,10 +11887,10 @@ else
  1317. /* When -fvisbility=hidden is used, assume the code has been annotated
  1318. correspondingly for the symbols needed. */
  1319. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  1320. -void fnord () __attribute__((visibility("default")));
  1321. +int fnord () __attribute__((visibility("default")));
  1322. #endif
  1323. -void fnord () { int i=42; }
  1324. +int fnord () { return 42; }
  1325. int main ()
  1326. {
  1327. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  1328. @@ -13225,7 +13875,7 @@ SHARED_LDFLAGS=
  1329. if test "$enable_shared" = "yes"; then
  1330. x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
  1331. if test -n "$x"; then
  1332. - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
  1333. + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
  1334. fi
  1335. fi
  1336. @@ -15869,13 +16519,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  1337. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  1338. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  1339. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  1340. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  1341. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  1342. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  1343. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  1344. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  1345. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  1346. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  1347. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  1348. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  1349. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  1350. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  1351. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  1352. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  1353. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  1354. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  1355. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  1356. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  1357. @@ -15890,14 +16547,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  1358. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  1359. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  1360. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  1361. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  1362. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  1363. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  1364. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  1365. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  1366. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  1367. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  1368. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  1369. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  1370. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  1371. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  1372. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  1373. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  1374. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  1375. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  1376. @@ -15930,12 +16590,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  1377. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  1378. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  1379. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  1380. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  1381. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  1382. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  1383. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  1384. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  1385. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  1386. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  1387. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  1388. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  1389. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  1390. @@ -15990,8 +16650,13 @@ reload_flag \
  1391. OBJDUMP \
  1392. deplibs_check_method \
  1393. file_magic_cmd \
  1394. +file_magic_glob \
  1395. +want_nocaseglob \
  1396. +DLLTOOL \
  1397. +sharedlib_from_linklib_cmd \
  1398. AR \
  1399. AR_FLAGS \
  1400. +archiver_list_spec \
  1401. STRIP \
  1402. RANLIB \
  1403. CC \
  1404. @@ -16001,12 +16666,14 @@ lt_cv_sys_global_symbol_pipe \
  1405. lt_cv_sys_global_symbol_to_cdecl \
  1406. lt_cv_sys_global_symbol_to_c_name_address \
  1407. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  1408. +nm_file_list_spec \
  1409. lt_prog_compiler_no_builtin_flag \
  1410. -lt_prog_compiler_wl \
  1411. lt_prog_compiler_pic \
  1412. +lt_prog_compiler_wl \
  1413. lt_prog_compiler_static \
  1414. lt_cv_prog_compiler_c_o \
  1415. need_locks \
  1416. +MANIFEST_TOOL \
  1417. DSYMUTIL \
  1418. NMEDIT \
  1419. LIPO \
  1420. @@ -16022,7 +16689,6 @@ no_undefined_flag \
  1421. hardcode_libdir_flag_spec \
  1422. hardcode_libdir_flag_spec_ld \
  1423. hardcode_libdir_separator \
  1424. -fix_srcfile_path \
  1425. exclude_expsyms \
  1426. include_expsyms \
  1427. file_list_spec \
  1428. @@ -16058,6 +16724,7 @@ module_cmds \
  1429. module_expsym_cmds \
  1430. export_symbols_cmds \
  1431. prelink_cmds \
  1432. +postlink_cmds \
  1433. postinstall_cmds \
  1434. postuninstall_cmds \
  1435. finish_cmds \
  1436. @@ -16826,7 +17493,8 @@ $as_echo X"$file" |
  1437. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  1438. #
  1439. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  1440. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  1441. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  1442. +# Inc.
  1443. # Written by Gordon Matzigkeit, 1996
  1444. #
  1445. # This file is part of GNU Libtool.
  1446. @@ -16929,19 +17597,42 @@ SP2NL=$lt_lt_SP2NL
  1447. # turn newlines into spaces.
  1448. NL2SP=$lt_lt_NL2SP
  1449. +# convert \$build file names to \$host format.
  1450. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  1451. +
  1452. +# convert \$build files to toolchain format.
  1453. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  1454. +
  1455. # An object symbol dumper.
  1456. OBJDUMP=$lt_OBJDUMP
  1457. # Method to check whether dependent libraries are shared objects.
  1458. deplibs_check_method=$lt_deplibs_check_method
  1459. -# Command to use when deplibs_check_method == "file_magic".
  1460. +# Command to use when deplibs_check_method = "file_magic".
  1461. file_magic_cmd=$lt_file_magic_cmd
  1462. +# How to find potential files when deplibs_check_method = "file_magic".
  1463. +file_magic_glob=$lt_file_magic_glob
  1464. +
  1465. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  1466. +want_nocaseglob=$lt_want_nocaseglob
  1467. +
  1468. +# DLL creation program.
  1469. +DLLTOOL=$lt_DLLTOOL
  1470. +
  1471. +# Command to associate shared and link libraries.
  1472. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  1473. +
  1474. # The archiver.
  1475. AR=$lt_AR
  1476. +
  1477. +# Flags to create an archive.
  1478. AR_FLAGS=$lt_AR_FLAGS
  1479. +# How to feed a file listing to the archiver.
  1480. +archiver_list_spec=$lt_archiver_list_spec
  1481. +
  1482. # A symbol stripping program.
  1483. STRIP=$lt_STRIP
  1484. @@ -16971,6 +17662,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  1485. # Transform the output of nm in a C name address pair when lib prefix is needed.
  1486. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  1487. +# Specify filename containing input files for \$NM.
  1488. +nm_file_list_spec=$lt_nm_file_list_spec
  1489. +
  1490. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  1491. +lt_sysroot=$lt_sysroot
  1492. +
  1493. # The name of the directory that contains temporary libtool files.
  1494. objdir=$objdir
  1495. @@ -16980,6 +17677,9 @@ MAGIC_CMD=$MAGIC_CMD
  1496. # Must we lock files when doing compilation?
  1497. need_locks=$lt_need_locks
  1498. +# Manifest tool.
  1499. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  1500. +
  1501. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  1502. DSYMUTIL=$lt_DSYMUTIL
  1503. @@ -17094,12 +17794,12 @@ with_gcc=$GCC
  1504. # Compiler flag to turn off builtin functions.
  1505. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  1506. -# How to pass a linker flag through the compiler.
  1507. -wl=$lt_lt_prog_compiler_wl
  1508. -
  1509. # Additional compiler flags for building library objects.
  1510. pic_flag=$lt_lt_prog_compiler_pic
  1511. +# How to pass a linker flag through the compiler.
  1512. +wl=$lt_lt_prog_compiler_wl
  1513. +
  1514. # Compiler flag to prevent dynamic linking.
  1515. link_static_flag=$lt_lt_prog_compiler_static
  1516. @@ -17186,9 +17886,6 @@ inherit_rpath=$inherit_rpath
  1517. # Whether libtool must link a program against all its dependency libraries.
  1518. link_all_deplibs=$link_all_deplibs
  1519. -# Fix the shell variable \$srcfile for the compiler.
  1520. -fix_srcfile_path=$lt_fix_srcfile_path
  1521. -
  1522. # Set to "yes" if exported symbols are required.
  1523. always_export_symbols=$always_export_symbols
  1524. @@ -17204,6 +17901,9 @@ include_expsyms=$lt_include_expsyms
  1525. # Commands necessary for linking programs (against libraries) with templates.
  1526. prelink_cmds=$lt_prelink_cmds
  1527. +# Commands necessary for finishing linking programs.
  1528. +postlink_cmds=$lt_postlink_cmds
  1529. +
  1530. # Specify filename containing input files.
  1531. file_list_spec=$lt_file_list_spec
  1532. @@ -17236,210 +17936,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  1533. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  1534. # text mode, it properly converts lines to CR/LF. This bash problem
  1535. # is reportedly fixed, but why not run on old versions too?
  1536. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  1537. - || (rm -f "$cfgfile"; exit 1)
  1538. -
  1539. - case $xsi_shell in
  1540. - yes)
  1541. - cat << \_LT_EOF >> "$cfgfile"
  1542. -
  1543. -# func_dirname file append nondir_replacement
  1544. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  1545. -# otherwise set result to NONDIR_REPLACEMENT.
  1546. -func_dirname ()
  1547. -{
  1548. - case ${1} in
  1549. - */*) func_dirname_result="${1%/*}${2}" ;;
  1550. - * ) func_dirname_result="${3}" ;;
  1551. - esac
  1552. -}
  1553. -
  1554. -# func_basename file
  1555. -func_basename ()
  1556. -{
  1557. - func_basename_result="${1##*/}"
  1558. -}
  1559. -
  1560. -# func_dirname_and_basename file append nondir_replacement
  1561. -# perform func_basename and func_dirname in a single function
  1562. -# call:
  1563. -# dirname: Compute the dirname of FILE. If nonempty,
  1564. -# add APPEND to the result, otherwise set result
  1565. -# to NONDIR_REPLACEMENT.
  1566. -# value returned in "$func_dirname_result"
  1567. -# basename: Compute filename of FILE.
  1568. -# value retuned in "$func_basename_result"
  1569. -# Implementation must be kept synchronized with func_dirname
  1570. -# and func_basename. For efficiency, we do not delegate to
  1571. -# those functions but instead duplicate the functionality here.
  1572. -func_dirname_and_basename ()
  1573. -{
  1574. - case ${1} in
  1575. - */*) func_dirname_result="${1%/*}${2}" ;;
  1576. - * ) func_dirname_result="${3}" ;;
  1577. - esac
  1578. - func_basename_result="${1##*/}"
  1579. -}
  1580. -
  1581. -# func_stripname prefix suffix name
  1582. -# strip PREFIX and SUFFIX off of NAME.
  1583. -# PREFIX and SUFFIX must not contain globbing or regex special
  1584. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  1585. -# dot (in which case that matches only a dot).
  1586. -func_stripname ()
  1587. -{
  1588. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  1589. - # positional parameters, so assign one to ordinary parameter first.
  1590. - func_stripname_result=${3}
  1591. - func_stripname_result=${func_stripname_result#"${1}"}
  1592. - func_stripname_result=${func_stripname_result%"${2}"}
  1593. -}
  1594. -
  1595. -# func_opt_split
  1596. -func_opt_split ()
  1597. -{
  1598. - func_opt_split_opt=${1%%=*}
  1599. - func_opt_split_arg=${1#*=}
  1600. -}
  1601. -
  1602. -# func_lo2o object
  1603. -func_lo2o ()
  1604. -{
  1605. - case ${1} in
  1606. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  1607. - *) func_lo2o_result=${1} ;;
  1608. - esac
  1609. -}
  1610. -
  1611. -# func_xform libobj-or-source
  1612. -func_xform ()
  1613. -{
  1614. - func_xform_result=${1%.*}.lo
  1615. -}
  1616. -
  1617. -# func_arith arithmetic-term...
  1618. -func_arith ()
  1619. -{
  1620. - func_arith_result=$(( $* ))
  1621. -}
  1622. -
  1623. -# func_len string
  1624. -# STRING may not start with a hyphen.
  1625. -func_len ()
  1626. -{
  1627. - func_len_result=${#1}
  1628. -}
  1629. -
  1630. -_LT_EOF
  1631. - ;;
  1632. - *) # Bourne compatible functions.
  1633. - cat << \_LT_EOF >> "$cfgfile"
  1634. -
  1635. -# func_dirname file append nondir_replacement
  1636. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  1637. -# otherwise set result to NONDIR_REPLACEMENT.
  1638. -func_dirname ()
  1639. -{
  1640. - # Extract subdirectory from the argument.
  1641. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  1642. - if test "X$func_dirname_result" = "X${1}"; then
  1643. - func_dirname_result="${3}"
  1644. - else
  1645. - func_dirname_result="$func_dirname_result${2}"
  1646. - fi
  1647. -}
  1648. -
  1649. -# func_basename file
  1650. -func_basename ()
  1651. -{
  1652. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  1653. -}
  1654. -
  1655. -
  1656. -# func_stripname prefix suffix name
  1657. -# strip PREFIX and SUFFIX off of NAME.
  1658. -# PREFIX and SUFFIX must not contain globbing or regex special
  1659. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  1660. -# dot (in which case that matches only a dot).
  1661. -# func_strip_suffix prefix name
  1662. -func_stripname ()
  1663. -{
  1664. - case ${2} in
  1665. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  1666. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  1667. - esac
  1668. -}
  1669. -
  1670. -# sed scripts:
  1671. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  1672. -my_sed_long_arg='1s/^-[^=]*=//'
  1673. -
  1674. -# func_opt_split
  1675. -func_opt_split ()
  1676. -{
  1677. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  1678. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  1679. -}
  1680. -
  1681. -# func_lo2o object
  1682. -func_lo2o ()
  1683. -{
  1684. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  1685. -}
  1686. -
  1687. -# func_xform libobj-or-source
  1688. -func_xform ()
  1689. -{
  1690. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  1691. -}
  1692. -
  1693. -# func_arith arithmetic-term...
  1694. -func_arith ()
  1695. -{
  1696. - func_arith_result=`expr "$@"`
  1697. -}
  1698. -
  1699. -# func_len string
  1700. -# STRING may not start with a hyphen.
  1701. -func_len ()
  1702. -{
  1703. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  1704. -}
  1705. -
  1706. -_LT_EOF
  1707. -esac
  1708. -
  1709. -case $lt_shell_append in
  1710. - yes)
  1711. - cat << \_LT_EOF >> "$cfgfile"
  1712. -
  1713. -# func_append var value
  1714. -# Append VALUE to the end of shell variable VAR.
  1715. -func_append ()
  1716. -{
  1717. - eval "$1+=\$2"
  1718. -}
  1719. -_LT_EOF
  1720. - ;;
  1721. - *)
  1722. - cat << \_LT_EOF >> "$cfgfile"
  1723. -
  1724. -# func_append var value
  1725. -# Append VALUE to the end of shell variable VAR.
  1726. -func_append ()
  1727. -{
  1728. - eval "$1=\$$1\$2"
  1729. -}
  1730. -
  1731. -_LT_EOF
  1732. - ;;
  1733. - esac
  1734. -
  1735. -
  1736. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  1737. - || (rm -f "$cfgfile"; exit 1)
  1738. -
  1739. - mv -f "$cfgfile" "$ofile" ||
  1740. + sed '$q' "$ltmain" >> "$cfgfile" \
  1741. + || (rm -f "$cfgfile"; exit 1)
  1742. +
  1743. + if test x"$xsi_shell" = xyes; then
  1744. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  1745. +func_dirname ()\
  1746. +{\
  1747. +\ case ${1} in\
  1748. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  1749. +\ * ) func_dirname_result="${3}" ;;\
  1750. +\ esac\
  1751. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  1752. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1753. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1754. +test 0 -eq $? || _lt_function_replace_fail=:
  1755. +
  1756. +
  1757. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  1758. +func_basename ()\
  1759. +{\
  1760. +\ func_basename_result="${1##*/}"\
  1761. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  1762. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1763. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1764. +test 0 -eq $? || _lt_function_replace_fail=:
  1765. +
  1766. +
  1767. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  1768. +func_dirname_and_basename ()\
  1769. +{\
  1770. +\ case ${1} in\
  1771. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  1772. +\ * ) func_dirname_result="${3}" ;;\
  1773. +\ esac\
  1774. +\ func_basename_result="${1##*/}"\
  1775. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  1776. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1777. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1778. +test 0 -eq $? || _lt_function_replace_fail=:
  1779. +
  1780. +
  1781. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  1782. +func_stripname ()\
  1783. +{\
  1784. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  1785. +\ # positional parameters, so assign one to ordinary parameter first.\
  1786. +\ func_stripname_result=${3}\
  1787. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  1788. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  1789. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  1790. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1791. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1792. +test 0 -eq $? || _lt_function_replace_fail=:
  1793. +
  1794. +
  1795. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  1796. +func_split_long_opt ()\
  1797. +{\
  1798. +\ func_split_long_opt_name=${1%%=*}\
  1799. +\ func_split_long_opt_arg=${1#*=}\
  1800. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  1801. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1802. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1803. +test 0 -eq $? || _lt_function_replace_fail=:
  1804. +
  1805. +
  1806. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  1807. +func_split_short_opt ()\
  1808. +{\
  1809. +\ func_split_short_opt_arg=${1#??}\
  1810. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  1811. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  1812. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1813. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1814. +test 0 -eq $? || _lt_function_replace_fail=:
  1815. +
  1816. +
  1817. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  1818. +func_lo2o ()\
  1819. +{\
  1820. +\ case ${1} in\
  1821. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  1822. +\ *) func_lo2o_result=${1} ;;\
  1823. +\ esac\
  1824. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  1825. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1826. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1827. +test 0 -eq $? || _lt_function_replace_fail=:
  1828. +
  1829. +
  1830. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  1831. +func_xform ()\
  1832. +{\
  1833. + func_xform_result=${1%.*}.lo\
  1834. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  1835. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1836. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1837. +test 0 -eq $? || _lt_function_replace_fail=:
  1838. +
  1839. +
  1840. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  1841. +func_arith ()\
  1842. +{\
  1843. + func_arith_result=$(( $* ))\
  1844. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  1845. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1846. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1847. +test 0 -eq $? || _lt_function_replace_fail=:
  1848. +
  1849. +
  1850. + sed -e '/^func_len ()$/,/^} # func_len /c\
  1851. +func_len ()\
  1852. +{\
  1853. + func_len_result=${#1}\
  1854. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  1855. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1856. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1857. +test 0 -eq $? || _lt_function_replace_fail=:
  1858. +
  1859. +fi
  1860. +
  1861. +if test x"$lt_shell_append" = xyes; then
  1862. + sed -e '/^func_append ()$/,/^} # func_append /c\
  1863. +func_append ()\
  1864. +{\
  1865. + eval "${1}+=\\${2}"\
  1866. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  1867. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1868. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1869. +test 0 -eq $? || _lt_function_replace_fail=:
  1870. +
  1871. +
  1872. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  1873. +func_append_quoted ()\
  1874. +{\
  1875. +\ func_quote_for_eval "${2}"\
  1876. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  1877. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  1878. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1879. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1880. +test 0 -eq $? || _lt_function_replace_fail=:
  1881. +
  1882. +
  1883. + # Save a `func_append' function call where possible by direct use of '+='
  1884. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  1885. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1886. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1887. + test 0 -eq $? || _lt_function_replace_fail=:
  1888. +else
  1889. + # Save a `func_append' function call even when '+=' is not available
  1890. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  1891. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1892. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1893. + test 0 -eq $? || _lt_function_replace_fail=:
  1894. +fi
  1895. +
  1896. +if test x"$_lt_function_replace_fail" = x":"; then
  1897. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  1898. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  1899. +fi
  1900. +
  1901. +
  1902. + mv -f "$cfgfile" "$ofile" ||
  1903. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  1904. chmod +x "$ofile"
  1905. diff --git a/bfd/configure.ac b/bfd/configure.ac
  1906. index 6146efb5ae3..73e5e03d016 100644
  1907. --- a/bfd/configure.ac
  1908. +++ b/bfd/configure.ac
  1909. @@ -282,7 +282,7 @@ changequote(,)dnl
  1910. x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
  1911. changequote([,])dnl
  1912. if test -n "$x"; then
  1913. - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
  1914. + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
  1915. fi
  1916. fi
  1917. diff --git a/binutils/Makefile.in b/binutils/Makefile.in
  1918. index 78d32b350e3..ad4f2de7358 100644
  1919. --- a/binutils/Makefile.in
  1920. +++ b/binutils/Makefile.in
  1921. @@ -492,6 +492,7 @@ DEBUGINFOD_LIBS = @DEBUGINFOD_LIBS@
  1922. DEFS = @DEFS@
  1923. DEMANGLER_NAME = @DEMANGLER_NAME@
  1924. DEPDIR = @DEPDIR@
  1925. +DLLTOOL = @DLLTOOL@
  1926. DLLTOOL_DEFS = @DLLTOOL_DEFS@
  1927. DSYMUTIL = @DSYMUTIL@
  1928. DUMPBIN = @DUMPBIN@
  1929. @@ -533,6 +534,7 @@ LTLIBICONV = @LTLIBICONV@
  1930. LTLIBOBJS = @LTLIBOBJS@
  1931. MAINT = @MAINT@
  1932. MAKEINFO = @MAKEINFO@
  1933. +MANIFEST_TOOL = @MANIFEST_TOOL@
  1934. MKDIR_P = @MKDIR_P@
  1935. MKINSTALLDIRS = @MKINSTALLDIRS@
  1936. MSGFMT = @MSGFMT@
  1937. @@ -579,6 +581,7 @@ abs_builddir = @abs_builddir@
  1938. abs_srcdir = @abs_srcdir@
  1939. abs_top_builddir = @abs_top_builddir@
  1940. abs_top_srcdir = @abs_top_srcdir@
  1941. +ac_ct_AR = @ac_ct_AR@
  1942. ac_ct_CC = @ac_ct_CC@
  1943. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  1944. am__include = @am__include@
  1945. diff --git a/binutils/configure b/binutils/configure
  1946. index 149815542f9..43952bde405 100755
  1947. --- a/binutils/configure
  1948. +++ b/binutils/configure
  1949. @@ -698,8 +698,11 @@ OTOOL
  1950. LIPO
  1951. NMEDIT
  1952. DSYMUTIL
  1953. +MANIFEST_TOOL
  1954. RANLIB
  1955. +ac_ct_AR
  1956. AR
  1957. +DLLTOOL
  1958. OBJDUMP
  1959. LN_S
  1960. NM
  1961. @@ -816,6 +819,7 @@ enable_static
  1962. with_pic
  1963. enable_fast_install
  1964. with_gnu_ld
  1965. +with_libtool_sysroot
  1966. enable_libtool_lock
  1967. enable_plugins
  1968. enable_largefile
  1969. @@ -1514,6 +1518,8 @@ Optional Packages:
  1970. --with-pic try to use only PIC/non-PIC objects [default=use
  1971. both]
  1972. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  1973. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  1974. + (or the compiler's sysroot if not specified).
  1975. --with-debuginfod Enable debuginfo lookups with debuginfod
  1976. (auto/yes/no)
  1977. --with-system-zlib use installed libz
  1978. @@ -4893,8 +4899,8 @@ esac
  1979. -macro_version='2.2.7a'
  1980. -macro_revision='1.3134'
  1981. +macro_version='2.4'
  1982. +macro_revision='1.3293'
  1983. @@ -4934,7 +4940,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  1984. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  1985. $as_echo_n "checking how to print strings... " >&6; }
  1986. # Test print first, because it will be a builtin if present.
  1987. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  1988. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  1989. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  1990. ECHO='print -r --'
  1991. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  1992. @@ -5627,8 +5633,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  1993. # Try some XSI features
  1994. xsi_shell=no
  1995. ( _lt_dummy="a/b/c"
  1996. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  1997. - = c,a/b,, \
  1998. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  1999. + = c,a/b,b/c, \
  2000. && eval 'test $(( 1 + 1 )) -eq 2 \
  2001. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  2002. && xsi_shell=yes
  2003. @@ -5677,6 +5683,80 @@ esac
  2004. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  2005. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  2006. +if ${lt_cv_to_host_file_cmd+:} false; then :
  2007. + $as_echo_n "(cached) " >&6
  2008. +else
  2009. + case $host in
  2010. + *-*-mingw* )
  2011. + case $build in
  2012. + *-*-mingw* ) # actually msys
  2013. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  2014. + ;;
  2015. + *-*-cygwin* )
  2016. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  2017. + ;;
  2018. + * ) # otherwise, assume *nix
  2019. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  2020. + ;;
  2021. + esac
  2022. + ;;
  2023. + *-*-cygwin* )
  2024. + case $build in
  2025. + *-*-mingw* ) # actually msys
  2026. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  2027. + ;;
  2028. + *-*-cygwin* )
  2029. + lt_cv_to_host_file_cmd=func_convert_file_noop
  2030. + ;;
  2031. + * ) # otherwise, assume *nix
  2032. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  2033. + ;;
  2034. + esac
  2035. + ;;
  2036. + * ) # unhandled hosts (and "normal" native builds)
  2037. + lt_cv_to_host_file_cmd=func_convert_file_noop
  2038. + ;;
  2039. +esac
  2040. +
  2041. +fi
  2042. +
  2043. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  2044. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  2045. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  2046. +
  2047. +
  2048. +
  2049. +
  2050. +
  2051. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  2052. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  2053. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  2054. + $as_echo_n "(cached) " >&6
  2055. +else
  2056. + #assume ordinary cross tools, or native build.
  2057. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  2058. +case $host in
  2059. + *-*-mingw* )
  2060. + case $build in
  2061. + *-*-mingw* ) # actually msys
  2062. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  2063. + ;;
  2064. + esac
  2065. + ;;
  2066. +esac
  2067. +
  2068. +fi
  2069. +
  2070. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  2071. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  2072. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  2073. +
  2074. +
  2075. +
  2076. +
  2077. +
  2078. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  2079. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  2080. if ${lt_cv_ld_reload_flag+:} false; then :
  2081. @@ -5693,6 +5773,11 @@ case $reload_flag in
  2082. esac
  2083. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  2084. case $host_os in
  2085. + cygwin* | mingw* | pw32* | cegcc*)
  2086. + if test "$GCC" != yes; then
  2087. + reload_cmds=false
  2088. + fi
  2089. + ;;
  2090. darwin*)
  2091. if test "$GCC" = yes; then
  2092. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  2093. @@ -5861,7 +5946,8 @@ mingw* | pw32*)
  2094. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  2095. lt_cv_file_magic_cmd='func_win32_libid'
  2096. else
  2097. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  2098. + # Keep this pattern in sync with the one in func_win32_libid.
  2099. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  2100. lt_cv_file_magic_cmd='$OBJDUMP -f'
  2101. fi
  2102. ;;
  2103. @@ -6015,6 +6101,21 @@ esac
  2104. fi
  2105. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  2106. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  2107. +
  2108. +file_magic_glob=
  2109. +want_nocaseglob=no
  2110. +if test "$build" = "$host"; then
  2111. + case $host_os in
  2112. + mingw* | pw32*)
  2113. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  2114. + want_nocaseglob=yes
  2115. + else
  2116. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  2117. + fi
  2118. + ;;
  2119. + esac
  2120. +fi
  2121. +
  2122. file_magic_cmd=$lt_cv_file_magic_cmd
  2123. deplibs_check_method=$lt_cv_deplibs_check_method
  2124. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  2125. @@ -6030,6 +6131,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  2126. +
  2127. +
  2128. +
  2129. +
  2130. +
  2131. +
  2132. +
  2133. +
  2134. +
  2135. +
  2136. +if test -n "$ac_tool_prefix"; then
  2137. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  2138. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  2139. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2140. +$as_echo_n "checking for $ac_word... " >&6; }
  2141. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  2142. + $as_echo_n "(cached) " >&6
  2143. +else
  2144. + if test -n "$DLLTOOL"; then
  2145. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  2146. +else
  2147. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2148. +for as_dir in $PATH
  2149. +do
  2150. + IFS=$as_save_IFS
  2151. + test -z "$as_dir" && as_dir=.
  2152. + for ac_exec_ext in '' $ac_executable_extensions; do
  2153. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2154. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  2155. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2156. + break 2
  2157. + fi
  2158. +done
  2159. + done
  2160. +IFS=$as_save_IFS
  2161. +
  2162. +fi
  2163. +fi
  2164. +DLLTOOL=$ac_cv_prog_DLLTOOL
  2165. +if test -n "$DLLTOOL"; then
  2166. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  2167. +$as_echo "$DLLTOOL" >&6; }
  2168. +else
  2169. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2170. +$as_echo "no" >&6; }
  2171. +fi
  2172. +
  2173. +
  2174. +fi
  2175. +if test -z "$ac_cv_prog_DLLTOOL"; then
  2176. + ac_ct_DLLTOOL=$DLLTOOL
  2177. + # Extract the first word of "dlltool", so it can be a program name with args.
  2178. +set dummy dlltool; ac_word=$2
  2179. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2180. +$as_echo_n "checking for $ac_word... " >&6; }
  2181. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  2182. + $as_echo_n "(cached) " >&6
  2183. +else
  2184. + if test -n "$ac_ct_DLLTOOL"; then
  2185. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  2186. +else
  2187. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2188. +for as_dir in $PATH
  2189. +do
  2190. + IFS=$as_save_IFS
  2191. + test -z "$as_dir" && as_dir=.
  2192. + for ac_exec_ext in '' $ac_executable_extensions; do
  2193. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2194. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  2195. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2196. + break 2
  2197. + fi
  2198. +done
  2199. + done
  2200. +IFS=$as_save_IFS
  2201. +
  2202. +fi
  2203. +fi
  2204. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  2205. +if test -n "$ac_ct_DLLTOOL"; then
  2206. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  2207. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  2208. +else
  2209. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2210. +$as_echo "no" >&6; }
  2211. +fi
  2212. +
  2213. + if test "x$ac_ct_DLLTOOL" = x; then
  2214. + DLLTOOL="false"
  2215. + else
  2216. + case $cross_compiling:$ac_tool_warned in
  2217. +yes:)
  2218. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  2219. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  2220. +ac_tool_warned=yes ;;
  2221. +esac
  2222. + DLLTOOL=$ac_ct_DLLTOOL
  2223. + fi
  2224. +else
  2225. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  2226. +fi
  2227. +
  2228. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  2229. +
  2230. +
  2231. +
  2232. +
  2233. +
  2234. +
  2235. +
  2236. +
  2237. +
  2238. +
  2239. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  2240. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  2241. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  2242. + $as_echo_n "(cached) " >&6
  2243. +else
  2244. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  2245. +
  2246. +case $host_os in
  2247. +cygwin* | mingw* | pw32* | cegcc*)
  2248. + # two different shell functions defined in ltmain.sh
  2249. + # decide which to use based on capabilities of $DLLTOOL
  2250. + case `$DLLTOOL --help 2>&1` in
  2251. + *--identify-strict*)
  2252. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  2253. + ;;
  2254. + *)
  2255. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  2256. + ;;
  2257. + esac
  2258. + ;;
  2259. +*)
  2260. + # fallback: assume linklib IS sharedlib
  2261. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  2262. + ;;
  2263. +esac
  2264. +
  2265. +fi
  2266. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  2267. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  2268. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  2269. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  2270. +
  2271. +
  2272. +
  2273. +
  2274. +
  2275. +
  2276. +
  2277. plugin_option=
  2278. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  2279. for plugin in $plugin_names; do
  2280. @@ -6044,8 +6296,10 @@ for plugin in $plugin_names; do
  2281. done
  2282. if test -n "$ac_tool_prefix"; then
  2283. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  2284. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  2285. + for ac_prog in ar
  2286. + do
  2287. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  2288. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  2289. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2290. $as_echo_n "checking for $ac_word... " >&6; }
  2291. if ${ac_cv_prog_AR+:} false; then :
  2292. @@ -6061,7 +6315,7 @@ do
  2293. test -z "$as_dir" && as_dir=.
  2294. for ac_exec_ext in '' $ac_executable_extensions; do
  2295. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2296. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  2297. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  2298. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2299. break 2
  2300. fi
  2301. @@ -6081,11 +6335,15 @@ $as_echo "no" >&6; }
  2302. fi
  2303. + test -n "$AR" && break
  2304. + done
  2305. fi
  2306. -if test -z "$ac_cv_prog_AR"; then
  2307. +if test -z "$AR"; then
  2308. ac_ct_AR=$AR
  2309. - # Extract the first word of "ar", so it can be a program name with args.
  2310. -set dummy ar; ac_word=$2
  2311. + for ac_prog in ar
  2312. +do
  2313. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  2314. +set dummy $ac_prog; ac_word=$2
  2315. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2316. $as_echo_n "checking for $ac_word... " >&6; }
  2317. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  2318. @@ -6101,7 +6359,7 @@ do
  2319. test -z "$as_dir" && as_dir=.
  2320. for ac_exec_ext in '' $ac_executable_extensions; do
  2321. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2322. - ac_cv_prog_ac_ct_AR="ar"
  2323. + ac_cv_prog_ac_ct_AR="$ac_prog"
  2324. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2325. break 2
  2326. fi
  2327. @@ -6120,6 +6378,10 @@ else
  2328. $as_echo "no" >&6; }
  2329. fi
  2330. +
  2331. + test -n "$ac_ct_AR" && break
  2332. +done
  2333. +
  2334. if test "x$ac_ct_AR" = x; then
  2335. AR="false"
  2336. else
  2337. @@ -6131,29 +6393,81 @@ ac_tool_warned=yes ;;
  2338. esac
  2339. AR=$ac_ct_AR
  2340. fi
  2341. -else
  2342. - AR="$ac_cv_prog_AR"
  2343. fi
  2344. -test -z "$AR" && AR=ar
  2345. -if test -n "$plugin_option"; then
  2346. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  2347. - touch conftest.c
  2348. - $AR $plugin_option rc conftest.a conftest.c
  2349. - if test "$?" != 0; then
  2350. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  2351. + touch conftest.c
  2352. + $AR $plugin_option rc conftest.a conftest.c
  2353. + if test "$?" != 0; then
  2354. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  2355. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  2356. - else
  2357. - AR="$AR $plugin_option"
  2358. - fi
  2359. - rm -f conftest.*
  2360. + else
  2361. + AR="$AR $plugin_option"
  2362. fi
  2363. -fi
  2364. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  2365. + rm -f conftest.*
  2366. +: ${AR=ar}
  2367. +: ${AR_FLAGS=cru}
  2368. +
  2369. +
  2370. +
  2371. +
  2372. +
  2373. +
  2374. +
  2375. +
  2376. +
  2377. +
  2378. +
  2379. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  2380. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  2381. +if ${lt_cv_ar_at_file+:} false; then :
  2382. + $as_echo_n "(cached) " >&6
  2383. +else
  2384. + lt_cv_ar_at_file=no
  2385. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2386. +/* end confdefs.h. */
  2387. +
  2388. +int
  2389. +main ()
  2390. +{
  2391. + ;
  2392. + return 0;
  2393. +}
  2394. +_ACEOF
  2395. +if ac_fn_c_try_compile "$LINENO"; then :
  2396. + echo conftest.$ac_objext > conftest.lst
  2397. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  2398. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  2399. + (eval $lt_ar_try) 2>&5
  2400. + ac_status=$?
  2401. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  2402. + test $ac_status = 0; }
  2403. + if test "$ac_status" -eq 0; then
  2404. + # Ensure the archiver fails upon bogus file names.
  2405. + rm -f conftest.$ac_objext libconftest.a
  2406. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  2407. + (eval $lt_ar_try) 2>&5
  2408. + ac_status=$?
  2409. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  2410. + test $ac_status = 0; }
  2411. + if test "$ac_status" -ne 0; then
  2412. + lt_cv_ar_at_file=@
  2413. + fi
  2414. + fi
  2415. + rm -f conftest.* libconftest.a
  2416. +fi
  2417. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  2418. +fi
  2419. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  2420. +$as_echo "$lt_cv_ar_at_file" >&6; }
  2421. +if test "x$lt_cv_ar_at_file" = xno; then
  2422. + archiver_list_spec=
  2423. +else
  2424. + archiver_list_spec=$lt_cv_ar_at_file
  2425. +fi
  2426. @@ -6500,8 +6814,8 @@ esac
  2427. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  2428. # Transform an extracted symbol line into symbol name and symbol address
  2429. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  2430. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  2431. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  2432. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  2433. # Handle CRLF in mingw tool chain
  2434. opt_cr=
  2435. @@ -6537,6 +6851,7 @@ for ac_symprfx in "" "_"; do
  2436. else
  2437. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  2438. fi
  2439. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  2440. # Check to see that the pipe works correctly.
  2441. pipe_works=no
  2442. @@ -6578,6 +6893,18 @@ _LT_EOF
  2443. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  2444. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  2445. cat <<_LT_EOF > conftest.$ac_ext
  2446. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  2447. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  2448. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  2449. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  2450. +# define LT_DLSYM_CONST
  2451. +#elif defined(__osf__)
  2452. +/* This system does not cope well with relocations in const data. */
  2453. +# define LT_DLSYM_CONST
  2454. +#else
  2455. +# define LT_DLSYM_CONST const
  2456. +#endif
  2457. +
  2458. #ifdef __cplusplus
  2459. extern "C" {
  2460. #endif
  2461. @@ -6589,7 +6916,7 @@ _LT_EOF
  2462. cat <<_LT_EOF >> conftest.$ac_ext
  2463. /* The mapping between symbol names and symbols. */
  2464. -const struct {
  2465. +LT_DLSYM_CONST struct {
  2466. const char *name;
  2467. void *address;
  2468. }
  2469. @@ -6615,8 +6942,8 @@ static const void *lt_preloaded_setup() {
  2470. _LT_EOF
  2471. # Now try linking the two files.
  2472. mv conftest.$ac_objext conftstm.$ac_objext
  2473. - lt_save_LIBS="$LIBS"
  2474. - lt_save_CFLAGS="$CFLAGS"
  2475. + lt_globsym_save_LIBS=$LIBS
  2476. + lt_globsym_save_CFLAGS=$CFLAGS
  2477. LIBS="conftstm.$ac_objext"
  2478. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  2479. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  2480. @@ -6626,8 +6953,8 @@ _LT_EOF
  2481. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  2482. pipe_works=yes
  2483. fi
  2484. - LIBS="$lt_save_LIBS"
  2485. - CFLAGS="$lt_save_CFLAGS"
  2486. + LIBS=$lt_globsym_save_LIBS
  2487. + CFLAGS=$lt_globsym_save_CFLAGS
  2488. else
  2489. echo "cannot find nm_test_func in $nlist" >&5
  2490. fi
  2491. @@ -6664,6 +6991,19 @@ else
  2492. $as_echo "ok" >&6; }
  2493. fi
  2494. +# Response file support.
  2495. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  2496. + nm_file_list_spec='@'
  2497. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  2498. + nm_file_list_spec='@'
  2499. +fi
  2500. +
  2501. +
  2502. +
  2503. +
  2504. +
  2505. +
  2506. +
  2507. @@ -6680,6 +7020,42 @@ fi
  2508. +
  2509. +
  2510. +
  2511. +
  2512. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  2513. +$as_echo_n "checking for sysroot... " >&6; }
  2514. +
  2515. +# Check whether --with-libtool-sysroot was given.
  2516. +if test "${with_libtool_sysroot+set}" = set; then :
  2517. + withval=$with_libtool_sysroot;
  2518. +else
  2519. + with_libtool_sysroot=no
  2520. +fi
  2521. +
  2522. +
  2523. +lt_sysroot=
  2524. +case ${with_libtool_sysroot} in #(
  2525. + yes)
  2526. + if test "$GCC" = yes; then
  2527. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  2528. + fi
  2529. + ;; #(
  2530. + /*)
  2531. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  2532. + ;; #(
  2533. + no|'')
  2534. + ;; #(
  2535. + *)
  2536. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  2537. +$as_echo "${with_libtool_sysroot}" >&6; }
  2538. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  2539. + ;;
  2540. +esac
  2541. +
  2542. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  2543. +$as_echo "${lt_sysroot:-no}" >&6; }
  2544. @@ -6891,6 +7267,123 @@ esac
  2545. need_locks="$enable_libtool_lock"
  2546. +if test -n "$ac_tool_prefix"; then
  2547. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  2548. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  2549. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2550. +$as_echo_n "checking for $ac_word... " >&6; }
  2551. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  2552. + $as_echo_n "(cached) " >&6
  2553. +else
  2554. + if test -n "$MANIFEST_TOOL"; then
  2555. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  2556. +else
  2557. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2558. +for as_dir in $PATH
  2559. +do
  2560. + IFS=$as_save_IFS
  2561. + test -z "$as_dir" && as_dir=.
  2562. + for ac_exec_ext in '' $ac_executable_extensions; do
  2563. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2564. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  2565. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2566. + break 2
  2567. + fi
  2568. +done
  2569. + done
  2570. +IFS=$as_save_IFS
  2571. +
  2572. +fi
  2573. +fi
  2574. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  2575. +if test -n "$MANIFEST_TOOL"; then
  2576. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  2577. +$as_echo "$MANIFEST_TOOL" >&6; }
  2578. +else
  2579. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2580. +$as_echo "no" >&6; }
  2581. +fi
  2582. +
  2583. +
  2584. +fi
  2585. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  2586. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  2587. + # Extract the first word of "mt", so it can be a program name with args.
  2588. +set dummy mt; ac_word=$2
  2589. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2590. +$as_echo_n "checking for $ac_word... " >&6; }
  2591. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  2592. + $as_echo_n "(cached) " >&6
  2593. +else
  2594. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  2595. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  2596. +else
  2597. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2598. +for as_dir in $PATH
  2599. +do
  2600. + IFS=$as_save_IFS
  2601. + test -z "$as_dir" && as_dir=.
  2602. + for ac_exec_ext in '' $ac_executable_extensions; do
  2603. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2604. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  2605. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2606. + break 2
  2607. + fi
  2608. +done
  2609. + done
  2610. +IFS=$as_save_IFS
  2611. +
  2612. +fi
  2613. +fi
  2614. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  2615. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  2616. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  2617. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  2618. +else
  2619. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2620. +$as_echo "no" >&6; }
  2621. +fi
  2622. +
  2623. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  2624. + MANIFEST_TOOL=":"
  2625. + else
  2626. + case $cross_compiling:$ac_tool_warned in
  2627. +yes:)
  2628. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  2629. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  2630. +ac_tool_warned=yes ;;
  2631. +esac
  2632. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  2633. + fi
  2634. +else
  2635. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  2636. +fi
  2637. +
  2638. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  2639. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  2640. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  2641. +if ${lt_cv_path_mainfest_tool+:} false; then :
  2642. + $as_echo_n "(cached) " >&6
  2643. +else
  2644. + lt_cv_path_mainfest_tool=no
  2645. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  2646. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  2647. + cat conftest.err >&5
  2648. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  2649. + lt_cv_path_mainfest_tool=yes
  2650. + fi
  2651. + rm -f conftest*
  2652. +fi
  2653. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  2654. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  2655. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  2656. + MANIFEST_TOOL=:
  2657. +fi
  2658. +
  2659. +
  2660. +
  2661. +
  2662. +
  2663. case $host_os in
  2664. rhapsody* | darwin*)
  2665. @@ -7454,6 +7947,8 @@ _LT_EOF
  2666. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  2667. echo "$AR cru libconftest.a conftest.o" >&5
  2668. $AR cru libconftest.a conftest.o 2>&5
  2669. + echo "$RANLIB libconftest.a" >&5
  2670. + $RANLIB libconftest.a 2>&5
  2671. cat > conftest.c << _LT_EOF
  2672. int main() { return 0;}
  2673. _LT_EOF
  2674. @@ -8036,8 +8531,6 @@ fi
  2675. lt_prog_compiler_pic=
  2676. lt_prog_compiler_static=
  2677. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  2678. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2679. if test "$GCC" = yes; then
  2680. lt_prog_compiler_wl='-Wl,'
  2681. @@ -8203,6 +8696,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2682. lt_prog_compiler_pic='--shared'
  2683. lt_prog_compiler_static='--static'
  2684. ;;
  2685. + nagfor*)
  2686. + # NAG Fortran compiler
  2687. + lt_prog_compiler_wl='-Wl,-Wl,,'
  2688. + lt_prog_compiler_pic='-PIC'
  2689. + lt_prog_compiler_static='-Bstatic'
  2690. + ;;
  2691. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  2692. # Portland Group compilers (*not* the Pentium gcc compiler,
  2693. # which looks to be a dead project)
  2694. @@ -8265,7 +8764,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2695. lt_prog_compiler_pic='-KPIC'
  2696. lt_prog_compiler_static='-Bstatic'
  2697. case $cc_basename in
  2698. - f77* | f90* | f95*)
  2699. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  2700. lt_prog_compiler_wl='-Qoption ld ';;
  2701. *)
  2702. lt_prog_compiler_wl='-Wl,';;
  2703. @@ -8322,13 +8821,17 @@ case $host_os in
  2704. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  2705. ;;
  2706. esac
  2707. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  2708. -$as_echo "$lt_prog_compiler_pic" >&6; }
  2709. -
  2710. -
  2711. -
  2712. -
  2713. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  2714. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2715. +if ${lt_cv_prog_compiler_pic+:} false; then :
  2716. + $as_echo_n "(cached) " >&6
  2717. +else
  2718. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  2719. +fi
  2720. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  2721. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  2722. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  2723. #
  2724. # Check to make sure the PIC flag actually works.
  2725. @@ -8389,6 +8892,11 @@ fi
  2726. +
  2727. +
  2728. +
  2729. +
  2730. +
  2731. #
  2732. # Check to make sure the static flag actually works.
  2733. #
  2734. @@ -8739,7 +9247,8 @@ _LT_EOF
  2735. allow_undefined_flag=unsupported
  2736. always_export_symbols=no
  2737. enable_shared_with_static_runtimes=yes
  2738. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  2739. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  2740. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  2741. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  2742. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  2743. @@ -8838,12 +9347,12 @@ _LT_EOF
  2744. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  2745. hardcode_libdir_flag_spec=
  2746. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  2747. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  2748. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  2749. if test "x$supports_anon_versioning" = xyes; then
  2750. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  2751. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  2752. echo "local: *; };" >> $output_objdir/$libname.ver~
  2753. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  2754. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  2755. fi
  2756. ;;
  2757. esac
  2758. @@ -8857,8 +9366,8 @@ _LT_EOF
  2759. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  2760. wlarc=
  2761. else
  2762. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2763. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2764. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2765. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2766. fi
  2767. ;;
  2768. @@ -8876,8 +9385,8 @@ _LT_EOF
  2769. _LT_EOF
  2770. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  2771. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2772. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2773. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2774. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2775. else
  2776. ld_shlibs=no
  2777. fi
  2778. @@ -8923,8 +9432,8 @@ _LT_EOF
  2779. *)
  2780. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  2781. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2782. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2783. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2784. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2785. else
  2786. ld_shlibs=no
  2787. fi
  2788. @@ -9054,7 +9563,13 @@ _LT_EOF
  2789. allow_undefined_flag='-berok'
  2790. # Determine the default libpath from the value encoded in an
  2791. # empty executable.
  2792. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2793. + if test "${lt_cv_aix_libpath+set}" = set; then
  2794. + aix_libpath=$lt_cv_aix_libpath
  2795. +else
  2796. + if ${lt_cv_aix_libpath_+:} false; then :
  2797. + $as_echo_n "(cached) " >&6
  2798. +else
  2799. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2800. /* end confdefs.h. */
  2801. int
  2802. @@ -9067,22 +9582,29 @@ main ()
  2803. _ACEOF
  2804. if ac_fn_c_try_link "$LINENO"; then :
  2805. -lt_aix_libpath_sed='
  2806. - /Import File Strings/,/^$/ {
  2807. - /^0/ {
  2808. - s/^0 *\(.*\)$/\1/
  2809. - p
  2810. - }
  2811. - }'
  2812. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2813. -# Check for a 64-bit object if we didn't find anything.
  2814. -if test -z "$aix_libpath"; then
  2815. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2816. -fi
  2817. + lt_aix_libpath_sed='
  2818. + /Import File Strings/,/^$/ {
  2819. + /^0/ {
  2820. + s/^0 *\([^ ]*\) *$/\1/
  2821. + p
  2822. + }
  2823. + }'
  2824. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2825. + # Check for a 64-bit object if we didn't find anything.
  2826. + if test -z "$lt_cv_aix_libpath_"; then
  2827. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2828. + fi
  2829. fi
  2830. rm -f core conftest.err conftest.$ac_objext \
  2831. conftest$ac_exeext conftest.$ac_ext
  2832. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2833. + if test -z "$lt_cv_aix_libpath_"; then
  2834. + lt_cv_aix_libpath_="/usr/lib:/lib"
  2835. + fi
  2836. +
  2837. +fi
  2838. +
  2839. + aix_libpath=$lt_cv_aix_libpath_
  2840. +fi
  2841. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  2842. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  2843. @@ -9094,7 +9616,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2844. else
  2845. # Determine the default libpath from the value encoded in an
  2846. # empty executable.
  2847. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2848. + if test "${lt_cv_aix_libpath+set}" = set; then
  2849. + aix_libpath=$lt_cv_aix_libpath
  2850. +else
  2851. + if ${lt_cv_aix_libpath_+:} false; then :
  2852. + $as_echo_n "(cached) " >&6
  2853. +else
  2854. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2855. /* end confdefs.h. */
  2856. int
  2857. @@ -9107,22 +9635,29 @@ main ()
  2858. _ACEOF
  2859. if ac_fn_c_try_link "$LINENO"; then :
  2860. -lt_aix_libpath_sed='
  2861. - /Import File Strings/,/^$/ {
  2862. - /^0/ {
  2863. - s/^0 *\(.*\)$/\1/
  2864. - p
  2865. - }
  2866. - }'
  2867. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2868. -# Check for a 64-bit object if we didn't find anything.
  2869. -if test -z "$aix_libpath"; then
  2870. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2871. -fi
  2872. + lt_aix_libpath_sed='
  2873. + /Import File Strings/,/^$/ {
  2874. + /^0/ {
  2875. + s/^0 *\([^ ]*\) *$/\1/
  2876. + p
  2877. + }
  2878. + }'
  2879. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2880. + # Check for a 64-bit object if we didn't find anything.
  2881. + if test -z "$lt_cv_aix_libpath_"; then
  2882. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2883. + fi
  2884. fi
  2885. rm -f core conftest.err conftest.$ac_objext \
  2886. conftest$ac_exeext conftest.$ac_ext
  2887. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2888. + if test -z "$lt_cv_aix_libpath_"; then
  2889. + lt_cv_aix_libpath_="/usr/lib:/lib"
  2890. + fi
  2891. +
  2892. +fi
  2893. +
  2894. + aix_libpath=$lt_cv_aix_libpath_
  2895. +fi
  2896. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  2897. # Warning - without using the other run time loading flags,
  2898. @@ -9167,20 +9702,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2899. # Microsoft Visual C++.
  2900. # hardcode_libdir_flag_spec is actually meaningless, as there is
  2901. # no search path for DLLs.
  2902. - hardcode_libdir_flag_spec=' '
  2903. - allow_undefined_flag=unsupported
  2904. - # Tell ltmain to make .lib files, not .a files.
  2905. - libext=lib
  2906. - # Tell ltmain to make .dll files, not .so files.
  2907. - shrext_cmds=".dll"
  2908. - # FIXME: Setting linknames here is a bad hack.
  2909. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  2910. - # The linker will automatically build a .lib file if we build a DLL.
  2911. - old_archive_from_new_cmds='true'
  2912. - # FIXME: Should let the user specify the lib program.
  2913. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  2914. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  2915. - enable_shared_with_static_runtimes=yes
  2916. + case $cc_basename in
  2917. + cl*)
  2918. + # Native MSVC
  2919. + hardcode_libdir_flag_spec=' '
  2920. + allow_undefined_flag=unsupported
  2921. + always_export_symbols=yes
  2922. + file_list_spec='@'
  2923. + # Tell ltmain to make .lib files, not .a files.
  2924. + libext=lib
  2925. + # Tell ltmain to make .dll files, not .so files.
  2926. + shrext_cmds=".dll"
  2927. + # FIXME: Setting linknames here is a bad hack.
  2928. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  2929. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  2930. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  2931. + else
  2932. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  2933. + fi~
  2934. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  2935. + linknames='
  2936. + # The linker will not automatically build a static lib if we build a DLL.
  2937. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  2938. + enable_shared_with_static_runtimes=yes
  2939. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  2940. + # Don't use ranlib
  2941. + old_postinstall_cmds='chmod 644 $oldlib'
  2942. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  2943. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  2944. + case $lt_outputfile in
  2945. + *.exe|*.EXE) ;;
  2946. + *)
  2947. + lt_outputfile="$lt_outputfile.exe"
  2948. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  2949. + ;;
  2950. + esac~
  2951. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  2952. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  2953. + $RM "$lt_outputfile.manifest";
  2954. + fi'
  2955. + ;;
  2956. + *)
  2957. + # Assume MSVC wrapper
  2958. + hardcode_libdir_flag_spec=' '
  2959. + allow_undefined_flag=unsupported
  2960. + # Tell ltmain to make .lib files, not .a files.
  2961. + libext=lib
  2962. + # Tell ltmain to make .dll files, not .so files.
  2963. + shrext_cmds=".dll"
  2964. + # FIXME: Setting linknames here is a bad hack.
  2965. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  2966. + # The linker will automatically build a .lib file if we build a DLL.
  2967. + old_archive_from_new_cmds='true'
  2968. + # FIXME: Should let the user specify the lib program.
  2969. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  2970. + enable_shared_with_static_runtimes=yes
  2971. + ;;
  2972. + esac
  2973. ;;
  2974. darwin* | rhapsody*)
  2975. @@ -9241,7 +9819,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2976. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  2977. freebsd* | dragonfly*)
  2978. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  2979. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  2980. hardcode_libdir_flag_spec='-R$libdir'
  2981. hardcode_direct=yes
  2982. hardcode_shlibpath_var=no
  2983. @@ -9249,7 +9827,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2984. hpux9*)
  2985. if test "$GCC" = yes; then
  2986. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  2987. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  2988. else
  2989. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  2990. fi
  2991. @@ -9265,7 +9843,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2992. hpux10*)
  2993. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  2994. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  2995. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  2996. else
  2997. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  2998. fi
  2999. @@ -9289,10 +9867,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  3000. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  3001. ;;
  3002. ia64*)
  3003. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  3004. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  3005. ;;
  3006. *)
  3007. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  3008. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  3009. ;;
  3010. esac
  3011. else
  3012. @@ -9371,23 +9949,36 @@ fi
  3013. irix5* | irix6* | nonstopux*)
  3014. if test "$GCC" = yes; then
  3015. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  3016. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  3017. # Try to use the -exported_symbol ld option, if it does not
  3018. # work, assume that -exports_file does not work either and
  3019. # implicitly export all symbols.
  3020. - save_LDFLAGS="$LDFLAGS"
  3021. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  3022. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3023. + # This should be the same for all languages, so no per-tag cache variable.
  3024. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  3025. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  3026. +if ${lt_cv_irix_exported_symbol+:} false; then :
  3027. + $as_echo_n "(cached) " >&6
  3028. +else
  3029. + save_LDFLAGS="$LDFLAGS"
  3030. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  3031. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  3032. /* end confdefs.h. */
  3033. -int foo(void) {}
  3034. +int foo (void) { return 0; }
  3035. _ACEOF
  3036. if ac_fn_c_try_link "$LINENO"; then :
  3037. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  3038. -
  3039. + lt_cv_irix_exported_symbol=yes
  3040. +else
  3041. + lt_cv_irix_exported_symbol=no
  3042. fi
  3043. rm -f core conftest.err conftest.$ac_objext \
  3044. conftest$ac_exeext conftest.$ac_ext
  3045. - LDFLAGS="$save_LDFLAGS"
  3046. + LDFLAGS="$save_LDFLAGS"
  3047. +fi
  3048. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  3049. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  3050. + if test "$lt_cv_irix_exported_symbol" = yes; then
  3051. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  3052. + fi
  3053. else
  3054. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  3055. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  3056. @@ -9472,7 +10063,7 @@ rm -f core conftest.err conftest.$ac_objext \
  3057. osf4* | osf5*) # as osf3* with the addition of -msym flag
  3058. if test "$GCC" = yes; then
  3059. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  3060. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  3061. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  3062. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  3063. else
  3064. allow_undefined_flag=' -expect_unresolved \*'
  3065. @@ -9491,9 +10082,9 @@ rm -f core conftest.err conftest.$ac_objext \
  3066. no_undefined_flag=' -z defs'
  3067. if test "$GCC" = yes; then
  3068. wlarc='${wl}'
  3069. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  3070. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  3071. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  3072. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  3073. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  3074. else
  3075. case `$CC -V 2>&1` in
  3076. *"Compilers 5.0"*)
  3077. @@ -10069,8 +10660,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  3078. need_version=no
  3079. need_lib_prefix=no
  3080. - case $GCC,$host_os in
  3081. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  3082. + case $GCC,$cc_basename in
  3083. + yes,*)
  3084. + # gcc
  3085. library_names_spec='$libname.dll.a'
  3086. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  3087. postinstall_cmds='base_file=`basename \${file}`~
  3088. @@ -10103,13 +10695,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  3089. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  3090. ;;
  3091. esac
  3092. + dynamic_linker='Win32 ld.exe'
  3093. + ;;
  3094. +
  3095. + *,cl*)
  3096. + # Native MSVC
  3097. + libname_spec='$name'
  3098. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  3099. + library_names_spec='${libname}.dll.lib'
  3100. +
  3101. + case $build_os in
  3102. + mingw*)
  3103. + sys_lib_search_path_spec=
  3104. + lt_save_ifs=$IFS
  3105. + IFS=';'
  3106. + for lt_path in $LIB
  3107. + do
  3108. + IFS=$lt_save_ifs
  3109. + # Let DOS variable expansion print the short 8.3 style file name.
  3110. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  3111. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  3112. + done
  3113. + IFS=$lt_save_ifs
  3114. + # Convert to MSYS style.
  3115. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  3116. + ;;
  3117. + cygwin*)
  3118. + # Convert to unix form, then to dos form, then back to unix form
  3119. + # but this time dos style (no spaces!) so that the unix form looks
  3120. + # like /cygdrive/c/PROGRA~1:/cygdr...
  3121. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  3122. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  3123. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  3124. + ;;
  3125. + *)
  3126. + sys_lib_search_path_spec="$LIB"
  3127. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  3128. + # It is most probably a Windows format PATH.
  3129. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  3130. + else
  3131. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  3132. + fi
  3133. + # FIXME: find the short name or the path components, as spaces are
  3134. + # common. (e.g. "Program Files" -> "PROGRA~1")
  3135. + ;;
  3136. + esac
  3137. +
  3138. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  3139. + postinstall_cmds='base_file=`basename \${file}`~
  3140. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  3141. + dldir=$destdir/`dirname \$dlpath`~
  3142. + test -d \$dldir || mkdir -p \$dldir~
  3143. + $install_prog $dir/$dlname \$dldir/$dlname'
  3144. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  3145. + dlpath=$dir/\$dldll~
  3146. + $RM \$dlpath'
  3147. + shlibpath_overrides_runpath=yes
  3148. + dynamic_linker='Win32 link.exe'
  3149. ;;
  3150. *)
  3151. + # Assume MSVC wrapper
  3152. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  3153. + dynamic_linker='Win32 ld.exe'
  3154. ;;
  3155. esac
  3156. - dynamic_linker='Win32 ld.exe'
  3157. # FIXME: first we should search . and the directory the executable is in
  3158. shlibpath_var=PATH
  3159. ;;
  3160. @@ -10987,7 +11637,7 @@ else
  3161. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  3162. lt_status=$lt_dlunknown
  3163. cat > conftest.$ac_ext <<_LT_EOF
  3164. -#line 10990 "configure"
  3165. +#line $LINENO "configure"
  3166. #include "confdefs.h"
  3167. #if HAVE_DLFCN_H
  3168. @@ -11031,10 +11681,10 @@ else
  3169. /* When -fvisbility=hidden is used, assume the code has been annotated
  3170. correspondingly for the symbols needed. */
  3171. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  3172. -void fnord () __attribute__((visibility("default")));
  3173. +int fnord () __attribute__((visibility("default")));
  3174. #endif
  3175. -void fnord () { int i=42; }
  3176. +int fnord () { return 42; }
  3177. int main ()
  3178. {
  3179. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  3180. @@ -11093,7 +11743,7 @@ else
  3181. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  3182. lt_status=$lt_dlunknown
  3183. cat > conftest.$ac_ext <<_LT_EOF
  3184. -#line 11096 "configure"
  3185. +#line $LINENO "configure"
  3186. #include "confdefs.h"
  3187. #if HAVE_DLFCN_H
  3188. @@ -11137,10 +11787,10 @@ else
  3189. /* When -fvisbility=hidden is used, assume the code has been annotated
  3190. correspondingly for the symbols needed. */
  3191. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  3192. -void fnord () __attribute__((visibility("default")));
  3193. +int fnord () __attribute__((visibility("default")));
  3194. #endif
  3195. -void fnord () { int i=42; }
  3196. +int fnord () { return 42; }
  3197. int main ()
  3198. {
  3199. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  3200. @@ -15642,13 +16292,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  3201. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  3202. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  3203. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  3204. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  3205. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  3206. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  3207. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  3208. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  3209. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  3210. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  3211. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  3212. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  3213. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  3214. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  3215. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  3216. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  3217. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  3218. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  3219. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  3220. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  3221. @@ -15663,14 +16320,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  3222. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  3223. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  3224. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  3225. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  3226. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  3227. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  3228. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  3229. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  3230. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  3231. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  3232. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  3233. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  3234. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  3235. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  3236. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  3237. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  3238. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  3239. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  3240. @@ -15703,12 +16363,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  3241. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  3242. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  3243. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  3244. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  3245. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  3246. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  3247. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  3248. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  3249. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  3250. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  3251. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  3252. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  3253. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  3254. @@ -15763,8 +16423,13 @@ reload_flag \
  3255. OBJDUMP \
  3256. deplibs_check_method \
  3257. file_magic_cmd \
  3258. +file_magic_glob \
  3259. +want_nocaseglob \
  3260. +DLLTOOL \
  3261. +sharedlib_from_linklib_cmd \
  3262. AR \
  3263. AR_FLAGS \
  3264. +archiver_list_spec \
  3265. STRIP \
  3266. RANLIB \
  3267. CC \
  3268. @@ -15774,12 +16439,14 @@ lt_cv_sys_global_symbol_pipe \
  3269. lt_cv_sys_global_symbol_to_cdecl \
  3270. lt_cv_sys_global_symbol_to_c_name_address \
  3271. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  3272. +nm_file_list_spec \
  3273. lt_prog_compiler_no_builtin_flag \
  3274. -lt_prog_compiler_wl \
  3275. lt_prog_compiler_pic \
  3276. +lt_prog_compiler_wl \
  3277. lt_prog_compiler_static \
  3278. lt_cv_prog_compiler_c_o \
  3279. need_locks \
  3280. +MANIFEST_TOOL \
  3281. DSYMUTIL \
  3282. NMEDIT \
  3283. LIPO \
  3284. @@ -15795,7 +16462,6 @@ no_undefined_flag \
  3285. hardcode_libdir_flag_spec \
  3286. hardcode_libdir_flag_spec_ld \
  3287. hardcode_libdir_separator \
  3288. -fix_srcfile_path \
  3289. exclude_expsyms \
  3290. include_expsyms \
  3291. file_list_spec \
  3292. @@ -15831,6 +16497,7 @@ module_cmds \
  3293. module_expsym_cmds \
  3294. export_symbols_cmds \
  3295. prelink_cmds \
  3296. +postlink_cmds \
  3297. postinstall_cmds \
  3298. postuninstall_cmds \
  3299. finish_cmds \
  3300. @@ -16596,7 +17263,8 @@ $as_echo X"$file" |
  3301. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  3302. #
  3303. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  3304. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  3305. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  3306. +# Inc.
  3307. # Written by Gordon Matzigkeit, 1996
  3308. #
  3309. # This file is part of GNU Libtool.
  3310. @@ -16699,19 +17367,42 @@ SP2NL=$lt_lt_SP2NL
  3311. # turn newlines into spaces.
  3312. NL2SP=$lt_lt_NL2SP
  3313. +# convert \$build file names to \$host format.
  3314. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  3315. +
  3316. +# convert \$build files to toolchain format.
  3317. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  3318. +
  3319. # An object symbol dumper.
  3320. OBJDUMP=$lt_OBJDUMP
  3321. # Method to check whether dependent libraries are shared objects.
  3322. deplibs_check_method=$lt_deplibs_check_method
  3323. -# Command to use when deplibs_check_method == "file_magic".
  3324. +# Command to use when deplibs_check_method = "file_magic".
  3325. file_magic_cmd=$lt_file_magic_cmd
  3326. +# How to find potential files when deplibs_check_method = "file_magic".
  3327. +file_magic_glob=$lt_file_magic_glob
  3328. +
  3329. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  3330. +want_nocaseglob=$lt_want_nocaseglob
  3331. +
  3332. +# DLL creation program.
  3333. +DLLTOOL=$lt_DLLTOOL
  3334. +
  3335. +# Command to associate shared and link libraries.
  3336. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  3337. +
  3338. # The archiver.
  3339. AR=$lt_AR
  3340. +
  3341. +# Flags to create an archive.
  3342. AR_FLAGS=$lt_AR_FLAGS
  3343. +# How to feed a file listing to the archiver.
  3344. +archiver_list_spec=$lt_archiver_list_spec
  3345. +
  3346. # A symbol stripping program.
  3347. STRIP=$lt_STRIP
  3348. @@ -16741,6 +17432,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  3349. # Transform the output of nm in a C name address pair when lib prefix is needed.
  3350. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  3351. +# Specify filename containing input files for \$NM.
  3352. +nm_file_list_spec=$lt_nm_file_list_spec
  3353. +
  3354. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  3355. +lt_sysroot=$lt_sysroot
  3356. +
  3357. # The name of the directory that contains temporary libtool files.
  3358. objdir=$objdir
  3359. @@ -16750,6 +17447,9 @@ MAGIC_CMD=$MAGIC_CMD
  3360. # Must we lock files when doing compilation?
  3361. need_locks=$lt_need_locks
  3362. +# Manifest tool.
  3363. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  3364. +
  3365. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  3366. DSYMUTIL=$lt_DSYMUTIL
  3367. @@ -16864,12 +17564,12 @@ with_gcc=$GCC
  3368. # Compiler flag to turn off builtin functions.
  3369. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  3370. -# How to pass a linker flag through the compiler.
  3371. -wl=$lt_lt_prog_compiler_wl
  3372. -
  3373. # Additional compiler flags for building library objects.
  3374. pic_flag=$lt_lt_prog_compiler_pic
  3375. +# How to pass a linker flag through the compiler.
  3376. +wl=$lt_lt_prog_compiler_wl
  3377. +
  3378. # Compiler flag to prevent dynamic linking.
  3379. link_static_flag=$lt_lt_prog_compiler_static
  3380. @@ -16956,9 +17656,6 @@ inherit_rpath=$inherit_rpath
  3381. # Whether libtool must link a program against all its dependency libraries.
  3382. link_all_deplibs=$link_all_deplibs
  3383. -# Fix the shell variable \$srcfile for the compiler.
  3384. -fix_srcfile_path=$lt_fix_srcfile_path
  3385. -
  3386. # Set to "yes" if exported symbols are required.
  3387. always_export_symbols=$always_export_symbols
  3388. @@ -16974,6 +17671,9 @@ include_expsyms=$lt_include_expsyms
  3389. # Commands necessary for linking programs (against libraries) with templates.
  3390. prelink_cmds=$lt_prelink_cmds
  3391. +# Commands necessary for finishing linking programs.
  3392. +postlink_cmds=$lt_postlink_cmds
  3393. +
  3394. # Specify filename containing input files.
  3395. file_list_spec=$lt_file_list_spec
  3396. @@ -17006,210 +17706,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  3397. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  3398. # text mode, it properly converts lines to CR/LF. This bash problem
  3399. # is reportedly fixed, but why not run on old versions too?
  3400. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  3401. - || (rm -f "$cfgfile"; exit 1)
  3402. -
  3403. - case $xsi_shell in
  3404. - yes)
  3405. - cat << \_LT_EOF >> "$cfgfile"
  3406. -
  3407. -# func_dirname file append nondir_replacement
  3408. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  3409. -# otherwise set result to NONDIR_REPLACEMENT.
  3410. -func_dirname ()
  3411. -{
  3412. - case ${1} in
  3413. - */*) func_dirname_result="${1%/*}${2}" ;;
  3414. - * ) func_dirname_result="${3}" ;;
  3415. - esac
  3416. -}
  3417. -
  3418. -# func_basename file
  3419. -func_basename ()
  3420. -{
  3421. - func_basename_result="${1##*/}"
  3422. -}
  3423. -
  3424. -# func_dirname_and_basename file append nondir_replacement
  3425. -# perform func_basename and func_dirname in a single function
  3426. -# call:
  3427. -# dirname: Compute the dirname of FILE. If nonempty,
  3428. -# add APPEND to the result, otherwise set result
  3429. -# to NONDIR_REPLACEMENT.
  3430. -# value returned in "$func_dirname_result"
  3431. -# basename: Compute filename of FILE.
  3432. -# value retuned in "$func_basename_result"
  3433. -# Implementation must be kept synchronized with func_dirname
  3434. -# and func_basename. For efficiency, we do not delegate to
  3435. -# those functions but instead duplicate the functionality here.
  3436. -func_dirname_and_basename ()
  3437. -{
  3438. - case ${1} in
  3439. - */*) func_dirname_result="${1%/*}${2}" ;;
  3440. - * ) func_dirname_result="${3}" ;;
  3441. - esac
  3442. - func_basename_result="${1##*/}"
  3443. -}
  3444. -
  3445. -# func_stripname prefix suffix name
  3446. -# strip PREFIX and SUFFIX off of NAME.
  3447. -# PREFIX and SUFFIX must not contain globbing or regex special
  3448. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  3449. -# dot (in which case that matches only a dot).
  3450. -func_stripname ()
  3451. -{
  3452. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  3453. - # positional parameters, so assign one to ordinary parameter first.
  3454. - func_stripname_result=${3}
  3455. - func_stripname_result=${func_stripname_result#"${1}"}
  3456. - func_stripname_result=${func_stripname_result%"${2}"}
  3457. -}
  3458. -
  3459. -# func_opt_split
  3460. -func_opt_split ()
  3461. -{
  3462. - func_opt_split_opt=${1%%=*}
  3463. - func_opt_split_arg=${1#*=}
  3464. -}
  3465. -
  3466. -# func_lo2o object
  3467. -func_lo2o ()
  3468. -{
  3469. - case ${1} in
  3470. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  3471. - *) func_lo2o_result=${1} ;;
  3472. - esac
  3473. -}
  3474. -
  3475. -# func_xform libobj-or-source
  3476. -func_xform ()
  3477. -{
  3478. - func_xform_result=${1%.*}.lo
  3479. -}
  3480. -
  3481. -# func_arith arithmetic-term...
  3482. -func_arith ()
  3483. -{
  3484. - func_arith_result=$(( $* ))
  3485. -}
  3486. -
  3487. -# func_len string
  3488. -# STRING may not start with a hyphen.
  3489. -func_len ()
  3490. -{
  3491. - func_len_result=${#1}
  3492. -}
  3493. -
  3494. -_LT_EOF
  3495. - ;;
  3496. - *) # Bourne compatible functions.
  3497. - cat << \_LT_EOF >> "$cfgfile"
  3498. -
  3499. -# func_dirname file append nondir_replacement
  3500. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  3501. -# otherwise set result to NONDIR_REPLACEMENT.
  3502. -func_dirname ()
  3503. -{
  3504. - # Extract subdirectory from the argument.
  3505. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  3506. - if test "X$func_dirname_result" = "X${1}"; then
  3507. - func_dirname_result="${3}"
  3508. - else
  3509. - func_dirname_result="$func_dirname_result${2}"
  3510. - fi
  3511. -}
  3512. -
  3513. -# func_basename file
  3514. -func_basename ()
  3515. -{
  3516. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  3517. -}
  3518. -
  3519. -
  3520. -# func_stripname prefix suffix name
  3521. -# strip PREFIX and SUFFIX off of NAME.
  3522. -# PREFIX and SUFFIX must not contain globbing or regex special
  3523. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  3524. -# dot (in which case that matches only a dot).
  3525. -# func_strip_suffix prefix name
  3526. -func_stripname ()
  3527. -{
  3528. - case ${2} in
  3529. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  3530. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  3531. - esac
  3532. -}
  3533. -
  3534. -# sed scripts:
  3535. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  3536. -my_sed_long_arg='1s/^-[^=]*=//'
  3537. -
  3538. -# func_opt_split
  3539. -func_opt_split ()
  3540. -{
  3541. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  3542. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  3543. -}
  3544. -
  3545. -# func_lo2o object
  3546. -func_lo2o ()
  3547. -{
  3548. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  3549. -}
  3550. -
  3551. -# func_xform libobj-or-source
  3552. -func_xform ()
  3553. -{
  3554. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  3555. -}
  3556. -
  3557. -# func_arith arithmetic-term...
  3558. -func_arith ()
  3559. -{
  3560. - func_arith_result=`expr "$@"`
  3561. -}
  3562. -
  3563. -# func_len string
  3564. -# STRING may not start with a hyphen.
  3565. -func_len ()
  3566. -{
  3567. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  3568. -}
  3569. -
  3570. -_LT_EOF
  3571. -esac
  3572. -
  3573. -case $lt_shell_append in
  3574. - yes)
  3575. - cat << \_LT_EOF >> "$cfgfile"
  3576. -
  3577. -# func_append var value
  3578. -# Append VALUE to the end of shell variable VAR.
  3579. -func_append ()
  3580. -{
  3581. - eval "$1+=\$2"
  3582. -}
  3583. -_LT_EOF
  3584. - ;;
  3585. - *)
  3586. - cat << \_LT_EOF >> "$cfgfile"
  3587. -
  3588. -# func_append var value
  3589. -# Append VALUE to the end of shell variable VAR.
  3590. -func_append ()
  3591. -{
  3592. - eval "$1=\$$1\$2"
  3593. -}
  3594. -
  3595. -_LT_EOF
  3596. - ;;
  3597. - esac
  3598. -
  3599. -
  3600. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  3601. - || (rm -f "$cfgfile"; exit 1)
  3602. -
  3603. - mv -f "$cfgfile" "$ofile" ||
  3604. + sed '$q' "$ltmain" >> "$cfgfile" \
  3605. + || (rm -f "$cfgfile"; exit 1)
  3606. +
  3607. + if test x"$xsi_shell" = xyes; then
  3608. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  3609. +func_dirname ()\
  3610. +{\
  3611. +\ case ${1} in\
  3612. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  3613. +\ * ) func_dirname_result="${3}" ;;\
  3614. +\ esac\
  3615. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  3616. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3617. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3618. +test 0 -eq $? || _lt_function_replace_fail=:
  3619. +
  3620. +
  3621. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  3622. +func_basename ()\
  3623. +{\
  3624. +\ func_basename_result="${1##*/}"\
  3625. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  3626. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3627. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3628. +test 0 -eq $? || _lt_function_replace_fail=:
  3629. +
  3630. +
  3631. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  3632. +func_dirname_and_basename ()\
  3633. +{\
  3634. +\ case ${1} in\
  3635. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  3636. +\ * ) func_dirname_result="${3}" ;;\
  3637. +\ esac\
  3638. +\ func_basename_result="${1##*/}"\
  3639. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  3640. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3641. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3642. +test 0 -eq $? || _lt_function_replace_fail=:
  3643. +
  3644. +
  3645. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  3646. +func_stripname ()\
  3647. +{\
  3648. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  3649. +\ # positional parameters, so assign one to ordinary parameter first.\
  3650. +\ func_stripname_result=${3}\
  3651. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  3652. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  3653. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  3654. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3655. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3656. +test 0 -eq $? || _lt_function_replace_fail=:
  3657. +
  3658. +
  3659. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  3660. +func_split_long_opt ()\
  3661. +{\
  3662. +\ func_split_long_opt_name=${1%%=*}\
  3663. +\ func_split_long_opt_arg=${1#*=}\
  3664. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  3665. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3666. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3667. +test 0 -eq $? || _lt_function_replace_fail=:
  3668. +
  3669. +
  3670. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  3671. +func_split_short_opt ()\
  3672. +{\
  3673. +\ func_split_short_opt_arg=${1#??}\
  3674. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  3675. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  3676. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3677. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3678. +test 0 -eq $? || _lt_function_replace_fail=:
  3679. +
  3680. +
  3681. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  3682. +func_lo2o ()\
  3683. +{\
  3684. +\ case ${1} in\
  3685. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  3686. +\ *) func_lo2o_result=${1} ;;\
  3687. +\ esac\
  3688. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  3689. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3690. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3691. +test 0 -eq $? || _lt_function_replace_fail=:
  3692. +
  3693. +
  3694. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  3695. +func_xform ()\
  3696. +{\
  3697. + func_xform_result=${1%.*}.lo\
  3698. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  3699. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3700. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3701. +test 0 -eq $? || _lt_function_replace_fail=:
  3702. +
  3703. +
  3704. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  3705. +func_arith ()\
  3706. +{\
  3707. + func_arith_result=$(( $* ))\
  3708. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  3709. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3710. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3711. +test 0 -eq $? || _lt_function_replace_fail=:
  3712. +
  3713. +
  3714. + sed -e '/^func_len ()$/,/^} # func_len /c\
  3715. +func_len ()\
  3716. +{\
  3717. + func_len_result=${#1}\
  3718. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  3719. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3720. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3721. +test 0 -eq $? || _lt_function_replace_fail=:
  3722. +
  3723. +fi
  3724. +
  3725. +if test x"$lt_shell_append" = xyes; then
  3726. + sed -e '/^func_append ()$/,/^} # func_append /c\
  3727. +func_append ()\
  3728. +{\
  3729. + eval "${1}+=\\${2}"\
  3730. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  3731. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3732. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3733. +test 0 -eq $? || _lt_function_replace_fail=:
  3734. +
  3735. +
  3736. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  3737. +func_append_quoted ()\
  3738. +{\
  3739. +\ func_quote_for_eval "${2}"\
  3740. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  3741. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  3742. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3743. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3744. +test 0 -eq $? || _lt_function_replace_fail=:
  3745. +
  3746. +
  3747. + # Save a `func_append' function call where possible by direct use of '+='
  3748. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  3749. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3750. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3751. + test 0 -eq $? || _lt_function_replace_fail=:
  3752. +else
  3753. + # Save a `func_append' function call even when '+=' is not available
  3754. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  3755. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3756. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3757. + test 0 -eq $? || _lt_function_replace_fail=:
  3758. +fi
  3759. +
  3760. +if test x"$_lt_function_replace_fail" = x":"; then
  3761. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  3762. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  3763. +fi
  3764. +
  3765. +
  3766. + mv -f "$cfgfile" "$ofile" ||
  3767. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  3768. chmod +x "$ofile"
  3769. diff --git a/gas/Makefile.in b/gas/Makefile.in
  3770. index c57d78f82c4..da370b21855 100644
  3771. --- a/gas/Makefile.in
  3772. +++ b/gas/Makefile.in
  3773. @@ -373,6 +373,7 @@ CYGPATH_W = @CYGPATH_W@
  3774. DATADIRNAME = @DATADIRNAME@
  3775. DEFS = @DEFS@
  3776. DEPDIR = @DEPDIR@
  3777. +DLLTOOL = @DLLTOOL@
  3778. DSYMUTIL = @DSYMUTIL@
  3779. DUMPBIN = @DUMPBIN@
  3780. ECHO_C = @ECHO_C@
  3781. @@ -409,6 +410,7 @@ LN_S = @LN_S@
  3782. LTLIBOBJS = @LTLIBOBJS@
  3783. MAINT = @MAINT@
  3784. MAKEINFO = @MAKEINFO@
  3785. +MANIFEST_TOOL = @MANIFEST_TOOL@
  3786. MKDIR_P = @MKDIR_P@
  3787. MKINSTALLDIRS = @MKINSTALLDIRS@
  3788. MSGFMT = @MSGFMT@
  3789. @@ -447,6 +449,7 @@ abs_builddir = @abs_builddir@
  3790. abs_srcdir = @abs_srcdir@
  3791. abs_top_builddir = @abs_top_builddir@
  3792. abs_top_srcdir = @abs_top_srcdir@
  3793. +ac_ct_AR = @ac_ct_AR@
  3794. ac_ct_CC = @ac_ct_CC@
  3795. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  3796. am__include = @am__include@
  3797. diff --git a/gas/configure b/gas/configure
  3798. index 12c16faefd9..11b5127bf3a 100755
  3799. --- a/gas/configure
  3800. +++ b/gas/configure
  3801. @@ -681,8 +681,11 @@ OTOOL
  3802. LIPO
  3803. NMEDIT
  3804. DSYMUTIL
  3805. +MANIFEST_TOOL
  3806. RANLIB
  3807. +ac_ct_AR
  3808. AR
  3809. +DLLTOOL
  3810. OBJDUMP
  3811. LN_S
  3812. NM
  3813. @@ -799,6 +802,7 @@ enable_static
  3814. with_pic
  3815. enable_fast_install
  3816. with_gnu_ld
  3817. +with_libtool_sysroot
  3818. enable_libtool_lock
  3819. enable_plugins
  3820. enable_largefile
  3821. @@ -1490,6 +1494,8 @@ Optional Packages:
  3822. --with-pic try to use only PIC/non-PIC objects [default=use
  3823. both]
  3824. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  3825. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  3826. + (or the compiler's sysroot if not specified).
  3827. --with-cpu=CPU default cpu variant is CPU (currently only supported
  3828. on ARC)
  3829. --with-system-zlib use installed libz
  3830. @@ -4608,8 +4614,8 @@ esac
  3831. -macro_version='2.2.7a'
  3832. -macro_revision='1.3134'
  3833. +macro_version='2.4'
  3834. +macro_revision='1.3293'
  3835. @@ -4649,7 +4655,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  3836. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  3837. $as_echo_n "checking how to print strings... " >&6; }
  3838. # Test print first, because it will be a builtin if present.
  3839. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  3840. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  3841. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  3842. ECHO='print -r --'
  3843. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  3844. @@ -5342,8 +5348,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  3845. # Try some XSI features
  3846. xsi_shell=no
  3847. ( _lt_dummy="a/b/c"
  3848. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  3849. - = c,a/b,, \
  3850. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  3851. + = c,a/b,b/c, \
  3852. && eval 'test $(( 1 + 1 )) -eq 2 \
  3853. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  3854. && xsi_shell=yes
  3855. @@ -5392,6 +5398,80 @@ esac
  3856. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  3857. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  3858. +if ${lt_cv_to_host_file_cmd+:} false; then :
  3859. + $as_echo_n "(cached) " >&6
  3860. +else
  3861. + case $host in
  3862. + *-*-mingw* )
  3863. + case $build in
  3864. + *-*-mingw* ) # actually msys
  3865. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  3866. + ;;
  3867. + *-*-cygwin* )
  3868. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  3869. + ;;
  3870. + * ) # otherwise, assume *nix
  3871. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  3872. + ;;
  3873. + esac
  3874. + ;;
  3875. + *-*-cygwin* )
  3876. + case $build in
  3877. + *-*-mingw* ) # actually msys
  3878. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  3879. + ;;
  3880. + *-*-cygwin* )
  3881. + lt_cv_to_host_file_cmd=func_convert_file_noop
  3882. + ;;
  3883. + * ) # otherwise, assume *nix
  3884. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  3885. + ;;
  3886. + esac
  3887. + ;;
  3888. + * ) # unhandled hosts (and "normal" native builds)
  3889. + lt_cv_to_host_file_cmd=func_convert_file_noop
  3890. + ;;
  3891. +esac
  3892. +
  3893. +fi
  3894. +
  3895. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  3896. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  3897. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  3898. +
  3899. +
  3900. +
  3901. +
  3902. +
  3903. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  3904. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  3905. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  3906. + $as_echo_n "(cached) " >&6
  3907. +else
  3908. + #assume ordinary cross tools, or native build.
  3909. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  3910. +case $host in
  3911. + *-*-mingw* )
  3912. + case $build in
  3913. + *-*-mingw* ) # actually msys
  3914. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  3915. + ;;
  3916. + esac
  3917. + ;;
  3918. +esac
  3919. +
  3920. +fi
  3921. +
  3922. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  3923. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  3924. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  3925. +
  3926. +
  3927. +
  3928. +
  3929. +
  3930. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  3931. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  3932. if ${lt_cv_ld_reload_flag+:} false; then :
  3933. @@ -5408,6 +5488,11 @@ case $reload_flag in
  3934. esac
  3935. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  3936. case $host_os in
  3937. + cygwin* | mingw* | pw32* | cegcc*)
  3938. + if test "$GCC" != yes; then
  3939. + reload_cmds=false
  3940. + fi
  3941. + ;;
  3942. darwin*)
  3943. if test "$GCC" = yes; then
  3944. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  3945. @@ -5576,7 +5661,8 @@ mingw* | pw32*)
  3946. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  3947. lt_cv_file_magic_cmd='func_win32_libid'
  3948. else
  3949. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  3950. + # Keep this pattern in sync with the one in func_win32_libid.
  3951. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  3952. lt_cv_file_magic_cmd='$OBJDUMP -f'
  3953. fi
  3954. ;;
  3955. @@ -5730,6 +5816,21 @@ esac
  3956. fi
  3957. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  3958. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  3959. +
  3960. +file_magic_glob=
  3961. +want_nocaseglob=no
  3962. +if test "$build" = "$host"; then
  3963. + case $host_os in
  3964. + mingw* | pw32*)
  3965. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  3966. + want_nocaseglob=yes
  3967. + else
  3968. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  3969. + fi
  3970. + ;;
  3971. + esac
  3972. +fi
  3973. +
  3974. file_magic_cmd=$lt_cv_file_magic_cmd
  3975. deplibs_check_method=$lt_cv_deplibs_check_method
  3976. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  3977. @@ -5745,6 +5846,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  3978. +
  3979. +
  3980. +
  3981. +
  3982. +
  3983. +
  3984. +
  3985. +
  3986. +
  3987. +
  3988. +if test -n "$ac_tool_prefix"; then
  3989. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  3990. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  3991. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3992. +$as_echo_n "checking for $ac_word... " >&6; }
  3993. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  3994. + $as_echo_n "(cached) " >&6
  3995. +else
  3996. + if test -n "$DLLTOOL"; then
  3997. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  3998. +else
  3999. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4000. +for as_dir in $PATH
  4001. +do
  4002. + IFS=$as_save_IFS
  4003. + test -z "$as_dir" && as_dir=.
  4004. + for ac_exec_ext in '' $ac_executable_extensions; do
  4005. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4006. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  4007. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4008. + break 2
  4009. + fi
  4010. +done
  4011. + done
  4012. +IFS=$as_save_IFS
  4013. +
  4014. +fi
  4015. +fi
  4016. +DLLTOOL=$ac_cv_prog_DLLTOOL
  4017. +if test -n "$DLLTOOL"; then
  4018. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  4019. +$as_echo "$DLLTOOL" >&6; }
  4020. +else
  4021. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4022. +$as_echo "no" >&6; }
  4023. +fi
  4024. +
  4025. +
  4026. +fi
  4027. +if test -z "$ac_cv_prog_DLLTOOL"; then
  4028. + ac_ct_DLLTOOL=$DLLTOOL
  4029. + # Extract the first word of "dlltool", so it can be a program name with args.
  4030. +set dummy dlltool; ac_word=$2
  4031. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4032. +$as_echo_n "checking for $ac_word... " >&6; }
  4033. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  4034. + $as_echo_n "(cached) " >&6
  4035. +else
  4036. + if test -n "$ac_ct_DLLTOOL"; then
  4037. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  4038. +else
  4039. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4040. +for as_dir in $PATH
  4041. +do
  4042. + IFS=$as_save_IFS
  4043. + test -z "$as_dir" && as_dir=.
  4044. + for ac_exec_ext in '' $ac_executable_extensions; do
  4045. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4046. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  4047. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4048. + break 2
  4049. + fi
  4050. +done
  4051. + done
  4052. +IFS=$as_save_IFS
  4053. +
  4054. +fi
  4055. +fi
  4056. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  4057. +if test -n "$ac_ct_DLLTOOL"; then
  4058. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  4059. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  4060. +else
  4061. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4062. +$as_echo "no" >&6; }
  4063. +fi
  4064. +
  4065. + if test "x$ac_ct_DLLTOOL" = x; then
  4066. + DLLTOOL="false"
  4067. + else
  4068. + case $cross_compiling:$ac_tool_warned in
  4069. +yes:)
  4070. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  4071. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  4072. +ac_tool_warned=yes ;;
  4073. +esac
  4074. + DLLTOOL=$ac_ct_DLLTOOL
  4075. + fi
  4076. +else
  4077. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  4078. +fi
  4079. +
  4080. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  4081. +
  4082. +
  4083. +
  4084. +
  4085. +
  4086. +
  4087. +
  4088. +
  4089. +
  4090. +
  4091. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  4092. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  4093. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  4094. + $as_echo_n "(cached) " >&6
  4095. +else
  4096. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  4097. +
  4098. +case $host_os in
  4099. +cygwin* | mingw* | pw32* | cegcc*)
  4100. + # two different shell functions defined in ltmain.sh
  4101. + # decide which to use based on capabilities of $DLLTOOL
  4102. + case `$DLLTOOL --help 2>&1` in
  4103. + *--identify-strict*)
  4104. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  4105. + ;;
  4106. + *)
  4107. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  4108. + ;;
  4109. + esac
  4110. + ;;
  4111. +*)
  4112. + # fallback: assume linklib IS sharedlib
  4113. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  4114. + ;;
  4115. +esac
  4116. +
  4117. +fi
  4118. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  4119. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  4120. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  4121. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  4122. +
  4123. +
  4124. +
  4125. +
  4126. +
  4127. +
  4128. +
  4129. plugin_option=
  4130. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  4131. for plugin in $plugin_names; do
  4132. @@ -5759,8 +6011,10 @@ for plugin in $plugin_names; do
  4133. done
  4134. if test -n "$ac_tool_prefix"; then
  4135. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  4136. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  4137. + for ac_prog in ar
  4138. + do
  4139. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  4140. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  4141. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4142. $as_echo_n "checking for $ac_word... " >&6; }
  4143. if ${ac_cv_prog_AR+:} false; then :
  4144. @@ -5776,7 +6030,7 @@ do
  4145. test -z "$as_dir" && as_dir=.
  4146. for ac_exec_ext in '' $ac_executable_extensions; do
  4147. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4148. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  4149. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  4150. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4151. break 2
  4152. fi
  4153. @@ -5796,11 +6050,15 @@ $as_echo "no" >&6; }
  4154. fi
  4155. + test -n "$AR" && break
  4156. + done
  4157. fi
  4158. -if test -z "$ac_cv_prog_AR"; then
  4159. +if test -z "$AR"; then
  4160. ac_ct_AR=$AR
  4161. - # Extract the first word of "ar", so it can be a program name with args.
  4162. -set dummy ar; ac_word=$2
  4163. + for ac_prog in ar
  4164. +do
  4165. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  4166. +set dummy $ac_prog; ac_word=$2
  4167. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4168. $as_echo_n "checking for $ac_word... " >&6; }
  4169. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  4170. @@ -5816,7 +6074,7 @@ do
  4171. test -z "$as_dir" && as_dir=.
  4172. for ac_exec_ext in '' $ac_executable_extensions; do
  4173. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4174. - ac_cv_prog_ac_ct_AR="ar"
  4175. + ac_cv_prog_ac_ct_AR="$ac_prog"
  4176. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4177. break 2
  4178. fi
  4179. @@ -5835,6 +6093,10 @@ else
  4180. $as_echo "no" >&6; }
  4181. fi
  4182. +
  4183. + test -n "$ac_ct_AR" && break
  4184. +done
  4185. +
  4186. if test "x$ac_ct_AR" = x; then
  4187. AR="false"
  4188. else
  4189. @@ -5846,29 +6108,81 @@ ac_tool_warned=yes ;;
  4190. esac
  4191. AR=$ac_ct_AR
  4192. fi
  4193. -else
  4194. - AR="$ac_cv_prog_AR"
  4195. fi
  4196. -test -z "$AR" && AR=ar
  4197. -if test -n "$plugin_option"; then
  4198. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  4199. - touch conftest.c
  4200. - $AR $plugin_option rc conftest.a conftest.c
  4201. - if test "$?" != 0; then
  4202. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  4203. + touch conftest.c
  4204. + $AR $plugin_option rc conftest.a conftest.c
  4205. + if test "$?" != 0; then
  4206. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  4207. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  4208. - else
  4209. - AR="$AR $plugin_option"
  4210. - fi
  4211. - rm -f conftest.*
  4212. + else
  4213. + AR="$AR $plugin_option"
  4214. fi
  4215. -fi
  4216. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  4217. + rm -f conftest.*
  4218. +: ${AR=ar}
  4219. +: ${AR_FLAGS=cru}
  4220. +
  4221. +
  4222. +
  4223. +
  4224. +
  4225. +
  4226. +
  4227. +
  4228. +
  4229. +
  4230. +
  4231. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  4232. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  4233. +if ${lt_cv_ar_at_file+:} false; then :
  4234. + $as_echo_n "(cached) " >&6
  4235. +else
  4236. + lt_cv_ar_at_file=no
  4237. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4238. +/* end confdefs.h. */
  4239. +
  4240. +int
  4241. +main ()
  4242. +{
  4243. + ;
  4244. + return 0;
  4245. +}
  4246. +_ACEOF
  4247. +if ac_fn_c_try_compile "$LINENO"; then :
  4248. + echo conftest.$ac_objext > conftest.lst
  4249. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  4250. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  4251. + (eval $lt_ar_try) 2>&5
  4252. + ac_status=$?
  4253. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  4254. + test $ac_status = 0; }
  4255. + if test "$ac_status" -eq 0; then
  4256. + # Ensure the archiver fails upon bogus file names.
  4257. + rm -f conftest.$ac_objext libconftest.a
  4258. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  4259. + (eval $lt_ar_try) 2>&5
  4260. + ac_status=$?
  4261. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  4262. + test $ac_status = 0; }
  4263. + if test "$ac_status" -ne 0; then
  4264. + lt_cv_ar_at_file=@
  4265. + fi
  4266. + fi
  4267. + rm -f conftest.* libconftest.a
  4268. +fi
  4269. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  4270. +fi
  4271. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  4272. +$as_echo "$lt_cv_ar_at_file" >&6; }
  4273. +if test "x$lt_cv_ar_at_file" = xno; then
  4274. + archiver_list_spec=
  4275. +else
  4276. + archiver_list_spec=$lt_cv_ar_at_file
  4277. +fi
  4278. @@ -6215,8 +6529,8 @@ esac
  4279. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  4280. # Transform an extracted symbol line into symbol name and symbol address
  4281. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  4282. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  4283. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  4284. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  4285. # Handle CRLF in mingw tool chain
  4286. opt_cr=
  4287. @@ -6252,6 +6566,7 @@ for ac_symprfx in "" "_"; do
  4288. else
  4289. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  4290. fi
  4291. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  4292. # Check to see that the pipe works correctly.
  4293. pipe_works=no
  4294. @@ -6293,6 +6608,18 @@ _LT_EOF
  4295. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  4296. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  4297. cat <<_LT_EOF > conftest.$ac_ext
  4298. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  4299. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  4300. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  4301. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  4302. +# define LT_DLSYM_CONST
  4303. +#elif defined(__osf__)
  4304. +/* This system does not cope well with relocations in const data. */
  4305. +# define LT_DLSYM_CONST
  4306. +#else
  4307. +# define LT_DLSYM_CONST const
  4308. +#endif
  4309. +
  4310. #ifdef __cplusplus
  4311. extern "C" {
  4312. #endif
  4313. @@ -6304,7 +6631,7 @@ _LT_EOF
  4314. cat <<_LT_EOF >> conftest.$ac_ext
  4315. /* The mapping between symbol names and symbols. */
  4316. -const struct {
  4317. +LT_DLSYM_CONST struct {
  4318. const char *name;
  4319. void *address;
  4320. }
  4321. @@ -6330,8 +6657,8 @@ static const void *lt_preloaded_setup() {
  4322. _LT_EOF
  4323. # Now try linking the two files.
  4324. mv conftest.$ac_objext conftstm.$ac_objext
  4325. - lt_save_LIBS="$LIBS"
  4326. - lt_save_CFLAGS="$CFLAGS"
  4327. + lt_globsym_save_LIBS=$LIBS
  4328. + lt_globsym_save_CFLAGS=$CFLAGS
  4329. LIBS="conftstm.$ac_objext"
  4330. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  4331. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  4332. @@ -6341,8 +6668,8 @@ _LT_EOF
  4333. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  4334. pipe_works=yes
  4335. fi
  4336. - LIBS="$lt_save_LIBS"
  4337. - CFLAGS="$lt_save_CFLAGS"
  4338. + LIBS=$lt_globsym_save_LIBS
  4339. + CFLAGS=$lt_globsym_save_CFLAGS
  4340. else
  4341. echo "cannot find nm_test_func in $nlist" >&5
  4342. fi
  4343. @@ -6379,6 +6706,19 @@ else
  4344. $as_echo "ok" >&6; }
  4345. fi
  4346. +# Response file support.
  4347. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  4348. + nm_file_list_spec='@'
  4349. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  4350. + nm_file_list_spec='@'
  4351. +fi
  4352. +
  4353. +
  4354. +
  4355. +
  4356. +
  4357. +
  4358. +
  4359. @@ -6395,6 +6735,42 @@ fi
  4360. +
  4361. +
  4362. +
  4363. +
  4364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  4365. +$as_echo_n "checking for sysroot... " >&6; }
  4366. +
  4367. +# Check whether --with-libtool-sysroot was given.
  4368. +if test "${with_libtool_sysroot+set}" = set; then :
  4369. + withval=$with_libtool_sysroot;
  4370. +else
  4371. + with_libtool_sysroot=no
  4372. +fi
  4373. +
  4374. +
  4375. +lt_sysroot=
  4376. +case ${with_libtool_sysroot} in #(
  4377. + yes)
  4378. + if test "$GCC" = yes; then
  4379. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  4380. + fi
  4381. + ;; #(
  4382. + /*)
  4383. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  4384. + ;; #(
  4385. + no|'')
  4386. + ;; #(
  4387. + *)
  4388. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  4389. +$as_echo "${with_libtool_sysroot}" >&6; }
  4390. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  4391. + ;;
  4392. +esac
  4393. +
  4394. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  4395. +$as_echo "${lt_sysroot:-no}" >&6; }
  4396. @@ -6606,6 +6982,123 @@ esac
  4397. need_locks="$enable_libtool_lock"
  4398. +if test -n "$ac_tool_prefix"; then
  4399. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  4400. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  4401. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4402. +$as_echo_n "checking for $ac_word... " >&6; }
  4403. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  4404. + $as_echo_n "(cached) " >&6
  4405. +else
  4406. + if test -n "$MANIFEST_TOOL"; then
  4407. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  4408. +else
  4409. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4410. +for as_dir in $PATH
  4411. +do
  4412. + IFS=$as_save_IFS
  4413. + test -z "$as_dir" && as_dir=.
  4414. + for ac_exec_ext in '' $ac_executable_extensions; do
  4415. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4416. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  4417. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4418. + break 2
  4419. + fi
  4420. +done
  4421. + done
  4422. +IFS=$as_save_IFS
  4423. +
  4424. +fi
  4425. +fi
  4426. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  4427. +if test -n "$MANIFEST_TOOL"; then
  4428. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  4429. +$as_echo "$MANIFEST_TOOL" >&6; }
  4430. +else
  4431. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4432. +$as_echo "no" >&6; }
  4433. +fi
  4434. +
  4435. +
  4436. +fi
  4437. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  4438. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  4439. + # Extract the first word of "mt", so it can be a program name with args.
  4440. +set dummy mt; ac_word=$2
  4441. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4442. +$as_echo_n "checking for $ac_word... " >&6; }
  4443. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  4444. + $as_echo_n "(cached) " >&6
  4445. +else
  4446. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  4447. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  4448. +else
  4449. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4450. +for as_dir in $PATH
  4451. +do
  4452. + IFS=$as_save_IFS
  4453. + test -z "$as_dir" && as_dir=.
  4454. + for ac_exec_ext in '' $ac_executable_extensions; do
  4455. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4456. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  4457. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4458. + break 2
  4459. + fi
  4460. +done
  4461. + done
  4462. +IFS=$as_save_IFS
  4463. +
  4464. +fi
  4465. +fi
  4466. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  4467. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  4468. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  4469. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  4470. +else
  4471. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4472. +$as_echo "no" >&6; }
  4473. +fi
  4474. +
  4475. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  4476. + MANIFEST_TOOL=":"
  4477. + else
  4478. + case $cross_compiling:$ac_tool_warned in
  4479. +yes:)
  4480. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  4481. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  4482. +ac_tool_warned=yes ;;
  4483. +esac
  4484. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  4485. + fi
  4486. +else
  4487. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  4488. +fi
  4489. +
  4490. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  4491. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  4492. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  4493. +if ${lt_cv_path_mainfest_tool+:} false; then :
  4494. + $as_echo_n "(cached) " >&6
  4495. +else
  4496. + lt_cv_path_mainfest_tool=no
  4497. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  4498. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  4499. + cat conftest.err >&5
  4500. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  4501. + lt_cv_path_mainfest_tool=yes
  4502. + fi
  4503. + rm -f conftest*
  4504. +fi
  4505. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  4506. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  4507. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  4508. + MANIFEST_TOOL=:
  4509. +fi
  4510. +
  4511. +
  4512. +
  4513. +
  4514. +
  4515. case $host_os in
  4516. rhapsody* | darwin*)
  4517. @@ -7169,6 +7662,8 @@ _LT_EOF
  4518. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  4519. echo "$AR cru libconftest.a conftest.o" >&5
  4520. $AR cru libconftest.a conftest.o 2>&5
  4521. + echo "$RANLIB libconftest.a" >&5
  4522. + $RANLIB libconftest.a 2>&5
  4523. cat > conftest.c << _LT_EOF
  4524. int main() { return 0;}
  4525. _LT_EOF
  4526. @@ -7751,8 +8246,6 @@ fi
  4527. lt_prog_compiler_pic=
  4528. lt_prog_compiler_static=
  4529. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  4530. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4531. if test "$GCC" = yes; then
  4532. lt_prog_compiler_wl='-Wl,'
  4533. @@ -7918,6 +8411,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4534. lt_prog_compiler_pic='--shared'
  4535. lt_prog_compiler_static='--static'
  4536. ;;
  4537. + nagfor*)
  4538. + # NAG Fortran compiler
  4539. + lt_prog_compiler_wl='-Wl,-Wl,,'
  4540. + lt_prog_compiler_pic='-PIC'
  4541. + lt_prog_compiler_static='-Bstatic'
  4542. + ;;
  4543. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  4544. # Portland Group compilers (*not* the Pentium gcc compiler,
  4545. # which looks to be a dead project)
  4546. @@ -7980,7 +8479,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4547. lt_prog_compiler_pic='-KPIC'
  4548. lt_prog_compiler_static='-Bstatic'
  4549. case $cc_basename in
  4550. - f77* | f90* | f95*)
  4551. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  4552. lt_prog_compiler_wl='-Qoption ld ';;
  4553. *)
  4554. lt_prog_compiler_wl='-Wl,';;
  4555. @@ -8037,13 +8536,17 @@ case $host_os in
  4556. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  4557. ;;
  4558. esac
  4559. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  4560. -$as_echo "$lt_prog_compiler_pic" >&6; }
  4561. -
  4562. -
  4563. -
  4564. -
  4565. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  4566. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4567. +if ${lt_cv_prog_compiler_pic+:} false; then :
  4568. + $as_echo_n "(cached) " >&6
  4569. +else
  4570. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  4571. +fi
  4572. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  4573. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  4574. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  4575. #
  4576. # Check to make sure the PIC flag actually works.
  4577. @@ -8104,6 +8607,11 @@ fi
  4578. +
  4579. +
  4580. +
  4581. +
  4582. +
  4583. #
  4584. # Check to make sure the static flag actually works.
  4585. #
  4586. @@ -8454,7 +8962,8 @@ _LT_EOF
  4587. allow_undefined_flag=unsupported
  4588. always_export_symbols=no
  4589. enable_shared_with_static_runtimes=yes
  4590. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  4591. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  4592. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  4593. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  4594. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  4595. @@ -8553,12 +9062,12 @@ _LT_EOF
  4596. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  4597. hardcode_libdir_flag_spec=
  4598. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  4599. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  4600. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  4601. if test "x$supports_anon_versioning" = xyes; then
  4602. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  4603. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  4604. echo "local: *; };" >> $output_objdir/$libname.ver~
  4605. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  4606. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  4607. fi
  4608. ;;
  4609. esac
  4610. @@ -8572,8 +9081,8 @@ _LT_EOF
  4611. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  4612. wlarc=
  4613. else
  4614. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4615. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4616. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4617. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4618. fi
  4619. ;;
  4620. @@ -8591,8 +9100,8 @@ _LT_EOF
  4621. _LT_EOF
  4622. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  4623. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4624. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4625. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4626. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4627. else
  4628. ld_shlibs=no
  4629. fi
  4630. @@ -8638,8 +9147,8 @@ _LT_EOF
  4631. *)
  4632. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  4633. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4634. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4635. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4636. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4637. else
  4638. ld_shlibs=no
  4639. fi
  4640. @@ -8769,7 +9278,13 @@ _LT_EOF
  4641. allow_undefined_flag='-berok'
  4642. # Determine the default libpath from the value encoded in an
  4643. # empty executable.
  4644. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4645. + if test "${lt_cv_aix_libpath+set}" = set; then
  4646. + aix_libpath=$lt_cv_aix_libpath
  4647. +else
  4648. + if ${lt_cv_aix_libpath_+:} false; then :
  4649. + $as_echo_n "(cached) " >&6
  4650. +else
  4651. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4652. /* end confdefs.h. */
  4653. int
  4654. @@ -8782,22 +9297,29 @@ main ()
  4655. _ACEOF
  4656. if ac_fn_c_try_link "$LINENO"; then :
  4657. -lt_aix_libpath_sed='
  4658. - /Import File Strings/,/^$/ {
  4659. - /^0/ {
  4660. - s/^0 *\(.*\)$/\1/
  4661. - p
  4662. - }
  4663. - }'
  4664. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4665. -# Check for a 64-bit object if we didn't find anything.
  4666. -if test -z "$aix_libpath"; then
  4667. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4668. -fi
  4669. + lt_aix_libpath_sed='
  4670. + /Import File Strings/,/^$/ {
  4671. + /^0/ {
  4672. + s/^0 *\([^ ]*\) *$/\1/
  4673. + p
  4674. + }
  4675. + }'
  4676. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4677. + # Check for a 64-bit object if we didn't find anything.
  4678. + if test -z "$lt_cv_aix_libpath_"; then
  4679. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4680. + fi
  4681. fi
  4682. rm -f core conftest.err conftest.$ac_objext \
  4683. conftest$ac_exeext conftest.$ac_ext
  4684. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4685. + if test -z "$lt_cv_aix_libpath_"; then
  4686. + lt_cv_aix_libpath_="/usr/lib:/lib"
  4687. + fi
  4688. +
  4689. +fi
  4690. +
  4691. + aix_libpath=$lt_cv_aix_libpath_
  4692. +fi
  4693. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  4694. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  4695. @@ -8809,7 +9331,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4696. else
  4697. # Determine the default libpath from the value encoded in an
  4698. # empty executable.
  4699. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4700. + if test "${lt_cv_aix_libpath+set}" = set; then
  4701. + aix_libpath=$lt_cv_aix_libpath
  4702. +else
  4703. + if ${lt_cv_aix_libpath_+:} false; then :
  4704. + $as_echo_n "(cached) " >&6
  4705. +else
  4706. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4707. /* end confdefs.h. */
  4708. int
  4709. @@ -8822,22 +9350,29 @@ main ()
  4710. _ACEOF
  4711. if ac_fn_c_try_link "$LINENO"; then :
  4712. -lt_aix_libpath_sed='
  4713. - /Import File Strings/,/^$/ {
  4714. - /^0/ {
  4715. - s/^0 *\(.*\)$/\1/
  4716. - p
  4717. - }
  4718. - }'
  4719. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4720. -# Check for a 64-bit object if we didn't find anything.
  4721. -if test -z "$aix_libpath"; then
  4722. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4723. -fi
  4724. + lt_aix_libpath_sed='
  4725. + /Import File Strings/,/^$/ {
  4726. + /^0/ {
  4727. + s/^0 *\([^ ]*\) *$/\1/
  4728. + p
  4729. + }
  4730. + }'
  4731. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4732. + # Check for a 64-bit object if we didn't find anything.
  4733. + if test -z "$lt_cv_aix_libpath_"; then
  4734. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4735. + fi
  4736. fi
  4737. rm -f core conftest.err conftest.$ac_objext \
  4738. conftest$ac_exeext conftest.$ac_ext
  4739. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4740. + if test -z "$lt_cv_aix_libpath_"; then
  4741. + lt_cv_aix_libpath_="/usr/lib:/lib"
  4742. + fi
  4743. +
  4744. +fi
  4745. +
  4746. + aix_libpath=$lt_cv_aix_libpath_
  4747. +fi
  4748. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  4749. # Warning - without using the other run time loading flags,
  4750. @@ -8882,20 +9417,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4751. # Microsoft Visual C++.
  4752. # hardcode_libdir_flag_spec is actually meaningless, as there is
  4753. # no search path for DLLs.
  4754. - hardcode_libdir_flag_spec=' '
  4755. - allow_undefined_flag=unsupported
  4756. - # Tell ltmain to make .lib files, not .a files.
  4757. - libext=lib
  4758. - # Tell ltmain to make .dll files, not .so files.
  4759. - shrext_cmds=".dll"
  4760. - # FIXME: Setting linknames here is a bad hack.
  4761. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  4762. - # The linker will automatically build a .lib file if we build a DLL.
  4763. - old_archive_from_new_cmds='true'
  4764. - # FIXME: Should let the user specify the lib program.
  4765. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  4766. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  4767. - enable_shared_with_static_runtimes=yes
  4768. + case $cc_basename in
  4769. + cl*)
  4770. + # Native MSVC
  4771. + hardcode_libdir_flag_spec=' '
  4772. + allow_undefined_flag=unsupported
  4773. + always_export_symbols=yes
  4774. + file_list_spec='@'
  4775. + # Tell ltmain to make .lib files, not .a files.
  4776. + libext=lib
  4777. + # Tell ltmain to make .dll files, not .so files.
  4778. + shrext_cmds=".dll"
  4779. + # FIXME: Setting linknames here is a bad hack.
  4780. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  4781. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  4782. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  4783. + else
  4784. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  4785. + fi~
  4786. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  4787. + linknames='
  4788. + # The linker will not automatically build a static lib if we build a DLL.
  4789. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  4790. + enable_shared_with_static_runtimes=yes
  4791. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  4792. + # Don't use ranlib
  4793. + old_postinstall_cmds='chmod 644 $oldlib'
  4794. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  4795. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  4796. + case $lt_outputfile in
  4797. + *.exe|*.EXE) ;;
  4798. + *)
  4799. + lt_outputfile="$lt_outputfile.exe"
  4800. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  4801. + ;;
  4802. + esac~
  4803. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  4804. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  4805. + $RM "$lt_outputfile.manifest";
  4806. + fi'
  4807. + ;;
  4808. + *)
  4809. + # Assume MSVC wrapper
  4810. + hardcode_libdir_flag_spec=' '
  4811. + allow_undefined_flag=unsupported
  4812. + # Tell ltmain to make .lib files, not .a files.
  4813. + libext=lib
  4814. + # Tell ltmain to make .dll files, not .so files.
  4815. + shrext_cmds=".dll"
  4816. + # FIXME: Setting linknames here is a bad hack.
  4817. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  4818. + # The linker will automatically build a .lib file if we build a DLL.
  4819. + old_archive_from_new_cmds='true'
  4820. + # FIXME: Should let the user specify the lib program.
  4821. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  4822. + enable_shared_with_static_runtimes=yes
  4823. + ;;
  4824. + esac
  4825. ;;
  4826. darwin* | rhapsody*)
  4827. @@ -8956,7 +9534,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4828. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  4829. freebsd* | dragonfly*)
  4830. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  4831. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  4832. hardcode_libdir_flag_spec='-R$libdir'
  4833. hardcode_direct=yes
  4834. hardcode_shlibpath_var=no
  4835. @@ -8964,7 +9542,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4836. hpux9*)
  4837. if test "$GCC" = yes; then
  4838. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  4839. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  4840. else
  4841. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  4842. fi
  4843. @@ -8980,7 +9558,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4844. hpux10*)
  4845. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  4846. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4847. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4848. else
  4849. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  4850. fi
  4851. @@ -9004,10 +9582,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4852. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  4853. ;;
  4854. ia64*)
  4855. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  4856. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  4857. ;;
  4858. *)
  4859. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4860. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4861. ;;
  4862. esac
  4863. else
  4864. @@ -9086,23 +9664,36 @@ fi
  4865. irix5* | irix6* | nonstopux*)
  4866. if test "$GCC" = yes; then
  4867. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  4868. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  4869. # Try to use the -exported_symbol ld option, if it does not
  4870. # work, assume that -exports_file does not work either and
  4871. # implicitly export all symbols.
  4872. - save_LDFLAGS="$LDFLAGS"
  4873. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  4874. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4875. + # This should be the same for all languages, so no per-tag cache variable.
  4876. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  4877. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  4878. +if ${lt_cv_irix_exported_symbol+:} false; then :
  4879. + $as_echo_n "(cached) " >&6
  4880. +else
  4881. + save_LDFLAGS="$LDFLAGS"
  4882. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  4883. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4884. /* end confdefs.h. */
  4885. -int foo(void) {}
  4886. +int foo (void) { return 0; }
  4887. _ACEOF
  4888. if ac_fn_c_try_link "$LINENO"; then :
  4889. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  4890. -
  4891. + lt_cv_irix_exported_symbol=yes
  4892. +else
  4893. + lt_cv_irix_exported_symbol=no
  4894. fi
  4895. rm -f core conftest.err conftest.$ac_objext \
  4896. conftest$ac_exeext conftest.$ac_ext
  4897. - LDFLAGS="$save_LDFLAGS"
  4898. + LDFLAGS="$save_LDFLAGS"
  4899. +fi
  4900. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  4901. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  4902. + if test "$lt_cv_irix_exported_symbol" = yes; then
  4903. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  4904. + fi
  4905. else
  4906. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  4907. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  4908. @@ -9187,7 +9778,7 @@ rm -f core conftest.err conftest.$ac_objext \
  4909. osf4* | osf5*) # as osf3* with the addition of -msym flag
  4910. if test "$GCC" = yes; then
  4911. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  4912. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  4913. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  4914. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  4915. else
  4916. allow_undefined_flag=' -expect_unresolved \*'
  4917. @@ -9206,9 +9797,9 @@ rm -f core conftest.err conftest.$ac_objext \
  4918. no_undefined_flag=' -z defs'
  4919. if test "$GCC" = yes; then
  4920. wlarc='${wl}'
  4921. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  4922. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  4923. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  4924. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  4925. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  4926. else
  4927. case `$CC -V 2>&1` in
  4928. *"Compilers 5.0"*)
  4929. @@ -9784,8 +10375,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  4930. need_version=no
  4931. need_lib_prefix=no
  4932. - case $GCC,$host_os in
  4933. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  4934. + case $GCC,$cc_basename in
  4935. + yes,*)
  4936. + # gcc
  4937. library_names_spec='$libname.dll.a'
  4938. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  4939. postinstall_cmds='base_file=`basename \${file}`~
  4940. @@ -9818,13 +10410,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  4941. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  4942. ;;
  4943. esac
  4944. + dynamic_linker='Win32 ld.exe'
  4945. + ;;
  4946. +
  4947. + *,cl*)
  4948. + # Native MSVC
  4949. + libname_spec='$name'
  4950. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  4951. + library_names_spec='${libname}.dll.lib'
  4952. +
  4953. + case $build_os in
  4954. + mingw*)
  4955. + sys_lib_search_path_spec=
  4956. + lt_save_ifs=$IFS
  4957. + IFS=';'
  4958. + for lt_path in $LIB
  4959. + do
  4960. + IFS=$lt_save_ifs
  4961. + # Let DOS variable expansion print the short 8.3 style file name.
  4962. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  4963. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  4964. + done
  4965. + IFS=$lt_save_ifs
  4966. + # Convert to MSYS style.
  4967. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  4968. + ;;
  4969. + cygwin*)
  4970. + # Convert to unix form, then to dos form, then back to unix form
  4971. + # but this time dos style (no spaces!) so that the unix form looks
  4972. + # like /cygdrive/c/PROGRA~1:/cygdr...
  4973. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  4974. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  4975. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  4976. + ;;
  4977. + *)
  4978. + sys_lib_search_path_spec="$LIB"
  4979. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  4980. + # It is most probably a Windows format PATH.
  4981. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  4982. + else
  4983. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  4984. + fi
  4985. + # FIXME: find the short name or the path components, as spaces are
  4986. + # common. (e.g. "Program Files" -> "PROGRA~1")
  4987. + ;;
  4988. + esac
  4989. +
  4990. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  4991. + postinstall_cmds='base_file=`basename \${file}`~
  4992. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  4993. + dldir=$destdir/`dirname \$dlpath`~
  4994. + test -d \$dldir || mkdir -p \$dldir~
  4995. + $install_prog $dir/$dlname \$dldir/$dlname'
  4996. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  4997. + dlpath=$dir/\$dldll~
  4998. + $RM \$dlpath'
  4999. + shlibpath_overrides_runpath=yes
  5000. + dynamic_linker='Win32 link.exe'
  5001. ;;
  5002. *)
  5003. + # Assume MSVC wrapper
  5004. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  5005. + dynamic_linker='Win32 ld.exe'
  5006. ;;
  5007. esac
  5008. - dynamic_linker='Win32 ld.exe'
  5009. # FIXME: first we should search . and the directory the executable is in
  5010. shlibpath_var=PATH
  5011. ;;
  5012. @@ -10702,7 +11352,7 @@ else
  5013. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  5014. lt_status=$lt_dlunknown
  5015. cat > conftest.$ac_ext <<_LT_EOF
  5016. -#line 10705 "configure"
  5017. +#line $LINENO "configure"
  5018. #include "confdefs.h"
  5019. #if HAVE_DLFCN_H
  5020. @@ -10746,10 +11396,10 @@ else
  5021. /* When -fvisbility=hidden is used, assume the code has been annotated
  5022. correspondingly for the symbols needed. */
  5023. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  5024. -void fnord () __attribute__((visibility("default")));
  5025. +int fnord () __attribute__((visibility("default")));
  5026. #endif
  5027. -void fnord () { int i=42; }
  5028. +int fnord () { return 42; }
  5029. int main ()
  5030. {
  5031. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  5032. @@ -10808,7 +11458,7 @@ else
  5033. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  5034. lt_status=$lt_dlunknown
  5035. cat > conftest.$ac_ext <<_LT_EOF
  5036. -#line 10811 "configure"
  5037. +#line $LINENO "configure"
  5038. #include "confdefs.h"
  5039. #if HAVE_DLFCN_H
  5040. @@ -10852,10 +11502,10 @@ else
  5041. /* When -fvisbility=hidden is used, assume the code has been annotated
  5042. correspondingly for the symbols needed. */
  5043. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  5044. -void fnord () __attribute__((visibility("default")));
  5045. +int fnord () __attribute__((visibility("default")));
  5046. #endif
  5047. -void fnord () { int i=42; }
  5048. +int fnord () { return 42; }
  5049. int main ()
  5050. {
  5051. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  5052. @@ -14834,13 +15484,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  5053. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  5054. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  5055. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  5056. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  5057. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  5058. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  5059. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  5060. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  5061. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  5062. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  5063. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  5064. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  5065. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  5066. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  5067. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  5068. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  5069. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  5070. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  5071. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  5072. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  5073. @@ -14855,14 +15512,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  5074. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  5075. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  5076. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  5077. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  5078. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  5079. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  5080. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  5081. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  5082. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  5083. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  5084. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  5085. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  5086. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  5087. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  5088. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  5089. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  5090. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  5091. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  5092. @@ -14895,12 +15555,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  5093. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  5094. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  5095. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  5096. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  5097. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  5098. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  5099. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  5100. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  5101. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  5102. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  5103. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  5104. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  5105. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  5106. @@ -14955,8 +15615,13 @@ reload_flag \
  5107. OBJDUMP \
  5108. deplibs_check_method \
  5109. file_magic_cmd \
  5110. +file_magic_glob \
  5111. +want_nocaseglob \
  5112. +DLLTOOL \
  5113. +sharedlib_from_linklib_cmd \
  5114. AR \
  5115. AR_FLAGS \
  5116. +archiver_list_spec \
  5117. STRIP \
  5118. RANLIB \
  5119. CC \
  5120. @@ -14966,12 +15631,14 @@ lt_cv_sys_global_symbol_pipe \
  5121. lt_cv_sys_global_symbol_to_cdecl \
  5122. lt_cv_sys_global_symbol_to_c_name_address \
  5123. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  5124. +nm_file_list_spec \
  5125. lt_prog_compiler_no_builtin_flag \
  5126. -lt_prog_compiler_wl \
  5127. lt_prog_compiler_pic \
  5128. +lt_prog_compiler_wl \
  5129. lt_prog_compiler_static \
  5130. lt_cv_prog_compiler_c_o \
  5131. need_locks \
  5132. +MANIFEST_TOOL \
  5133. DSYMUTIL \
  5134. NMEDIT \
  5135. LIPO \
  5136. @@ -14987,7 +15654,6 @@ no_undefined_flag \
  5137. hardcode_libdir_flag_spec \
  5138. hardcode_libdir_flag_spec_ld \
  5139. hardcode_libdir_separator \
  5140. -fix_srcfile_path \
  5141. exclude_expsyms \
  5142. include_expsyms \
  5143. file_list_spec \
  5144. @@ -15023,6 +15689,7 @@ module_cmds \
  5145. module_expsym_cmds \
  5146. export_symbols_cmds \
  5147. prelink_cmds \
  5148. +postlink_cmds \
  5149. postinstall_cmds \
  5150. postuninstall_cmds \
  5151. finish_cmds \
  5152. @@ -15795,7 +16462,8 @@ $as_echo X"$file" |
  5153. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  5154. #
  5155. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  5156. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  5157. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  5158. +# Inc.
  5159. # Written by Gordon Matzigkeit, 1996
  5160. #
  5161. # This file is part of GNU Libtool.
  5162. @@ -15898,19 +16566,42 @@ SP2NL=$lt_lt_SP2NL
  5163. # turn newlines into spaces.
  5164. NL2SP=$lt_lt_NL2SP
  5165. +# convert \$build file names to \$host format.
  5166. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  5167. +
  5168. +# convert \$build files to toolchain format.
  5169. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  5170. +
  5171. # An object symbol dumper.
  5172. OBJDUMP=$lt_OBJDUMP
  5173. # Method to check whether dependent libraries are shared objects.
  5174. deplibs_check_method=$lt_deplibs_check_method
  5175. -# Command to use when deplibs_check_method == "file_magic".
  5176. +# Command to use when deplibs_check_method = "file_magic".
  5177. file_magic_cmd=$lt_file_magic_cmd
  5178. +# How to find potential files when deplibs_check_method = "file_magic".
  5179. +file_magic_glob=$lt_file_magic_glob
  5180. +
  5181. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  5182. +want_nocaseglob=$lt_want_nocaseglob
  5183. +
  5184. +# DLL creation program.
  5185. +DLLTOOL=$lt_DLLTOOL
  5186. +
  5187. +# Command to associate shared and link libraries.
  5188. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  5189. +
  5190. # The archiver.
  5191. AR=$lt_AR
  5192. +
  5193. +# Flags to create an archive.
  5194. AR_FLAGS=$lt_AR_FLAGS
  5195. +# How to feed a file listing to the archiver.
  5196. +archiver_list_spec=$lt_archiver_list_spec
  5197. +
  5198. # A symbol stripping program.
  5199. STRIP=$lt_STRIP
  5200. @@ -15940,6 +16631,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  5201. # Transform the output of nm in a C name address pair when lib prefix is needed.
  5202. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  5203. +# Specify filename containing input files for \$NM.
  5204. +nm_file_list_spec=$lt_nm_file_list_spec
  5205. +
  5206. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  5207. +lt_sysroot=$lt_sysroot
  5208. +
  5209. # The name of the directory that contains temporary libtool files.
  5210. objdir=$objdir
  5211. @@ -15949,6 +16646,9 @@ MAGIC_CMD=$MAGIC_CMD
  5212. # Must we lock files when doing compilation?
  5213. need_locks=$lt_need_locks
  5214. +# Manifest tool.
  5215. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  5216. +
  5217. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  5218. DSYMUTIL=$lt_DSYMUTIL
  5219. @@ -16063,12 +16763,12 @@ with_gcc=$GCC
  5220. # Compiler flag to turn off builtin functions.
  5221. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  5222. -# How to pass a linker flag through the compiler.
  5223. -wl=$lt_lt_prog_compiler_wl
  5224. -
  5225. # Additional compiler flags for building library objects.
  5226. pic_flag=$lt_lt_prog_compiler_pic
  5227. +# How to pass a linker flag through the compiler.
  5228. +wl=$lt_lt_prog_compiler_wl
  5229. +
  5230. # Compiler flag to prevent dynamic linking.
  5231. link_static_flag=$lt_lt_prog_compiler_static
  5232. @@ -16155,9 +16855,6 @@ inherit_rpath=$inherit_rpath
  5233. # Whether libtool must link a program against all its dependency libraries.
  5234. link_all_deplibs=$link_all_deplibs
  5235. -# Fix the shell variable \$srcfile for the compiler.
  5236. -fix_srcfile_path=$lt_fix_srcfile_path
  5237. -
  5238. # Set to "yes" if exported symbols are required.
  5239. always_export_symbols=$always_export_symbols
  5240. @@ -16173,6 +16870,9 @@ include_expsyms=$lt_include_expsyms
  5241. # Commands necessary for linking programs (against libraries) with templates.
  5242. prelink_cmds=$lt_prelink_cmds
  5243. +# Commands necessary for finishing linking programs.
  5244. +postlink_cmds=$lt_postlink_cmds
  5245. +
  5246. # Specify filename containing input files.
  5247. file_list_spec=$lt_file_list_spec
  5248. @@ -16205,210 +16905,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  5249. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  5250. # text mode, it properly converts lines to CR/LF. This bash problem
  5251. # is reportedly fixed, but why not run on old versions too?
  5252. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  5253. - || (rm -f "$cfgfile"; exit 1)
  5254. -
  5255. - case $xsi_shell in
  5256. - yes)
  5257. - cat << \_LT_EOF >> "$cfgfile"
  5258. -
  5259. -# func_dirname file append nondir_replacement
  5260. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  5261. -# otherwise set result to NONDIR_REPLACEMENT.
  5262. -func_dirname ()
  5263. -{
  5264. - case ${1} in
  5265. - */*) func_dirname_result="${1%/*}${2}" ;;
  5266. - * ) func_dirname_result="${3}" ;;
  5267. - esac
  5268. -}
  5269. -
  5270. -# func_basename file
  5271. -func_basename ()
  5272. -{
  5273. - func_basename_result="${1##*/}"
  5274. -}
  5275. -
  5276. -# func_dirname_and_basename file append nondir_replacement
  5277. -# perform func_basename and func_dirname in a single function
  5278. -# call:
  5279. -# dirname: Compute the dirname of FILE. If nonempty,
  5280. -# add APPEND to the result, otherwise set result
  5281. -# to NONDIR_REPLACEMENT.
  5282. -# value returned in "$func_dirname_result"
  5283. -# basename: Compute filename of FILE.
  5284. -# value retuned in "$func_basename_result"
  5285. -# Implementation must be kept synchronized with func_dirname
  5286. -# and func_basename. For efficiency, we do not delegate to
  5287. -# those functions but instead duplicate the functionality here.
  5288. -func_dirname_and_basename ()
  5289. -{
  5290. - case ${1} in
  5291. - */*) func_dirname_result="${1%/*}${2}" ;;
  5292. - * ) func_dirname_result="${3}" ;;
  5293. - esac
  5294. - func_basename_result="${1##*/}"
  5295. -}
  5296. -
  5297. -# func_stripname prefix suffix name
  5298. -# strip PREFIX and SUFFIX off of NAME.
  5299. -# PREFIX and SUFFIX must not contain globbing or regex special
  5300. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  5301. -# dot (in which case that matches only a dot).
  5302. -func_stripname ()
  5303. -{
  5304. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  5305. - # positional parameters, so assign one to ordinary parameter first.
  5306. - func_stripname_result=${3}
  5307. - func_stripname_result=${func_stripname_result#"${1}"}
  5308. - func_stripname_result=${func_stripname_result%"${2}"}
  5309. -}
  5310. -
  5311. -# func_opt_split
  5312. -func_opt_split ()
  5313. -{
  5314. - func_opt_split_opt=${1%%=*}
  5315. - func_opt_split_arg=${1#*=}
  5316. -}
  5317. -
  5318. -# func_lo2o object
  5319. -func_lo2o ()
  5320. -{
  5321. - case ${1} in
  5322. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  5323. - *) func_lo2o_result=${1} ;;
  5324. - esac
  5325. -}
  5326. -
  5327. -# func_xform libobj-or-source
  5328. -func_xform ()
  5329. -{
  5330. - func_xform_result=${1%.*}.lo
  5331. -}
  5332. -
  5333. -# func_arith arithmetic-term...
  5334. -func_arith ()
  5335. -{
  5336. - func_arith_result=$(( $* ))
  5337. -}
  5338. -
  5339. -# func_len string
  5340. -# STRING may not start with a hyphen.
  5341. -func_len ()
  5342. -{
  5343. - func_len_result=${#1}
  5344. -}
  5345. -
  5346. -_LT_EOF
  5347. - ;;
  5348. - *) # Bourne compatible functions.
  5349. - cat << \_LT_EOF >> "$cfgfile"
  5350. -
  5351. -# func_dirname file append nondir_replacement
  5352. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  5353. -# otherwise set result to NONDIR_REPLACEMENT.
  5354. -func_dirname ()
  5355. -{
  5356. - # Extract subdirectory from the argument.
  5357. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  5358. - if test "X$func_dirname_result" = "X${1}"; then
  5359. - func_dirname_result="${3}"
  5360. - else
  5361. - func_dirname_result="$func_dirname_result${2}"
  5362. - fi
  5363. -}
  5364. -
  5365. -# func_basename file
  5366. -func_basename ()
  5367. -{
  5368. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  5369. -}
  5370. -
  5371. -
  5372. -# func_stripname prefix suffix name
  5373. -# strip PREFIX and SUFFIX off of NAME.
  5374. -# PREFIX and SUFFIX must not contain globbing or regex special
  5375. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  5376. -# dot (in which case that matches only a dot).
  5377. -# func_strip_suffix prefix name
  5378. -func_stripname ()
  5379. -{
  5380. - case ${2} in
  5381. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  5382. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  5383. - esac
  5384. -}
  5385. -
  5386. -# sed scripts:
  5387. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  5388. -my_sed_long_arg='1s/^-[^=]*=//'
  5389. -
  5390. -# func_opt_split
  5391. -func_opt_split ()
  5392. -{
  5393. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  5394. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  5395. -}
  5396. -
  5397. -# func_lo2o object
  5398. -func_lo2o ()
  5399. -{
  5400. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  5401. -}
  5402. -
  5403. -# func_xform libobj-or-source
  5404. -func_xform ()
  5405. -{
  5406. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  5407. -}
  5408. -
  5409. -# func_arith arithmetic-term...
  5410. -func_arith ()
  5411. -{
  5412. - func_arith_result=`expr "$@"`
  5413. -}
  5414. -
  5415. -# func_len string
  5416. -# STRING may not start with a hyphen.
  5417. -func_len ()
  5418. -{
  5419. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  5420. -}
  5421. -
  5422. -_LT_EOF
  5423. -esac
  5424. -
  5425. -case $lt_shell_append in
  5426. - yes)
  5427. - cat << \_LT_EOF >> "$cfgfile"
  5428. -
  5429. -# func_append var value
  5430. -# Append VALUE to the end of shell variable VAR.
  5431. -func_append ()
  5432. -{
  5433. - eval "$1+=\$2"
  5434. -}
  5435. -_LT_EOF
  5436. - ;;
  5437. - *)
  5438. - cat << \_LT_EOF >> "$cfgfile"
  5439. -
  5440. -# func_append var value
  5441. -# Append VALUE to the end of shell variable VAR.
  5442. -func_append ()
  5443. -{
  5444. - eval "$1=\$$1\$2"
  5445. -}
  5446. -
  5447. -_LT_EOF
  5448. - ;;
  5449. - esac
  5450. -
  5451. -
  5452. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  5453. - || (rm -f "$cfgfile"; exit 1)
  5454. -
  5455. - mv -f "$cfgfile" "$ofile" ||
  5456. + sed '$q' "$ltmain" >> "$cfgfile" \
  5457. + || (rm -f "$cfgfile"; exit 1)
  5458. +
  5459. + if test x"$xsi_shell" = xyes; then
  5460. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  5461. +func_dirname ()\
  5462. +{\
  5463. +\ case ${1} in\
  5464. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  5465. +\ * ) func_dirname_result="${3}" ;;\
  5466. +\ esac\
  5467. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  5468. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5469. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5470. +test 0 -eq $? || _lt_function_replace_fail=:
  5471. +
  5472. +
  5473. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  5474. +func_basename ()\
  5475. +{\
  5476. +\ func_basename_result="${1##*/}"\
  5477. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  5478. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5479. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5480. +test 0 -eq $? || _lt_function_replace_fail=:
  5481. +
  5482. +
  5483. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  5484. +func_dirname_and_basename ()\
  5485. +{\
  5486. +\ case ${1} in\
  5487. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  5488. +\ * ) func_dirname_result="${3}" ;;\
  5489. +\ esac\
  5490. +\ func_basename_result="${1##*/}"\
  5491. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  5492. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5493. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5494. +test 0 -eq $? || _lt_function_replace_fail=:
  5495. +
  5496. +
  5497. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  5498. +func_stripname ()\
  5499. +{\
  5500. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  5501. +\ # positional parameters, so assign one to ordinary parameter first.\
  5502. +\ func_stripname_result=${3}\
  5503. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  5504. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  5505. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  5506. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5507. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5508. +test 0 -eq $? || _lt_function_replace_fail=:
  5509. +
  5510. +
  5511. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  5512. +func_split_long_opt ()\
  5513. +{\
  5514. +\ func_split_long_opt_name=${1%%=*}\
  5515. +\ func_split_long_opt_arg=${1#*=}\
  5516. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  5517. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5518. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5519. +test 0 -eq $? || _lt_function_replace_fail=:
  5520. +
  5521. +
  5522. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  5523. +func_split_short_opt ()\
  5524. +{\
  5525. +\ func_split_short_opt_arg=${1#??}\
  5526. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  5527. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  5528. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5529. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5530. +test 0 -eq $? || _lt_function_replace_fail=:
  5531. +
  5532. +
  5533. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  5534. +func_lo2o ()\
  5535. +{\
  5536. +\ case ${1} in\
  5537. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  5538. +\ *) func_lo2o_result=${1} ;;\
  5539. +\ esac\
  5540. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  5541. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5542. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5543. +test 0 -eq $? || _lt_function_replace_fail=:
  5544. +
  5545. +
  5546. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  5547. +func_xform ()\
  5548. +{\
  5549. + func_xform_result=${1%.*}.lo\
  5550. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  5551. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5552. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5553. +test 0 -eq $? || _lt_function_replace_fail=:
  5554. +
  5555. +
  5556. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  5557. +func_arith ()\
  5558. +{\
  5559. + func_arith_result=$(( $* ))\
  5560. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  5561. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5562. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5563. +test 0 -eq $? || _lt_function_replace_fail=:
  5564. +
  5565. +
  5566. + sed -e '/^func_len ()$/,/^} # func_len /c\
  5567. +func_len ()\
  5568. +{\
  5569. + func_len_result=${#1}\
  5570. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  5571. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5572. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5573. +test 0 -eq $? || _lt_function_replace_fail=:
  5574. +
  5575. +fi
  5576. +
  5577. +if test x"$lt_shell_append" = xyes; then
  5578. + sed -e '/^func_append ()$/,/^} # func_append /c\
  5579. +func_append ()\
  5580. +{\
  5581. + eval "${1}+=\\${2}"\
  5582. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  5583. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5584. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5585. +test 0 -eq $? || _lt_function_replace_fail=:
  5586. +
  5587. +
  5588. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  5589. +func_append_quoted ()\
  5590. +{\
  5591. +\ func_quote_for_eval "${2}"\
  5592. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  5593. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  5594. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5595. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5596. +test 0 -eq $? || _lt_function_replace_fail=:
  5597. +
  5598. +
  5599. + # Save a `func_append' function call where possible by direct use of '+='
  5600. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  5601. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5602. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5603. + test 0 -eq $? || _lt_function_replace_fail=:
  5604. +else
  5605. + # Save a `func_append' function call even when '+=' is not available
  5606. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  5607. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5608. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5609. + test 0 -eq $? || _lt_function_replace_fail=:
  5610. +fi
  5611. +
  5612. +if test x"$_lt_function_replace_fail" = x":"; then
  5613. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  5614. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  5615. +fi
  5616. +
  5617. +
  5618. + mv -f "$cfgfile" "$ofile" ||
  5619. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  5620. chmod +x "$ofile"
  5621. diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
  5622. index bdceff3b56a..6aadae41031 100644
  5623. --- a/gdbsupport/Makefile.in
  5624. +++ b/gdbsupport/Makefile.in
  5625. @@ -233,6 +233,7 @@ CATOBJEXT = @CATOBJEXT@
  5626. CC = @CC@
  5627. CCDEPMODE = @CCDEPMODE@
  5628. CFLAGS = @CFLAGS@
  5629. +CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
  5630. CPP = @CPP@
  5631. CPPFLAGS = @CPPFLAGS@
  5632. CXX = @CXX@
  5633. diff --git a/gprof/Makefile.in b/gprof/Makefile.in
  5634. index 5ef5ece74a9..9d7ce8b62b2 100644
  5635. --- a/gprof/Makefile.in
  5636. +++ b/gprof/Makefile.in
  5637. @@ -321,6 +321,7 @@ CYGPATH_W = @CYGPATH_W@
  5638. DATADIRNAME = @DATADIRNAME@
  5639. DEFS = @DEFS@
  5640. DEPDIR = @DEPDIR@
  5641. +DLLTOOL = @DLLTOOL@
  5642. DSYMUTIL = @DSYMUTIL@
  5643. DUMPBIN = @DUMPBIN@
  5644. ECHO_C = @ECHO_C@
  5645. @@ -352,6 +353,7 @@ LN_S = @LN_S@
  5646. LTLIBOBJS = @LTLIBOBJS@
  5647. MAINT = @MAINT@
  5648. MAKEINFO = @MAKEINFO@
  5649. +MANIFEST_TOOL = @MANIFEST_TOOL@
  5650. MKDIR_P = @MKDIR_P@
  5651. MKINSTALLDIRS = @MKINSTALLDIRS@
  5652. MSGFMT = @MSGFMT@
  5653. @@ -387,6 +389,7 @@ abs_builddir = @abs_builddir@
  5654. abs_srcdir = @abs_srcdir@
  5655. abs_top_builddir = @abs_top_builddir@
  5656. abs_top_srcdir = @abs_top_srcdir@
  5657. +ac_ct_AR = @ac_ct_AR@
  5658. ac_ct_CC = @ac_ct_CC@
  5659. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  5660. am__include = @am__include@
  5661. diff --git a/gprof/configure b/gprof/configure
  5662. index 5a59f1c1d0e..2506887d3b0 100755
  5663. --- a/gprof/configure
  5664. +++ b/gprof/configure
  5665. @@ -663,8 +663,11 @@ OTOOL
  5666. LIPO
  5667. NMEDIT
  5668. DSYMUTIL
  5669. +MANIFEST_TOOL
  5670. RANLIB
  5671. +ac_ct_AR
  5672. AR
  5673. +DLLTOOL
  5674. OBJDUMP
  5675. LN_S
  5676. NM
  5677. @@ -781,6 +784,7 @@ enable_static
  5678. with_pic
  5679. enable_fast_install
  5680. with_gnu_ld
  5681. +with_libtool_sysroot
  5682. enable_libtool_lock
  5683. enable_plugins
  5684. enable_largefile
  5685. @@ -1443,6 +1447,8 @@ Optional Packages:
  5686. --with-pic try to use only PIC/non-PIC objects [default=use
  5687. both]
  5688. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  5689. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  5690. + (or the compiler's sysroot if not specified).
  5691. Some influential environment variables:
  5692. CC C compiler command
  5693. @@ -4510,8 +4516,8 @@ esac
  5694. -macro_version='2.2.7a'
  5695. -macro_revision='1.3134'
  5696. +macro_version='2.4'
  5697. +macro_revision='1.3293'
  5698. @@ -4551,7 +4557,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  5699. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  5700. $as_echo_n "checking how to print strings... " >&6; }
  5701. # Test print first, because it will be a builtin if present.
  5702. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  5703. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  5704. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  5705. ECHO='print -r --'
  5706. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  5707. @@ -5244,8 +5250,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  5708. # Try some XSI features
  5709. xsi_shell=no
  5710. ( _lt_dummy="a/b/c"
  5711. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  5712. - = c,a/b,, \
  5713. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  5714. + = c,a/b,b/c, \
  5715. && eval 'test $(( 1 + 1 )) -eq 2 \
  5716. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  5717. && xsi_shell=yes
  5718. @@ -5294,6 +5300,80 @@ esac
  5719. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  5720. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  5721. +if ${lt_cv_to_host_file_cmd+:} false; then :
  5722. + $as_echo_n "(cached) " >&6
  5723. +else
  5724. + case $host in
  5725. + *-*-mingw* )
  5726. + case $build in
  5727. + *-*-mingw* ) # actually msys
  5728. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  5729. + ;;
  5730. + *-*-cygwin* )
  5731. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  5732. + ;;
  5733. + * ) # otherwise, assume *nix
  5734. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  5735. + ;;
  5736. + esac
  5737. + ;;
  5738. + *-*-cygwin* )
  5739. + case $build in
  5740. + *-*-mingw* ) # actually msys
  5741. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  5742. + ;;
  5743. + *-*-cygwin* )
  5744. + lt_cv_to_host_file_cmd=func_convert_file_noop
  5745. + ;;
  5746. + * ) # otherwise, assume *nix
  5747. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  5748. + ;;
  5749. + esac
  5750. + ;;
  5751. + * ) # unhandled hosts (and "normal" native builds)
  5752. + lt_cv_to_host_file_cmd=func_convert_file_noop
  5753. + ;;
  5754. +esac
  5755. +
  5756. +fi
  5757. +
  5758. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  5759. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  5760. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  5761. +
  5762. +
  5763. +
  5764. +
  5765. +
  5766. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  5767. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  5768. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  5769. + $as_echo_n "(cached) " >&6
  5770. +else
  5771. + #assume ordinary cross tools, or native build.
  5772. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  5773. +case $host in
  5774. + *-*-mingw* )
  5775. + case $build in
  5776. + *-*-mingw* ) # actually msys
  5777. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  5778. + ;;
  5779. + esac
  5780. + ;;
  5781. +esac
  5782. +
  5783. +fi
  5784. +
  5785. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  5786. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  5787. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  5788. +
  5789. +
  5790. +
  5791. +
  5792. +
  5793. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  5794. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  5795. if ${lt_cv_ld_reload_flag+:} false; then :
  5796. @@ -5310,6 +5390,11 @@ case $reload_flag in
  5797. esac
  5798. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  5799. case $host_os in
  5800. + cygwin* | mingw* | pw32* | cegcc*)
  5801. + if test "$GCC" != yes; then
  5802. + reload_cmds=false
  5803. + fi
  5804. + ;;
  5805. darwin*)
  5806. if test "$GCC" = yes; then
  5807. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  5808. @@ -5478,7 +5563,8 @@ mingw* | pw32*)
  5809. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  5810. lt_cv_file_magic_cmd='func_win32_libid'
  5811. else
  5812. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  5813. + # Keep this pattern in sync with the one in func_win32_libid.
  5814. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  5815. lt_cv_file_magic_cmd='$OBJDUMP -f'
  5816. fi
  5817. ;;
  5818. @@ -5632,6 +5718,21 @@ esac
  5819. fi
  5820. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  5821. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  5822. +
  5823. +file_magic_glob=
  5824. +want_nocaseglob=no
  5825. +if test "$build" = "$host"; then
  5826. + case $host_os in
  5827. + mingw* | pw32*)
  5828. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  5829. + want_nocaseglob=yes
  5830. + else
  5831. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  5832. + fi
  5833. + ;;
  5834. + esac
  5835. +fi
  5836. +
  5837. file_magic_cmd=$lt_cv_file_magic_cmd
  5838. deplibs_check_method=$lt_cv_deplibs_check_method
  5839. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  5840. @@ -5647,6 +5748,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  5841. +
  5842. +
  5843. +
  5844. +
  5845. +
  5846. +
  5847. +
  5848. +
  5849. +
  5850. +
  5851. +if test -n "$ac_tool_prefix"; then
  5852. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  5853. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  5854. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5855. +$as_echo_n "checking for $ac_word... " >&6; }
  5856. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  5857. + $as_echo_n "(cached) " >&6
  5858. +else
  5859. + if test -n "$DLLTOOL"; then
  5860. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  5861. +else
  5862. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  5863. +for as_dir in $PATH
  5864. +do
  5865. + IFS=$as_save_IFS
  5866. + test -z "$as_dir" && as_dir=.
  5867. + for ac_exec_ext in '' $ac_executable_extensions; do
  5868. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  5869. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  5870. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5871. + break 2
  5872. + fi
  5873. +done
  5874. + done
  5875. +IFS=$as_save_IFS
  5876. +
  5877. +fi
  5878. +fi
  5879. +DLLTOOL=$ac_cv_prog_DLLTOOL
  5880. +if test -n "$DLLTOOL"; then
  5881. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  5882. +$as_echo "$DLLTOOL" >&6; }
  5883. +else
  5884. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5885. +$as_echo "no" >&6; }
  5886. +fi
  5887. +
  5888. +
  5889. +fi
  5890. +if test -z "$ac_cv_prog_DLLTOOL"; then
  5891. + ac_ct_DLLTOOL=$DLLTOOL
  5892. + # Extract the first word of "dlltool", so it can be a program name with args.
  5893. +set dummy dlltool; ac_word=$2
  5894. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5895. +$as_echo_n "checking for $ac_word... " >&6; }
  5896. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  5897. + $as_echo_n "(cached) " >&6
  5898. +else
  5899. + if test -n "$ac_ct_DLLTOOL"; then
  5900. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  5901. +else
  5902. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  5903. +for as_dir in $PATH
  5904. +do
  5905. + IFS=$as_save_IFS
  5906. + test -z "$as_dir" && as_dir=.
  5907. + for ac_exec_ext in '' $ac_executable_extensions; do
  5908. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  5909. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  5910. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5911. + break 2
  5912. + fi
  5913. +done
  5914. + done
  5915. +IFS=$as_save_IFS
  5916. +
  5917. +fi
  5918. +fi
  5919. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  5920. +if test -n "$ac_ct_DLLTOOL"; then
  5921. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  5922. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  5923. +else
  5924. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5925. +$as_echo "no" >&6; }
  5926. +fi
  5927. +
  5928. + if test "x$ac_ct_DLLTOOL" = x; then
  5929. + DLLTOOL="false"
  5930. + else
  5931. + case $cross_compiling:$ac_tool_warned in
  5932. +yes:)
  5933. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  5934. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  5935. +ac_tool_warned=yes ;;
  5936. +esac
  5937. + DLLTOOL=$ac_ct_DLLTOOL
  5938. + fi
  5939. +else
  5940. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  5941. +fi
  5942. +
  5943. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  5944. +
  5945. +
  5946. +
  5947. +
  5948. +
  5949. +
  5950. +
  5951. +
  5952. +
  5953. +
  5954. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  5955. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  5956. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  5957. + $as_echo_n "(cached) " >&6
  5958. +else
  5959. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  5960. +
  5961. +case $host_os in
  5962. +cygwin* | mingw* | pw32* | cegcc*)
  5963. + # two different shell functions defined in ltmain.sh
  5964. + # decide which to use based on capabilities of $DLLTOOL
  5965. + case `$DLLTOOL --help 2>&1` in
  5966. + *--identify-strict*)
  5967. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  5968. + ;;
  5969. + *)
  5970. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  5971. + ;;
  5972. + esac
  5973. + ;;
  5974. +*)
  5975. + # fallback: assume linklib IS sharedlib
  5976. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  5977. + ;;
  5978. +esac
  5979. +
  5980. +fi
  5981. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  5982. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  5983. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  5984. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  5985. +
  5986. +
  5987. +
  5988. +
  5989. +
  5990. +
  5991. +
  5992. plugin_option=
  5993. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  5994. for plugin in $plugin_names; do
  5995. @@ -5661,8 +5913,10 @@ for plugin in $plugin_names; do
  5996. done
  5997. if test -n "$ac_tool_prefix"; then
  5998. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  5999. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  6000. + for ac_prog in ar
  6001. + do
  6002. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  6003. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6004. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6005. $as_echo_n "checking for $ac_word... " >&6; }
  6006. if ${ac_cv_prog_AR+:} false; then :
  6007. @@ -5678,7 +5932,7 @@ do
  6008. test -z "$as_dir" && as_dir=.
  6009. for ac_exec_ext in '' $ac_executable_extensions; do
  6010. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6011. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  6012. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  6013. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6014. break 2
  6015. fi
  6016. @@ -5698,11 +5952,15 @@ $as_echo "no" >&6; }
  6017. fi
  6018. + test -n "$AR" && break
  6019. + done
  6020. fi
  6021. -if test -z "$ac_cv_prog_AR"; then
  6022. +if test -z "$AR"; then
  6023. ac_ct_AR=$AR
  6024. - # Extract the first word of "ar", so it can be a program name with args.
  6025. -set dummy ar; ac_word=$2
  6026. + for ac_prog in ar
  6027. +do
  6028. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  6029. +set dummy $ac_prog; ac_word=$2
  6030. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6031. $as_echo_n "checking for $ac_word... " >&6; }
  6032. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  6033. @@ -5718,7 +5976,7 @@ do
  6034. test -z "$as_dir" && as_dir=.
  6035. for ac_exec_ext in '' $ac_executable_extensions; do
  6036. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6037. - ac_cv_prog_ac_ct_AR="ar"
  6038. + ac_cv_prog_ac_ct_AR="$ac_prog"
  6039. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6040. break 2
  6041. fi
  6042. @@ -5737,6 +5995,10 @@ else
  6043. $as_echo "no" >&6; }
  6044. fi
  6045. +
  6046. + test -n "$ac_ct_AR" && break
  6047. +done
  6048. +
  6049. if test "x$ac_ct_AR" = x; then
  6050. AR="false"
  6051. else
  6052. @@ -5748,25 +6010,19 @@ ac_tool_warned=yes ;;
  6053. esac
  6054. AR=$ac_ct_AR
  6055. fi
  6056. -else
  6057. - AR="$ac_cv_prog_AR"
  6058. fi
  6059. -test -z "$AR" && AR=ar
  6060. -if test -n "$plugin_option"; then
  6061. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  6062. - touch conftest.c
  6063. - $AR $plugin_option rc conftest.a conftest.c
  6064. - if test "$?" != 0; then
  6065. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  6066. + touch conftest.c
  6067. + $AR $plugin_option rc conftest.a conftest.c
  6068. + if test "$?" != 0; then
  6069. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  6070. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  6071. - else
  6072. - AR="$AR $plugin_option"
  6073. - fi
  6074. - rm -f conftest.*
  6075. + else
  6076. + AR="$AR $plugin_option"
  6077. fi
  6078. -fi
  6079. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  6080. + rm -f conftest.*
  6081. +: ${AR=ar}
  6082. +: ${AR_FLAGS=cru}
  6083. @@ -5778,6 +6034,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  6084. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  6085. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  6086. +if ${lt_cv_ar_at_file+:} false; then :
  6087. + $as_echo_n "(cached) " >&6
  6088. +else
  6089. + lt_cv_ar_at_file=no
  6090. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6091. +/* end confdefs.h. */
  6092. +
  6093. +int
  6094. +main ()
  6095. +{
  6096. +
  6097. + ;
  6098. + return 0;
  6099. +}
  6100. +_ACEOF
  6101. +if ac_fn_c_try_compile "$LINENO"; then :
  6102. + echo conftest.$ac_objext > conftest.lst
  6103. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  6104. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  6105. + (eval $lt_ar_try) 2>&5
  6106. + ac_status=$?
  6107. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  6108. + test $ac_status = 0; }
  6109. + if test "$ac_status" -eq 0; then
  6110. + # Ensure the archiver fails upon bogus file names.
  6111. + rm -f conftest.$ac_objext libconftest.a
  6112. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  6113. + (eval $lt_ar_try) 2>&5
  6114. + ac_status=$?
  6115. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  6116. + test $ac_status = 0; }
  6117. + if test "$ac_status" -ne 0; then
  6118. + lt_cv_ar_at_file=@
  6119. + fi
  6120. + fi
  6121. + rm -f conftest.* libconftest.a
  6122. +
  6123. +fi
  6124. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  6125. +
  6126. +fi
  6127. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  6128. +$as_echo "$lt_cv_ar_at_file" >&6; }
  6129. +
  6130. +if test "x$lt_cv_ar_at_file" = xno; then
  6131. + archiver_list_spec=
  6132. +else
  6133. + archiver_list_spec=$lt_cv_ar_at_file
  6134. +fi
  6135. +
  6136. +
  6137. +
  6138. +
  6139. +
  6140. +
  6141. +
  6142. if test -n "$ac_tool_prefix"; then
  6143. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  6144. set dummy ${ac_tool_prefix}strip; ac_word=$2
  6145. @@ -6117,8 +6431,8 @@ esac
  6146. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  6147. # Transform an extracted symbol line into symbol name and symbol address
  6148. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  6149. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  6150. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  6151. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  6152. # Handle CRLF in mingw tool chain
  6153. opt_cr=
  6154. @@ -6154,6 +6468,7 @@ for ac_symprfx in "" "_"; do
  6155. else
  6156. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  6157. fi
  6158. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  6159. # Check to see that the pipe works correctly.
  6160. pipe_works=no
  6161. @@ -6195,6 +6510,18 @@ _LT_EOF
  6162. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  6163. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  6164. cat <<_LT_EOF > conftest.$ac_ext
  6165. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  6166. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  6167. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  6168. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  6169. +# define LT_DLSYM_CONST
  6170. +#elif defined(__osf__)
  6171. +/* This system does not cope well with relocations in const data. */
  6172. +# define LT_DLSYM_CONST
  6173. +#else
  6174. +# define LT_DLSYM_CONST const
  6175. +#endif
  6176. +
  6177. #ifdef __cplusplus
  6178. extern "C" {
  6179. #endif
  6180. @@ -6206,7 +6533,7 @@ _LT_EOF
  6181. cat <<_LT_EOF >> conftest.$ac_ext
  6182. /* The mapping between symbol names and symbols. */
  6183. -const struct {
  6184. +LT_DLSYM_CONST struct {
  6185. const char *name;
  6186. void *address;
  6187. }
  6188. @@ -6232,8 +6559,8 @@ static const void *lt_preloaded_setup() {
  6189. _LT_EOF
  6190. # Now try linking the two files.
  6191. mv conftest.$ac_objext conftstm.$ac_objext
  6192. - lt_save_LIBS="$LIBS"
  6193. - lt_save_CFLAGS="$CFLAGS"
  6194. + lt_globsym_save_LIBS=$LIBS
  6195. + lt_globsym_save_CFLAGS=$CFLAGS
  6196. LIBS="conftstm.$ac_objext"
  6197. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  6198. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  6199. @@ -6243,8 +6570,8 @@ _LT_EOF
  6200. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  6201. pipe_works=yes
  6202. fi
  6203. - LIBS="$lt_save_LIBS"
  6204. - CFLAGS="$lt_save_CFLAGS"
  6205. + LIBS=$lt_globsym_save_LIBS
  6206. + CFLAGS=$lt_globsym_save_CFLAGS
  6207. else
  6208. echo "cannot find nm_test_func in $nlist" >&5
  6209. fi
  6210. @@ -6281,6 +6608,18 @@ else
  6211. $as_echo "ok" >&6; }
  6212. fi
  6213. +# Response file support.
  6214. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  6215. + nm_file_list_spec='@'
  6216. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  6217. + nm_file_list_spec='@'
  6218. +fi
  6219. +
  6220. +
  6221. +
  6222. +
  6223. +
  6224. +
  6225. @@ -6297,6 +6636,43 @@ fi
  6226. +
  6227. +
  6228. +
  6229. +
  6230. +
  6231. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  6232. +$as_echo_n "checking for sysroot... " >&6; }
  6233. +
  6234. +# Check whether --with-libtool-sysroot was given.
  6235. +if test "${with_libtool_sysroot+set}" = set; then :
  6236. + withval=$with_libtool_sysroot;
  6237. +else
  6238. + with_libtool_sysroot=no
  6239. +fi
  6240. +
  6241. +
  6242. +lt_sysroot=
  6243. +case ${with_libtool_sysroot} in #(
  6244. + yes)
  6245. + if test "$GCC" = yes; then
  6246. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  6247. + fi
  6248. + ;; #(
  6249. + /*)
  6250. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  6251. + ;; #(
  6252. + no|'')
  6253. + ;; #(
  6254. + *)
  6255. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  6256. +$as_echo "${with_libtool_sysroot}" >&6; }
  6257. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  6258. + ;;
  6259. +esac
  6260. +
  6261. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  6262. +$as_echo "${lt_sysroot:-no}" >&6; }
  6263. @@ -6508,6 +6884,123 @@ esac
  6264. need_locks="$enable_libtool_lock"
  6265. +if test -n "$ac_tool_prefix"; then
  6266. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  6267. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  6268. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6269. +$as_echo_n "checking for $ac_word... " >&6; }
  6270. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  6271. + $as_echo_n "(cached) " >&6
  6272. +else
  6273. + if test -n "$MANIFEST_TOOL"; then
  6274. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  6275. +else
  6276. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6277. +for as_dir in $PATH
  6278. +do
  6279. + IFS=$as_save_IFS
  6280. + test -z "$as_dir" && as_dir=.
  6281. + for ac_exec_ext in '' $ac_executable_extensions; do
  6282. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6283. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  6284. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6285. + break 2
  6286. + fi
  6287. +done
  6288. + done
  6289. +IFS=$as_save_IFS
  6290. +
  6291. +fi
  6292. +fi
  6293. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  6294. +if test -n "$MANIFEST_TOOL"; then
  6295. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  6296. +$as_echo "$MANIFEST_TOOL" >&6; }
  6297. +else
  6298. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  6299. +$as_echo "no" >&6; }
  6300. +fi
  6301. +
  6302. +
  6303. +fi
  6304. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  6305. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  6306. + # Extract the first word of "mt", so it can be a program name with args.
  6307. +set dummy mt; ac_word=$2
  6308. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6309. +$as_echo_n "checking for $ac_word... " >&6; }
  6310. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  6311. + $as_echo_n "(cached) " >&6
  6312. +else
  6313. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  6314. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  6315. +else
  6316. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6317. +for as_dir in $PATH
  6318. +do
  6319. + IFS=$as_save_IFS
  6320. + test -z "$as_dir" && as_dir=.
  6321. + for ac_exec_ext in '' $ac_executable_extensions; do
  6322. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6323. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  6324. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6325. + break 2
  6326. + fi
  6327. +done
  6328. + done
  6329. +IFS=$as_save_IFS
  6330. +
  6331. +fi
  6332. +fi
  6333. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  6334. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  6335. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  6336. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  6337. +else
  6338. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  6339. +$as_echo "no" >&6; }
  6340. +fi
  6341. +
  6342. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  6343. + MANIFEST_TOOL=":"
  6344. + else
  6345. + case $cross_compiling:$ac_tool_warned in
  6346. +yes:)
  6347. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  6348. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6349. +ac_tool_warned=yes ;;
  6350. +esac
  6351. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  6352. + fi
  6353. +else
  6354. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  6355. +fi
  6356. +
  6357. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  6358. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  6359. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  6360. +if ${lt_cv_path_mainfest_tool+:} false; then :
  6361. + $as_echo_n "(cached) " >&6
  6362. +else
  6363. + lt_cv_path_mainfest_tool=no
  6364. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  6365. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  6366. + cat conftest.err >&5
  6367. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  6368. + lt_cv_path_mainfest_tool=yes
  6369. + fi
  6370. + rm -f conftest*
  6371. +fi
  6372. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  6373. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  6374. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  6375. + MANIFEST_TOOL=:
  6376. +fi
  6377. +
  6378. +
  6379. +
  6380. +
  6381. +
  6382. case $host_os in
  6383. rhapsody* | darwin*)
  6384. @@ -7071,6 +7564,8 @@ _LT_EOF
  6385. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  6386. echo "$AR cru libconftest.a conftest.o" >&5
  6387. $AR cru libconftest.a conftest.o 2>&5
  6388. + echo "$RANLIB libconftest.a" >&5
  6389. + $RANLIB libconftest.a 2>&5
  6390. cat > conftest.c << _LT_EOF
  6391. int main() { return 0;}
  6392. _LT_EOF
  6393. @@ -7653,8 +8148,6 @@ fi
  6394. lt_prog_compiler_pic=
  6395. lt_prog_compiler_static=
  6396. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  6397. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6398. if test "$GCC" = yes; then
  6399. lt_prog_compiler_wl='-Wl,'
  6400. @@ -7820,6 +8313,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6401. lt_prog_compiler_pic='--shared'
  6402. lt_prog_compiler_static='--static'
  6403. ;;
  6404. + nagfor*)
  6405. + # NAG Fortran compiler
  6406. + lt_prog_compiler_wl='-Wl,-Wl,,'
  6407. + lt_prog_compiler_pic='-PIC'
  6408. + lt_prog_compiler_static='-Bstatic'
  6409. + ;;
  6410. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  6411. # Portland Group compilers (*not* the Pentium gcc compiler,
  6412. # which looks to be a dead project)
  6413. @@ -7882,7 +8381,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6414. lt_prog_compiler_pic='-KPIC'
  6415. lt_prog_compiler_static='-Bstatic'
  6416. case $cc_basename in
  6417. - f77* | f90* | f95*)
  6418. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  6419. lt_prog_compiler_wl='-Qoption ld ';;
  6420. *)
  6421. lt_prog_compiler_wl='-Wl,';;
  6422. @@ -7939,13 +8438,17 @@ case $host_os in
  6423. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  6424. ;;
  6425. esac
  6426. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  6427. -$as_echo "$lt_prog_compiler_pic" >&6; }
  6428. -
  6429. -
  6430. -
  6431. -
  6432. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  6433. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6434. +if ${lt_cv_prog_compiler_pic+:} false; then :
  6435. + $as_echo_n "(cached) " >&6
  6436. +else
  6437. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  6438. +fi
  6439. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  6440. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  6441. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  6442. #
  6443. # Check to make sure the PIC flag actually works.
  6444. @@ -8006,6 +8509,11 @@ fi
  6445. +
  6446. +
  6447. +
  6448. +
  6449. +
  6450. #
  6451. # Check to make sure the static flag actually works.
  6452. #
  6453. @@ -8356,7 +8864,8 @@ _LT_EOF
  6454. allow_undefined_flag=unsupported
  6455. always_export_symbols=no
  6456. enable_shared_with_static_runtimes=yes
  6457. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  6458. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  6459. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  6460. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  6461. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  6462. @@ -8455,12 +8964,12 @@ _LT_EOF
  6463. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  6464. hardcode_libdir_flag_spec=
  6465. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  6466. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  6467. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  6468. if test "x$supports_anon_versioning" = xyes; then
  6469. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  6470. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  6471. echo "local: *; };" >> $output_objdir/$libname.ver~
  6472. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  6473. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  6474. fi
  6475. ;;
  6476. esac
  6477. @@ -8474,8 +8983,8 @@ _LT_EOF
  6478. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  6479. wlarc=
  6480. else
  6481. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6482. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6483. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6484. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6485. fi
  6486. ;;
  6487. @@ -8493,8 +9002,8 @@ _LT_EOF
  6488. _LT_EOF
  6489. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  6490. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6491. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6492. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6493. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6494. else
  6495. ld_shlibs=no
  6496. fi
  6497. @@ -8540,8 +9049,8 @@ _LT_EOF
  6498. *)
  6499. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  6500. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6501. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6502. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6503. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6504. else
  6505. ld_shlibs=no
  6506. fi
  6507. @@ -8671,7 +9180,13 @@ _LT_EOF
  6508. allow_undefined_flag='-berok'
  6509. # Determine the default libpath from the value encoded in an
  6510. # empty executable.
  6511. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6512. + if test "${lt_cv_aix_libpath+set}" = set; then
  6513. + aix_libpath=$lt_cv_aix_libpath
  6514. +else
  6515. + if ${lt_cv_aix_libpath_+:} false; then :
  6516. + $as_echo_n "(cached) " >&6
  6517. +else
  6518. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6519. /* end confdefs.h. */
  6520. int
  6521. @@ -8684,22 +9199,29 @@ main ()
  6522. _ACEOF
  6523. if ac_fn_c_try_link "$LINENO"; then :
  6524. -lt_aix_libpath_sed='
  6525. - /Import File Strings/,/^$/ {
  6526. - /^0/ {
  6527. - s/^0 *\(.*\)$/\1/
  6528. - p
  6529. - }
  6530. - }'
  6531. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6532. -# Check for a 64-bit object if we didn't find anything.
  6533. -if test -z "$aix_libpath"; then
  6534. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6535. -fi
  6536. + lt_aix_libpath_sed='
  6537. + /Import File Strings/,/^$/ {
  6538. + /^0/ {
  6539. + s/^0 *\([^ ]*\) *$/\1/
  6540. + p
  6541. + }
  6542. + }'
  6543. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6544. + # Check for a 64-bit object if we didn't find anything.
  6545. + if test -z "$lt_cv_aix_libpath_"; then
  6546. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6547. + fi
  6548. fi
  6549. rm -f core conftest.err conftest.$ac_objext \
  6550. conftest$ac_exeext conftest.$ac_ext
  6551. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6552. + if test -z "$lt_cv_aix_libpath_"; then
  6553. + lt_cv_aix_libpath_="/usr/lib:/lib"
  6554. + fi
  6555. +
  6556. +fi
  6557. +
  6558. + aix_libpath=$lt_cv_aix_libpath_
  6559. +fi
  6560. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  6561. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  6562. @@ -8711,7 +9233,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6563. else
  6564. # Determine the default libpath from the value encoded in an
  6565. # empty executable.
  6566. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6567. + if test "${lt_cv_aix_libpath+set}" = set; then
  6568. + aix_libpath=$lt_cv_aix_libpath
  6569. +else
  6570. + if ${lt_cv_aix_libpath_+:} false; then :
  6571. + $as_echo_n "(cached) " >&6
  6572. +else
  6573. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6574. /* end confdefs.h. */
  6575. int
  6576. @@ -8724,22 +9252,29 @@ main ()
  6577. _ACEOF
  6578. if ac_fn_c_try_link "$LINENO"; then :
  6579. -lt_aix_libpath_sed='
  6580. - /Import File Strings/,/^$/ {
  6581. - /^0/ {
  6582. - s/^0 *\(.*\)$/\1/
  6583. - p
  6584. - }
  6585. - }'
  6586. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6587. -# Check for a 64-bit object if we didn't find anything.
  6588. -if test -z "$aix_libpath"; then
  6589. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6590. -fi
  6591. + lt_aix_libpath_sed='
  6592. + /Import File Strings/,/^$/ {
  6593. + /^0/ {
  6594. + s/^0 *\([^ ]*\) *$/\1/
  6595. + p
  6596. + }
  6597. + }'
  6598. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6599. + # Check for a 64-bit object if we didn't find anything.
  6600. + if test -z "$lt_cv_aix_libpath_"; then
  6601. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6602. + fi
  6603. fi
  6604. rm -f core conftest.err conftest.$ac_objext \
  6605. conftest$ac_exeext conftest.$ac_ext
  6606. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6607. + if test -z "$lt_cv_aix_libpath_"; then
  6608. + lt_cv_aix_libpath_="/usr/lib:/lib"
  6609. + fi
  6610. +
  6611. +fi
  6612. +
  6613. + aix_libpath=$lt_cv_aix_libpath_
  6614. +fi
  6615. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  6616. # Warning - without using the other run time loading flags,
  6617. @@ -8784,20 +9319,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6618. # Microsoft Visual C++.
  6619. # hardcode_libdir_flag_spec is actually meaningless, as there is
  6620. # no search path for DLLs.
  6621. - hardcode_libdir_flag_spec=' '
  6622. - allow_undefined_flag=unsupported
  6623. - # Tell ltmain to make .lib files, not .a files.
  6624. - libext=lib
  6625. - # Tell ltmain to make .dll files, not .so files.
  6626. - shrext_cmds=".dll"
  6627. - # FIXME: Setting linknames here is a bad hack.
  6628. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  6629. - # The linker will automatically build a .lib file if we build a DLL.
  6630. - old_archive_from_new_cmds='true'
  6631. - # FIXME: Should let the user specify the lib program.
  6632. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  6633. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  6634. - enable_shared_with_static_runtimes=yes
  6635. + case $cc_basename in
  6636. + cl*)
  6637. + # Native MSVC
  6638. + hardcode_libdir_flag_spec=' '
  6639. + allow_undefined_flag=unsupported
  6640. + always_export_symbols=yes
  6641. + file_list_spec='@'
  6642. + # Tell ltmain to make .lib files, not .a files.
  6643. + libext=lib
  6644. + # Tell ltmain to make .dll files, not .so files.
  6645. + shrext_cmds=".dll"
  6646. + # FIXME: Setting linknames here is a bad hack.
  6647. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  6648. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  6649. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  6650. + else
  6651. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  6652. + fi~
  6653. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  6654. + linknames='
  6655. + # The linker will not automatically build a static lib if we build a DLL.
  6656. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  6657. + enable_shared_with_static_runtimes=yes
  6658. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  6659. + # Don't use ranlib
  6660. + old_postinstall_cmds='chmod 644 $oldlib'
  6661. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  6662. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  6663. + case $lt_outputfile in
  6664. + *.exe|*.EXE) ;;
  6665. + *)
  6666. + lt_outputfile="$lt_outputfile.exe"
  6667. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  6668. + ;;
  6669. + esac~
  6670. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  6671. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  6672. + $RM "$lt_outputfile.manifest";
  6673. + fi'
  6674. + ;;
  6675. + *)
  6676. + # Assume MSVC wrapper
  6677. + hardcode_libdir_flag_spec=' '
  6678. + allow_undefined_flag=unsupported
  6679. + # Tell ltmain to make .lib files, not .a files.
  6680. + libext=lib
  6681. + # Tell ltmain to make .dll files, not .so files.
  6682. + shrext_cmds=".dll"
  6683. + # FIXME: Setting linknames here is a bad hack.
  6684. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  6685. + # The linker will automatically build a .lib file if we build a DLL.
  6686. + old_archive_from_new_cmds='true'
  6687. + # FIXME: Should let the user specify the lib program.
  6688. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  6689. + enable_shared_with_static_runtimes=yes
  6690. + ;;
  6691. + esac
  6692. ;;
  6693. darwin* | rhapsody*)
  6694. @@ -8858,7 +9436,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6695. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  6696. freebsd* | dragonfly*)
  6697. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  6698. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  6699. hardcode_libdir_flag_spec='-R$libdir'
  6700. hardcode_direct=yes
  6701. hardcode_shlibpath_var=no
  6702. @@ -8866,7 +9444,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6703. hpux9*)
  6704. if test "$GCC" = yes; then
  6705. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  6706. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  6707. else
  6708. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  6709. fi
  6710. @@ -8882,7 +9460,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6711. hpux10*)
  6712. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  6713. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6714. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6715. else
  6716. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  6717. fi
  6718. @@ -8906,10 +9484,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6719. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  6720. ;;
  6721. ia64*)
  6722. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  6723. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  6724. ;;
  6725. *)
  6726. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6727. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6728. ;;
  6729. esac
  6730. else
  6731. @@ -8988,23 +9566,36 @@ fi
  6732. irix5* | irix6* | nonstopux*)
  6733. if test "$GCC" = yes; then
  6734. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  6735. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  6736. # Try to use the -exported_symbol ld option, if it does not
  6737. # work, assume that -exports_file does not work either and
  6738. # implicitly export all symbols.
  6739. - save_LDFLAGS="$LDFLAGS"
  6740. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  6741. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6742. + # This should be the same for all languages, so no per-tag cache variable.
  6743. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  6744. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  6745. +if ${lt_cv_irix_exported_symbol+:} false; then :
  6746. + $as_echo_n "(cached) " >&6
  6747. +else
  6748. + save_LDFLAGS="$LDFLAGS"
  6749. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  6750. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6751. /* end confdefs.h. */
  6752. -int foo(void) {}
  6753. +int foo (void) { return 0; }
  6754. _ACEOF
  6755. if ac_fn_c_try_link "$LINENO"; then :
  6756. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  6757. -
  6758. + lt_cv_irix_exported_symbol=yes
  6759. +else
  6760. + lt_cv_irix_exported_symbol=no
  6761. fi
  6762. rm -f core conftest.err conftest.$ac_objext \
  6763. conftest$ac_exeext conftest.$ac_ext
  6764. - LDFLAGS="$save_LDFLAGS"
  6765. + LDFLAGS="$save_LDFLAGS"
  6766. +fi
  6767. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  6768. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  6769. + if test "$lt_cv_irix_exported_symbol" = yes; then
  6770. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  6771. + fi
  6772. else
  6773. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  6774. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  6775. @@ -9089,7 +9680,7 @@ rm -f core conftest.err conftest.$ac_objext \
  6776. osf4* | osf5*) # as osf3* with the addition of -msym flag
  6777. if test "$GCC" = yes; then
  6778. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  6779. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  6780. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  6781. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  6782. else
  6783. allow_undefined_flag=' -expect_unresolved \*'
  6784. @@ -9108,9 +9699,9 @@ rm -f core conftest.err conftest.$ac_objext \
  6785. no_undefined_flag=' -z defs'
  6786. if test "$GCC" = yes; then
  6787. wlarc='${wl}'
  6788. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  6789. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  6790. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  6791. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  6792. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  6793. else
  6794. case `$CC -V 2>&1` in
  6795. *"Compilers 5.0"*)
  6796. @@ -9686,8 +10277,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  6797. need_version=no
  6798. need_lib_prefix=no
  6799. - case $GCC,$host_os in
  6800. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  6801. + case $GCC,$cc_basename in
  6802. + yes,*)
  6803. + # gcc
  6804. library_names_spec='$libname.dll.a'
  6805. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  6806. postinstall_cmds='base_file=`basename \${file}`~
  6807. @@ -9720,13 +10312,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  6808. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  6809. ;;
  6810. esac
  6811. + dynamic_linker='Win32 ld.exe'
  6812. + ;;
  6813. +
  6814. + *,cl*)
  6815. + # Native MSVC
  6816. + libname_spec='$name'
  6817. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  6818. + library_names_spec='${libname}.dll.lib'
  6819. +
  6820. + case $build_os in
  6821. + mingw*)
  6822. + sys_lib_search_path_spec=
  6823. + lt_save_ifs=$IFS
  6824. + IFS=';'
  6825. + for lt_path in $LIB
  6826. + do
  6827. + IFS=$lt_save_ifs
  6828. + # Let DOS variable expansion print the short 8.3 style file name.
  6829. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  6830. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  6831. + done
  6832. + IFS=$lt_save_ifs
  6833. + # Convert to MSYS style.
  6834. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  6835. + ;;
  6836. + cygwin*)
  6837. + # Convert to unix form, then to dos form, then back to unix form
  6838. + # but this time dos style (no spaces!) so that the unix form looks
  6839. + # like /cygdrive/c/PROGRA~1:/cygdr...
  6840. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  6841. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  6842. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  6843. + ;;
  6844. + *)
  6845. + sys_lib_search_path_spec="$LIB"
  6846. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  6847. + # It is most probably a Windows format PATH.
  6848. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  6849. + else
  6850. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  6851. + fi
  6852. + # FIXME: find the short name or the path components, as spaces are
  6853. + # common. (e.g. "Program Files" -> "PROGRA~1")
  6854. + ;;
  6855. + esac
  6856. +
  6857. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  6858. + postinstall_cmds='base_file=`basename \${file}`~
  6859. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  6860. + dldir=$destdir/`dirname \$dlpath`~
  6861. + test -d \$dldir || mkdir -p \$dldir~
  6862. + $install_prog $dir/$dlname \$dldir/$dlname'
  6863. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  6864. + dlpath=$dir/\$dldll~
  6865. + $RM \$dlpath'
  6866. + shlibpath_overrides_runpath=yes
  6867. + dynamic_linker='Win32 link.exe'
  6868. ;;
  6869. *)
  6870. + # Assume MSVC wrapper
  6871. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  6872. + dynamic_linker='Win32 ld.exe'
  6873. ;;
  6874. esac
  6875. - dynamic_linker='Win32 ld.exe'
  6876. # FIXME: first we should search . and the directory the executable is in
  6877. shlibpath_var=PATH
  6878. ;;
  6879. @@ -10604,7 +11254,7 @@ else
  6880. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  6881. lt_status=$lt_dlunknown
  6882. cat > conftest.$ac_ext <<_LT_EOF
  6883. -#line 10607 "configure"
  6884. +#line $LINENO "configure"
  6885. #include "confdefs.h"
  6886. #if HAVE_DLFCN_H
  6887. @@ -10648,10 +11298,10 @@ else
  6888. /* When -fvisbility=hidden is used, assume the code has been annotated
  6889. correspondingly for the symbols needed. */
  6890. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  6891. -void fnord () __attribute__((visibility("default")));
  6892. +int fnord () __attribute__((visibility("default")));
  6893. #endif
  6894. -void fnord () { int i=42; }
  6895. +int fnord () { return 42; }
  6896. int main ()
  6897. {
  6898. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  6899. @@ -10710,7 +11360,7 @@ else
  6900. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  6901. lt_status=$lt_dlunknown
  6902. cat > conftest.$ac_ext <<_LT_EOF
  6903. -#line 10713 "configure"
  6904. +#line $LINENO "configure"
  6905. #include "confdefs.h"
  6906. #if HAVE_DLFCN_H
  6907. @@ -10754,10 +11404,10 @@ else
  6908. /* When -fvisbility=hidden is used, assume the code has been annotated
  6909. correspondingly for the symbols needed. */
  6910. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  6911. -void fnord () __attribute__((visibility("default")));
  6912. +int fnord () __attribute__((visibility("default")));
  6913. #endif
  6914. -void fnord () { int i=42; }
  6915. +int fnord () { return 42; }
  6916. int main ()
  6917. {
  6918. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  6919. @@ -12777,13 +13427,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  6920. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  6921. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  6922. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  6923. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  6924. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  6925. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  6926. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  6927. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  6928. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  6929. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  6930. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  6931. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  6932. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  6933. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  6934. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  6935. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  6936. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  6937. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  6938. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  6939. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  6940. @@ -12798,14 +13455,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  6941. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  6942. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  6943. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  6944. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  6945. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  6946. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  6947. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  6948. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  6949. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  6950. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  6951. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  6952. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  6953. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  6954. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  6955. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  6956. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  6957. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  6958. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  6959. @@ -12838,12 +13498,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  6960. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  6961. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  6962. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  6963. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  6964. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  6965. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  6966. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  6967. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  6968. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  6969. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  6970. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  6971. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  6972. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  6973. @@ -12898,8 +13558,13 @@ reload_flag \
  6974. OBJDUMP \
  6975. deplibs_check_method \
  6976. file_magic_cmd \
  6977. +file_magic_glob \
  6978. +want_nocaseglob \
  6979. +DLLTOOL \
  6980. +sharedlib_from_linklib_cmd \
  6981. AR \
  6982. AR_FLAGS \
  6983. +archiver_list_spec \
  6984. STRIP \
  6985. RANLIB \
  6986. CC \
  6987. @@ -12909,12 +13574,14 @@ lt_cv_sys_global_symbol_pipe \
  6988. lt_cv_sys_global_symbol_to_cdecl \
  6989. lt_cv_sys_global_symbol_to_c_name_address \
  6990. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  6991. +nm_file_list_spec \
  6992. lt_prog_compiler_no_builtin_flag \
  6993. -lt_prog_compiler_wl \
  6994. lt_prog_compiler_pic \
  6995. +lt_prog_compiler_wl \
  6996. lt_prog_compiler_static \
  6997. lt_cv_prog_compiler_c_o \
  6998. need_locks \
  6999. +MANIFEST_TOOL \
  7000. DSYMUTIL \
  7001. NMEDIT \
  7002. LIPO \
  7003. @@ -12930,7 +13597,6 @@ no_undefined_flag \
  7004. hardcode_libdir_flag_spec \
  7005. hardcode_libdir_flag_spec_ld \
  7006. hardcode_libdir_separator \
  7007. -fix_srcfile_path \
  7008. exclude_expsyms \
  7009. include_expsyms \
  7010. file_list_spec \
  7011. @@ -12966,6 +13632,7 @@ module_cmds \
  7012. module_expsym_cmds \
  7013. export_symbols_cmds \
  7014. prelink_cmds \
  7015. +postlink_cmds \
  7016. postinstall_cmds \
  7017. postuninstall_cmds \
  7018. finish_cmds \
  7019. @@ -13731,7 +14398,8 @@ $as_echo X"$file" |
  7020. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  7021. #
  7022. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  7023. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  7024. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  7025. +# Inc.
  7026. # Written by Gordon Matzigkeit, 1996
  7027. #
  7028. # This file is part of GNU Libtool.
  7029. @@ -13834,19 +14502,42 @@ SP2NL=$lt_lt_SP2NL
  7030. # turn newlines into spaces.
  7031. NL2SP=$lt_lt_NL2SP
  7032. +# convert \$build file names to \$host format.
  7033. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  7034. +
  7035. +# convert \$build files to toolchain format.
  7036. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  7037. +
  7038. # An object symbol dumper.
  7039. OBJDUMP=$lt_OBJDUMP
  7040. # Method to check whether dependent libraries are shared objects.
  7041. deplibs_check_method=$lt_deplibs_check_method
  7042. -# Command to use when deplibs_check_method == "file_magic".
  7043. +# Command to use when deplibs_check_method = "file_magic".
  7044. file_magic_cmd=$lt_file_magic_cmd
  7045. +# How to find potential files when deplibs_check_method = "file_magic".
  7046. +file_magic_glob=$lt_file_magic_glob
  7047. +
  7048. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  7049. +want_nocaseglob=$lt_want_nocaseglob
  7050. +
  7051. +# DLL creation program.
  7052. +DLLTOOL=$lt_DLLTOOL
  7053. +
  7054. +# Command to associate shared and link libraries.
  7055. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  7056. +
  7057. # The archiver.
  7058. AR=$lt_AR
  7059. +
  7060. +# Flags to create an archive.
  7061. AR_FLAGS=$lt_AR_FLAGS
  7062. +# How to feed a file listing to the archiver.
  7063. +archiver_list_spec=$lt_archiver_list_spec
  7064. +
  7065. # A symbol stripping program.
  7066. STRIP=$lt_STRIP
  7067. @@ -13876,6 +14567,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  7068. # Transform the output of nm in a C name address pair when lib prefix is needed.
  7069. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  7070. +# Specify filename containing input files for \$NM.
  7071. +nm_file_list_spec=$lt_nm_file_list_spec
  7072. +
  7073. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  7074. +lt_sysroot=$lt_sysroot
  7075. +
  7076. # The name of the directory that contains temporary libtool files.
  7077. objdir=$objdir
  7078. @@ -13885,6 +14582,9 @@ MAGIC_CMD=$MAGIC_CMD
  7079. # Must we lock files when doing compilation?
  7080. need_locks=$lt_need_locks
  7081. +# Manifest tool.
  7082. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  7083. +
  7084. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  7085. DSYMUTIL=$lt_DSYMUTIL
  7086. @@ -13999,12 +14699,12 @@ with_gcc=$GCC
  7087. # Compiler flag to turn off builtin functions.
  7088. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  7089. -# How to pass a linker flag through the compiler.
  7090. -wl=$lt_lt_prog_compiler_wl
  7091. -
  7092. # Additional compiler flags for building library objects.
  7093. pic_flag=$lt_lt_prog_compiler_pic
  7094. +# How to pass a linker flag through the compiler.
  7095. +wl=$lt_lt_prog_compiler_wl
  7096. +
  7097. # Compiler flag to prevent dynamic linking.
  7098. link_static_flag=$lt_lt_prog_compiler_static
  7099. @@ -14091,9 +14791,6 @@ inherit_rpath=$inherit_rpath
  7100. # Whether libtool must link a program against all its dependency libraries.
  7101. link_all_deplibs=$link_all_deplibs
  7102. -# Fix the shell variable \$srcfile for the compiler.
  7103. -fix_srcfile_path=$lt_fix_srcfile_path
  7104. -
  7105. # Set to "yes" if exported symbols are required.
  7106. always_export_symbols=$always_export_symbols
  7107. @@ -14109,6 +14806,9 @@ include_expsyms=$lt_include_expsyms
  7108. # Commands necessary for linking programs (against libraries) with templates.
  7109. prelink_cmds=$lt_prelink_cmds
  7110. +# Commands necessary for finishing linking programs.
  7111. +postlink_cmds=$lt_postlink_cmds
  7112. +
  7113. # Specify filename containing input files.
  7114. file_list_spec=$lt_file_list_spec
  7115. @@ -14141,210 +14841,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  7116. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  7117. # text mode, it properly converts lines to CR/LF. This bash problem
  7118. # is reportedly fixed, but why not run on old versions too?
  7119. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  7120. - || (rm -f "$cfgfile"; exit 1)
  7121. -
  7122. - case $xsi_shell in
  7123. - yes)
  7124. - cat << \_LT_EOF >> "$cfgfile"
  7125. -
  7126. -# func_dirname file append nondir_replacement
  7127. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  7128. -# otherwise set result to NONDIR_REPLACEMENT.
  7129. -func_dirname ()
  7130. -{
  7131. - case ${1} in
  7132. - */*) func_dirname_result="${1%/*}${2}" ;;
  7133. - * ) func_dirname_result="${3}" ;;
  7134. - esac
  7135. -}
  7136. -
  7137. -# func_basename file
  7138. -func_basename ()
  7139. -{
  7140. - func_basename_result="${1##*/}"
  7141. -}
  7142. -
  7143. -# func_dirname_and_basename file append nondir_replacement
  7144. -# perform func_basename and func_dirname in a single function
  7145. -# call:
  7146. -# dirname: Compute the dirname of FILE. If nonempty,
  7147. -# add APPEND to the result, otherwise set result
  7148. -# to NONDIR_REPLACEMENT.
  7149. -# value returned in "$func_dirname_result"
  7150. -# basename: Compute filename of FILE.
  7151. -# value retuned in "$func_basename_result"
  7152. -# Implementation must be kept synchronized with func_dirname
  7153. -# and func_basename. For efficiency, we do not delegate to
  7154. -# those functions but instead duplicate the functionality here.
  7155. -func_dirname_and_basename ()
  7156. -{
  7157. - case ${1} in
  7158. - */*) func_dirname_result="${1%/*}${2}" ;;
  7159. - * ) func_dirname_result="${3}" ;;
  7160. - esac
  7161. - func_basename_result="${1##*/}"
  7162. -}
  7163. -
  7164. -# func_stripname prefix suffix name
  7165. -# strip PREFIX and SUFFIX off of NAME.
  7166. -# PREFIX and SUFFIX must not contain globbing or regex special
  7167. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  7168. -# dot (in which case that matches only a dot).
  7169. -func_stripname ()
  7170. -{
  7171. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  7172. - # positional parameters, so assign one to ordinary parameter first.
  7173. - func_stripname_result=${3}
  7174. - func_stripname_result=${func_stripname_result#"${1}"}
  7175. - func_stripname_result=${func_stripname_result%"${2}"}
  7176. -}
  7177. -
  7178. -# func_opt_split
  7179. -func_opt_split ()
  7180. -{
  7181. - func_opt_split_opt=${1%%=*}
  7182. - func_opt_split_arg=${1#*=}
  7183. -}
  7184. -
  7185. -# func_lo2o object
  7186. -func_lo2o ()
  7187. -{
  7188. - case ${1} in
  7189. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  7190. - *) func_lo2o_result=${1} ;;
  7191. - esac
  7192. -}
  7193. -
  7194. -# func_xform libobj-or-source
  7195. -func_xform ()
  7196. -{
  7197. - func_xform_result=${1%.*}.lo
  7198. -}
  7199. -
  7200. -# func_arith arithmetic-term...
  7201. -func_arith ()
  7202. -{
  7203. - func_arith_result=$(( $* ))
  7204. -}
  7205. -
  7206. -# func_len string
  7207. -# STRING may not start with a hyphen.
  7208. -func_len ()
  7209. -{
  7210. - func_len_result=${#1}
  7211. -}
  7212. -
  7213. -_LT_EOF
  7214. - ;;
  7215. - *) # Bourne compatible functions.
  7216. - cat << \_LT_EOF >> "$cfgfile"
  7217. -
  7218. -# func_dirname file append nondir_replacement
  7219. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  7220. -# otherwise set result to NONDIR_REPLACEMENT.
  7221. -func_dirname ()
  7222. -{
  7223. - # Extract subdirectory from the argument.
  7224. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  7225. - if test "X$func_dirname_result" = "X${1}"; then
  7226. - func_dirname_result="${3}"
  7227. - else
  7228. - func_dirname_result="$func_dirname_result${2}"
  7229. - fi
  7230. -}
  7231. -
  7232. -# func_basename file
  7233. -func_basename ()
  7234. -{
  7235. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  7236. -}
  7237. -
  7238. -
  7239. -# func_stripname prefix suffix name
  7240. -# strip PREFIX and SUFFIX off of NAME.
  7241. -# PREFIX and SUFFIX must not contain globbing or regex special
  7242. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  7243. -# dot (in which case that matches only a dot).
  7244. -# func_strip_suffix prefix name
  7245. -func_stripname ()
  7246. -{
  7247. - case ${2} in
  7248. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  7249. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  7250. - esac
  7251. -}
  7252. -
  7253. -# sed scripts:
  7254. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  7255. -my_sed_long_arg='1s/^-[^=]*=//'
  7256. -
  7257. -# func_opt_split
  7258. -func_opt_split ()
  7259. -{
  7260. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  7261. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  7262. -}
  7263. -
  7264. -# func_lo2o object
  7265. -func_lo2o ()
  7266. -{
  7267. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  7268. -}
  7269. -
  7270. -# func_xform libobj-or-source
  7271. -func_xform ()
  7272. -{
  7273. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  7274. -}
  7275. -
  7276. -# func_arith arithmetic-term...
  7277. -func_arith ()
  7278. -{
  7279. - func_arith_result=`expr "$@"`
  7280. -}
  7281. -
  7282. -# func_len string
  7283. -# STRING may not start with a hyphen.
  7284. -func_len ()
  7285. -{
  7286. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  7287. -}
  7288. -
  7289. -_LT_EOF
  7290. -esac
  7291. -
  7292. -case $lt_shell_append in
  7293. - yes)
  7294. - cat << \_LT_EOF >> "$cfgfile"
  7295. -
  7296. -# func_append var value
  7297. -# Append VALUE to the end of shell variable VAR.
  7298. -func_append ()
  7299. -{
  7300. - eval "$1+=\$2"
  7301. -}
  7302. -_LT_EOF
  7303. - ;;
  7304. - *)
  7305. - cat << \_LT_EOF >> "$cfgfile"
  7306. -
  7307. -# func_append var value
  7308. -# Append VALUE to the end of shell variable VAR.
  7309. -func_append ()
  7310. -{
  7311. - eval "$1=\$$1\$2"
  7312. -}
  7313. -
  7314. -_LT_EOF
  7315. - ;;
  7316. - esac
  7317. -
  7318. -
  7319. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  7320. - || (rm -f "$cfgfile"; exit 1)
  7321. -
  7322. - mv -f "$cfgfile" "$ofile" ||
  7323. + sed '$q' "$ltmain" >> "$cfgfile" \
  7324. + || (rm -f "$cfgfile"; exit 1)
  7325. +
  7326. + if test x"$xsi_shell" = xyes; then
  7327. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  7328. +func_dirname ()\
  7329. +{\
  7330. +\ case ${1} in\
  7331. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  7332. +\ * ) func_dirname_result="${3}" ;;\
  7333. +\ esac\
  7334. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  7335. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7336. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7337. +test 0 -eq $? || _lt_function_replace_fail=:
  7338. +
  7339. +
  7340. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  7341. +func_basename ()\
  7342. +{\
  7343. +\ func_basename_result="${1##*/}"\
  7344. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  7345. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7346. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7347. +test 0 -eq $? || _lt_function_replace_fail=:
  7348. +
  7349. +
  7350. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  7351. +func_dirname_and_basename ()\
  7352. +{\
  7353. +\ case ${1} in\
  7354. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  7355. +\ * ) func_dirname_result="${3}" ;;\
  7356. +\ esac\
  7357. +\ func_basename_result="${1##*/}"\
  7358. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  7359. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7360. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7361. +test 0 -eq $? || _lt_function_replace_fail=:
  7362. +
  7363. +
  7364. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  7365. +func_stripname ()\
  7366. +{\
  7367. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  7368. +\ # positional parameters, so assign one to ordinary parameter first.\
  7369. +\ func_stripname_result=${3}\
  7370. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  7371. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  7372. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  7373. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7374. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7375. +test 0 -eq $? || _lt_function_replace_fail=:
  7376. +
  7377. +
  7378. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  7379. +func_split_long_opt ()\
  7380. +{\
  7381. +\ func_split_long_opt_name=${1%%=*}\
  7382. +\ func_split_long_opt_arg=${1#*=}\
  7383. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  7384. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7385. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7386. +test 0 -eq $? || _lt_function_replace_fail=:
  7387. +
  7388. +
  7389. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  7390. +func_split_short_opt ()\
  7391. +{\
  7392. +\ func_split_short_opt_arg=${1#??}\
  7393. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  7394. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  7395. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7396. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7397. +test 0 -eq $? || _lt_function_replace_fail=:
  7398. +
  7399. +
  7400. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  7401. +func_lo2o ()\
  7402. +{\
  7403. +\ case ${1} in\
  7404. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  7405. +\ *) func_lo2o_result=${1} ;;\
  7406. +\ esac\
  7407. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  7408. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7409. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7410. +test 0 -eq $? || _lt_function_replace_fail=:
  7411. +
  7412. +
  7413. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  7414. +func_xform ()\
  7415. +{\
  7416. + func_xform_result=${1%.*}.lo\
  7417. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  7418. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7419. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7420. +test 0 -eq $? || _lt_function_replace_fail=:
  7421. +
  7422. +
  7423. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  7424. +func_arith ()\
  7425. +{\
  7426. + func_arith_result=$(( $* ))\
  7427. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  7428. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7429. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7430. +test 0 -eq $? || _lt_function_replace_fail=:
  7431. +
  7432. +
  7433. + sed -e '/^func_len ()$/,/^} # func_len /c\
  7434. +func_len ()\
  7435. +{\
  7436. + func_len_result=${#1}\
  7437. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  7438. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7439. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7440. +test 0 -eq $? || _lt_function_replace_fail=:
  7441. +
  7442. +fi
  7443. +
  7444. +if test x"$lt_shell_append" = xyes; then
  7445. + sed -e '/^func_append ()$/,/^} # func_append /c\
  7446. +func_append ()\
  7447. +{\
  7448. + eval "${1}+=\\${2}"\
  7449. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  7450. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7451. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7452. +test 0 -eq $? || _lt_function_replace_fail=:
  7453. +
  7454. +
  7455. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  7456. +func_append_quoted ()\
  7457. +{\
  7458. +\ func_quote_for_eval "${2}"\
  7459. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  7460. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  7461. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7462. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7463. +test 0 -eq $? || _lt_function_replace_fail=:
  7464. +
  7465. +
  7466. + # Save a `func_append' function call where possible by direct use of '+='
  7467. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  7468. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7469. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7470. + test 0 -eq $? || _lt_function_replace_fail=:
  7471. +else
  7472. + # Save a `func_append' function call even when '+=' is not available
  7473. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  7474. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7475. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7476. + test 0 -eq $? || _lt_function_replace_fail=:
  7477. +fi
  7478. +
  7479. +if test x"$_lt_function_replace_fail" = x":"; then
  7480. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  7481. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  7482. +fi
  7483. +
  7484. +
  7485. + mv -f "$cfgfile" "$ofile" ||
  7486. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  7487. chmod +x "$ofile"
  7488. diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in
  7489. index fd5279b4df1..6e74c7b302a 100644
  7490. --- a/gprofng/Makefile.in
  7491. +++ b/gprofng/Makefile.in
  7492. @@ -253,6 +253,7 @@ CXXFLAGS = @CXXFLAGS@
  7493. CYGPATH_W = @CYGPATH_W@
  7494. DEFS = @DEFS@
  7495. DEPDIR = @DEPDIR@
  7496. +DLLTOOL = @DLLTOOL@
  7497. DSYMUTIL = @DSYMUTIL@
  7498. DUMPBIN = @DUMPBIN@
  7499. ECHO_C = @ECHO_C@
  7500. @@ -290,6 +291,7 @@ LN_S = @LN_S@
  7501. LTLIBOBJS = @LTLIBOBJS@
  7502. MAINT = @MAINT@
  7503. MAKEINFO = @MAKEINFO@
  7504. +MANIFEST_TOOL = @MANIFEST_TOOL@
  7505. MKDIR_P = @MKDIR_P@
  7506. NM = @NM@
  7507. NMEDIT = @NMEDIT@
  7508. diff --git a/gprofng/configure b/gprofng/configure
  7509. index ac14d126ac0..f8d7685a72e 100755
  7510. --- a/gprofng/configure
  7511. +++ b/gprofng/configure
  7512. @@ -672,6 +672,8 @@ OTOOL
  7513. LIPO
  7514. NMEDIT
  7515. DSYMUTIL
  7516. +MANIFEST_TOOL
  7517. +DLLTOOL
  7518. OBJDUMP
  7519. LN_S
  7520. NM
  7521. @@ -802,6 +804,7 @@ enable_static
  7522. with_pic
  7523. enable_fast_install
  7524. with_gnu_ld
  7525. +with_libtool_sysroot
  7526. enable_libtool_lock
  7527. enable_werror_always
  7528. enable_gprofng_tools
  7529. @@ -1465,6 +1468,8 @@ Optional Packages:
  7530. --with-pic try to use only PIC/non-PIC objects [default=use
  7531. both]
  7532. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  7533. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  7534. + (or the compiler's sysroot if not specified).
  7535. --with-jdk=PATH specify prefix directory for installed JDK.
  7536. --with-system-zlib use installed libz
  7537. @@ -6156,8 +6161,8 @@ esac
  7538. -macro_version='2.2.7a'
  7539. -macro_revision='1.3134'
  7540. +macro_version='2.4'
  7541. +macro_revision='1.3293'
  7542. @@ -6197,7 +6202,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  7543. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  7544. $as_echo_n "checking how to print strings... " >&6; }
  7545. # Test print first, because it will be a builtin if present.
  7546. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  7547. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  7548. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  7549. ECHO='print -r --'
  7550. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  7551. @@ -6890,8 +6895,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  7552. # Try some XSI features
  7553. xsi_shell=no
  7554. ( _lt_dummy="a/b/c"
  7555. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  7556. - = c,a/b,, \
  7557. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  7558. + = c,a/b,b/c, \
  7559. && eval 'test $(( 1 + 1 )) -eq 2 \
  7560. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  7561. && xsi_shell=yes
  7562. @@ -6940,6 +6945,80 @@ esac
  7563. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  7564. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  7565. +if ${lt_cv_to_host_file_cmd+:} false; then :
  7566. + $as_echo_n "(cached) " >&6
  7567. +else
  7568. + case $host in
  7569. + *-*-mingw* )
  7570. + case $build in
  7571. + *-*-mingw* ) # actually msys
  7572. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  7573. + ;;
  7574. + *-*-cygwin* )
  7575. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  7576. + ;;
  7577. + * ) # otherwise, assume *nix
  7578. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  7579. + ;;
  7580. + esac
  7581. + ;;
  7582. + *-*-cygwin* )
  7583. + case $build in
  7584. + *-*-mingw* ) # actually msys
  7585. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  7586. + ;;
  7587. + *-*-cygwin* )
  7588. + lt_cv_to_host_file_cmd=func_convert_file_noop
  7589. + ;;
  7590. + * ) # otherwise, assume *nix
  7591. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  7592. + ;;
  7593. + esac
  7594. + ;;
  7595. + * ) # unhandled hosts (and "normal" native builds)
  7596. + lt_cv_to_host_file_cmd=func_convert_file_noop
  7597. + ;;
  7598. +esac
  7599. +
  7600. +fi
  7601. +
  7602. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  7603. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  7604. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  7605. +
  7606. +
  7607. +
  7608. +
  7609. +
  7610. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  7611. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  7612. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  7613. + $as_echo_n "(cached) " >&6
  7614. +else
  7615. + #assume ordinary cross tools, or native build.
  7616. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  7617. +case $host in
  7618. + *-*-mingw* )
  7619. + case $build in
  7620. + *-*-mingw* ) # actually msys
  7621. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  7622. + ;;
  7623. + esac
  7624. + ;;
  7625. +esac
  7626. +
  7627. +fi
  7628. +
  7629. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  7630. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  7631. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  7632. +
  7633. +
  7634. +
  7635. +
  7636. +
  7637. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  7638. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  7639. if ${lt_cv_ld_reload_flag+:} false; then :
  7640. @@ -6956,6 +7035,11 @@ case $reload_flag in
  7641. esac
  7642. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  7643. case $host_os in
  7644. + cygwin* | mingw* | pw32* | cegcc*)
  7645. + if test "$GCC" != yes; then
  7646. + reload_cmds=false
  7647. + fi
  7648. + ;;
  7649. darwin*)
  7650. if test "$GCC" = yes; then
  7651. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  7652. @@ -7124,7 +7208,8 @@ mingw* | pw32*)
  7653. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  7654. lt_cv_file_magic_cmd='func_win32_libid'
  7655. else
  7656. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  7657. + # Keep this pattern in sync with the one in func_win32_libid.
  7658. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  7659. lt_cv_file_magic_cmd='$OBJDUMP -f'
  7660. fi
  7661. ;;
  7662. @@ -7278,6 +7363,21 @@ esac
  7663. fi
  7664. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  7665. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  7666. +
  7667. +file_magic_glob=
  7668. +want_nocaseglob=no
  7669. +if test "$build" = "$host"; then
  7670. + case $host_os in
  7671. + mingw* | pw32*)
  7672. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  7673. + want_nocaseglob=yes
  7674. + else
  7675. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  7676. + fi
  7677. + ;;
  7678. + esac
  7679. +fi
  7680. +
  7681. file_magic_cmd=$lt_cv_file_magic_cmd
  7682. deplibs_check_method=$lt_cv_deplibs_check_method
  7683. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  7684. @@ -7293,6 +7393,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  7685. +
  7686. +
  7687. +
  7688. +
  7689. +
  7690. +
  7691. +
  7692. +
  7693. +
  7694. +
  7695. +if test -n "$ac_tool_prefix"; then
  7696. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  7697. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  7698. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7699. +$as_echo_n "checking for $ac_word... " >&6; }
  7700. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  7701. + $as_echo_n "(cached) " >&6
  7702. +else
  7703. + if test -n "$DLLTOOL"; then
  7704. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  7705. +else
  7706. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  7707. +for as_dir in $PATH
  7708. +do
  7709. + IFS=$as_save_IFS
  7710. + test -z "$as_dir" && as_dir=.
  7711. + for ac_exec_ext in '' $ac_executable_extensions; do
  7712. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7713. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  7714. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7715. + break 2
  7716. + fi
  7717. +done
  7718. + done
  7719. +IFS=$as_save_IFS
  7720. +
  7721. +fi
  7722. +fi
  7723. +DLLTOOL=$ac_cv_prog_DLLTOOL
  7724. +if test -n "$DLLTOOL"; then
  7725. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  7726. +$as_echo "$DLLTOOL" >&6; }
  7727. +else
  7728. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  7729. +$as_echo "no" >&6; }
  7730. +fi
  7731. +
  7732. +
  7733. +fi
  7734. +if test -z "$ac_cv_prog_DLLTOOL"; then
  7735. + ac_ct_DLLTOOL=$DLLTOOL
  7736. + # Extract the first word of "dlltool", so it can be a program name with args.
  7737. +set dummy dlltool; ac_word=$2
  7738. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7739. +$as_echo_n "checking for $ac_word... " >&6; }
  7740. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  7741. + $as_echo_n "(cached) " >&6
  7742. +else
  7743. + if test -n "$ac_ct_DLLTOOL"; then
  7744. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  7745. +else
  7746. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  7747. +for as_dir in $PATH
  7748. +do
  7749. + IFS=$as_save_IFS
  7750. + test -z "$as_dir" && as_dir=.
  7751. + for ac_exec_ext in '' $ac_executable_extensions; do
  7752. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7753. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  7754. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7755. + break 2
  7756. + fi
  7757. +done
  7758. + done
  7759. +IFS=$as_save_IFS
  7760. +
  7761. +fi
  7762. +fi
  7763. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  7764. +if test -n "$ac_ct_DLLTOOL"; then
  7765. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  7766. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  7767. +else
  7768. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  7769. +$as_echo "no" >&6; }
  7770. +fi
  7771. +
  7772. + if test "x$ac_ct_DLLTOOL" = x; then
  7773. + DLLTOOL="false"
  7774. + else
  7775. + case $cross_compiling:$ac_tool_warned in
  7776. +yes:)
  7777. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  7778. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  7779. +ac_tool_warned=yes ;;
  7780. +esac
  7781. + DLLTOOL=$ac_ct_DLLTOOL
  7782. + fi
  7783. +else
  7784. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  7785. +fi
  7786. +
  7787. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  7788. +
  7789. +
  7790. +
  7791. +
  7792. +
  7793. +
  7794. +
  7795. +
  7796. +
  7797. +
  7798. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  7799. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  7800. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  7801. + $as_echo_n "(cached) " >&6
  7802. +else
  7803. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  7804. +
  7805. +case $host_os in
  7806. +cygwin* | mingw* | pw32* | cegcc*)
  7807. + # two different shell functions defined in ltmain.sh
  7808. + # decide which to use based on capabilities of $DLLTOOL
  7809. + case `$DLLTOOL --help 2>&1` in
  7810. + *--identify-strict*)
  7811. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  7812. + ;;
  7813. + *)
  7814. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  7815. + ;;
  7816. + esac
  7817. + ;;
  7818. +*)
  7819. + # fallback: assume linklib IS sharedlib
  7820. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  7821. + ;;
  7822. +esac
  7823. +
  7824. +fi
  7825. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  7826. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  7827. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  7828. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  7829. +
  7830. +
  7831. +
  7832. +
  7833. +
  7834. +
  7835. +
  7836. plugin_option=
  7837. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  7838. for plugin in $plugin_names; do
  7839. @@ -7307,8 +7558,10 @@ for plugin in $plugin_names; do
  7840. done
  7841. if test -n "$ac_tool_prefix"; then
  7842. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  7843. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  7844. + for ac_prog in ar
  7845. + do
  7846. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  7847. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  7848. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7849. $as_echo_n "checking for $ac_word... " >&6; }
  7850. if ${ac_cv_prog_AR+:} false; then :
  7851. @@ -7324,7 +7577,7 @@ do
  7852. test -z "$as_dir" && as_dir=.
  7853. for ac_exec_ext in '' $ac_executable_extensions; do
  7854. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7855. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  7856. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  7857. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7858. break 2
  7859. fi
  7860. @@ -7344,11 +7597,15 @@ $as_echo "no" >&6; }
  7861. fi
  7862. + test -n "$AR" && break
  7863. + done
  7864. fi
  7865. -if test -z "$ac_cv_prog_AR"; then
  7866. +if test -z "$AR"; then
  7867. ac_ct_AR=$AR
  7868. - # Extract the first word of "ar", so it can be a program name with args.
  7869. -set dummy ar; ac_word=$2
  7870. + for ac_prog in ar
  7871. +do
  7872. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  7873. +set dummy $ac_prog; ac_word=$2
  7874. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7875. $as_echo_n "checking for $ac_word... " >&6; }
  7876. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  7877. @@ -7364,7 +7621,7 @@ do
  7878. test -z "$as_dir" && as_dir=.
  7879. for ac_exec_ext in '' $ac_executable_extensions; do
  7880. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7881. - ac_cv_prog_ac_ct_AR="ar"
  7882. + ac_cv_prog_ac_ct_AR="$ac_prog"
  7883. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7884. break 2
  7885. fi
  7886. @@ -7383,6 +7640,10 @@ else
  7887. $as_echo "no" >&6; }
  7888. fi
  7889. +
  7890. + test -n "$ac_ct_AR" && break
  7891. +done
  7892. +
  7893. if test "x$ac_ct_AR" = x; then
  7894. AR="false"
  7895. else
  7896. @@ -7394,29 +7655,81 @@ ac_tool_warned=yes ;;
  7897. esac
  7898. AR=$ac_ct_AR
  7899. fi
  7900. -else
  7901. - AR="$ac_cv_prog_AR"
  7902. fi
  7903. -test -z "$AR" && AR=ar
  7904. -if test -n "$plugin_option"; then
  7905. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  7906. - touch conftest.c
  7907. - $AR $plugin_option rc conftest.a conftest.c
  7908. - if test "$?" != 0; then
  7909. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  7910. + touch conftest.c
  7911. + $AR $plugin_option rc conftest.a conftest.c
  7912. + if test "$?" != 0; then
  7913. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  7914. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  7915. - else
  7916. - AR="$AR $plugin_option"
  7917. - fi
  7918. - rm -f conftest.*
  7919. + else
  7920. + AR="$AR $plugin_option"
  7921. fi
  7922. -fi
  7923. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  7924. + rm -f conftest.*
  7925. +: ${AR=ar}
  7926. +: ${AR_FLAGS=cru}
  7927. +
  7928. +
  7929. +
  7930. +
  7931. +
  7932. +
  7933. +
  7934. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  7935. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  7936. +if ${lt_cv_ar_at_file+:} false; then :
  7937. + $as_echo_n "(cached) " >&6
  7938. +else
  7939. + lt_cv_ar_at_file=no
  7940. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  7941. +/* end confdefs.h. */
  7942. +
  7943. +int
  7944. +main ()
  7945. +{
  7946. +
  7947. + ;
  7948. + return 0;
  7949. +}
  7950. +_ACEOF
  7951. +if ac_fn_c_try_compile "$LINENO"; then :
  7952. + echo conftest.$ac_objext > conftest.lst
  7953. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  7954. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  7955. + (eval $lt_ar_try) 2>&5
  7956. + ac_status=$?
  7957. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  7958. + test $ac_status = 0; }
  7959. + if test "$ac_status" -eq 0; then
  7960. + # Ensure the archiver fails upon bogus file names.
  7961. + rm -f conftest.$ac_objext libconftest.a
  7962. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  7963. + (eval $lt_ar_try) 2>&5
  7964. + ac_status=$?
  7965. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  7966. + test $ac_status = 0; }
  7967. + if test "$ac_status" -ne 0; then
  7968. + lt_cv_ar_at_file=@
  7969. + fi
  7970. + fi
  7971. + rm -f conftest.* libconftest.a
  7972. +
  7973. +fi
  7974. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  7975. +
  7976. +fi
  7977. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  7978. +$as_echo "$lt_cv_ar_at_file" >&6; }
  7979. +
  7980. +if test "x$lt_cv_ar_at_file" = xno; then
  7981. + archiver_list_spec=
  7982. +else
  7983. + archiver_list_spec=$lt_cv_ar_at_file
  7984. +fi
  7985. @@ -7763,8 +8076,8 @@ esac
  7986. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  7987. # Transform an extracted symbol line into symbol name and symbol address
  7988. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  7989. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  7990. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  7991. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  7992. # Handle CRLF in mingw tool chain
  7993. opt_cr=
  7994. @@ -7800,6 +8113,7 @@ for ac_symprfx in "" "_"; do
  7995. else
  7996. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  7997. fi
  7998. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  7999. # Check to see that the pipe works correctly.
  8000. pipe_works=no
  8001. @@ -7841,6 +8155,18 @@ _LT_EOF
  8002. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  8003. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  8004. cat <<_LT_EOF > conftest.$ac_ext
  8005. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  8006. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  8007. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  8008. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  8009. +# define LT_DLSYM_CONST
  8010. +#elif defined(__osf__)
  8011. +/* This system does not cope well with relocations in const data. */
  8012. +# define LT_DLSYM_CONST
  8013. +#else
  8014. +# define LT_DLSYM_CONST const
  8015. +#endif
  8016. +
  8017. #ifdef __cplusplus
  8018. extern "C" {
  8019. #endif
  8020. @@ -7852,7 +8178,7 @@ _LT_EOF
  8021. cat <<_LT_EOF >> conftest.$ac_ext
  8022. /* The mapping between symbol names and symbols. */
  8023. -const struct {
  8024. +LT_DLSYM_CONST struct {
  8025. const char *name;
  8026. void *address;
  8027. }
  8028. @@ -7878,8 +8204,8 @@ static const void *lt_preloaded_setup() {
  8029. _LT_EOF
  8030. # Now try linking the two files.
  8031. mv conftest.$ac_objext conftstm.$ac_objext
  8032. - lt_save_LIBS="$LIBS"
  8033. - lt_save_CFLAGS="$CFLAGS"
  8034. + lt_globsym_save_LIBS=$LIBS
  8035. + lt_globsym_save_CFLAGS=$CFLAGS
  8036. LIBS="conftstm.$ac_objext"
  8037. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  8038. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  8039. @@ -7889,8 +8215,8 @@ _LT_EOF
  8040. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  8041. pipe_works=yes
  8042. fi
  8043. - LIBS="$lt_save_LIBS"
  8044. - CFLAGS="$lt_save_CFLAGS"
  8045. + LIBS=$lt_globsym_save_LIBS
  8046. + CFLAGS=$lt_globsym_save_CFLAGS
  8047. else
  8048. echo "cannot find nm_test_func in $nlist" >&5
  8049. fi
  8050. @@ -7927,6 +8253,13 @@ else
  8051. $as_echo "ok" >&6; }
  8052. fi
  8053. +# Response file support.
  8054. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  8055. + nm_file_list_spec='@'
  8056. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  8057. + nm_file_list_spec='@'
  8058. +fi
  8059. +
  8060. @@ -7946,6 +8279,48 @@ fi
  8061. +
  8062. +
  8063. +
  8064. +
  8065. +
  8066. +
  8067. +
  8068. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  8069. +$as_echo_n "checking for sysroot... " >&6; }
  8070. +
  8071. +# Check whether --with-libtool-sysroot was given.
  8072. +if test "${with_libtool_sysroot+set}" = set; then :
  8073. + withval=$with_libtool_sysroot;
  8074. +else
  8075. + with_libtool_sysroot=no
  8076. +fi
  8077. +
  8078. +
  8079. +lt_sysroot=
  8080. +case ${with_libtool_sysroot} in #(
  8081. + yes)
  8082. + if test "$GCC" = yes; then
  8083. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  8084. + fi
  8085. + ;; #(
  8086. + /*)
  8087. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  8088. + ;; #(
  8089. + no|'')
  8090. + ;; #(
  8091. + *)
  8092. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  8093. +$as_echo "${with_libtool_sysroot}" >&6; }
  8094. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  8095. + ;;
  8096. +esac
  8097. +
  8098. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  8099. +$as_echo "${lt_sysroot:-no}" >&6; }
  8100. +
  8101. +
  8102. +
  8103. # Check whether --enable-libtool-lock was given.
  8104. @@ -8154,6 +8529,123 @@ esac
  8105. need_locks="$enable_libtool_lock"
  8106. +if test -n "$ac_tool_prefix"; then
  8107. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  8108. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  8109. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  8110. +$as_echo_n "checking for $ac_word... " >&6; }
  8111. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  8112. + $as_echo_n "(cached) " >&6
  8113. +else
  8114. + if test -n "$MANIFEST_TOOL"; then
  8115. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  8116. +else
  8117. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  8118. +for as_dir in $PATH
  8119. +do
  8120. + IFS=$as_save_IFS
  8121. + test -z "$as_dir" && as_dir=.
  8122. + for ac_exec_ext in '' $ac_executable_extensions; do
  8123. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  8124. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  8125. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  8126. + break 2
  8127. + fi
  8128. +done
  8129. + done
  8130. +IFS=$as_save_IFS
  8131. +
  8132. +fi
  8133. +fi
  8134. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  8135. +if test -n "$MANIFEST_TOOL"; then
  8136. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  8137. +$as_echo "$MANIFEST_TOOL" >&6; }
  8138. +else
  8139. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  8140. +$as_echo "no" >&6; }
  8141. +fi
  8142. +
  8143. +
  8144. +fi
  8145. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  8146. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  8147. + # Extract the first word of "mt", so it can be a program name with args.
  8148. +set dummy mt; ac_word=$2
  8149. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  8150. +$as_echo_n "checking for $ac_word... " >&6; }
  8151. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  8152. + $as_echo_n "(cached) " >&6
  8153. +else
  8154. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  8155. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  8156. +else
  8157. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  8158. +for as_dir in $PATH
  8159. +do
  8160. + IFS=$as_save_IFS
  8161. + test -z "$as_dir" && as_dir=.
  8162. + for ac_exec_ext in '' $ac_executable_extensions; do
  8163. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  8164. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  8165. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  8166. + break 2
  8167. + fi
  8168. +done
  8169. + done
  8170. +IFS=$as_save_IFS
  8171. +
  8172. +fi
  8173. +fi
  8174. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  8175. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  8176. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  8177. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  8178. +else
  8179. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  8180. +$as_echo "no" >&6; }
  8181. +fi
  8182. +
  8183. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  8184. + MANIFEST_TOOL=":"
  8185. + else
  8186. + case $cross_compiling:$ac_tool_warned in
  8187. +yes:)
  8188. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  8189. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  8190. +ac_tool_warned=yes ;;
  8191. +esac
  8192. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  8193. + fi
  8194. +else
  8195. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  8196. +fi
  8197. +
  8198. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  8199. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  8200. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  8201. +if ${lt_cv_path_mainfest_tool+:} false; then :
  8202. + $as_echo_n "(cached) " >&6
  8203. +else
  8204. + lt_cv_path_mainfest_tool=no
  8205. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  8206. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  8207. + cat conftest.err >&5
  8208. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  8209. + lt_cv_path_mainfest_tool=yes
  8210. + fi
  8211. + rm -f conftest*
  8212. +fi
  8213. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  8214. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  8215. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  8216. + MANIFEST_TOOL=:
  8217. +fi
  8218. +
  8219. +
  8220. +
  8221. +
  8222. +
  8223. case $host_os in
  8224. rhapsody* | darwin*)
  8225. @@ -8717,6 +9209,8 @@ _LT_EOF
  8226. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  8227. echo "$AR cru libconftest.a conftest.o" >&5
  8228. $AR cru libconftest.a conftest.o 2>&5
  8229. + echo "$RANLIB libconftest.a" >&5
  8230. + $RANLIB libconftest.a 2>&5
  8231. cat > conftest.c << _LT_EOF
  8232. int main() { return 0;}
  8233. _LT_EOF
  8234. @@ -8785,6 +9279,16 @@ done
  8235. +func_stripname_cnf ()
  8236. +{
  8237. + case ${2} in
  8238. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  8239. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  8240. + esac
  8241. +} # func_stripname_cnf
  8242. +
  8243. +
  8244. +
  8245. # Set options
  8246. @@ -9270,8 +9774,6 @@ fi
  8247. lt_prog_compiler_pic=
  8248. lt_prog_compiler_static=
  8249. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  8250. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8251. if test "$GCC" = yes; then
  8252. lt_prog_compiler_wl='-Wl,'
  8253. @@ -9437,6 +9939,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8254. lt_prog_compiler_pic='--shared'
  8255. lt_prog_compiler_static='--static'
  8256. ;;
  8257. + nagfor*)
  8258. + # NAG Fortran compiler
  8259. + lt_prog_compiler_wl='-Wl,-Wl,,'
  8260. + lt_prog_compiler_pic='-PIC'
  8261. + lt_prog_compiler_static='-Bstatic'
  8262. + ;;
  8263. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  8264. # Portland Group compilers (*not* the Pentium gcc compiler,
  8265. # which looks to be a dead project)
  8266. @@ -9499,7 +10007,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8267. lt_prog_compiler_pic='-KPIC'
  8268. lt_prog_compiler_static='-Bstatic'
  8269. case $cc_basename in
  8270. - f77* | f90* | f95*)
  8271. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  8272. lt_prog_compiler_wl='-Qoption ld ';;
  8273. *)
  8274. lt_prog_compiler_wl='-Wl,';;
  8275. @@ -9556,13 +10064,17 @@ case $host_os in
  8276. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  8277. ;;
  8278. esac
  8279. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  8280. -$as_echo "$lt_prog_compiler_pic" >&6; }
  8281. -
  8282. -
  8283. -
  8284. -
  8285. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  8286. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8287. +if ${lt_cv_prog_compiler_pic+:} false; then :
  8288. + $as_echo_n "(cached) " >&6
  8289. +else
  8290. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  8291. +fi
  8292. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  8293. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  8294. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  8295. #
  8296. # Check to make sure the PIC flag actually works.
  8297. @@ -9623,6 +10135,11 @@ fi
  8298. +
  8299. +
  8300. +
  8301. +
  8302. +
  8303. #
  8304. # Check to make sure the static flag actually works.
  8305. #
  8306. @@ -9973,7 +10490,8 @@ _LT_EOF
  8307. allow_undefined_flag=unsupported
  8308. always_export_symbols=no
  8309. enable_shared_with_static_runtimes=yes
  8310. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  8311. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  8312. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  8313. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  8314. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  8315. @@ -10072,12 +10590,12 @@ _LT_EOF
  8316. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  8317. hardcode_libdir_flag_spec=
  8318. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  8319. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  8320. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  8321. if test "x$supports_anon_versioning" = xyes; then
  8322. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  8323. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  8324. echo "local: *; };" >> $output_objdir/$libname.ver~
  8325. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  8326. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  8327. fi
  8328. ;;
  8329. esac
  8330. @@ -10091,8 +10609,8 @@ _LT_EOF
  8331. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  8332. wlarc=
  8333. else
  8334. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8335. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8336. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8337. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8338. fi
  8339. ;;
  8340. @@ -10110,8 +10628,8 @@ _LT_EOF
  8341. _LT_EOF
  8342. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  8343. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8344. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8345. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8346. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8347. else
  8348. ld_shlibs=no
  8349. fi
  8350. @@ -10157,8 +10675,8 @@ _LT_EOF
  8351. *)
  8352. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  8353. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8354. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8355. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8356. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8357. else
  8358. ld_shlibs=no
  8359. fi
  8360. @@ -10288,7 +10806,13 @@ _LT_EOF
  8361. allow_undefined_flag='-berok'
  8362. # Determine the default libpath from the value encoded in an
  8363. # empty executable.
  8364. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8365. + if test "${lt_cv_aix_libpath+set}" = set; then
  8366. + aix_libpath=$lt_cv_aix_libpath
  8367. +else
  8368. + if ${lt_cv_aix_libpath_+:} false; then :
  8369. + $as_echo_n "(cached) " >&6
  8370. +else
  8371. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8372. /* end confdefs.h. */
  8373. int
  8374. @@ -10301,22 +10825,29 @@ main ()
  8375. _ACEOF
  8376. if ac_fn_c_try_link "$LINENO"; then :
  8377. -lt_aix_libpath_sed='
  8378. - /Import File Strings/,/^$/ {
  8379. - /^0/ {
  8380. - s/^0 *\(.*\)$/\1/
  8381. - p
  8382. - }
  8383. - }'
  8384. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8385. -# Check for a 64-bit object if we didn't find anything.
  8386. -if test -z "$aix_libpath"; then
  8387. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8388. -fi
  8389. + lt_aix_libpath_sed='
  8390. + /Import File Strings/,/^$/ {
  8391. + /^0/ {
  8392. + s/^0 *\([^ ]*\) *$/\1/
  8393. + p
  8394. + }
  8395. + }'
  8396. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8397. + # Check for a 64-bit object if we didn't find anything.
  8398. + if test -z "$lt_cv_aix_libpath_"; then
  8399. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8400. + fi
  8401. fi
  8402. rm -f core conftest.err conftest.$ac_objext \
  8403. conftest$ac_exeext conftest.$ac_ext
  8404. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8405. + if test -z "$lt_cv_aix_libpath_"; then
  8406. + lt_cv_aix_libpath_="/usr/lib:/lib"
  8407. + fi
  8408. +
  8409. +fi
  8410. +
  8411. + aix_libpath=$lt_cv_aix_libpath_
  8412. +fi
  8413. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  8414. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  8415. @@ -10328,7 +10859,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8416. else
  8417. # Determine the default libpath from the value encoded in an
  8418. # empty executable.
  8419. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8420. + if test "${lt_cv_aix_libpath+set}" = set; then
  8421. + aix_libpath=$lt_cv_aix_libpath
  8422. +else
  8423. + if ${lt_cv_aix_libpath_+:} false; then :
  8424. + $as_echo_n "(cached) " >&6
  8425. +else
  8426. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8427. /* end confdefs.h. */
  8428. int
  8429. @@ -10341,22 +10878,29 @@ main ()
  8430. _ACEOF
  8431. if ac_fn_c_try_link "$LINENO"; then :
  8432. -lt_aix_libpath_sed='
  8433. - /Import File Strings/,/^$/ {
  8434. - /^0/ {
  8435. - s/^0 *\(.*\)$/\1/
  8436. - p
  8437. - }
  8438. - }'
  8439. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8440. -# Check for a 64-bit object if we didn't find anything.
  8441. -if test -z "$aix_libpath"; then
  8442. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8443. -fi
  8444. + lt_aix_libpath_sed='
  8445. + /Import File Strings/,/^$/ {
  8446. + /^0/ {
  8447. + s/^0 *\([^ ]*\) *$/\1/
  8448. + p
  8449. + }
  8450. + }'
  8451. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8452. + # Check for a 64-bit object if we didn't find anything.
  8453. + if test -z "$lt_cv_aix_libpath_"; then
  8454. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8455. + fi
  8456. fi
  8457. rm -f core conftest.err conftest.$ac_objext \
  8458. conftest$ac_exeext conftest.$ac_ext
  8459. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8460. + if test -z "$lt_cv_aix_libpath_"; then
  8461. + lt_cv_aix_libpath_="/usr/lib:/lib"
  8462. + fi
  8463. +
  8464. +fi
  8465. +
  8466. + aix_libpath=$lt_cv_aix_libpath_
  8467. +fi
  8468. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  8469. # Warning - without using the other run time loading flags,
  8470. @@ -10401,20 +10945,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8471. # Microsoft Visual C++.
  8472. # hardcode_libdir_flag_spec is actually meaningless, as there is
  8473. # no search path for DLLs.
  8474. - hardcode_libdir_flag_spec=' '
  8475. - allow_undefined_flag=unsupported
  8476. - # Tell ltmain to make .lib files, not .a files.
  8477. - libext=lib
  8478. - # Tell ltmain to make .dll files, not .so files.
  8479. - shrext_cmds=".dll"
  8480. - # FIXME: Setting linknames here is a bad hack.
  8481. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  8482. - # The linker will automatically build a .lib file if we build a DLL.
  8483. - old_archive_from_new_cmds='true'
  8484. - # FIXME: Should let the user specify the lib program.
  8485. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  8486. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  8487. - enable_shared_with_static_runtimes=yes
  8488. + case $cc_basename in
  8489. + cl*)
  8490. + # Native MSVC
  8491. + hardcode_libdir_flag_spec=' '
  8492. + allow_undefined_flag=unsupported
  8493. + always_export_symbols=yes
  8494. + file_list_spec='@'
  8495. + # Tell ltmain to make .lib files, not .a files.
  8496. + libext=lib
  8497. + # Tell ltmain to make .dll files, not .so files.
  8498. + shrext_cmds=".dll"
  8499. + # FIXME: Setting linknames here is a bad hack.
  8500. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  8501. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8502. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  8503. + else
  8504. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  8505. + fi~
  8506. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  8507. + linknames='
  8508. + # The linker will not automatically build a static lib if we build a DLL.
  8509. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  8510. + enable_shared_with_static_runtimes=yes
  8511. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  8512. + # Don't use ranlib
  8513. + old_postinstall_cmds='chmod 644 $oldlib'
  8514. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  8515. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  8516. + case $lt_outputfile in
  8517. + *.exe|*.EXE) ;;
  8518. + *)
  8519. + lt_outputfile="$lt_outputfile.exe"
  8520. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  8521. + ;;
  8522. + esac~
  8523. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  8524. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  8525. + $RM "$lt_outputfile.manifest";
  8526. + fi'
  8527. + ;;
  8528. + *)
  8529. + # Assume MSVC wrapper
  8530. + hardcode_libdir_flag_spec=' '
  8531. + allow_undefined_flag=unsupported
  8532. + # Tell ltmain to make .lib files, not .a files.
  8533. + libext=lib
  8534. + # Tell ltmain to make .dll files, not .so files.
  8535. + shrext_cmds=".dll"
  8536. + # FIXME: Setting linknames here is a bad hack.
  8537. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  8538. + # The linker will automatically build a .lib file if we build a DLL.
  8539. + old_archive_from_new_cmds='true'
  8540. + # FIXME: Should let the user specify the lib program.
  8541. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  8542. + enable_shared_with_static_runtimes=yes
  8543. + ;;
  8544. + esac
  8545. ;;
  8546. darwin* | rhapsody*)
  8547. @@ -10475,7 +11062,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8548. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  8549. freebsd* | dragonfly*)
  8550. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  8551. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  8552. hardcode_libdir_flag_spec='-R$libdir'
  8553. hardcode_direct=yes
  8554. hardcode_shlibpath_var=no
  8555. @@ -10483,7 +11070,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8556. hpux9*)
  8557. if test "$GCC" = yes; then
  8558. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  8559. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  8560. else
  8561. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  8562. fi
  8563. @@ -10499,7 +11086,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8564. hpux10*)
  8565. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  8566. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8567. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8568. else
  8569. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  8570. fi
  8571. @@ -10523,10 +11110,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8572. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  8573. ;;
  8574. ia64*)
  8575. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  8576. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  8577. ;;
  8578. *)
  8579. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8580. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8581. ;;
  8582. esac
  8583. else
  8584. @@ -10605,23 +11192,36 @@ fi
  8585. irix5* | irix6* | nonstopux*)
  8586. if test "$GCC" = yes; then
  8587. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  8588. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  8589. # Try to use the -exported_symbol ld option, if it does not
  8590. # work, assume that -exports_file does not work either and
  8591. # implicitly export all symbols.
  8592. - save_LDFLAGS="$LDFLAGS"
  8593. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  8594. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8595. + # This should be the same for all languages, so no per-tag cache variable.
  8596. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  8597. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  8598. +if ${lt_cv_irix_exported_symbol+:} false; then :
  8599. + $as_echo_n "(cached) " >&6
  8600. +else
  8601. + save_LDFLAGS="$LDFLAGS"
  8602. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  8603. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8604. /* end confdefs.h. */
  8605. -int foo(void) {}
  8606. +int foo (void) { return 0; }
  8607. _ACEOF
  8608. if ac_fn_c_try_link "$LINENO"; then :
  8609. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  8610. -
  8611. + lt_cv_irix_exported_symbol=yes
  8612. +else
  8613. + lt_cv_irix_exported_symbol=no
  8614. fi
  8615. rm -f core conftest.err conftest.$ac_objext \
  8616. conftest$ac_exeext conftest.$ac_ext
  8617. - LDFLAGS="$save_LDFLAGS"
  8618. + LDFLAGS="$save_LDFLAGS"
  8619. +fi
  8620. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  8621. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  8622. + if test "$lt_cv_irix_exported_symbol" = yes; then
  8623. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  8624. + fi
  8625. else
  8626. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  8627. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  8628. @@ -10706,7 +11306,7 @@ rm -f core conftest.err conftest.$ac_objext \
  8629. osf4* | osf5*) # as osf3* with the addition of -msym flag
  8630. if test "$GCC" = yes; then
  8631. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  8632. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  8633. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  8634. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  8635. else
  8636. allow_undefined_flag=' -expect_unresolved \*'
  8637. @@ -10725,9 +11325,9 @@ rm -f core conftest.err conftest.$ac_objext \
  8638. no_undefined_flag=' -z defs'
  8639. if test "$GCC" = yes; then
  8640. wlarc='${wl}'
  8641. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  8642. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  8643. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  8644. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  8645. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  8646. else
  8647. case `$CC -V 2>&1` in
  8648. *"Compilers 5.0"*)
  8649. @@ -11303,8 +11903,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  8650. need_version=no
  8651. need_lib_prefix=no
  8652. - case $GCC,$host_os in
  8653. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  8654. + case $GCC,$cc_basename in
  8655. + yes,*)
  8656. + # gcc
  8657. library_names_spec='$libname.dll.a'
  8658. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  8659. postinstall_cmds='base_file=`basename \${file}`~
  8660. @@ -11337,13 +11938,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  8661. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  8662. ;;
  8663. esac
  8664. + dynamic_linker='Win32 ld.exe'
  8665. + ;;
  8666. +
  8667. + *,cl*)
  8668. + # Native MSVC
  8669. + libname_spec='$name'
  8670. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  8671. + library_names_spec='${libname}.dll.lib'
  8672. +
  8673. + case $build_os in
  8674. + mingw*)
  8675. + sys_lib_search_path_spec=
  8676. + lt_save_ifs=$IFS
  8677. + IFS=';'
  8678. + for lt_path in $LIB
  8679. + do
  8680. + IFS=$lt_save_ifs
  8681. + # Let DOS variable expansion print the short 8.3 style file name.
  8682. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  8683. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  8684. + done
  8685. + IFS=$lt_save_ifs
  8686. + # Convert to MSYS style.
  8687. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  8688. + ;;
  8689. + cygwin*)
  8690. + # Convert to unix form, then to dos form, then back to unix form
  8691. + # but this time dos style (no spaces!) so that the unix form looks
  8692. + # like /cygdrive/c/PROGRA~1:/cygdr...
  8693. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  8694. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  8695. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  8696. + ;;
  8697. + *)
  8698. + sys_lib_search_path_spec="$LIB"
  8699. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  8700. + # It is most probably a Windows format PATH.
  8701. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  8702. + else
  8703. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  8704. + fi
  8705. + # FIXME: find the short name or the path components, as spaces are
  8706. + # common. (e.g. "Program Files" -> "PROGRA~1")
  8707. + ;;
  8708. + esac
  8709. +
  8710. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  8711. + postinstall_cmds='base_file=`basename \${file}`~
  8712. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  8713. + dldir=$destdir/`dirname \$dlpath`~
  8714. + test -d \$dldir || mkdir -p \$dldir~
  8715. + $install_prog $dir/$dlname \$dldir/$dlname'
  8716. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  8717. + dlpath=$dir/\$dldll~
  8718. + $RM \$dlpath'
  8719. + shlibpath_overrides_runpath=yes
  8720. + dynamic_linker='Win32 link.exe'
  8721. ;;
  8722. *)
  8723. + # Assume MSVC wrapper
  8724. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  8725. + dynamic_linker='Win32 ld.exe'
  8726. ;;
  8727. esac
  8728. - dynamic_linker='Win32 ld.exe'
  8729. # FIXME: first we should search . and the directory the executable is in
  8730. shlibpath_var=PATH
  8731. ;;
  8732. @@ -12221,7 +12880,7 @@ else
  8733. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  8734. lt_status=$lt_dlunknown
  8735. cat > conftest.$ac_ext <<_LT_EOF
  8736. -#line 12224 "configure"
  8737. +#line $LINENO "configure"
  8738. #include "confdefs.h"
  8739. #if HAVE_DLFCN_H
  8740. @@ -12265,10 +12924,10 @@ else
  8741. /* When -fvisbility=hidden is used, assume the code has been annotated
  8742. correspondingly for the symbols needed. */
  8743. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  8744. -void fnord () __attribute__((visibility("default")));
  8745. +int fnord () __attribute__((visibility("default")));
  8746. #endif
  8747. -void fnord () { int i=42; }
  8748. +int fnord () { return 42; }
  8749. int main ()
  8750. {
  8751. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  8752. @@ -12327,7 +12986,7 @@ else
  8753. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  8754. lt_status=$lt_dlunknown
  8755. cat > conftest.$ac_ext <<_LT_EOF
  8756. -#line 12330 "configure"
  8757. +#line $LINENO "configure"
  8758. #include "confdefs.h"
  8759. #if HAVE_DLFCN_H
  8760. @@ -12371,10 +13030,10 @@ else
  8761. /* When -fvisbility=hidden is used, assume the code has been annotated
  8762. correspondingly for the symbols needed. */
  8763. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  8764. -void fnord () __attribute__((visibility("default")));
  8765. +int fnord () __attribute__((visibility("default")));
  8766. #endif
  8767. -void fnord () { int i=42; }
  8768. +int fnord () { return 42; }
  8769. int main ()
  8770. {
  8771. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  8772. @@ -12766,6 +13425,7 @@ $RM -r conftest*
  8773. # Allow CC to be a program name with arguments.
  8774. lt_save_CC=$CC
  8775. + lt_save_CFLAGS=$CFLAGS
  8776. lt_save_LD=$LD
  8777. lt_save_GCC=$GCC
  8778. GCC=$GXX
  8779. @@ -12783,6 +13443,7 @@ $RM -r conftest*
  8780. fi
  8781. test -z "${LDCXX+set}" || LD=$LDCXX
  8782. CC=${CXX-"c++"}
  8783. + CFLAGS=$CXXFLAGS
  8784. compiler=$CC
  8785. compiler_CXX=$CC
  8786. for cc_temp in $compiler""; do
  8787. @@ -13065,7 +13726,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  8788. allow_undefined_flag_CXX='-berok'
  8789. # Determine the default libpath from the value encoded in an empty
  8790. # executable.
  8791. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8792. + if test "${lt_cv_aix_libpath+set}" = set; then
  8793. + aix_libpath=$lt_cv_aix_libpath
  8794. +else
  8795. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  8796. + $as_echo_n "(cached) " >&6
  8797. +else
  8798. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8799. /* end confdefs.h. */
  8800. int
  8801. @@ -13078,22 +13745,29 @@ main ()
  8802. _ACEOF
  8803. if ac_fn_cxx_try_link "$LINENO"; then :
  8804. -lt_aix_libpath_sed='
  8805. - /Import File Strings/,/^$/ {
  8806. - /^0/ {
  8807. - s/^0 *\(.*\)$/\1/
  8808. - p
  8809. - }
  8810. - }'
  8811. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8812. -# Check for a 64-bit object if we didn't find anything.
  8813. -if test -z "$aix_libpath"; then
  8814. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8815. -fi
  8816. + lt_aix_libpath_sed='
  8817. + /Import File Strings/,/^$/ {
  8818. + /^0/ {
  8819. + s/^0 *\([^ ]*\) *$/\1/
  8820. + p
  8821. + }
  8822. + }'
  8823. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8824. + # Check for a 64-bit object if we didn't find anything.
  8825. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8826. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8827. + fi
  8828. fi
  8829. rm -f core conftest.err conftest.$ac_objext \
  8830. conftest$ac_exeext conftest.$ac_ext
  8831. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8832. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8833. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  8834. + fi
  8835. +
  8836. +fi
  8837. +
  8838. + aix_libpath=$lt_cv_aix_libpath__CXX
  8839. +fi
  8840. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  8841. @@ -13106,7 +13780,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8842. else
  8843. # Determine the default libpath from the value encoded in an
  8844. # empty executable.
  8845. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8846. + if test "${lt_cv_aix_libpath+set}" = set; then
  8847. + aix_libpath=$lt_cv_aix_libpath
  8848. +else
  8849. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  8850. + $as_echo_n "(cached) " >&6
  8851. +else
  8852. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8853. /* end confdefs.h. */
  8854. int
  8855. @@ -13119,22 +13799,29 @@ main ()
  8856. _ACEOF
  8857. if ac_fn_cxx_try_link "$LINENO"; then :
  8858. -lt_aix_libpath_sed='
  8859. - /Import File Strings/,/^$/ {
  8860. - /^0/ {
  8861. - s/^0 *\(.*\)$/\1/
  8862. - p
  8863. - }
  8864. - }'
  8865. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8866. -# Check for a 64-bit object if we didn't find anything.
  8867. -if test -z "$aix_libpath"; then
  8868. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8869. -fi
  8870. + lt_aix_libpath_sed='
  8871. + /Import File Strings/,/^$/ {
  8872. + /^0/ {
  8873. + s/^0 *\([^ ]*\) *$/\1/
  8874. + p
  8875. + }
  8876. + }'
  8877. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8878. + # Check for a 64-bit object if we didn't find anything.
  8879. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8880. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8881. + fi
  8882. fi
  8883. rm -f core conftest.err conftest.$ac_objext \
  8884. conftest$ac_exeext conftest.$ac_ext
  8885. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8886. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8887. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  8888. + fi
  8889. +
  8890. +fi
  8891. +
  8892. + aix_libpath=$lt_cv_aix_libpath__CXX
  8893. +fi
  8894. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  8895. # Warning - without using the other run time loading flags,
  8896. @@ -13177,29 +13864,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8897. ;;
  8898. cygwin* | mingw* | pw32* | cegcc*)
  8899. - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  8900. - # as there is no search path for DLLs.
  8901. - hardcode_libdir_flag_spec_CXX='-L$libdir'
  8902. - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  8903. - allow_undefined_flag_CXX=unsupported
  8904. - always_export_symbols_CXX=no
  8905. - enable_shared_with_static_runtimes_CXX=yes
  8906. -
  8907. - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  8908. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  8909. - # If the export-symbols file already is a .def file (1st line
  8910. - # is EXPORTS), use it as is; otherwise, prepend...
  8911. - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8912. - cp $export_symbols $output_objdir/$soname.def;
  8913. - else
  8914. - echo EXPORTS > $output_objdir/$soname.def;
  8915. - cat $export_symbols >> $output_objdir/$soname.def;
  8916. - fi~
  8917. - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  8918. - else
  8919. - ld_shlibs_CXX=no
  8920. - fi
  8921. - ;;
  8922. + case $GXX,$cc_basename in
  8923. + ,cl* | no,cl*)
  8924. + # Native MSVC
  8925. + # hardcode_libdir_flag_spec is actually meaningless, as there is
  8926. + # no search path for DLLs.
  8927. + hardcode_libdir_flag_spec_CXX=' '
  8928. + allow_undefined_flag_CXX=unsupported
  8929. + always_export_symbols_CXX=yes
  8930. + file_list_spec_CXX='@'
  8931. + # Tell ltmain to make .lib files, not .a files.
  8932. + libext=lib
  8933. + # Tell ltmain to make .dll files, not .so files.
  8934. + shrext_cmds=".dll"
  8935. + # FIXME: Setting linknames here is a bad hack.
  8936. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  8937. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8938. + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  8939. + else
  8940. + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  8941. + fi~
  8942. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  8943. + linknames='
  8944. + # The linker will not automatically build a static lib if we build a DLL.
  8945. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
  8946. + enable_shared_with_static_runtimes_CXX=yes
  8947. + # Don't use ranlib
  8948. + old_postinstall_cmds_CXX='chmod 644 $oldlib'
  8949. + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
  8950. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  8951. + case $lt_outputfile in
  8952. + *.exe|*.EXE) ;;
  8953. + *)
  8954. + lt_outputfile="$lt_outputfile.exe"
  8955. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  8956. + ;;
  8957. + esac~
  8958. + func_to_tool_file "$lt_outputfile"~
  8959. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  8960. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  8961. + $RM "$lt_outputfile.manifest";
  8962. + fi'
  8963. + ;;
  8964. + *)
  8965. + # g++
  8966. + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  8967. + # as there is no search path for DLLs.
  8968. + hardcode_libdir_flag_spec_CXX='-L$libdir'
  8969. + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  8970. + allow_undefined_flag_CXX=unsupported
  8971. + always_export_symbols_CXX=no
  8972. + enable_shared_with_static_runtimes_CXX=yes
  8973. +
  8974. + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  8975. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  8976. + # If the export-symbols file already is a .def file (1st line
  8977. + # is EXPORTS), use it as is; otherwise, prepend...
  8978. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8979. + cp $export_symbols $output_objdir/$soname.def;
  8980. + else
  8981. + echo EXPORTS > $output_objdir/$soname.def;
  8982. + cat $export_symbols >> $output_objdir/$soname.def;
  8983. + fi~
  8984. + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  8985. + else
  8986. + ld_shlibs_CXX=no
  8987. + fi
  8988. + ;;
  8989. + esac
  8990. + ;;
  8991. darwin* | rhapsody*)
  8992. @@ -13305,7 +14038,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8993. ;;
  8994. *)
  8995. if test "$GXX" = yes; then
  8996. - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  8997. + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  8998. else
  8999. # FIXME: insert proper C++ library support
  9000. ld_shlibs_CXX=no
  9001. @@ -13376,10 +14109,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9002. archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  9003. ;;
  9004. ia64*)
  9005. - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  9006. + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  9007. ;;
  9008. *)
  9009. - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  9010. + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  9011. ;;
  9012. esac
  9013. fi
  9014. @@ -13420,9 +14153,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9015. *)
  9016. if test "$GXX" = yes; then
  9017. if test "$with_gnu_ld" = no; then
  9018. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  9019. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  9020. else
  9021. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  9022. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  9023. fi
  9024. fi
  9025. link_all_deplibs_CXX=yes
  9026. @@ -13492,20 +14225,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9027. prelink_cmds_CXX='tpldir=Template.dir~
  9028. rm -rf $tpldir~
  9029. $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  9030. - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
  9031. + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  9032. old_archive_cmds_CXX='tpldir=Template.dir~
  9033. rm -rf $tpldir~
  9034. $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  9035. - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
  9036. + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  9037. $RANLIB $oldlib'
  9038. archive_cmds_CXX='tpldir=Template.dir~
  9039. rm -rf $tpldir~
  9040. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  9041. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  9042. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  9043. archive_expsym_cmds_CXX='tpldir=Template.dir~
  9044. rm -rf $tpldir~
  9045. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  9046. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  9047. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  9048. ;;
  9049. *) # Version 6 and above use weak symbols
  9050. archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  9051. @@ -13700,7 +14433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9052. archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  9053. ;;
  9054. *)
  9055. - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  9056. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  9057. ;;
  9058. esac
  9059. @@ -13746,7 +14479,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9060. solaris*)
  9061. case $cc_basename in
  9062. - CC*)
  9063. + CC* | sunCC*)
  9064. # Sun C++ 4.2, 5.x and Centerline C++
  9065. archive_cmds_need_lc_CXX=yes
  9066. no_undefined_flag_CXX=' -zdefs'
  9067. @@ -13787,9 +14520,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9068. if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  9069. no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  9070. if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  9071. - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  9072. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  9073. archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  9074. - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  9075. + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  9076. # Commands to make compiler produce verbose output that lists
  9077. # what "hidden" libraries, object files and flags are used when
  9078. @@ -13924,6 +14657,13 @@ private:
  9079. };
  9080. _LT_EOF
  9081. +
  9082. +_lt_libdeps_save_CFLAGS=$CFLAGS
  9083. +case "$CC $CFLAGS " in #(
  9084. +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
  9085. +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
  9086. +esac
  9087. +
  9088. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9089. (eval $ac_compile) 2>&5
  9090. ac_status=$?
  9091. @@ -13937,7 +14677,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9092. pre_test_object_deps_done=no
  9093. for p in `eval "$output_verbose_link_cmd"`; do
  9094. - case $p in
  9095. + case ${prev}${p} in
  9096. -L* | -R* | -l*)
  9097. # Some compilers place space between "-{L,R}" and the path.
  9098. @@ -13946,13 +14686,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9099. test $p = "-R"; then
  9100. prev=$p
  9101. continue
  9102. - else
  9103. - prev=
  9104. fi
  9105. + # Expand the sysroot to ease extracting the directories later.
  9106. + if test -z "$prev"; then
  9107. + case $p in
  9108. + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
  9109. + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
  9110. + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
  9111. + esac
  9112. + fi
  9113. + case $p in
  9114. + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
  9115. + esac
  9116. if test "$pre_test_object_deps_done" = no; then
  9117. - case $p in
  9118. - -L* | -R*)
  9119. + case ${prev} in
  9120. + -L | -R)
  9121. # Internal compiler library paths should come after those
  9122. # provided the user. The postdeps already come after the
  9123. # user supplied libs so there is no need to process them.
  9124. @@ -13972,8 +14721,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9125. postdeps_CXX="${postdeps_CXX} ${prev}${p}"
  9126. fi
  9127. fi
  9128. + prev=
  9129. ;;
  9130. + *.lto.$objext) ;; # Ignore GCC LTO objects
  9131. *.$objext)
  9132. # This assumes that the test object file only shows up
  9133. # once in the compiler output.
  9134. @@ -14009,6 +14760,7 @@ else
  9135. fi
  9136. $RM -f confest.$objext
  9137. +CFLAGS=$_lt_libdeps_save_CFLAGS
  9138. # PORTME: override above test on systems where it is broken
  9139. case $host_os in
  9140. @@ -14044,7 +14796,7 @@ linux*)
  9141. solaris*)
  9142. case $cc_basename in
  9143. - CC*)
  9144. + CC* | sunCC*)
  9145. # The more standards-conforming stlport4 library is
  9146. # incompatible with the Cstd library. Avoid specifying
  9147. # it if it's in CXXFLAGS. Ignore libCrun as
  9148. @@ -14109,8 +14861,6 @@ fi
  9149. lt_prog_compiler_pic_CXX=
  9150. lt_prog_compiler_static_CXX=
  9151. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  9152. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9153. # C++ specific cases for pic, static, wl, etc.
  9154. if test "$GXX" = yes; then
  9155. @@ -14215,6 +14965,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9156. ;;
  9157. esac
  9158. ;;
  9159. + mingw* | cygwin* | os2* | pw32* | cegcc*)
  9160. + # This hack is so that the source file can tell whether it is being
  9161. + # built for inclusion in a dll (and should export symbols for example).
  9162. + lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
  9163. + ;;
  9164. dgux*)
  9165. case $cc_basename in
  9166. ec++*)
  9167. @@ -14367,7 +15122,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9168. ;;
  9169. solaris*)
  9170. case $cc_basename in
  9171. - CC*)
  9172. + CC* | sunCC*)
  9173. # Sun C++ 4.2, 5.x and Centerline C++
  9174. lt_prog_compiler_pic_CXX='-KPIC'
  9175. lt_prog_compiler_static_CXX='-Bstatic'
  9176. @@ -14432,10 +15187,17 @@ case $host_os in
  9177. lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
  9178. ;;
  9179. esac
  9180. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
  9181. -$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  9182. -
  9183. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  9184. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9185. +if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
  9186. + $as_echo_n "(cached) " >&6
  9187. +else
  9188. + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
  9189. +fi
  9190. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
  9191. +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
  9192. +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
  9193. #
  9194. # Check to make sure the PIC flag actually works.
  9195. @@ -14493,6 +15255,8 @@ fi
  9196. +
  9197. +
  9198. #
  9199. # Check to make sure the static flag actually works.
  9200. #
  9201. @@ -14670,6 +15434,7 @@ fi
  9202. $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  9203. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  9204. + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  9205. case $host_os in
  9206. aix[4-9]*)
  9207. # If we're using GNU nm, then we don't want the "-C" option.
  9208. @@ -14684,15 +15449,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  9209. ;;
  9210. pw32*)
  9211. export_symbols_cmds_CXX="$ltdll_cmds"
  9212. - ;;
  9213. + ;;
  9214. cygwin* | mingw* | cegcc*)
  9215. - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  9216. - ;;
  9217. + case $cc_basename in
  9218. + cl*) ;;
  9219. + *)
  9220. + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  9221. + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  9222. + ;;
  9223. + esac
  9224. + ;;
  9225. *)
  9226. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  9227. - ;;
  9228. + ;;
  9229. esac
  9230. - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  9231. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
  9232. $as_echo "$ld_shlibs_CXX" >&6; }
  9233. @@ -14955,8 +15725,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  9234. need_version=no
  9235. need_lib_prefix=no
  9236. - case $GCC,$host_os in
  9237. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  9238. + case $GCC,$cc_basename in
  9239. + yes,*)
  9240. + # gcc
  9241. library_names_spec='$libname.dll.a'
  9242. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  9243. postinstall_cmds='base_file=`basename \${file}`~
  9244. @@ -14988,13 +15759,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  9245. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  9246. ;;
  9247. esac
  9248. + dynamic_linker='Win32 ld.exe'
  9249. + ;;
  9250. +
  9251. + *,cl*)
  9252. + # Native MSVC
  9253. + libname_spec='$name'
  9254. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  9255. + library_names_spec='${libname}.dll.lib'
  9256. +
  9257. + case $build_os in
  9258. + mingw*)
  9259. + sys_lib_search_path_spec=
  9260. + lt_save_ifs=$IFS
  9261. + IFS=';'
  9262. + for lt_path in $LIB
  9263. + do
  9264. + IFS=$lt_save_ifs
  9265. + # Let DOS variable expansion print the short 8.3 style file name.
  9266. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  9267. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  9268. + done
  9269. + IFS=$lt_save_ifs
  9270. + # Convert to MSYS style.
  9271. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  9272. + ;;
  9273. + cygwin*)
  9274. + # Convert to unix form, then to dos form, then back to unix form
  9275. + # but this time dos style (no spaces!) so that the unix form looks
  9276. + # like /cygdrive/c/PROGRA~1:/cygdr...
  9277. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  9278. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  9279. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  9280. + ;;
  9281. + *)
  9282. + sys_lib_search_path_spec="$LIB"
  9283. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  9284. + # It is most probably a Windows format PATH.
  9285. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  9286. + else
  9287. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  9288. + fi
  9289. + # FIXME: find the short name or the path components, as spaces are
  9290. + # common. (e.g. "Program Files" -> "PROGRA~1")
  9291. + ;;
  9292. + esac
  9293. +
  9294. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  9295. + postinstall_cmds='base_file=`basename \${file}`~
  9296. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  9297. + dldir=$destdir/`dirname \$dlpath`~
  9298. + test -d \$dldir || mkdir -p \$dldir~
  9299. + $install_prog $dir/$dlname \$dldir/$dlname'
  9300. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  9301. + dlpath=$dir/\$dldll~
  9302. + $RM \$dlpath'
  9303. + shlibpath_overrides_runpath=yes
  9304. + dynamic_linker='Win32 link.exe'
  9305. ;;
  9306. *)
  9307. + # Assume MSVC wrapper
  9308. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  9309. + dynamic_linker='Win32 ld.exe'
  9310. ;;
  9311. esac
  9312. - dynamic_linker='Win32 ld.exe'
  9313. # FIXME: first we should search . and the directory the executable is in
  9314. shlibpath_var=PATH
  9315. ;;
  9316. @@ -15534,6 +16363,7 @@ fi
  9317. fi # test -n "$compiler"
  9318. CC=$lt_save_CC
  9319. + CFLAGS=$lt_save_CFLAGS
  9320. LDCXX=$LD
  9321. LD=$lt_save_LD
  9322. GCC=$lt_save_GCC
  9323. @@ -17663,13 +18493,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  9324. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  9325. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  9326. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  9327. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  9328. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  9329. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  9330. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  9331. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  9332. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  9333. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  9334. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  9335. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  9336. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  9337. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  9338. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  9339. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  9340. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  9341. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  9342. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  9343. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  9344. @@ -17684,14 +18521,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  9345. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  9346. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  9347. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  9348. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  9349. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  9350. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  9351. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  9352. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  9353. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  9354. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  9355. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  9356. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  9357. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  9358. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  9359. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  9360. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  9361. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  9362. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  9363. @@ -17724,12 +18564,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  9364. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  9365. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  9366. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  9367. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  9368. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  9369. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  9370. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  9371. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  9372. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  9373. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  9374. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  9375. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  9376. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  9377. @@ -17768,8 +18608,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
  9378. compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
  9379. GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
  9380. lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
  9381. -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  9382. lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
  9383. +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  9384. lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
  9385. lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
  9386. archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
  9387. @@ -17796,12 +18636,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
  9388. hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
  9389. inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
  9390. link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
  9391. -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
  9392. always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
  9393. export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  9394. exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  9395. include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  9396. prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  9397. +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  9398. file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
  9399. hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
  9400. compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
  9401. @@ -17839,8 +18679,13 @@ reload_flag \
  9402. OBJDUMP \
  9403. deplibs_check_method \
  9404. file_magic_cmd \
  9405. +file_magic_glob \
  9406. +want_nocaseglob \
  9407. +DLLTOOL \
  9408. +sharedlib_from_linklib_cmd \
  9409. AR \
  9410. AR_FLAGS \
  9411. +archiver_list_spec \
  9412. STRIP \
  9413. RANLIB \
  9414. CC \
  9415. @@ -17850,12 +18695,14 @@ lt_cv_sys_global_symbol_pipe \
  9416. lt_cv_sys_global_symbol_to_cdecl \
  9417. lt_cv_sys_global_symbol_to_c_name_address \
  9418. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  9419. +nm_file_list_spec \
  9420. lt_prog_compiler_no_builtin_flag \
  9421. -lt_prog_compiler_wl \
  9422. lt_prog_compiler_pic \
  9423. +lt_prog_compiler_wl \
  9424. lt_prog_compiler_static \
  9425. lt_cv_prog_compiler_c_o \
  9426. need_locks \
  9427. +MANIFEST_TOOL \
  9428. DSYMUTIL \
  9429. NMEDIT \
  9430. LIPO \
  9431. @@ -17871,7 +18718,6 @@ no_undefined_flag \
  9432. hardcode_libdir_flag_spec \
  9433. hardcode_libdir_flag_spec_ld \
  9434. hardcode_libdir_separator \
  9435. -fix_srcfile_path \
  9436. exclude_expsyms \
  9437. include_expsyms \
  9438. file_list_spec \
  9439. @@ -17893,8 +18739,8 @@ LD_CXX \
  9440. reload_flag_CXX \
  9441. compiler_CXX \
  9442. lt_prog_compiler_no_builtin_flag_CXX \
  9443. -lt_prog_compiler_wl_CXX \
  9444. lt_prog_compiler_pic_CXX \
  9445. +lt_prog_compiler_wl_CXX \
  9446. lt_prog_compiler_static_CXX \
  9447. lt_cv_prog_compiler_c_o_CXX \
  9448. export_dynamic_flag_spec_CXX \
  9449. @@ -17906,7 +18752,6 @@ no_undefined_flag_CXX \
  9450. hardcode_libdir_flag_spec_CXX \
  9451. hardcode_libdir_flag_spec_ld_CXX \
  9452. hardcode_libdir_separator_CXX \
  9453. -fix_srcfile_path_CXX \
  9454. exclude_expsyms_CXX \
  9455. include_expsyms_CXX \
  9456. file_list_spec_CXX \
  9457. @@ -17940,6 +18785,7 @@ module_cmds \
  9458. module_expsym_cmds \
  9459. export_symbols_cmds \
  9460. prelink_cmds \
  9461. +postlink_cmds \
  9462. postinstall_cmds \
  9463. postuninstall_cmds \
  9464. finish_cmds \
  9465. @@ -17954,7 +18800,8 @@ archive_expsym_cmds_CXX \
  9466. module_cmds_CXX \
  9467. module_expsym_cmds_CXX \
  9468. export_symbols_cmds_CXX \
  9469. -prelink_cmds_CXX; do
  9470. +prelink_cmds_CXX \
  9471. +postlink_cmds_CXX; do
  9472. case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  9473. *[\\\\\\\`\\"\\\$]*)
  9474. eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  9475. @@ -18711,7 +19558,8 @@ $as_echo X"$file" |
  9476. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  9477. #
  9478. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  9479. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  9480. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  9481. +# Inc.
  9482. # Written by Gordon Matzigkeit, 1996
  9483. #
  9484. # This file is part of GNU Libtool.
  9485. @@ -18814,19 +19662,42 @@ SP2NL=$lt_lt_SP2NL
  9486. # turn newlines into spaces.
  9487. NL2SP=$lt_lt_NL2SP
  9488. +# convert \$build file names to \$host format.
  9489. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  9490. +
  9491. +# convert \$build files to toolchain format.
  9492. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  9493. +
  9494. # An object symbol dumper.
  9495. OBJDUMP=$lt_OBJDUMP
  9496. # Method to check whether dependent libraries are shared objects.
  9497. deplibs_check_method=$lt_deplibs_check_method
  9498. -# Command to use when deplibs_check_method == "file_magic".
  9499. +# Command to use when deplibs_check_method = "file_magic".
  9500. file_magic_cmd=$lt_file_magic_cmd
  9501. +# How to find potential files when deplibs_check_method = "file_magic".
  9502. +file_magic_glob=$lt_file_magic_glob
  9503. +
  9504. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  9505. +want_nocaseglob=$lt_want_nocaseglob
  9506. +
  9507. +# DLL creation program.
  9508. +DLLTOOL=$lt_DLLTOOL
  9509. +
  9510. +# Command to associate shared and link libraries.
  9511. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  9512. +
  9513. # The archiver.
  9514. AR=$lt_AR
  9515. +
  9516. +# Flags to create an archive.
  9517. AR_FLAGS=$lt_AR_FLAGS
  9518. +# How to feed a file listing to the archiver.
  9519. +archiver_list_spec=$lt_archiver_list_spec
  9520. +
  9521. # A symbol stripping program.
  9522. STRIP=$lt_STRIP
  9523. @@ -18856,6 +19727,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  9524. # Transform the output of nm in a C name address pair when lib prefix is needed.
  9525. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  9526. +# Specify filename containing input files for \$NM.
  9527. +nm_file_list_spec=$lt_nm_file_list_spec
  9528. +
  9529. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  9530. +lt_sysroot=$lt_sysroot
  9531. +
  9532. # The name of the directory that contains temporary libtool files.
  9533. objdir=$objdir
  9534. @@ -18865,6 +19742,9 @@ MAGIC_CMD=$MAGIC_CMD
  9535. # Must we lock files when doing compilation?
  9536. need_locks=$lt_need_locks
  9537. +# Manifest tool.
  9538. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  9539. +
  9540. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  9541. DSYMUTIL=$lt_DSYMUTIL
  9542. @@ -18979,12 +19859,12 @@ with_gcc=$GCC
  9543. # Compiler flag to turn off builtin functions.
  9544. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  9545. -# How to pass a linker flag through the compiler.
  9546. -wl=$lt_lt_prog_compiler_wl
  9547. -
  9548. # Additional compiler flags for building library objects.
  9549. pic_flag=$lt_lt_prog_compiler_pic
  9550. +# How to pass a linker flag through the compiler.
  9551. +wl=$lt_lt_prog_compiler_wl
  9552. +
  9553. # Compiler flag to prevent dynamic linking.
  9554. link_static_flag=$lt_lt_prog_compiler_static
  9555. @@ -19071,9 +19951,6 @@ inherit_rpath=$inherit_rpath
  9556. # Whether libtool must link a program against all its dependency libraries.
  9557. link_all_deplibs=$link_all_deplibs
  9558. -# Fix the shell variable \$srcfile for the compiler.
  9559. -fix_srcfile_path=$lt_fix_srcfile_path
  9560. -
  9561. # Set to "yes" if exported symbols are required.
  9562. always_export_symbols=$always_export_symbols
  9563. @@ -19089,6 +19966,9 @@ include_expsyms=$lt_include_expsyms
  9564. # Commands necessary for linking programs (against libraries) with templates.
  9565. prelink_cmds=$lt_prelink_cmds
  9566. +# Commands necessary for finishing linking programs.
  9567. +postlink_cmds=$lt_postlink_cmds
  9568. +
  9569. # Specify filename containing input files.
  9570. file_list_spec=$lt_file_list_spec
  9571. @@ -19135,210 +20015,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  9572. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  9573. # text mode, it properly converts lines to CR/LF. This bash problem
  9574. # is reportedly fixed, but why not run on old versions too?
  9575. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  9576. - || (rm -f "$cfgfile"; exit 1)
  9577. -
  9578. - case $xsi_shell in
  9579. - yes)
  9580. - cat << \_LT_EOF >> "$cfgfile"
  9581. -
  9582. -# func_dirname file append nondir_replacement
  9583. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  9584. -# otherwise set result to NONDIR_REPLACEMENT.
  9585. -func_dirname ()
  9586. -{
  9587. - case ${1} in
  9588. - */*) func_dirname_result="${1%/*}${2}" ;;
  9589. - * ) func_dirname_result="${3}" ;;
  9590. - esac
  9591. -}
  9592. -
  9593. -# func_basename file
  9594. -func_basename ()
  9595. -{
  9596. - func_basename_result="${1##*/}"
  9597. -}
  9598. -
  9599. -# func_dirname_and_basename file append nondir_replacement
  9600. -# perform func_basename and func_dirname in a single function
  9601. -# call:
  9602. -# dirname: Compute the dirname of FILE. If nonempty,
  9603. -# add APPEND to the result, otherwise set result
  9604. -# to NONDIR_REPLACEMENT.
  9605. -# value returned in "$func_dirname_result"
  9606. -# basename: Compute filename of FILE.
  9607. -# value retuned in "$func_basename_result"
  9608. -# Implementation must be kept synchronized with func_dirname
  9609. -# and func_basename. For efficiency, we do not delegate to
  9610. -# those functions but instead duplicate the functionality here.
  9611. -func_dirname_and_basename ()
  9612. -{
  9613. - case ${1} in
  9614. - */*) func_dirname_result="${1%/*}${2}" ;;
  9615. - * ) func_dirname_result="${3}" ;;
  9616. - esac
  9617. - func_basename_result="${1##*/}"
  9618. -}
  9619. -
  9620. -# func_stripname prefix suffix name
  9621. -# strip PREFIX and SUFFIX off of NAME.
  9622. -# PREFIX and SUFFIX must not contain globbing or regex special
  9623. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  9624. -# dot (in which case that matches only a dot).
  9625. -func_stripname ()
  9626. -{
  9627. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  9628. - # positional parameters, so assign one to ordinary parameter first.
  9629. - func_stripname_result=${3}
  9630. - func_stripname_result=${func_stripname_result#"${1}"}
  9631. - func_stripname_result=${func_stripname_result%"${2}"}
  9632. -}
  9633. -
  9634. -# func_opt_split
  9635. -func_opt_split ()
  9636. -{
  9637. - func_opt_split_opt=${1%%=*}
  9638. - func_opt_split_arg=${1#*=}
  9639. -}
  9640. -
  9641. -# func_lo2o object
  9642. -func_lo2o ()
  9643. -{
  9644. - case ${1} in
  9645. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  9646. - *) func_lo2o_result=${1} ;;
  9647. - esac
  9648. -}
  9649. -
  9650. -# func_xform libobj-or-source
  9651. -func_xform ()
  9652. -{
  9653. - func_xform_result=${1%.*}.lo
  9654. -}
  9655. -
  9656. -# func_arith arithmetic-term...
  9657. -func_arith ()
  9658. -{
  9659. - func_arith_result=$(( $* ))
  9660. -}
  9661. -
  9662. -# func_len string
  9663. -# STRING may not start with a hyphen.
  9664. -func_len ()
  9665. -{
  9666. - func_len_result=${#1}
  9667. -}
  9668. -
  9669. -_LT_EOF
  9670. - ;;
  9671. - *) # Bourne compatible functions.
  9672. - cat << \_LT_EOF >> "$cfgfile"
  9673. -
  9674. -# func_dirname file append nondir_replacement
  9675. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  9676. -# otherwise set result to NONDIR_REPLACEMENT.
  9677. -func_dirname ()
  9678. -{
  9679. - # Extract subdirectory from the argument.
  9680. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  9681. - if test "X$func_dirname_result" = "X${1}"; then
  9682. - func_dirname_result="${3}"
  9683. - else
  9684. - func_dirname_result="$func_dirname_result${2}"
  9685. - fi
  9686. -}
  9687. -
  9688. -# func_basename file
  9689. -func_basename ()
  9690. -{
  9691. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  9692. -}
  9693. -
  9694. -
  9695. -# func_stripname prefix suffix name
  9696. -# strip PREFIX and SUFFIX off of NAME.
  9697. -# PREFIX and SUFFIX must not contain globbing or regex special
  9698. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  9699. -# dot (in which case that matches only a dot).
  9700. -# func_strip_suffix prefix name
  9701. -func_stripname ()
  9702. -{
  9703. - case ${2} in
  9704. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  9705. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  9706. - esac
  9707. -}
  9708. -
  9709. -# sed scripts:
  9710. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  9711. -my_sed_long_arg='1s/^-[^=]*=//'
  9712. -
  9713. -# func_opt_split
  9714. -func_opt_split ()
  9715. -{
  9716. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  9717. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  9718. -}
  9719. -
  9720. -# func_lo2o object
  9721. -func_lo2o ()
  9722. -{
  9723. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  9724. -}
  9725. -
  9726. -# func_xform libobj-or-source
  9727. -func_xform ()
  9728. -{
  9729. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  9730. -}
  9731. -
  9732. -# func_arith arithmetic-term...
  9733. -func_arith ()
  9734. -{
  9735. - func_arith_result=`expr "$@"`
  9736. -}
  9737. -
  9738. -# func_len string
  9739. -# STRING may not start with a hyphen.
  9740. -func_len ()
  9741. -{
  9742. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  9743. -}
  9744. -
  9745. -_LT_EOF
  9746. -esac
  9747. -
  9748. -case $lt_shell_append in
  9749. - yes)
  9750. - cat << \_LT_EOF >> "$cfgfile"
  9751. -
  9752. -# func_append var value
  9753. -# Append VALUE to the end of shell variable VAR.
  9754. -func_append ()
  9755. -{
  9756. - eval "$1+=\$2"
  9757. -}
  9758. -_LT_EOF
  9759. - ;;
  9760. - *)
  9761. - cat << \_LT_EOF >> "$cfgfile"
  9762. -
  9763. -# func_append var value
  9764. -# Append VALUE to the end of shell variable VAR.
  9765. -func_append ()
  9766. -{
  9767. - eval "$1=\$$1\$2"
  9768. -}
  9769. -
  9770. -_LT_EOF
  9771. - ;;
  9772. - esac
  9773. -
  9774. -
  9775. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  9776. - || (rm -f "$cfgfile"; exit 1)
  9777. -
  9778. - mv -f "$cfgfile" "$ofile" ||
  9779. + sed '$q' "$ltmain" >> "$cfgfile" \
  9780. + || (rm -f "$cfgfile"; exit 1)
  9781. +
  9782. + if test x"$xsi_shell" = xyes; then
  9783. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  9784. +func_dirname ()\
  9785. +{\
  9786. +\ case ${1} in\
  9787. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  9788. +\ * ) func_dirname_result="${3}" ;;\
  9789. +\ esac\
  9790. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  9791. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9792. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9793. +test 0 -eq $? || _lt_function_replace_fail=:
  9794. +
  9795. +
  9796. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  9797. +func_basename ()\
  9798. +{\
  9799. +\ func_basename_result="${1##*/}"\
  9800. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  9801. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9802. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9803. +test 0 -eq $? || _lt_function_replace_fail=:
  9804. +
  9805. +
  9806. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  9807. +func_dirname_and_basename ()\
  9808. +{\
  9809. +\ case ${1} in\
  9810. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  9811. +\ * ) func_dirname_result="${3}" ;;\
  9812. +\ esac\
  9813. +\ func_basename_result="${1##*/}"\
  9814. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  9815. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9816. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9817. +test 0 -eq $? || _lt_function_replace_fail=:
  9818. +
  9819. +
  9820. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  9821. +func_stripname ()\
  9822. +{\
  9823. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  9824. +\ # positional parameters, so assign one to ordinary parameter first.\
  9825. +\ func_stripname_result=${3}\
  9826. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  9827. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  9828. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  9829. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9830. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9831. +test 0 -eq $? || _lt_function_replace_fail=:
  9832. +
  9833. +
  9834. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  9835. +func_split_long_opt ()\
  9836. +{\
  9837. +\ func_split_long_opt_name=${1%%=*}\
  9838. +\ func_split_long_opt_arg=${1#*=}\
  9839. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  9840. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9841. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9842. +test 0 -eq $? || _lt_function_replace_fail=:
  9843. +
  9844. +
  9845. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  9846. +func_split_short_opt ()\
  9847. +{\
  9848. +\ func_split_short_opt_arg=${1#??}\
  9849. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  9850. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  9851. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9852. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9853. +test 0 -eq $? || _lt_function_replace_fail=:
  9854. +
  9855. +
  9856. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  9857. +func_lo2o ()\
  9858. +{\
  9859. +\ case ${1} in\
  9860. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  9861. +\ *) func_lo2o_result=${1} ;;\
  9862. +\ esac\
  9863. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  9864. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9865. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9866. +test 0 -eq $? || _lt_function_replace_fail=:
  9867. +
  9868. +
  9869. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  9870. +func_xform ()\
  9871. +{\
  9872. + func_xform_result=${1%.*}.lo\
  9873. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  9874. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9875. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9876. +test 0 -eq $? || _lt_function_replace_fail=:
  9877. +
  9878. +
  9879. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  9880. +func_arith ()\
  9881. +{\
  9882. + func_arith_result=$(( $* ))\
  9883. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  9884. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9885. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9886. +test 0 -eq $? || _lt_function_replace_fail=:
  9887. +
  9888. +
  9889. + sed -e '/^func_len ()$/,/^} # func_len /c\
  9890. +func_len ()\
  9891. +{\
  9892. + func_len_result=${#1}\
  9893. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  9894. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9895. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9896. +test 0 -eq $? || _lt_function_replace_fail=:
  9897. +
  9898. +fi
  9899. +
  9900. +if test x"$lt_shell_append" = xyes; then
  9901. + sed -e '/^func_append ()$/,/^} # func_append /c\
  9902. +func_append ()\
  9903. +{\
  9904. + eval "${1}+=\\${2}"\
  9905. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  9906. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9907. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9908. +test 0 -eq $? || _lt_function_replace_fail=:
  9909. +
  9910. +
  9911. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  9912. +func_append_quoted ()\
  9913. +{\
  9914. +\ func_quote_for_eval "${2}"\
  9915. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  9916. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  9917. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9918. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9919. +test 0 -eq $? || _lt_function_replace_fail=:
  9920. +
  9921. +
  9922. + # Save a `func_append' function call where possible by direct use of '+='
  9923. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  9924. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9925. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9926. + test 0 -eq $? || _lt_function_replace_fail=:
  9927. +else
  9928. + # Save a `func_append' function call even when '+=' is not available
  9929. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  9930. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9931. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9932. + test 0 -eq $? || _lt_function_replace_fail=:
  9933. +fi
  9934. +
  9935. +if test x"$_lt_function_replace_fail" = x":"; then
  9936. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  9937. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  9938. +fi
  9939. +
  9940. +
  9941. + mv -f "$cfgfile" "$ofile" ||
  9942. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  9943. chmod +x "$ofile"
  9944. @@ -19366,12 +20205,12 @@ with_gcc=$GCC_CXX
  9945. # Compiler flag to turn off builtin functions.
  9946. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  9947. -# How to pass a linker flag through the compiler.
  9948. -wl=$lt_lt_prog_compiler_wl_CXX
  9949. -
  9950. # Additional compiler flags for building library objects.
  9951. pic_flag=$lt_lt_prog_compiler_pic_CXX
  9952. +# How to pass a linker flag through the compiler.
  9953. +wl=$lt_lt_prog_compiler_wl_CXX
  9954. +
  9955. # Compiler flag to prevent dynamic linking.
  9956. link_static_flag=$lt_lt_prog_compiler_static_CXX
  9957. @@ -19458,9 +20297,6 @@ inherit_rpath=$inherit_rpath_CXX
  9958. # Whether libtool must link a program against all its dependency libraries.
  9959. link_all_deplibs=$link_all_deplibs_CXX
  9960. -# Fix the shell variable \$srcfile for the compiler.
  9961. -fix_srcfile_path=$lt_fix_srcfile_path_CXX
  9962. -
  9963. # Set to "yes" if exported symbols are required.
  9964. always_export_symbols=$always_export_symbols_CXX
  9965. @@ -19476,6 +20312,9 @@ include_expsyms=$lt_include_expsyms_CXX
  9966. # Commands necessary for linking programs (against libraries) with templates.
  9967. prelink_cmds=$lt_prelink_cmds_CXX
  9968. +# Commands necessary for finishing linking programs.
  9969. +postlink_cmds=$lt_postlink_cmds_CXX
  9970. +
  9971. # Specify filename containing input files.
  9972. file_list_spec=$lt_file_list_spec_CXX
  9973. diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in
  9974. index 4050586f6a8..394469e3768 100644
  9975. --- a/gprofng/doc/Makefile.in
  9976. +++ b/gprofng/doc/Makefile.in
  9977. @@ -237,6 +237,7 @@ CXXFLAGS = @CXXFLAGS@
  9978. CYGPATH_W = @CYGPATH_W@
  9979. DEFS = @DEFS@
  9980. DEPDIR = @DEPDIR@
  9981. +DLLTOOL = @DLLTOOL@
  9982. DSYMUTIL = @DSYMUTIL@
  9983. DUMPBIN = @DUMPBIN@
  9984. ECHO_C = @ECHO_C@
  9985. @@ -272,6 +273,7 @@ LN_S = @LN_S@
  9986. LTLIBOBJS = @LTLIBOBJS@
  9987. MAINT = @MAINT@
  9988. MAKEINFO = @MAKEINFO@
  9989. +MANIFEST_TOOL = @MANIFEST_TOOL@
  9990. MKDIR_P = @MKDIR_P@
  9991. NM = @NM@
  9992. NMEDIT = @NMEDIT@
  9993. diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in
  9994. index 1206a79d3f0..2f763e5f760 100644
  9995. --- a/gprofng/gp-display-html/Makefile.in
  9996. +++ b/gprofng/gp-display-html/Makefile.in
  9997. @@ -200,6 +200,7 @@ CXXFLAGS = @CXXFLAGS@
  9998. CYGPATH_W = @CYGPATH_W@
  9999. DEFS = @DEFS@
  10000. DEPDIR = @DEPDIR@
  10001. +DLLTOOL = @DLLTOOL@
  10002. DSYMUTIL = @DSYMUTIL@
  10003. DUMPBIN = @DUMPBIN@
  10004. ECHO_C = @ECHO_C@
  10005. @@ -235,6 +236,7 @@ LN_S = @LN_S@
  10006. LTLIBOBJS = @LTLIBOBJS@
  10007. MAINT = @MAINT@
  10008. MAKEINFO = @MAKEINFO@
  10009. +MANIFEST_TOOL = @MANIFEST_TOOL@
  10010. MKDIR_P = @MKDIR_P@
  10011. NM = @NM@
  10012. NMEDIT = @NMEDIT@
  10013. diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in
  10014. index 9372c6dea78..0cf4f58c0ec 100644
  10015. --- a/gprofng/libcollector/Makefile.in
  10016. +++ b/gprofng/libcollector/Makefile.in
  10017. @@ -316,6 +316,7 @@ CXXFLAGS = @CXXFLAGS@
  10018. CYGPATH_W = @CYGPATH_W@
  10019. DEFS = @DEFS@
  10020. DEPDIR = @DEPDIR@
  10021. +DLLTOOL = @DLLTOOL@
  10022. DSYMUTIL = @DSYMUTIL@
  10023. DUMPBIN = @DUMPBIN@
  10024. ECHO_C = @ECHO_C@
  10025. @@ -342,6 +343,7 @@ LN_S = @LN_S@
  10026. LTLIBOBJS = @LTLIBOBJS@
  10027. MAINT = @MAINT@
  10028. MAKEINFO = @MAKEINFO@
  10029. +MANIFEST_TOOL = @MANIFEST_TOOL@
  10030. MKDIR_P = @MKDIR_P@
  10031. NM = @NM@
  10032. NMEDIT = @NMEDIT@
  10033. diff --git a/gprofng/libcollector/configure b/gprofng/libcollector/configure
  10034. index ec38721ced2..d9daed11e3f 100755
  10035. --- a/gprofng/libcollector/configure
  10036. +++ b/gprofng/libcollector/configure
  10037. @@ -641,6 +641,8 @@ OTOOL
  10038. LIPO
  10039. NMEDIT
  10040. DSYMUTIL
  10041. +MANIFEST_TOOL
  10042. +DLLTOOL
  10043. OBJDUMP
  10044. LN_S
  10045. NM
  10046. @@ -770,6 +772,7 @@ enable_static
  10047. with_pic
  10048. enable_fast_install
  10049. with_gnu_ld
  10050. +with_libtool_sysroot
  10051. enable_libtool_lock
  10052. '
  10053. ac_precious_vars='build_alias
  10054. @@ -1425,6 +1428,8 @@ Optional Packages:
  10055. --with-pic try to use only PIC/non-PIC objects [default=use
  10056. both]
  10057. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  10058. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  10059. + (or the compiler's sysroot if not specified).
  10060. Some influential environment variables:
  10061. CC C compiler command
  10062. @@ -5969,8 +5974,8 @@ esac
  10063. -macro_version='2.2.7a'
  10064. -macro_revision='1.3134'
  10065. +macro_version='2.4'
  10066. +macro_revision='1.3293'
  10067. @@ -6010,7 +6015,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  10068. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  10069. $as_echo_n "checking how to print strings... " >&6; }
  10070. # Test print first, because it will be a builtin if present.
  10071. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  10072. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  10073. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  10074. ECHO='print -r --'
  10075. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  10076. @@ -6703,8 +6708,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  10077. # Try some XSI features
  10078. xsi_shell=no
  10079. ( _lt_dummy="a/b/c"
  10080. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  10081. - = c,a/b,, \
  10082. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  10083. + = c,a/b,b/c, \
  10084. && eval 'test $(( 1 + 1 )) -eq 2 \
  10085. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  10086. && xsi_shell=yes
  10087. @@ -6753,6 +6758,80 @@ esac
  10088. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  10089. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  10090. +if ${lt_cv_to_host_file_cmd+:} false; then :
  10091. + $as_echo_n "(cached) " >&6
  10092. +else
  10093. + case $host in
  10094. + *-*-mingw* )
  10095. + case $build in
  10096. + *-*-mingw* ) # actually msys
  10097. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  10098. + ;;
  10099. + *-*-cygwin* )
  10100. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  10101. + ;;
  10102. + * ) # otherwise, assume *nix
  10103. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  10104. + ;;
  10105. + esac
  10106. + ;;
  10107. + *-*-cygwin* )
  10108. + case $build in
  10109. + *-*-mingw* ) # actually msys
  10110. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  10111. + ;;
  10112. + *-*-cygwin* )
  10113. + lt_cv_to_host_file_cmd=func_convert_file_noop
  10114. + ;;
  10115. + * ) # otherwise, assume *nix
  10116. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  10117. + ;;
  10118. + esac
  10119. + ;;
  10120. + * ) # unhandled hosts (and "normal" native builds)
  10121. + lt_cv_to_host_file_cmd=func_convert_file_noop
  10122. + ;;
  10123. +esac
  10124. +
  10125. +fi
  10126. +
  10127. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  10128. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  10129. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  10130. +
  10131. +
  10132. +
  10133. +
  10134. +
  10135. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  10136. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  10137. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  10138. + $as_echo_n "(cached) " >&6
  10139. +else
  10140. + #assume ordinary cross tools, or native build.
  10141. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  10142. +case $host in
  10143. + *-*-mingw* )
  10144. + case $build in
  10145. + *-*-mingw* ) # actually msys
  10146. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  10147. + ;;
  10148. + esac
  10149. + ;;
  10150. +esac
  10151. +
  10152. +fi
  10153. +
  10154. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  10155. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  10156. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  10157. +
  10158. +
  10159. +
  10160. +
  10161. +
  10162. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  10163. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  10164. if ${lt_cv_ld_reload_flag+:} false; then :
  10165. @@ -6769,6 +6848,11 @@ case $reload_flag in
  10166. esac
  10167. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  10168. case $host_os in
  10169. + cygwin* | mingw* | pw32* | cegcc*)
  10170. + if test "$GCC" != yes; then
  10171. + reload_cmds=false
  10172. + fi
  10173. + ;;
  10174. darwin*)
  10175. if test "$GCC" = yes; then
  10176. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  10177. @@ -6937,7 +7021,8 @@ mingw* | pw32*)
  10178. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  10179. lt_cv_file_magic_cmd='func_win32_libid'
  10180. else
  10181. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  10182. + # Keep this pattern in sync with the one in func_win32_libid.
  10183. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  10184. lt_cv_file_magic_cmd='$OBJDUMP -f'
  10185. fi
  10186. ;;
  10187. @@ -7091,6 +7176,21 @@ esac
  10188. fi
  10189. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  10190. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  10191. +
  10192. +file_magic_glob=
  10193. +want_nocaseglob=no
  10194. +if test "$build" = "$host"; then
  10195. + case $host_os in
  10196. + mingw* | pw32*)
  10197. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  10198. + want_nocaseglob=yes
  10199. + else
  10200. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  10201. + fi
  10202. + ;;
  10203. + esac
  10204. +fi
  10205. +
  10206. file_magic_cmd=$lt_cv_file_magic_cmd
  10207. deplibs_check_method=$lt_cv_deplibs_check_method
  10208. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  10209. @@ -7106,6 +7206,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  10210. +
  10211. +
  10212. +
  10213. +
  10214. +
  10215. +
  10216. +
  10217. +
  10218. +
  10219. +
  10220. +if test -n "$ac_tool_prefix"; then
  10221. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  10222. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  10223. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10224. +$as_echo_n "checking for $ac_word... " >&6; }
  10225. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  10226. + $as_echo_n "(cached) " >&6
  10227. +else
  10228. + if test -n "$DLLTOOL"; then
  10229. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  10230. +else
  10231. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10232. +for as_dir in $PATH
  10233. +do
  10234. + IFS=$as_save_IFS
  10235. + test -z "$as_dir" && as_dir=.
  10236. + for ac_exec_ext in '' $ac_executable_extensions; do
  10237. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10238. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  10239. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10240. + break 2
  10241. + fi
  10242. +done
  10243. + done
  10244. +IFS=$as_save_IFS
  10245. +
  10246. +fi
  10247. +fi
  10248. +DLLTOOL=$ac_cv_prog_DLLTOOL
  10249. +if test -n "$DLLTOOL"; then
  10250. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  10251. +$as_echo "$DLLTOOL" >&6; }
  10252. +else
  10253. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10254. +$as_echo "no" >&6; }
  10255. +fi
  10256. +
  10257. +
  10258. +fi
  10259. +if test -z "$ac_cv_prog_DLLTOOL"; then
  10260. + ac_ct_DLLTOOL=$DLLTOOL
  10261. + # Extract the first word of "dlltool", so it can be a program name with args.
  10262. +set dummy dlltool; ac_word=$2
  10263. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10264. +$as_echo_n "checking for $ac_word... " >&6; }
  10265. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  10266. + $as_echo_n "(cached) " >&6
  10267. +else
  10268. + if test -n "$ac_ct_DLLTOOL"; then
  10269. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  10270. +else
  10271. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10272. +for as_dir in $PATH
  10273. +do
  10274. + IFS=$as_save_IFS
  10275. + test -z "$as_dir" && as_dir=.
  10276. + for ac_exec_ext in '' $ac_executable_extensions; do
  10277. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10278. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  10279. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10280. + break 2
  10281. + fi
  10282. +done
  10283. + done
  10284. +IFS=$as_save_IFS
  10285. +
  10286. +fi
  10287. +fi
  10288. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  10289. +if test -n "$ac_ct_DLLTOOL"; then
  10290. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  10291. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  10292. +else
  10293. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10294. +$as_echo "no" >&6; }
  10295. +fi
  10296. +
  10297. + if test "x$ac_ct_DLLTOOL" = x; then
  10298. + DLLTOOL="false"
  10299. + else
  10300. + case $cross_compiling:$ac_tool_warned in
  10301. +yes:)
  10302. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  10303. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  10304. +ac_tool_warned=yes ;;
  10305. +esac
  10306. + DLLTOOL=$ac_ct_DLLTOOL
  10307. + fi
  10308. +else
  10309. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  10310. +fi
  10311. +
  10312. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  10313. +
  10314. +
  10315. +
  10316. +
  10317. +
  10318. +
  10319. +
  10320. +
  10321. +
  10322. +
  10323. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  10324. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  10325. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  10326. + $as_echo_n "(cached) " >&6
  10327. +else
  10328. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  10329. +
  10330. +case $host_os in
  10331. +cygwin* | mingw* | pw32* | cegcc*)
  10332. + # two different shell functions defined in ltmain.sh
  10333. + # decide which to use based on capabilities of $DLLTOOL
  10334. + case `$DLLTOOL --help 2>&1` in
  10335. + *--identify-strict*)
  10336. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  10337. + ;;
  10338. + *)
  10339. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  10340. + ;;
  10341. + esac
  10342. + ;;
  10343. +*)
  10344. + # fallback: assume linklib IS sharedlib
  10345. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  10346. + ;;
  10347. +esac
  10348. +
  10349. +fi
  10350. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  10351. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  10352. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  10353. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  10354. +
  10355. +
  10356. +
  10357. +
  10358. +
  10359. +
  10360. +
  10361. plugin_option=
  10362. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  10363. for plugin in $plugin_names; do
  10364. @@ -7120,8 +7371,10 @@ for plugin in $plugin_names; do
  10365. done
  10366. if test -n "$ac_tool_prefix"; then
  10367. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  10368. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  10369. + for ac_prog in ar
  10370. + do
  10371. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  10372. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  10373. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10374. $as_echo_n "checking for $ac_word... " >&6; }
  10375. if ${ac_cv_prog_AR+:} false; then :
  10376. @@ -7137,7 +7390,7 @@ do
  10377. test -z "$as_dir" && as_dir=.
  10378. for ac_exec_ext in '' $ac_executable_extensions; do
  10379. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10380. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  10381. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  10382. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10383. break 2
  10384. fi
  10385. @@ -7157,11 +7410,15 @@ $as_echo "no" >&6; }
  10386. fi
  10387. + test -n "$AR" && break
  10388. + done
  10389. fi
  10390. -if test -z "$ac_cv_prog_AR"; then
  10391. +if test -z "$AR"; then
  10392. ac_ct_AR=$AR
  10393. - # Extract the first word of "ar", so it can be a program name with args.
  10394. -set dummy ar; ac_word=$2
  10395. + for ac_prog in ar
  10396. +do
  10397. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  10398. +set dummy $ac_prog; ac_word=$2
  10399. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10400. $as_echo_n "checking for $ac_word... " >&6; }
  10401. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  10402. @@ -7177,7 +7434,7 @@ do
  10403. test -z "$as_dir" && as_dir=.
  10404. for ac_exec_ext in '' $ac_executable_extensions; do
  10405. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10406. - ac_cv_prog_ac_ct_AR="ar"
  10407. + ac_cv_prog_ac_ct_AR="$ac_prog"
  10408. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10409. break 2
  10410. fi
  10411. @@ -7196,6 +7453,10 @@ else
  10412. $as_echo "no" >&6; }
  10413. fi
  10414. +
  10415. + test -n "$ac_ct_AR" && break
  10416. +done
  10417. +
  10418. if test "x$ac_ct_AR" = x; then
  10419. AR="false"
  10420. else
  10421. @@ -7207,29 +7468,81 @@ ac_tool_warned=yes ;;
  10422. esac
  10423. AR=$ac_ct_AR
  10424. fi
  10425. -else
  10426. - AR="$ac_cv_prog_AR"
  10427. fi
  10428. -test -z "$AR" && AR=ar
  10429. -if test -n "$plugin_option"; then
  10430. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  10431. - touch conftest.c
  10432. - $AR $plugin_option rc conftest.a conftest.c
  10433. - if test "$?" != 0; then
  10434. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  10435. + touch conftest.c
  10436. + $AR $plugin_option rc conftest.a conftest.c
  10437. + if test "$?" != 0; then
  10438. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  10439. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  10440. - else
  10441. - AR="$AR $plugin_option"
  10442. - fi
  10443. - rm -f conftest.*
  10444. + else
  10445. + AR="$AR $plugin_option"
  10446. fi
  10447. -fi
  10448. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  10449. + rm -f conftest.*
  10450. +: ${AR=ar}
  10451. +: ${AR_FLAGS=cru}
  10452. +
  10453. +
  10454. +
  10455. +
  10456. +
  10457. +
  10458. +
  10459. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  10460. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  10461. +if ${lt_cv_ar_at_file+:} false; then :
  10462. + $as_echo_n "(cached) " >&6
  10463. +else
  10464. + lt_cv_ar_at_file=no
  10465. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10466. +/* end confdefs.h. */
  10467. +
  10468. +int
  10469. +main ()
  10470. +{
  10471. +
  10472. + ;
  10473. + return 0;
  10474. +}
  10475. +_ACEOF
  10476. +if ac_fn_c_try_compile "$LINENO"; then :
  10477. + echo conftest.$ac_objext > conftest.lst
  10478. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  10479. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  10480. + (eval $lt_ar_try) 2>&5
  10481. + ac_status=$?
  10482. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  10483. + test $ac_status = 0; }
  10484. + if test "$ac_status" -eq 0; then
  10485. + # Ensure the archiver fails upon bogus file names.
  10486. + rm -f conftest.$ac_objext libconftest.a
  10487. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  10488. + (eval $lt_ar_try) 2>&5
  10489. + ac_status=$?
  10490. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  10491. + test $ac_status = 0; }
  10492. + if test "$ac_status" -ne 0; then
  10493. + lt_cv_ar_at_file=@
  10494. + fi
  10495. + fi
  10496. + rm -f conftest.* libconftest.a
  10497. +
  10498. +fi
  10499. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  10500. +
  10501. +fi
  10502. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  10503. +$as_echo "$lt_cv_ar_at_file" >&6; }
  10504. +
  10505. +if test "x$lt_cv_ar_at_file" = xno; then
  10506. + archiver_list_spec=
  10507. +else
  10508. + archiver_list_spec=$lt_cv_ar_at_file
  10509. +fi
  10510. @@ -7576,8 +7889,8 @@ esac
  10511. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  10512. # Transform an extracted symbol line into symbol name and symbol address
  10513. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  10514. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  10515. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  10516. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  10517. # Handle CRLF in mingw tool chain
  10518. opt_cr=
  10519. @@ -7613,6 +7926,7 @@ for ac_symprfx in "" "_"; do
  10520. else
  10521. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  10522. fi
  10523. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  10524. # Check to see that the pipe works correctly.
  10525. pipe_works=no
  10526. @@ -7654,6 +7968,18 @@ _LT_EOF
  10527. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  10528. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  10529. cat <<_LT_EOF > conftest.$ac_ext
  10530. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  10531. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  10532. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  10533. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  10534. +# define LT_DLSYM_CONST
  10535. +#elif defined(__osf__)
  10536. +/* This system does not cope well with relocations in const data. */
  10537. +# define LT_DLSYM_CONST
  10538. +#else
  10539. +# define LT_DLSYM_CONST const
  10540. +#endif
  10541. +
  10542. #ifdef __cplusplus
  10543. extern "C" {
  10544. #endif
  10545. @@ -7665,7 +7991,7 @@ _LT_EOF
  10546. cat <<_LT_EOF >> conftest.$ac_ext
  10547. /* The mapping between symbol names and symbols. */
  10548. -const struct {
  10549. +LT_DLSYM_CONST struct {
  10550. const char *name;
  10551. void *address;
  10552. }
  10553. @@ -7691,8 +8017,8 @@ static const void *lt_preloaded_setup() {
  10554. _LT_EOF
  10555. # Now try linking the two files.
  10556. mv conftest.$ac_objext conftstm.$ac_objext
  10557. - lt_save_LIBS="$LIBS"
  10558. - lt_save_CFLAGS="$CFLAGS"
  10559. + lt_globsym_save_LIBS=$LIBS
  10560. + lt_globsym_save_CFLAGS=$CFLAGS
  10561. LIBS="conftstm.$ac_objext"
  10562. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  10563. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  10564. @@ -7702,8 +8028,8 @@ _LT_EOF
  10565. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  10566. pipe_works=yes
  10567. fi
  10568. - LIBS="$lt_save_LIBS"
  10569. - CFLAGS="$lt_save_CFLAGS"
  10570. + LIBS=$lt_globsym_save_LIBS
  10571. + CFLAGS=$lt_globsym_save_CFLAGS
  10572. else
  10573. echo "cannot find nm_test_func in $nlist" >&5
  10574. fi
  10575. @@ -7740,6 +8066,13 @@ else
  10576. $as_echo "ok" >&6; }
  10577. fi
  10578. +# Response file support.
  10579. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  10580. + nm_file_list_spec='@'
  10581. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  10582. + nm_file_list_spec='@'
  10583. +fi
  10584. +
  10585. @@ -7759,6 +8092,48 @@ fi
  10586. +
  10587. +
  10588. +
  10589. +
  10590. +
  10591. +
  10592. +
  10593. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  10594. +$as_echo_n "checking for sysroot... " >&6; }
  10595. +
  10596. +# Check whether --with-libtool-sysroot was given.
  10597. +if test "${with_libtool_sysroot+set}" = set; then :
  10598. + withval=$with_libtool_sysroot;
  10599. +else
  10600. + with_libtool_sysroot=no
  10601. +fi
  10602. +
  10603. +
  10604. +lt_sysroot=
  10605. +case ${with_libtool_sysroot} in #(
  10606. + yes)
  10607. + if test "$GCC" = yes; then
  10608. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  10609. + fi
  10610. + ;; #(
  10611. + /*)
  10612. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  10613. + ;; #(
  10614. + no|'')
  10615. + ;; #(
  10616. + *)
  10617. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  10618. +$as_echo "${with_libtool_sysroot}" >&6; }
  10619. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  10620. + ;;
  10621. +esac
  10622. +
  10623. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  10624. +$as_echo "${lt_sysroot:-no}" >&6; }
  10625. +
  10626. +
  10627. +
  10628. # Check whether --enable-libtool-lock was given.
  10629. @@ -7967,6 +8342,123 @@ esac
  10630. need_locks="$enable_libtool_lock"
  10631. +if test -n "$ac_tool_prefix"; then
  10632. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  10633. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  10634. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10635. +$as_echo_n "checking for $ac_word... " >&6; }
  10636. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  10637. + $as_echo_n "(cached) " >&6
  10638. +else
  10639. + if test -n "$MANIFEST_TOOL"; then
  10640. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  10641. +else
  10642. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10643. +for as_dir in $PATH
  10644. +do
  10645. + IFS=$as_save_IFS
  10646. + test -z "$as_dir" && as_dir=.
  10647. + for ac_exec_ext in '' $ac_executable_extensions; do
  10648. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10649. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  10650. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10651. + break 2
  10652. + fi
  10653. +done
  10654. + done
  10655. +IFS=$as_save_IFS
  10656. +
  10657. +fi
  10658. +fi
  10659. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  10660. +if test -n "$MANIFEST_TOOL"; then
  10661. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  10662. +$as_echo "$MANIFEST_TOOL" >&6; }
  10663. +else
  10664. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10665. +$as_echo "no" >&6; }
  10666. +fi
  10667. +
  10668. +
  10669. +fi
  10670. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  10671. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  10672. + # Extract the first word of "mt", so it can be a program name with args.
  10673. +set dummy mt; ac_word=$2
  10674. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10675. +$as_echo_n "checking for $ac_word... " >&6; }
  10676. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  10677. + $as_echo_n "(cached) " >&6
  10678. +else
  10679. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  10680. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  10681. +else
  10682. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10683. +for as_dir in $PATH
  10684. +do
  10685. + IFS=$as_save_IFS
  10686. + test -z "$as_dir" && as_dir=.
  10687. + for ac_exec_ext in '' $ac_executable_extensions; do
  10688. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10689. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  10690. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10691. + break 2
  10692. + fi
  10693. +done
  10694. + done
  10695. +IFS=$as_save_IFS
  10696. +
  10697. +fi
  10698. +fi
  10699. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  10700. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  10701. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  10702. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  10703. +else
  10704. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10705. +$as_echo "no" >&6; }
  10706. +fi
  10707. +
  10708. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  10709. + MANIFEST_TOOL=":"
  10710. + else
  10711. + case $cross_compiling:$ac_tool_warned in
  10712. +yes:)
  10713. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  10714. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  10715. +ac_tool_warned=yes ;;
  10716. +esac
  10717. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  10718. + fi
  10719. +else
  10720. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  10721. +fi
  10722. +
  10723. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  10724. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  10725. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  10726. +if ${lt_cv_path_mainfest_tool+:} false; then :
  10727. + $as_echo_n "(cached) " >&6
  10728. +else
  10729. + lt_cv_path_mainfest_tool=no
  10730. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  10731. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  10732. + cat conftest.err >&5
  10733. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  10734. + lt_cv_path_mainfest_tool=yes
  10735. + fi
  10736. + rm -f conftest*
  10737. +fi
  10738. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  10739. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  10740. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  10741. + MANIFEST_TOOL=:
  10742. +fi
  10743. +
  10744. +
  10745. +
  10746. +
  10747. +
  10748. case $host_os in
  10749. rhapsody* | darwin*)
  10750. @@ -8530,6 +9022,8 @@ _LT_EOF
  10751. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  10752. echo "$AR cru libconftest.a conftest.o" >&5
  10753. $AR cru libconftest.a conftest.o 2>&5
  10754. + echo "$RANLIB libconftest.a" >&5
  10755. + $RANLIB libconftest.a 2>&5
  10756. cat > conftest.c << _LT_EOF
  10757. int main() { return 0;}
  10758. _LT_EOF
  10759. @@ -8598,6 +9092,16 @@ done
  10760. +func_stripname_cnf ()
  10761. +{
  10762. + case ${2} in
  10763. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  10764. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  10765. + esac
  10766. +} # func_stripname_cnf
  10767. +
  10768. +
  10769. +
  10770. # Set options
  10771. @@ -9113,8 +9617,6 @@ fi
  10772. lt_prog_compiler_pic=
  10773. lt_prog_compiler_static=
  10774. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  10775. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10776. if test "$GCC" = yes; then
  10777. lt_prog_compiler_wl='-Wl,'
  10778. @@ -9280,6 +9782,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10779. lt_prog_compiler_pic='--shared'
  10780. lt_prog_compiler_static='--static'
  10781. ;;
  10782. + nagfor*)
  10783. + # NAG Fortran compiler
  10784. + lt_prog_compiler_wl='-Wl,-Wl,,'
  10785. + lt_prog_compiler_pic='-PIC'
  10786. + lt_prog_compiler_static='-Bstatic'
  10787. + ;;
  10788. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  10789. # Portland Group compilers (*not* the Pentium gcc compiler,
  10790. # which looks to be a dead project)
  10791. @@ -9342,7 +9850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10792. lt_prog_compiler_pic='-KPIC'
  10793. lt_prog_compiler_static='-Bstatic'
  10794. case $cc_basename in
  10795. - f77* | f90* | f95*)
  10796. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  10797. lt_prog_compiler_wl='-Qoption ld ';;
  10798. *)
  10799. lt_prog_compiler_wl='-Wl,';;
  10800. @@ -9399,13 +9907,17 @@ case $host_os in
  10801. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  10802. ;;
  10803. esac
  10804. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  10805. -$as_echo "$lt_prog_compiler_pic" >&6; }
  10806. -
  10807. -
  10808. -
  10809. -
  10810. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  10811. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10812. +if ${lt_cv_prog_compiler_pic+:} false; then :
  10813. + $as_echo_n "(cached) " >&6
  10814. +else
  10815. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  10816. +fi
  10817. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  10818. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  10819. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  10820. #
  10821. # Check to make sure the PIC flag actually works.
  10822. @@ -9466,6 +9978,11 @@ fi
  10823. +
  10824. +
  10825. +
  10826. +
  10827. +
  10828. #
  10829. # Check to make sure the static flag actually works.
  10830. #
  10831. @@ -9816,7 +10333,8 @@ _LT_EOF
  10832. allow_undefined_flag=unsupported
  10833. always_export_symbols=no
  10834. enable_shared_with_static_runtimes=yes
  10835. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  10836. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  10837. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  10838. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  10839. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  10840. @@ -9915,12 +10433,12 @@ _LT_EOF
  10841. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  10842. hardcode_libdir_flag_spec=
  10843. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  10844. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  10845. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  10846. if test "x$supports_anon_versioning" = xyes; then
  10847. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  10848. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  10849. echo "local: *; };" >> $output_objdir/$libname.ver~
  10850. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  10851. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  10852. fi
  10853. ;;
  10854. esac
  10855. @@ -9934,8 +10452,8 @@ _LT_EOF
  10856. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  10857. wlarc=
  10858. else
  10859. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10860. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10861. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10862. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10863. fi
  10864. ;;
  10865. @@ -9953,8 +10471,8 @@ _LT_EOF
  10866. _LT_EOF
  10867. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  10868. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10869. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10870. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10871. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10872. else
  10873. ld_shlibs=no
  10874. fi
  10875. @@ -10000,8 +10518,8 @@ _LT_EOF
  10876. *)
  10877. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  10878. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10879. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10880. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10881. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10882. else
  10883. ld_shlibs=no
  10884. fi
  10885. @@ -10131,7 +10649,13 @@ _LT_EOF
  10886. allow_undefined_flag='-berok'
  10887. # Determine the default libpath from the value encoded in an
  10888. # empty executable.
  10889. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10890. + if test "${lt_cv_aix_libpath+set}" = set; then
  10891. + aix_libpath=$lt_cv_aix_libpath
  10892. +else
  10893. + if ${lt_cv_aix_libpath_+:} false; then :
  10894. + $as_echo_n "(cached) " >&6
  10895. +else
  10896. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10897. /* end confdefs.h. */
  10898. int
  10899. @@ -10144,22 +10668,29 @@ main ()
  10900. _ACEOF
  10901. if ac_fn_c_try_link "$LINENO"; then :
  10902. -lt_aix_libpath_sed='
  10903. - /Import File Strings/,/^$/ {
  10904. - /^0/ {
  10905. - s/^0 *\(.*\)$/\1/
  10906. - p
  10907. - }
  10908. - }'
  10909. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10910. -# Check for a 64-bit object if we didn't find anything.
  10911. -if test -z "$aix_libpath"; then
  10912. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10913. -fi
  10914. + lt_aix_libpath_sed='
  10915. + /Import File Strings/,/^$/ {
  10916. + /^0/ {
  10917. + s/^0 *\([^ ]*\) *$/\1/
  10918. + p
  10919. + }
  10920. + }'
  10921. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10922. + # Check for a 64-bit object if we didn't find anything.
  10923. + if test -z "$lt_cv_aix_libpath_"; then
  10924. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10925. + fi
  10926. fi
  10927. rm -f core conftest.err conftest.$ac_objext \
  10928. conftest$ac_exeext conftest.$ac_ext
  10929. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10930. + if test -z "$lt_cv_aix_libpath_"; then
  10931. + lt_cv_aix_libpath_="/usr/lib:/lib"
  10932. + fi
  10933. +
  10934. +fi
  10935. +
  10936. + aix_libpath=$lt_cv_aix_libpath_
  10937. +fi
  10938. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  10939. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  10940. @@ -10171,7 +10702,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10941. else
  10942. # Determine the default libpath from the value encoded in an
  10943. # empty executable.
  10944. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10945. + if test "${lt_cv_aix_libpath+set}" = set; then
  10946. + aix_libpath=$lt_cv_aix_libpath
  10947. +else
  10948. + if ${lt_cv_aix_libpath_+:} false; then :
  10949. + $as_echo_n "(cached) " >&6
  10950. +else
  10951. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10952. /* end confdefs.h. */
  10953. int
  10954. @@ -10184,22 +10721,29 @@ main ()
  10955. _ACEOF
  10956. if ac_fn_c_try_link "$LINENO"; then :
  10957. -lt_aix_libpath_sed='
  10958. - /Import File Strings/,/^$/ {
  10959. - /^0/ {
  10960. - s/^0 *\(.*\)$/\1/
  10961. - p
  10962. - }
  10963. - }'
  10964. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10965. -# Check for a 64-bit object if we didn't find anything.
  10966. -if test -z "$aix_libpath"; then
  10967. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10968. -fi
  10969. + lt_aix_libpath_sed='
  10970. + /Import File Strings/,/^$/ {
  10971. + /^0/ {
  10972. + s/^0 *\([^ ]*\) *$/\1/
  10973. + p
  10974. + }
  10975. + }'
  10976. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10977. + # Check for a 64-bit object if we didn't find anything.
  10978. + if test -z "$lt_cv_aix_libpath_"; then
  10979. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10980. + fi
  10981. fi
  10982. rm -f core conftest.err conftest.$ac_objext \
  10983. conftest$ac_exeext conftest.$ac_ext
  10984. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10985. + if test -z "$lt_cv_aix_libpath_"; then
  10986. + lt_cv_aix_libpath_="/usr/lib:/lib"
  10987. + fi
  10988. +
  10989. +fi
  10990. +
  10991. + aix_libpath=$lt_cv_aix_libpath_
  10992. +fi
  10993. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  10994. # Warning - without using the other run time loading flags,
  10995. @@ -10243,21 +10787,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10996. # When not using gcc, we currently assume that we are using
  10997. # Microsoft Visual C++.
  10998. # hardcode_libdir_flag_spec is actually meaningless, as there is
  10999. - # no search path for DLLs.
  11000. - hardcode_libdir_flag_spec=' '
  11001. - allow_undefined_flag=unsupported
  11002. - # Tell ltmain to make .lib files, not .a files.
  11003. - libext=lib
  11004. - # Tell ltmain to make .dll files, not .so files.
  11005. - shrext_cmds=".dll"
  11006. - # FIXME: Setting linknames here is a bad hack.
  11007. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  11008. - # The linker will automatically build a .lib file if we build a DLL.
  11009. - old_archive_from_new_cmds='true'
  11010. - # FIXME: Should let the user specify the lib program.
  11011. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  11012. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  11013. - enable_shared_with_static_runtimes=yes
  11014. + # no search path for DLLs.
  11015. + case $cc_basename in
  11016. + cl*)
  11017. + # Native MSVC
  11018. + hardcode_libdir_flag_spec=' '
  11019. + allow_undefined_flag=unsupported
  11020. + always_export_symbols=yes
  11021. + file_list_spec='@'
  11022. + # Tell ltmain to make .lib files, not .a files.
  11023. + libext=lib
  11024. + # Tell ltmain to make .dll files, not .so files.
  11025. + shrext_cmds=".dll"
  11026. + # FIXME: Setting linknames here is a bad hack.
  11027. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  11028. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  11029. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  11030. + else
  11031. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  11032. + fi~
  11033. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  11034. + linknames='
  11035. + # The linker will not automatically build a static lib if we build a DLL.
  11036. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  11037. + enable_shared_with_static_runtimes=yes
  11038. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  11039. + # Don't use ranlib
  11040. + old_postinstall_cmds='chmod 644 $oldlib'
  11041. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  11042. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  11043. + case $lt_outputfile in
  11044. + *.exe|*.EXE) ;;
  11045. + *)
  11046. + lt_outputfile="$lt_outputfile.exe"
  11047. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  11048. + ;;
  11049. + esac~
  11050. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  11051. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  11052. + $RM "$lt_outputfile.manifest";
  11053. + fi'
  11054. + ;;
  11055. + *)
  11056. + # Assume MSVC wrapper
  11057. + hardcode_libdir_flag_spec=' '
  11058. + allow_undefined_flag=unsupported
  11059. + # Tell ltmain to make .lib files, not .a files.
  11060. + libext=lib
  11061. + # Tell ltmain to make .dll files, not .so files.
  11062. + shrext_cmds=".dll"
  11063. + # FIXME: Setting linknames here is a bad hack.
  11064. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  11065. + # The linker will automatically build a .lib file if we build a DLL.
  11066. + old_archive_from_new_cmds='true'
  11067. + # FIXME: Should let the user specify the lib program.
  11068. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  11069. + enable_shared_with_static_runtimes=yes
  11070. + ;;
  11071. + esac
  11072. ;;
  11073. darwin* | rhapsody*)
  11074. @@ -10318,7 +10905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11075. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  11076. freebsd* | dragonfly*)
  11077. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  11078. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  11079. hardcode_libdir_flag_spec='-R$libdir'
  11080. hardcode_direct=yes
  11081. hardcode_shlibpath_var=no
  11082. @@ -10326,7 +10913,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11083. hpux9*)
  11084. if test "$GCC" = yes; then
  11085. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  11086. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  11087. else
  11088. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  11089. fi
  11090. @@ -10342,7 +10929,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11091. hpux10*)
  11092. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  11093. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  11094. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  11095. else
  11096. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  11097. fi
  11098. @@ -10366,10 +10953,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11099. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  11100. ;;
  11101. ia64*)
  11102. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  11103. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  11104. ;;
  11105. *)
  11106. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  11107. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  11108. ;;
  11109. esac
  11110. else
  11111. @@ -10448,23 +11035,36 @@ fi
  11112. irix5* | irix6* | nonstopux*)
  11113. if test "$GCC" = yes; then
  11114. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11115. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11116. # Try to use the -exported_symbol ld option, if it does not
  11117. # work, assume that -exports_file does not work either and
  11118. # implicitly export all symbols.
  11119. - save_LDFLAGS="$LDFLAGS"
  11120. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  11121. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11122. + # This should be the same for all languages, so no per-tag cache variable.
  11123. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  11124. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  11125. +if ${lt_cv_irix_exported_symbol+:} false; then :
  11126. + $as_echo_n "(cached) " >&6
  11127. +else
  11128. + save_LDFLAGS="$LDFLAGS"
  11129. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  11130. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11131. /* end confdefs.h. */
  11132. -int foo(void) {}
  11133. +int foo (void) { return 0; }
  11134. _ACEOF
  11135. if ac_fn_c_try_link "$LINENO"; then :
  11136. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  11137. -
  11138. + lt_cv_irix_exported_symbol=yes
  11139. +else
  11140. + lt_cv_irix_exported_symbol=no
  11141. fi
  11142. rm -f core conftest.err conftest.$ac_objext \
  11143. conftest$ac_exeext conftest.$ac_ext
  11144. - LDFLAGS="$save_LDFLAGS"
  11145. + LDFLAGS="$save_LDFLAGS"
  11146. +fi
  11147. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  11148. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  11149. + if test "$lt_cv_irix_exported_symbol" = yes; then
  11150. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  11151. + fi
  11152. else
  11153. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  11154. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  11155. @@ -10549,7 +11149,7 @@ rm -f core conftest.err conftest.$ac_objext \
  11156. osf4* | osf5*) # as osf3* with the addition of -msym flag
  11157. if test "$GCC" = yes; then
  11158. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  11159. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11160. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11161. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  11162. else
  11163. allow_undefined_flag=' -expect_unresolved \*'
  11164. @@ -10568,9 +11168,9 @@ rm -f core conftest.err conftest.$ac_objext \
  11165. no_undefined_flag=' -z defs'
  11166. if test "$GCC" = yes; then
  11167. wlarc='${wl}'
  11168. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  11169. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  11170. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  11171. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  11172. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  11173. else
  11174. case `$CC -V 2>&1` in
  11175. *"Compilers 5.0"*)
  11176. @@ -11146,8 +11746,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  11177. need_version=no
  11178. need_lib_prefix=no
  11179. - case $GCC,$host_os in
  11180. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  11181. + case $GCC,$cc_basename in
  11182. + yes,*)
  11183. + # gcc
  11184. library_names_spec='$libname.dll.a'
  11185. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  11186. postinstall_cmds='base_file=`basename \${file}`~
  11187. @@ -11180,13 +11781,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  11188. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  11189. ;;
  11190. esac
  11191. + dynamic_linker='Win32 ld.exe'
  11192. + ;;
  11193. +
  11194. + *,cl*)
  11195. + # Native MSVC
  11196. + libname_spec='$name'
  11197. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  11198. + library_names_spec='${libname}.dll.lib'
  11199. +
  11200. + case $build_os in
  11201. + mingw*)
  11202. + sys_lib_search_path_spec=
  11203. + lt_save_ifs=$IFS
  11204. + IFS=';'
  11205. + for lt_path in $LIB
  11206. + do
  11207. + IFS=$lt_save_ifs
  11208. + # Let DOS variable expansion print the short 8.3 style file name.
  11209. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  11210. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  11211. + done
  11212. + IFS=$lt_save_ifs
  11213. + # Convert to MSYS style.
  11214. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  11215. + ;;
  11216. + cygwin*)
  11217. + # Convert to unix form, then to dos form, then back to unix form
  11218. + # but this time dos style (no spaces!) so that the unix form looks
  11219. + # like /cygdrive/c/PROGRA~1:/cygdr...
  11220. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  11221. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  11222. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  11223. + ;;
  11224. + *)
  11225. + sys_lib_search_path_spec="$LIB"
  11226. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  11227. + # It is most probably a Windows format PATH.
  11228. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  11229. + else
  11230. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  11231. + fi
  11232. + # FIXME: find the short name or the path components, as spaces are
  11233. + # common. (e.g. "Program Files" -> "PROGRA~1")
  11234. + ;;
  11235. + esac
  11236. +
  11237. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  11238. + postinstall_cmds='base_file=`basename \${file}`~
  11239. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  11240. + dldir=$destdir/`dirname \$dlpath`~
  11241. + test -d \$dldir || mkdir -p \$dldir~
  11242. + $install_prog $dir/$dlname \$dldir/$dlname'
  11243. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  11244. + dlpath=$dir/\$dldll~
  11245. + $RM \$dlpath'
  11246. + shlibpath_overrides_runpath=yes
  11247. + dynamic_linker='Win32 link.exe'
  11248. ;;
  11249. *)
  11250. + # Assume MSVC wrapper
  11251. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  11252. + dynamic_linker='Win32 ld.exe'
  11253. ;;
  11254. esac
  11255. - dynamic_linker='Win32 ld.exe'
  11256. # FIXME: first we should search . and the directory the executable is in
  11257. shlibpath_var=PATH
  11258. ;;
  11259. @@ -12064,7 +12723,7 @@ else
  11260. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  11261. lt_status=$lt_dlunknown
  11262. cat > conftest.$ac_ext <<_LT_EOF
  11263. -#line 12067 "configure"
  11264. +#line $LINENO "configure"
  11265. #include "confdefs.h"
  11266. #if HAVE_DLFCN_H
  11267. @@ -12108,10 +12767,10 @@ else
  11268. /* When -fvisbility=hidden is used, assume the code has been annotated
  11269. correspondingly for the symbols needed. */
  11270. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  11271. -void fnord () __attribute__((visibility("default")));
  11272. +int fnord () __attribute__((visibility("default")));
  11273. #endif
  11274. -void fnord () { int i=42; }
  11275. +int fnord () { return 42; }
  11276. int main ()
  11277. {
  11278. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  11279. @@ -12170,7 +12829,7 @@ else
  11280. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  11281. lt_status=$lt_dlunknown
  11282. cat > conftest.$ac_ext <<_LT_EOF
  11283. -#line 12173 "configure"
  11284. +#line $LINENO "configure"
  11285. #include "confdefs.h"
  11286. #if HAVE_DLFCN_H
  11287. @@ -12214,10 +12873,10 @@ else
  11288. /* When -fvisbility=hidden is used, assume the code has been annotated
  11289. correspondingly for the symbols needed. */
  11290. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  11291. -void fnord () __attribute__((visibility("default")));
  11292. +int fnord () __attribute__((visibility("default")));
  11293. #endif
  11294. -void fnord () { int i=42; }
  11295. +int fnord () { return 42; }
  11296. int main ()
  11297. {
  11298. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  11299. @@ -12609,6 +13268,7 @@ $RM -r conftest*
  11300. # Allow CC to be a program name with arguments.
  11301. lt_save_CC=$CC
  11302. + lt_save_CFLAGS=$CFLAGS
  11303. lt_save_LD=$LD
  11304. lt_save_GCC=$GCC
  11305. GCC=$GXX
  11306. @@ -12626,6 +13286,7 @@ $RM -r conftest*
  11307. fi
  11308. test -z "${LDCXX+set}" || LD=$LDCXX
  11309. CC=${CXX-"c++"}
  11310. + CFLAGS=$CXXFLAGS
  11311. compiler=$CC
  11312. compiler_CXX=$CC
  11313. for cc_temp in $compiler""; do
  11314. @@ -12908,7 +13569,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  11315. allow_undefined_flag_CXX='-berok'
  11316. # Determine the default libpath from the value encoded in an empty
  11317. # executable.
  11318. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11319. + if test "${lt_cv_aix_libpath+set}" = set; then
  11320. + aix_libpath=$lt_cv_aix_libpath
  11321. +else
  11322. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  11323. + $as_echo_n "(cached) " >&6
  11324. +else
  11325. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11326. /* end confdefs.h. */
  11327. int
  11328. @@ -12921,22 +13588,29 @@ main ()
  11329. _ACEOF
  11330. if ac_fn_cxx_try_link "$LINENO"; then :
  11331. -lt_aix_libpath_sed='
  11332. - /Import File Strings/,/^$/ {
  11333. - /^0/ {
  11334. - s/^0 *\(.*\)$/\1/
  11335. - p
  11336. - }
  11337. - }'
  11338. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11339. -# Check for a 64-bit object if we didn't find anything.
  11340. -if test -z "$aix_libpath"; then
  11341. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11342. -fi
  11343. + lt_aix_libpath_sed='
  11344. + /Import File Strings/,/^$/ {
  11345. + /^0/ {
  11346. + s/^0 *\([^ ]*\) *$/\1/
  11347. + p
  11348. + }
  11349. + }'
  11350. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11351. + # Check for a 64-bit object if we didn't find anything.
  11352. + if test -z "$lt_cv_aix_libpath__CXX"; then
  11353. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11354. + fi
  11355. fi
  11356. rm -f core conftest.err conftest.$ac_objext \
  11357. conftest$ac_exeext conftest.$ac_ext
  11358. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11359. + if test -z "$lt_cv_aix_libpath__CXX"; then
  11360. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  11361. + fi
  11362. +
  11363. +fi
  11364. +
  11365. + aix_libpath=$lt_cv_aix_libpath__CXX
  11366. +fi
  11367. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  11368. @@ -12949,7 +13623,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11369. else
  11370. # Determine the default libpath from the value encoded in an
  11371. # empty executable.
  11372. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11373. + if test "${lt_cv_aix_libpath+set}" = set; then
  11374. + aix_libpath=$lt_cv_aix_libpath
  11375. +else
  11376. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  11377. + $as_echo_n "(cached) " >&6
  11378. +else
  11379. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11380. /* end confdefs.h. */
  11381. int
  11382. @@ -12962,22 +13642,29 @@ main ()
  11383. _ACEOF
  11384. if ac_fn_cxx_try_link "$LINENO"; then :
  11385. -lt_aix_libpath_sed='
  11386. - /Import File Strings/,/^$/ {
  11387. - /^0/ {
  11388. - s/^0 *\(.*\)$/\1/
  11389. - p
  11390. - }
  11391. - }'
  11392. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11393. -# Check for a 64-bit object if we didn't find anything.
  11394. -if test -z "$aix_libpath"; then
  11395. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11396. -fi
  11397. + lt_aix_libpath_sed='
  11398. + /Import File Strings/,/^$/ {
  11399. + /^0/ {
  11400. + s/^0 *\([^ ]*\) *$/\1/
  11401. + p
  11402. + }
  11403. + }'
  11404. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11405. + # Check for a 64-bit object if we didn't find anything.
  11406. + if test -z "$lt_cv_aix_libpath__CXX"; then
  11407. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11408. + fi
  11409. fi
  11410. rm -f core conftest.err conftest.$ac_objext \
  11411. conftest$ac_exeext conftest.$ac_ext
  11412. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11413. + if test -z "$lt_cv_aix_libpath__CXX"; then
  11414. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  11415. + fi
  11416. +
  11417. +fi
  11418. +
  11419. + aix_libpath=$lt_cv_aix_libpath__CXX
  11420. +fi
  11421. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  11422. # Warning - without using the other run time loading flags,
  11423. @@ -13020,29 +13707,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11424. ;;
  11425. cygwin* | mingw* | pw32* | cegcc*)
  11426. - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  11427. - # as there is no search path for DLLs.
  11428. - hardcode_libdir_flag_spec_CXX='-L$libdir'
  11429. - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  11430. - allow_undefined_flag_CXX=unsupported
  11431. - always_export_symbols_CXX=no
  11432. - enable_shared_with_static_runtimes_CXX=yes
  11433. -
  11434. - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  11435. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  11436. - # If the export-symbols file already is a .def file (1st line
  11437. - # is EXPORTS), use it as is; otherwise, prepend...
  11438. - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  11439. - cp $export_symbols $output_objdir/$soname.def;
  11440. - else
  11441. - echo EXPORTS > $output_objdir/$soname.def;
  11442. - cat $export_symbols >> $output_objdir/$soname.def;
  11443. - fi~
  11444. - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  11445. - else
  11446. - ld_shlibs_CXX=no
  11447. - fi
  11448. - ;;
  11449. + case $GXX,$cc_basename in
  11450. + ,cl* | no,cl*)
  11451. + # Native MSVC
  11452. + # hardcode_libdir_flag_spec is actually meaningless, as there is
  11453. + # no search path for DLLs.
  11454. + hardcode_libdir_flag_spec_CXX=' '
  11455. + allow_undefined_flag_CXX=unsupported
  11456. + always_export_symbols_CXX=yes
  11457. + file_list_spec_CXX='@'
  11458. + # Tell ltmain to make .lib files, not .a files.
  11459. + libext=lib
  11460. + # Tell ltmain to make .dll files, not .so files.
  11461. + shrext_cmds=".dll"
  11462. + # FIXME: Setting linknames here is a bad hack.
  11463. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  11464. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  11465. + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  11466. + else
  11467. + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  11468. + fi~
  11469. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  11470. + linknames='
  11471. + # The linker will not automatically build a static lib if we build a DLL.
  11472. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
  11473. + enable_shared_with_static_runtimes_CXX=yes
  11474. + # Don't use ranlib
  11475. + old_postinstall_cmds_CXX='chmod 644 $oldlib'
  11476. + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
  11477. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  11478. + case $lt_outputfile in
  11479. + *.exe|*.EXE) ;;
  11480. + *)
  11481. + lt_outputfile="$lt_outputfile.exe"
  11482. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  11483. + ;;
  11484. + esac~
  11485. + func_to_tool_file "$lt_outputfile"~
  11486. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  11487. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  11488. + $RM "$lt_outputfile.manifest";
  11489. + fi'
  11490. + ;;
  11491. + *)
  11492. + # g++
  11493. + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  11494. + # as there is no search path for DLLs.
  11495. + hardcode_libdir_flag_spec_CXX='-L$libdir'
  11496. + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  11497. + allow_undefined_flag_CXX=unsupported
  11498. + always_export_symbols_CXX=no
  11499. + enable_shared_with_static_runtimes_CXX=yes
  11500. +
  11501. + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  11502. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  11503. + # If the export-symbols file already is a .def file (1st line
  11504. + # is EXPORTS), use it as is; otherwise, prepend...
  11505. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  11506. + cp $export_symbols $output_objdir/$soname.def;
  11507. + else
  11508. + echo EXPORTS > $output_objdir/$soname.def;
  11509. + cat $export_symbols >> $output_objdir/$soname.def;
  11510. + fi~
  11511. + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  11512. + else
  11513. + ld_shlibs_CXX=no
  11514. + fi
  11515. + ;;
  11516. + esac
  11517. + ;;
  11518. darwin* | rhapsody*)
  11519. @@ -13148,7 +13881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11520. ;;
  11521. *)
  11522. if test "$GXX" = yes; then
  11523. - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  11524. + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  11525. else
  11526. # FIXME: insert proper C++ library support
  11527. ld_shlibs_CXX=no
  11528. @@ -13219,10 +13952,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11529. archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  11530. ;;
  11531. ia64*)
  11532. - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  11533. + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  11534. ;;
  11535. *)
  11536. - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  11537. + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  11538. ;;
  11539. esac
  11540. fi
  11541. @@ -13263,9 +13996,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11542. *)
  11543. if test "$GXX" = yes; then
  11544. if test "$with_gnu_ld" = no; then
  11545. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11546. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11547. else
  11548. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  11549. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  11550. fi
  11551. fi
  11552. link_all_deplibs_CXX=yes
  11553. @@ -13335,20 +14068,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11554. prelink_cmds_CXX='tpldir=Template.dir~
  11555. rm -rf $tpldir~
  11556. $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  11557. - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
  11558. + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  11559. old_archive_cmds_CXX='tpldir=Template.dir~
  11560. rm -rf $tpldir~
  11561. $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  11562. - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
  11563. + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  11564. $RANLIB $oldlib'
  11565. archive_cmds_CXX='tpldir=Template.dir~
  11566. rm -rf $tpldir~
  11567. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  11568. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  11569. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  11570. archive_expsym_cmds_CXX='tpldir=Template.dir~
  11571. rm -rf $tpldir~
  11572. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  11573. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  11574. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  11575. ;;
  11576. *) # Version 6 and above use weak symbols
  11577. archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  11578. @@ -13543,7 +14276,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11579. archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11580. ;;
  11581. *)
  11582. - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11583. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  11584. ;;
  11585. esac
  11586. @@ -13589,7 +14322,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11587. solaris*)
  11588. case $cc_basename in
  11589. - CC*)
  11590. + CC* | sunCC*)
  11591. # Sun C++ 4.2, 5.x and Centerline C++
  11592. archive_cmds_need_lc_CXX=yes
  11593. no_undefined_flag_CXX=' -zdefs'
  11594. @@ -13630,9 +14363,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11595. if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  11596. no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  11597. if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  11598. - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  11599. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  11600. archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  11601. - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  11602. + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  11603. # Commands to make compiler produce verbose output that lists
  11604. # what "hidden" libraries, object files and flags are used when
  11605. @@ -13767,6 +14500,13 @@ private:
  11606. };
  11607. _LT_EOF
  11608. +
  11609. +_lt_libdeps_save_CFLAGS=$CFLAGS
  11610. +case "$CC $CFLAGS " in #(
  11611. +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
  11612. +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
  11613. +esac
  11614. +
  11615. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  11616. (eval $ac_compile) 2>&5
  11617. ac_status=$?
  11618. @@ -13780,7 +14520,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  11619. pre_test_object_deps_done=no
  11620. for p in `eval "$output_verbose_link_cmd"`; do
  11621. - case $p in
  11622. + case ${prev}${p} in
  11623. -L* | -R* | -l*)
  11624. # Some compilers place space between "-{L,R}" and the path.
  11625. @@ -13789,13 +14529,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  11626. test $p = "-R"; then
  11627. prev=$p
  11628. continue
  11629. - else
  11630. - prev=
  11631. fi
  11632. + # Expand the sysroot to ease extracting the directories later.
  11633. + if test -z "$prev"; then
  11634. + case $p in
  11635. + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
  11636. + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
  11637. + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
  11638. + esac
  11639. + fi
  11640. + case $p in
  11641. + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
  11642. + esac
  11643. if test "$pre_test_object_deps_done" = no; then
  11644. - case $p in
  11645. - -L* | -R*)
  11646. + case ${prev} in
  11647. + -L | -R)
  11648. # Internal compiler library paths should come after those
  11649. # provided the user. The postdeps already come after the
  11650. # user supplied libs so there is no need to process them.
  11651. @@ -13815,8 +14564,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  11652. postdeps_CXX="${postdeps_CXX} ${prev}${p}"
  11653. fi
  11654. fi
  11655. + prev=
  11656. ;;
  11657. + *.lto.$objext) ;; # Ignore GCC LTO objects
  11658. *.$objext)
  11659. # This assumes that the test object file only shows up
  11660. # once in the compiler output.
  11661. @@ -13852,6 +14603,7 @@ else
  11662. fi
  11663. $RM -f confest.$objext
  11664. +CFLAGS=$_lt_libdeps_save_CFLAGS
  11665. # PORTME: override above test on systems where it is broken
  11666. case $host_os in
  11667. @@ -13887,7 +14639,7 @@ linux*)
  11668. solaris*)
  11669. case $cc_basename in
  11670. - CC*)
  11671. + CC* | sunCC*)
  11672. # The more standards-conforming stlport4 library is
  11673. # incompatible with the Cstd library. Avoid specifying
  11674. # it if it's in CXXFLAGS. Ignore libCrun as
  11675. @@ -13952,8 +14704,6 @@ fi
  11676. lt_prog_compiler_pic_CXX=
  11677. lt_prog_compiler_static_CXX=
  11678. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  11679. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  11680. # C++ specific cases for pic, static, wl, etc.
  11681. if test "$GXX" = yes; then
  11682. @@ -14058,6 +14808,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  11683. ;;
  11684. esac
  11685. ;;
  11686. + mingw* | cygwin* | os2* | pw32* | cegcc*)
  11687. + # This hack is so that the source file can tell whether it is being
  11688. + # built for inclusion in a dll (and should export symbols for example).
  11689. + lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
  11690. + ;;
  11691. dgux*)
  11692. case $cc_basename in
  11693. ec++*)
  11694. @@ -14210,7 +14965,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  11695. ;;
  11696. solaris*)
  11697. case $cc_basename in
  11698. - CC*)
  11699. + CC* | sunCC*)
  11700. # Sun C++ 4.2, 5.x and Centerline C++
  11701. lt_prog_compiler_pic_CXX='-KPIC'
  11702. lt_prog_compiler_static_CXX='-Bstatic'
  11703. @@ -14275,10 +15030,17 @@ case $host_os in
  11704. lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
  11705. ;;
  11706. esac
  11707. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
  11708. -$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  11709. -
  11710. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  11711. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  11712. +if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
  11713. + $as_echo_n "(cached) " >&6
  11714. +else
  11715. + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
  11716. +fi
  11717. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
  11718. +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
  11719. +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
  11720. #
  11721. # Check to make sure the PIC flag actually works.
  11722. @@ -14336,6 +15098,8 @@ fi
  11723. +
  11724. +
  11725. #
  11726. # Check to make sure the static flag actually works.
  11727. #
  11728. @@ -14513,6 +15277,7 @@ fi
  11729. $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  11730. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  11731. + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  11732. case $host_os in
  11733. aix[4-9]*)
  11734. # If we're using GNU nm, then we don't want the "-C" option.
  11735. @@ -14527,15 +15292,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  11736. ;;
  11737. pw32*)
  11738. export_symbols_cmds_CXX="$ltdll_cmds"
  11739. - ;;
  11740. + ;;
  11741. cygwin* | mingw* | cegcc*)
  11742. - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  11743. - ;;
  11744. + case $cc_basename in
  11745. + cl*) ;;
  11746. + *)
  11747. + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  11748. + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  11749. + ;;
  11750. + esac
  11751. + ;;
  11752. *)
  11753. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  11754. - ;;
  11755. + ;;
  11756. esac
  11757. - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  11758. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
  11759. $as_echo "$ld_shlibs_CXX" >&6; }
  11760. @@ -14798,8 +15568,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  11761. need_version=no
  11762. need_lib_prefix=no
  11763. - case $GCC,$host_os in
  11764. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  11765. + case $GCC,$cc_basename in
  11766. + yes,*)
  11767. + # gcc
  11768. library_names_spec='$libname.dll.a'
  11769. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  11770. postinstall_cmds='base_file=`basename \${file}`~
  11771. @@ -14831,13 +15602,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  11772. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  11773. ;;
  11774. esac
  11775. + dynamic_linker='Win32 ld.exe'
  11776. + ;;
  11777. +
  11778. + *,cl*)
  11779. + # Native MSVC
  11780. + libname_spec='$name'
  11781. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  11782. + library_names_spec='${libname}.dll.lib'
  11783. +
  11784. + case $build_os in
  11785. + mingw*)
  11786. + sys_lib_search_path_spec=
  11787. + lt_save_ifs=$IFS
  11788. + IFS=';'
  11789. + for lt_path in $LIB
  11790. + do
  11791. + IFS=$lt_save_ifs
  11792. + # Let DOS variable expansion print the short 8.3 style file name.
  11793. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  11794. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  11795. + done
  11796. + IFS=$lt_save_ifs
  11797. + # Convert to MSYS style.
  11798. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  11799. + ;;
  11800. + cygwin*)
  11801. + # Convert to unix form, then to dos form, then back to unix form
  11802. + # but this time dos style (no spaces!) so that the unix form looks
  11803. + # like /cygdrive/c/PROGRA~1:/cygdr...
  11804. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  11805. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  11806. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  11807. + ;;
  11808. + *)
  11809. + sys_lib_search_path_spec="$LIB"
  11810. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  11811. + # It is most probably a Windows format PATH.
  11812. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  11813. + else
  11814. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  11815. + fi
  11816. + # FIXME: find the short name or the path components, as spaces are
  11817. + # common. (e.g. "Program Files" -> "PROGRA~1")
  11818. + ;;
  11819. + esac
  11820. +
  11821. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  11822. + postinstall_cmds='base_file=`basename \${file}`~
  11823. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  11824. + dldir=$destdir/`dirname \$dlpath`~
  11825. + test -d \$dldir || mkdir -p \$dldir~
  11826. + $install_prog $dir/$dlname \$dldir/$dlname'
  11827. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  11828. + dlpath=$dir/\$dldll~
  11829. + $RM \$dlpath'
  11830. + shlibpath_overrides_runpath=yes
  11831. + dynamic_linker='Win32 link.exe'
  11832. ;;
  11833. *)
  11834. + # Assume MSVC wrapper
  11835. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  11836. + dynamic_linker='Win32 ld.exe'
  11837. ;;
  11838. esac
  11839. - dynamic_linker='Win32 ld.exe'
  11840. # FIXME: first we should search . and the directory the executable is in
  11841. shlibpath_var=PATH
  11842. ;;
  11843. @@ -15377,6 +16206,7 @@ fi
  11844. fi # test -n "$compiler"
  11845. CC=$lt_save_CC
  11846. + CFLAGS=$lt_save_CFLAGS
  11847. LDCXX=$LD
  11848. LD=$lt_save_LD
  11849. GCC=$lt_save_GCC
  11850. @@ -16321,13 +17151,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  11851. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  11852. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  11853. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  11854. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  11855. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  11856. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  11857. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  11858. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  11859. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  11860. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  11861. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  11862. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  11863. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  11864. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  11865. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  11866. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  11867. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  11868. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  11869. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  11870. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  11871. @@ -16342,14 +17179,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  11872. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  11873. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  11874. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  11875. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  11876. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  11877. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  11878. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  11879. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  11880. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  11881. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  11882. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  11883. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  11884. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  11885. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  11886. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  11887. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  11888. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  11889. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  11890. @@ -16382,12 +17222,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  11891. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  11892. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  11893. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  11894. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  11895. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  11896. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  11897. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  11898. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  11899. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  11900. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  11901. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  11902. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  11903. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  11904. @@ -16426,8 +17266,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
  11905. compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
  11906. GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
  11907. lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
  11908. -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  11909. lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
  11910. +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  11911. lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
  11912. lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
  11913. archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
  11914. @@ -16454,12 +17294,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
  11915. hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
  11916. inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
  11917. link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
  11918. -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
  11919. always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
  11920. export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  11921. exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  11922. include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  11923. prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  11924. +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  11925. file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
  11926. hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
  11927. compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
  11928. @@ -16497,8 +17337,13 @@ reload_flag \
  11929. OBJDUMP \
  11930. deplibs_check_method \
  11931. file_magic_cmd \
  11932. +file_magic_glob \
  11933. +want_nocaseglob \
  11934. +DLLTOOL \
  11935. +sharedlib_from_linklib_cmd \
  11936. AR \
  11937. AR_FLAGS \
  11938. +archiver_list_spec \
  11939. STRIP \
  11940. RANLIB \
  11941. CC \
  11942. @@ -16508,12 +17353,14 @@ lt_cv_sys_global_symbol_pipe \
  11943. lt_cv_sys_global_symbol_to_cdecl \
  11944. lt_cv_sys_global_symbol_to_c_name_address \
  11945. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  11946. +nm_file_list_spec \
  11947. lt_prog_compiler_no_builtin_flag \
  11948. -lt_prog_compiler_wl \
  11949. lt_prog_compiler_pic \
  11950. +lt_prog_compiler_wl \
  11951. lt_prog_compiler_static \
  11952. lt_cv_prog_compiler_c_o \
  11953. need_locks \
  11954. +MANIFEST_TOOL \
  11955. DSYMUTIL \
  11956. NMEDIT \
  11957. LIPO \
  11958. @@ -16529,7 +17376,6 @@ no_undefined_flag \
  11959. hardcode_libdir_flag_spec \
  11960. hardcode_libdir_flag_spec_ld \
  11961. hardcode_libdir_separator \
  11962. -fix_srcfile_path \
  11963. exclude_expsyms \
  11964. include_expsyms \
  11965. file_list_spec \
  11966. @@ -16551,8 +17397,8 @@ LD_CXX \
  11967. reload_flag_CXX \
  11968. compiler_CXX \
  11969. lt_prog_compiler_no_builtin_flag_CXX \
  11970. -lt_prog_compiler_wl_CXX \
  11971. lt_prog_compiler_pic_CXX \
  11972. +lt_prog_compiler_wl_CXX \
  11973. lt_prog_compiler_static_CXX \
  11974. lt_cv_prog_compiler_c_o_CXX \
  11975. export_dynamic_flag_spec_CXX \
  11976. @@ -16564,7 +17410,6 @@ no_undefined_flag_CXX \
  11977. hardcode_libdir_flag_spec_CXX \
  11978. hardcode_libdir_flag_spec_ld_CXX \
  11979. hardcode_libdir_separator_CXX \
  11980. -fix_srcfile_path_CXX \
  11981. exclude_expsyms_CXX \
  11982. include_expsyms_CXX \
  11983. file_list_spec_CXX \
  11984. @@ -16598,6 +17443,7 @@ module_cmds \
  11985. module_expsym_cmds \
  11986. export_symbols_cmds \
  11987. prelink_cmds \
  11988. +postlink_cmds \
  11989. postinstall_cmds \
  11990. postuninstall_cmds \
  11991. finish_cmds \
  11992. @@ -16612,7 +17458,8 @@ archive_expsym_cmds_CXX \
  11993. module_cmds_CXX \
  11994. module_expsym_cmds_CXX \
  11995. export_symbols_cmds_CXX \
  11996. -prelink_cmds_CXX; do
  11997. +prelink_cmds_CXX \
  11998. +postlink_cmds_CXX; do
  11999. case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  12000. *[\\\\\\\`\\"\\\$]*)
  12001. eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  12002. @@ -17366,7 +18213,8 @@ $as_echo X"$file" |
  12003. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  12004. #
  12005. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  12006. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  12007. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  12008. +# Inc.
  12009. # Written by Gordon Matzigkeit, 1996
  12010. #
  12011. # This file is part of GNU Libtool.
  12012. @@ -17469,19 +18317,42 @@ SP2NL=$lt_lt_SP2NL
  12013. # turn newlines into spaces.
  12014. NL2SP=$lt_lt_NL2SP
  12015. +# convert \$build file names to \$host format.
  12016. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  12017. +
  12018. +# convert \$build files to toolchain format.
  12019. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  12020. +
  12021. # An object symbol dumper.
  12022. OBJDUMP=$lt_OBJDUMP
  12023. # Method to check whether dependent libraries are shared objects.
  12024. deplibs_check_method=$lt_deplibs_check_method
  12025. -# Command to use when deplibs_check_method == "file_magic".
  12026. +# Command to use when deplibs_check_method = "file_magic".
  12027. file_magic_cmd=$lt_file_magic_cmd
  12028. +# How to find potential files when deplibs_check_method = "file_magic".
  12029. +file_magic_glob=$lt_file_magic_glob
  12030. +
  12031. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  12032. +want_nocaseglob=$lt_want_nocaseglob
  12033. +
  12034. +# DLL creation program.
  12035. +DLLTOOL=$lt_DLLTOOL
  12036. +
  12037. +# Command to associate shared and link libraries.
  12038. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  12039. +
  12040. # The archiver.
  12041. AR=$lt_AR
  12042. +
  12043. +# Flags to create an archive.
  12044. AR_FLAGS=$lt_AR_FLAGS
  12045. +# How to feed a file listing to the archiver.
  12046. +archiver_list_spec=$lt_archiver_list_spec
  12047. +
  12048. # A symbol stripping program.
  12049. STRIP=$lt_STRIP
  12050. @@ -17511,6 +18382,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  12051. # Transform the output of nm in a C name address pair when lib prefix is needed.
  12052. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  12053. +# Specify filename containing input files for \$NM.
  12054. +nm_file_list_spec=$lt_nm_file_list_spec
  12055. +
  12056. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  12057. +lt_sysroot=$lt_sysroot
  12058. +
  12059. # The name of the directory that contains temporary libtool files.
  12060. objdir=$objdir
  12061. @@ -17520,6 +18397,9 @@ MAGIC_CMD=$MAGIC_CMD
  12062. # Must we lock files when doing compilation?
  12063. need_locks=$lt_need_locks
  12064. +# Manifest tool.
  12065. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  12066. +
  12067. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  12068. DSYMUTIL=$lt_DSYMUTIL
  12069. @@ -17634,12 +18514,12 @@ with_gcc=$GCC
  12070. # Compiler flag to turn off builtin functions.
  12071. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  12072. -# How to pass a linker flag through the compiler.
  12073. -wl=$lt_lt_prog_compiler_wl
  12074. -
  12075. # Additional compiler flags for building library objects.
  12076. pic_flag=$lt_lt_prog_compiler_pic
  12077. +# How to pass a linker flag through the compiler.
  12078. +wl=$lt_lt_prog_compiler_wl
  12079. +
  12080. # Compiler flag to prevent dynamic linking.
  12081. link_static_flag=$lt_lt_prog_compiler_static
  12082. @@ -17726,9 +18606,6 @@ inherit_rpath=$inherit_rpath
  12083. # Whether libtool must link a program against all its dependency libraries.
  12084. link_all_deplibs=$link_all_deplibs
  12085. -# Fix the shell variable \$srcfile for the compiler.
  12086. -fix_srcfile_path=$lt_fix_srcfile_path
  12087. -
  12088. # Set to "yes" if exported symbols are required.
  12089. always_export_symbols=$always_export_symbols
  12090. @@ -17744,6 +18621,9 @@ include_expsyms=$lt_include_expsyms
  12091. # Commands necessary for linking programs (against libraries) with templates.
  12092. prelink_cmds=$lt_prelink_cmds
  12093. +# Commands necessary for finishing linking programs.
  12094. +postlink_cmds=$lt_postlink_cmds
  12095. +
  12096. # Specify filename containing input files.
  12097. file_list_spec=$lt_file_list_spec
  12098. @@ -17790,210 +18670,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  12099. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  12100. # text mode, it properly converts lines to CR/LF. This bash problem
  12101. # is reportedly fixed, but why not run on old versions too?
  12102. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  12103. - || (rm -f "$cfgfile"; exit 1)
  12104. -
  12105. - case $xsi_shell in
  12106. - yes)
  12107. - cat << \_LT_EOF >> "$cfgfile"
  12108. -
  12109. -# func_dirname file append nondir_replacement
  12110. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  12111. -# otherwise set result to NONDIR_REPLACEMENT.
  12112. -func_dirname ()
  12113. -{
  12114. - case ${1} in
  12115. - */*) func_dirname_result="${1%/*}${2}" ;;
  12116. - * ) func_dirname_result="${3}" ;;
  12117. - esac
  12118. -}
  12119. -
  12120. -# func_basename file
  12121. -func_basename ()
  12122. -{
  12123. - func_basename_result="${1##*/}"
  12124. -}
  12125. -
  12126. -# func_dirname_and_basename file append nondir_replacement
  12127. -# perform func_basename and func_dirname in a single function
  12128. -# call:
  12129. -# dirname: Compute the dirname of FILE. If nonempty,
  12130. -# add APPEND to the result, otherwise set result
  12131. -# to NONDIR_REPLACEMENT.
  12132. -# value returned in "$func_dirname_result"
  12133. -# basename: Compute filename of FILE.
  12134. -# value retuned in "$func_basename_result"
  12135. -# Implementation must be kept synchronized with func_dirname
  12136. -# and func_basename. For efficiency, we do not delegate to
  12137. -# those functions but instead duplicate the functionality here.
  12138. -func_dirname_and_basename ()
  12139. -{
  12140. - case ${1} in
  12141. - */*) func_dirname_result="${1%/*}${2}" ;;
  12142. - * ) func_dirname_result="${3}" ;;
  12143. - esac
  12144. - func_basename_result="${1##*/}"
  12145. -}
  12146. -
  12147. -# func_stripname prefix suffix name
  12148. -# strip PREFIX and SUFFIX off of NAME.
  12149. -# PREFIX and SUFFIX must not contain globbing or regex special
  12150. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  12151. -# dot (in which case that matches only a dot).
  12152. -func_stripname ()
  12153. -{
  12154. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  12155. - # positional parameters, so assign one to ordinary parameter first.
  12156. - func_stripname_result=${3}
  12157. - func_stripname_result=${func_stripname_result#"${1}"}
  12158. - func_stripname_result=${func_stripname_result%"${2}"}
  12159. -}
  12160. -
  12161. -# func_opt_split
  12162. -func_opt_split ()
  12163. -{
  12164. - func_opt_split_opt=${1%%=*}
  12165. - func_opt_split_arg=${1#*=}
  12166. -}
  12167. -
  12168. -# func_lo2o object
  12169. -func_lo2o ()
  12170. -{
  12171. - case ${1} in
  12172. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  12173. - *) func_lo2o_result=${1} ;;
  12174. - esac
  12175. -}
  12176. -
  12177. -# func_xform libobj-or-source
  12178. -func_xform ()
  12179. -{
  12180. - func_xform_result=${1%.*}.lo
  12181. -}
  12182. -
  12183. -# func_arith arithmetic-term...
  12184. -func_arith ()
  12185. -{
  12186. - func_arith_result=$(( $* ))
  12187. -}
  12188. -
  12189. -# func_len string
  12190. -# STRING may not start with a hyphen.
  12191. -func_len ()
  12192. -{
  12193. - func_len_result=${#1}
  12194. -}
  12195. -
  12196. -_LT_EOF
  12197. - ;;
  12198. - *) # Bourne compatible functions.
  12199. - cat << \_LT_EOF >> "$cfgfile"
  12200. -
  12201. -# func_dirname file append nondir_replacement
  12202. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  12203. -# otherwise set result to NONDIR_REPLACEMENT.
  12204. -func_dirname ()
  12205. -{
  12206. - # Extract subdirectory from the argument.
  12207. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  12208. - if test "X$func_dirname_result" = "X${1}"; then
  12209. - func_dirname_result="${3}"
  12210. - else
  12211. - func_dirname_result="$func_dirname_result${2}"
  12212. - fi
  12213. -}
  12214. -
  12215. -# func_basename file
  12216. -func_basename ()
  12217. -{
  12218. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  12219. -}
  12220. -
  12221. -
  12222. -# func_stripname prefix suffix name
  12223. -# strip PREFIX and SUFFIX off of NAME.
  12224. -# PREFIX and SUFFIX must not contain globbing or regex special
  12225. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  12226. -# dot (in which case that matches only a dot).
  12227. -# func_strip_suffix prefix name
  12228. -func_stripname ()
  12229. -{
  12230. - case ${2} in
  12231. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  12232. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  12233. - esac
  12234. -}
  12235. -
  12236. -# sed scripts:
  12237. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  12238. -my_sed_long_arg='1s/^-[^=]*=//'
  12239. -
  12240. -# func_opt_split
  12241. -func_opt_split ()
  12242. -{
  12243. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  12244. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  12245. -}
  12246. -
  12247. -# func_lo2o object
  12248. -func_lo2o ()
  12249. -{
  12250. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  12251. -}
  12252. -
  12253. -# func_xform libobj-or-source
  12254. -func_xform ()
  12255. -{
  12256. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  12257. -}
  12258. -
  12259. -# func_arith arithmetic-term...
  12260. -func_arith ()
  12261. -{
  12262. - func_arith_result=`expr "$@"`
  12263. -}
  12264. -
  12265. -# func_len string
  12266. -# STRING may not start with a hyphen.
  12267. -func_len ()
  12268. -{
  12269. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  12270. -}
  12271. -
  12272. -_LT_EOF
  12273. -esac
  12274. -
  12275. -case $lt_shell_append in
  12276. - yes)
  12277. - cat << \_LT_EOF >> "$cfgfile"
  12278. -
  12279. -# func_append var value
  12280. -# Append VALUE to the end of shell variable VAR.
  12281. -func_append ()
  12282. -{
  12283. - eval "$1+=\$2"
  12284. -}
  12285. -_LT_EOF
  12286. - ;;
  12287. - *)
  12288. - cat << \_LT_EOF >> "$cfgfile"
  12289. -
  12290. -# func_append var value
  12291. -# Append VALUE to the end of shell variable VAR.
  12292. -func_append ()
  12293. -{
  12294. - eval "$1=\$$1\$2"
  12295. -}
  12296. -
  12297. -_LT_EOF
  12298. - ;;
  12299. - esac
  12300. -
  12301. -
  12302. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  12303. - || (rm -f "$cfgfile"; exit 1)
  12304. -
  12305. - mv -f "$cfgfile" "$ofile" ||
  12306. + sed '$q' "$ltmain" >> "$cfgfile" \
  12307. + || (rm -f "$cfgfile"; exit 1)
  12308. +
  12309. + if test x"$xsi_shell" = xyes; then
  12310. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  12311. +func_dirname ()\
  12312. +{\
  12313. +\ case ${1} in\
  12314. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  12315. +\ * ) func_dirname_result="${3}" ;;\
  12316. +\ esac\
  12317. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  12318. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12319. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12320. +test 0 -eq $? || _lt_function_replace_fail=:
  12321. +
  12322. +
  12323. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  12324. +func_basename ()\
  12325. +{\
  12326. +\ func_basename_result="${1##*/}"\
  12327. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  12328. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12329. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12330. +test 0 -eq $? || _lt_function_replace_fail=:
  12331. +
  12332. +
  12333. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  12334. +func_dirname_and_basename ()\
  12335. +{\
  12336. +\ case ${1} in\
  12337. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  12338. +\ * ) func_dirname_result="${3}" ;;\
  12339. +\ esac\
  12340. +\ func_basename_result="${1##*/}"\
  12341. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  12342. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12343. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12344. +test 0 -eq $? || _lt_function_replace_fail=:
  12345. +
  12346. +
  12347. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  12348. +func_stripname ()\
  12349. +{\
  12350. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  12351. +\ # positional parameters, so assign one to ordinary parameter first.\
  12352. +\ func_stripname_result=${3}\
  12353. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  12354. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  12355. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  12356. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12357. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12358. +test 0 -eq $? || _lt_function_replace_fail=:
  12359. +
  12360. +
  12361. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  12362. +func_split_long_opt ()\
  12363. +{\
  12364. +\ func_split_long_opt_name=${1%%=*}\
  12365. +\ func_split_long_opt_arg=${1#*=}\
  12366. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  12367. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12368. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12369. +test 0 -eq $? || _lt_function_replace_fail=:
  12370. +
  12371. +
  12372. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  12373. +func_split_short_opt ()\
  12374. +{\
  12375. +\ func_split_short_opt_arg=${1#??}\
  12376. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  12377. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  12378. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12379. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12380. +test 0 -eq $? || _lt_function_replace_fail=:
  12381. +
  12382. +
  12383. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  12384. +func_lo2o ()\
  12385. +{\
  12386. +\ case ${1} in\
  12387. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  12388. +\ *) func_lo2o_result=${1} ;;\
  12389. +\ esac\
  12390. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  12391. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12392. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12393. +test 0 -eq $? || _lt_function_replace_fail=:
  12394. +
  12395. +
  12396. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  12397. +func_xform ()\
  12398. +{\
  12399. + func_xform_result=${1%.*}.lo\
  12400. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  12401. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12402. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12403. +test 0 -eq $? || _lt_function_replace_fail=:
  12404. +
  12405. +
  12406. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  12407. +func_arith ()\
  12408. +{\
  12409. + func_arith_result=$(( $* ))\
  12410. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  12411. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12412. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12413. +test 0 -eq $? || _lt_function_replace_fail=:
  12414. +
  12415. +
  12416. + sed -e '/^func_len ()$/,/^} # func_len /c\
  12417. +func_len ()\
  12418. +{\
  12419. + func_len_result=${#1}\
  12420. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  12421. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12422. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12423. +test 0 -eq $? || _lt_function_replace_fail=:
  12424. +
  12425. +fi
  12426. +
  12427. +if test x"$lt_shell_append" = xyes; then
  12428. + sed -e '/^func_append ()$/,/^} # func_append /c\
  12429. +func_append ()\
  12430. +{\
  12431. + eval "${1}+=\\${2}"\
  12432. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  12433. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12434. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12435. +test 0 -eq $? || _lt_function_replace_fail=:
  12436. +
  12437. +
  12438. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  12439. +func_append_quoted ()\
  12440. +{\
  12441. +\ func_quote_for_eval "${2}"\
  12442. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  12443. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  12444. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12445. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12446. +test 0 -eq $? || _lt_function_replace_fail=:
  12447. +
  12448. +
  12449. + # Save a `func_append' function call where possible by direct use of '+='
  12450. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  12451. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12452. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12453. + test 0 -eq $? || _lt_function_replace_fail=:
  12454. +else
  12455. + # Save a `func_append' function call even when '+=' is not available
  12456. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  12457. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  12458. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  12459. + test 0 -eq $? || _lt_function_replace_fail=:
  12460. +fi
  12461. +
  12462. +if test x"$_lt_function_replace_fail" = x":"; then
  12463. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  12464. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  12465. +fi
  12466. +
  12467. +
  12468. + mv -f "$cfgfile" "$ofile" ||
  12469. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  12470. chmod +x "$ofile"
  12471. @@ -18021,12 +18860,12 @@ with_gcc=$GCC_CXX
  12472. # Compiler flag to turn off builtin functions.
  12473. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  12474. -# How to pass a linker flag through the compiler.
  12475. -wl=$lt_lt_prog_compiler_wl_CXX
  12476. -
  12477. # Additional compiler flags for building library objects.
  12478. pic_flag=$lt_lt_prog_compiler_pic_CXX
  12479. +# How to pass a linker flag through the compiler.
  12480. +wl=$lt_lt_prog_compiler_wl_CXX
  12481. +
  12482. # Compiler flag to prevent dynamic linking.
  12483. link_static_flag=$lt_lt_prog_compiler_static_CXX
  12484. @@ -18113,9 +18952,6 @@ inherit_rpath=$inherit_rpath_CXX
  12485. # Whether libtool must link a program against all its dependency libraries.
  12486. link_all_deplibs=$link_all_deplibs_CXX
  12487. -# Fix the shell variable \$srcfile for the compiler.
  12488. -fix_srcfile_path=$lt_fix_srcfile_path_CXX
  12489. -
  12490. # Set to "yes" if exported symbols are required.
  12491. always_export_symbols=$always_export_symbols_CXX
  12492. @@ -18131,6 +18967,9 @@ include_expsyms=$lt_include_expsyms_CXX
  12493. # Commands necessary for linking programs (against libraries) with templates.
  12494. prelink_cmds=$lt_prelink_cmds_CXX
  12495. +# Commands necessary for finishing linking programs.
  12496. +postlink_cmds=$lt_postlink_cmds_CXX
  12497. +
  12498. # Specify filename containing input files.
  12499. file_list_spec=$lt_file_list_spec_CXX
  12500. diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in
  12501. index ba7fdd6e8ad..3a0fc5dbbe7 100644
  12502. --- a/gprofng/src/Makefile.in
  12503. +++ b/gprofng/src/Makefile.in
  12504. @@ -324,6 +324,7 @@ CXXFLAGS = @CXXFLAGS@
  12505. CYGPATH_W = @CYGPATH_W@
  12506. DEFS = @DEFS@
  12507. DEPDIR = @DEPDIR@
  12508. +DLLTOOL = @DLLTOOL@
  12509. DSYMUTIL = @DSYMUTIL@
  12510. DUMPBIN = @DUMPBIN@
  12511. ECHO_C = @ECHO_C@
  12512. @@ -359,6 +360,7 @@ LN_S = @LN_S@
  12513. LTLIBOBJS = @LTLIBOBJS@
  12514. MAINT = @MAINT@
  12515. MAKEINFO = @MAKEINFO@
  12516. +MANIFEST_TOOL = @MANIFEST_TOOL@
  12517. MKDIR_P = @MKDIR_P@
  12518. NM = @NM@
  12519. NMEDIT = @NMEDIT@
  12520. diff --git a/ld/Makefile.in b/ld/Makefile.in
  12521. index 782d4017a60..71bbe487aef 100644
  12522. --- a/ld/Makefile.in
  12523. +++ b/ld/Makefile.in
  12524. @@ -383,6 +383,7 @@ CYGPATH_W = @CYGPATH_W@
  12525. DATADIRNAME = @DATADIRNAME@
  12526. DEFS = @DEFS@
  12527. DEPDIR = @DEPDIR@
  12528. +DLLTOOL = @DLLTOOL@
  12529. DSYMUTIL = @DSYMUTIL@
  12530. DUMPBIN = @DUMPBIN@
  12531. ECHO_C = @ECHO_C@
  12532. @@ -433,6 +434,7 @@ LN_S = @LN_S@
  12533. LTLIBOBJS = @LTLIBOBJS@
  12534. MAINT = @MAINT@
  12535. MAKEINFO = @MAKEINFO@
  12536. +MANIFEST_TOOL = @MANIFEST_TOOL@
  12537. MKDIR_P = @MKDIR_P@
  12538. MKINSTALLDIRS = @MKINSTALLDIRS@
  12539. MSGFMT = @MSGFMT@
  12540. @@ -481,6 +483,7 @@ abs_builddir = @abs_builddir@
  12541. abs_srcdir = @abs_srcdir@
  12542. abs_top_builddir = @abs_top_builddir@
  12543. abs_top_srcdir = @abs_top_srcdir@
  12544. +ac_ct_AR = @ac_ct_AR@
  12545. ac_ct_CC = @ac_ct_CC@
  12546. ac_ct_CXX = @ac_ct_CXX@
  12547. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  12548. diff --git a/ld/configure b/ld/configure
  12549. index d0a467ac101..45b20013a45 100755
  12550. --- a/ld/configure
  12551. +++ b/ld/configure
  12552. @@ -700,8 +700,11 @@ OTOOL
  12553. LIPO
  12554. NMEDIT
  12555. DSYMUTIL
  12556. +MANIFEST_TOOL
  12557. RANLIB
  12558. +ac_ct_AR
  12559. AR
  12560. +DLLTOOL
  12561. OBJDUMP
  12562. LN_S
  12563. NM
  12564. @@ -828,6 +831,7 @@ enable_static
  12565. with_pic
  12566. enable_fast_install
  12567. with_gnu_ld
  12568. +with_libtool_sysroot
  12569. enable_libtool_lock
  12570. enable_plugins
  12571. enable_largefile
  12572. @@ -1552,6 +1556,8 @@ Optional Packages:
  12573. --with-pic try to use only PIC/non-PIC objects [default=use
  12574. both]
  12575. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  12576. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  12577. + (or the compiler's sysroot if not specified).
  12578. --with-lib-path=dir1:dir2... set default LIB_PATH
  12579. --with-sysroot=DIR Search for usr/lib et al within DIR.
  12580. --with-system-zlib use installed libz
  12581. @@ -5399,8 +5405,8 @@ esac
  12582. -macro_version='2.2.7a'
  12583. -macro_revision='1.3134'
  12584. +macro_version='2.4'
  12585. +macro_revision='1.3293'
  12586. @@ -5440,7 +5446,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  12587. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  12588. $as_echo_n "checking how to print strings... " >&6; }
  12589. # Test print first, because it will be a builtin if present.
  12590. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  12591. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  12592. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  12593. ECHO='print -r --'
  12594. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  12595. @@ -6133,8 +6139,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  12596. # Try some XSI features
  12597. xsi_shell=no
  12598. ( _lt_dummy="a/b/c"
  12599. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  12600. - = c,a/b,, \
  12601. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  12602. + = c,a/b,b/c, \
  12603. && eval 'test $(( 1 + 1 )) -eq 2 \
  12604. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  12605. && xsi_shell=yes
  12606. @@ -6183,6 +6189,80 @@ esac
  12607. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  12608. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  12609. +if ${lt_cv_to_host_file_cmd+:} false; then :
  12610. + $as_echo_n "(cached) " >&6
  12611. +else
  12612. + case $host in
  12613. + *-*-mingw* )
  12614. + case $build in
  12615. + *-*-mingw* ) # actually msys
  12616. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  12617. + ;;
  12618. + *-*-cygwin* )
  12619. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  12620. + ;;
  12621. + * ) # otherwise, assume *nix
  12622. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  12623. + ;;
  12624. + esac
  12625. + ;;
  12626. + *-*-cygwin* )
  12627. + case $build in
  12628. + *-*-mingw* ) # actually msys
  12629. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  12630. + ;;
  12631. + *-*-cygwin* )
  12632. + lt_cv_to_host_file_cmd=func_convert_file_noop
  12633. + ;;
  12634. + * ) # otherwise, assume *nix
  12635. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  12636. + ;;
  12637. + esac
  12638. + ;;
  12639. + * ) # unhandled hosts (and "normal" native builds)
  12640. + lt_cv_to_host_file_cmd=func_convert_file_noop
  12641. + ;;
  12642. +esac
  12643. +
  12644. +fi
  12645. +
  12646. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  12647. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  12648. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  12649. +
  12650. +
  12651. +
  12652. +
  12653. +
  12654. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  12655. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  12656. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  12657. + $as_echo_n "(cached) " >&6
  12658. +else
  12659. + #assume ordinary cross tools, or native build.
  12660. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  12661. +case $host in
  12662. + *-*-mingw* )
  12663. + case $build in
  12664. + *-*-mingw* ) # actually msys
  12665. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  12666. + ;;
  12667. + esac
  12668. + ;;
  12669. +esac
  12670. +
  12671. +fi
  12672. +
  12673. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  12674. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  12675. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  12676. +
  12677. +
  12678. +
  12679. +
  12680. +
  12681. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  12682. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  12683. if ${lt_cv_ld_reload_flag+:} false; then :
  12684. @@ -6199,6 +6279,11 @@ case $reload_flag in
  12685. esac
  12686. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  12687. case $host_os in
  12688. + cygwin* | mingw* | pw32* | cegcc*)
  12689. + if test "$GCC" != yes; then
  12690. + reload_cmds=false
  12691. + fi
  12692. + ;;
  12693. darwin*)
  12694. if test "$GCC" = yes; then
  12695. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  12696. @@ -6367,7 +6452,8 @@ mingw* | pw32*)
  12697. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  12698. lt_cv_file_magic_cmd='func_win32_libid'
  12699. else
  12700. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  12701. + # Keep this pattern in sync with the one in func_win32_libid.
  12702. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  12703. lt_cv_file_magic_cmd='$OBJDUMP -f'
  12704. fi
  12705. ;;
  12706. @@ -6521,6 +6607,21 @@ esac
  12707. fi
  12708. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  12709. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  12710. +
  12711. +file_magic_glob=
  12712. +want_nocaseglob=no
  12713. +if test "$build" = "$host"; then
  12714. + case $host_os in
  12715. + mingw* | pw32*)
  12716. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  12717. + want_nocaseglob=yes
  12718. + else
  12719. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  12720. + fi
  12721. + ;;
  12722. + esac
  12723. +fi
  12724. +
  12725. file_magic_cmd=$lt_cv_file_magic_cmd
  12726. deplibs_check_method=$lt_cv_deplibs_check_method
  12727. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  12728. @@ -6536,6 +6637,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  12729. +
  12730. +
  12731. +
  12732. +
  12733. +
  12734. +
  12735. +
  12736. +
  12737. +
  12738. +
  12739. +if test -n "$ac_tool_prefix"; then
  12740. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  12741. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  12742. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  12743. +$as_echo_n "checking for $ac_word... " >&6; }
  12744. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  12745. + $as_echo_n "(cached) " >&6
  12746. +else
  12747. + if test -n "$DLLTOOL"; then
  12748. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  12749. +else
  12750. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  12751. +for as_dir in $PATH
  12752. +do
  12753. + IFS=$as_save_IFS
  12754. + test -z "$as_dir" && as_dir=.
  12755. + for ac_exec_ext in '' $ac_executable_extensions; do
  12756. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  12757. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  12758. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  12759. + break 2
  12760. + fi
  12761. +done
  12762. + done
  12763. +IFS=$as_save_IFS
  12764. +
  12765. +fi
  12766. +fi
  12767. +DLLTOOL=$ac_cv_prog_DLLTOOL
  12768. +if test -n "$DLLTOOL"; then
  12769. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  12770. +$as_echo "$DLLTOOL" >&6; }
  12771. +else
  12772. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  12773. +$as_echo "no" >&6; }
  12774. +fi
  12775. +
  12776. +
  12777. +fi
  12778. +if test -z "$ac_cv_prog_DLLTOOL"; then
  12779. + ac_ct_DLLTOOL=$DLLTOOL
  12780. + # Extract the first word of "dlltool", so it can be a program name with args.
  12781. +set dummy dlltool; ac_word=$2
  12782. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  12783. +$as_echo_n "checking for $ac_word... " >&6; }
  12784. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  12785. + $as_echo_n "(cached) " >&6
  12786. +else
  12787. + if test -n "$ac_ct_DLLTOOL"; then
  12788. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  12789. +else
  12790. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  12791. +for as_dir in $PATH
  12792. +do
  12793. + IFS=$as_save_IFS
  12794. + test -z "$as_dir" && as_dir=.
  12795. + for ac_exec_ext in '' $ac_executable_extensions; do
  12796. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  12797. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  12798. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  12799. + break 2
  12800. + fi
  12801. +done
  12802. + done
  12803. +IFS=$as_save_IFS
  12804. +
  12805. +fi
  12806. +fi
  12807. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  12808. +if test -n "$ac_ct_DLLTOOL"; then
  12809. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  12810. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  12811. +else
  12812. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  12813. +$as_echo "no" >&6; }
  12814. +fi
  12815. +
  12816. + if test "x$ac_ct_DLLTOOL" = x; then
  12817. + DLLTOOL="false"
  12818. + else
  12819. + case $cross_compiling:$ac_tool_warned in
  12820. +yes:)
  12821. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  12822. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  12823. +ac_tool_warned=yes ;;
  12824. +esac
  12825. + DLLTOOL=$ac_ct_DLLTOOL
  12826. + fi
  12827. +else
  12828. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  12829. +fi
  12830. +
  12831. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  12832. +
  12833. +
  12834. +
  12835. +
  12836. +
  12837. +
  12838. +
  12839. +
  12840. +
  12841. +
  12842. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  12843. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  12844. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  12845. + $as_echo_n "(cached) " >&6
  12846. +else
  12847. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  12848. +
  12849. +case $host_os in
  12850. +cygwin* | mingw* | pw32* | cegcc*)
  12851. + # two different shell functions defined in ltmain.sh
  12852. + # decide which to use based on capabilities of $DLLTOOL
  12853. + case `$DLLTOOL --help 2>&1` in
  12854. + *--identify-strict*)
  12855. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  12856. + ;;
  12857. + *)
  12858. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  12859. + ;;
  12860. + esac
  12861. + ;;
  12862. +*)
  12863. + # fallback: assume linklib IS sharedlib
  12864. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  12865. + ;;
  12866. +esac
  12867. +
  12868. +fi
  12869. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  12870. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  12871. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  12872. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  12873. +
  12874. +
  12875. +
  12876. +
  12877. +
  12878. +
  12879. +
  12880. plugin_option=
  12881. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  12882. for plugin in $plugin_names; do
  12883. @@ -6550,8 +6802,10 @@ for plugin in $plugin_names; do
  12884. done
  12885. if test -n "$ac_tool_prefix"; then
  12886. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  12887. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  12888. + for ac_prog in ar
  12889. + do
  12890. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  12891. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  12892. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  12893. $as_echo_n "checking for $ac_word... " >&6; }
  12894. if ${ac_cv_prog_AR+:} false; then :
  12895. @@ -6567,7 +6821,7 @@ do
  12896. test -z "$as_dir" && as_dir=.
  12897. for ac_exec_ext in '' $ac_executable_extensions; do
  12898. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  12899. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  12900. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  12901. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  12902. break 2
  12903. fi
  12904. @@ -6587,11 +6841,15 @@ $as_echo "no" >&6; }
  12905. fi
  12906. + test -n "$AR" && break
  12907. + done
  12908. fi
  12909. -if test -z "$ac_cv_prog_AR"; then
  12910. +if test -z "$AR"; then
  12911. ac_ct_AR=$AR
  12912. - # Extract the first word of "ar", so it can be a program name with args.
  12913. -set dummy ar; ac_word=$2
  12914. + for ac_prog in ar
  12915. +do
  12916. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  12917. +set dummy $ac_prog; ac_word=$2
  12918. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  12919. $as_echo_n "checking for $ac_word... " >&6; }
  12920. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  12921. @@ -6607,7 +6865,7 @@ do
  12922. test -z "$as_dir" && as_dir=.
  12923. for ac_exec_ext in '' $ac_executable_extensions; do
  12924. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  12925. - ac_cv_prog_ac_ct_AR="ar"
  12926. + ac_cv_prog_ac_ct_AR="$ac_prog"
  12927. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  12928. break 2
  12929. fi
  12930. @@ -6626,6 +6884,10 @@ else
  12931. $as_echo "no" >&6; }
  12932. fi
  12933. +
  12934. + test -n "$ac_ct_AR" && break
  12935. +done
  12936. +
  12937. if test "x$ac_ct_AR" = x; then
  12938. AR="false"
  12939. else
  12940. @@ -6637,25 +6899,19 @@ ac_tool_warned=yes ;;
  12941. esac
  12942. AR=$ac_ct_AR
  12943. fi
  12944. -else
  12945. - AR="$ac_cv_prog_AR"
  12946. fi
  12947. -test -z "$AR" && AR=ar
  12948. -if test -n "$plugin_option"; then
  12949. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  12950. - touch conftest.c
  12951. - $AR $plugin_option rc conftest.a conftest.c
  12952. - if test "$?" != 0; then
  12953. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  12954. + touch conftest.c
  12955. + $AR $plugin_option rc conftest.a conftest.c
  12956. + if test "$?" != 0; then
  12957. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  12958. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  12959. - else
  12960. - AR="$AR $plugin_option"
  12961. - fi
  12962. - rm -f conftest.*
  12963. + else
  12964. + AR="$AR $plugin_option"
  12965. fi
  12966. -fi
  12967. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  12968. + rm -f conftest.*
  12969. +: ${AR=ar}
  12970. +: ${AR_FLAGS=cru}
  12971. @@ -6667,6 +6923,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  12972. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  12973. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  12974. +if ${lt_cv_ar_at_file+:} false; then :
  12975. + $as_echo_n "(cached) " >&6
  12976. +else
  12977. + lt_cv_ar_at_file=no
  12978. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  12979. +/* end confdefs.h. */
  12980. +
  12981. +int
  12982. +main ()
  12983. +{
  12984. +
  12985. + ;
  12986. + return 0;
  12987. +}
  12988. +_ACEOF
  12989. +if ac_fn_c_try_compile "$LINENO"; then :
  12990. + echo conftest.$ac_objext > conftest.lst
  12991. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  12992. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  12993. + (eval $lt_ar_try) 2>&5
  12994. + ac_status=$?
  12995. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12996. + test $ac_status = 0; }
  12997. + if test "$ac_status" -eq 0; then
  12998. + # Ensure the archiver fails upon bogus file names.
  12999. + rm -f conftest.$ac_objext libconftest.a
  13000. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  13001. + (eval $lt_ar_try) 2>&5
  13002. + ac_status=$?
  13003. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  13004. + test $ac_status = 0; }
  13005. + if test "$ac_status" -ne 0; then
  13006. + lt_cv_ar_at_file=@
  13007. + fi
  13008. + fi
  13009. + rm -f conftest.* libconftest.a
  13010. +
  13011. +fi
  13012. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  13013. +
  13014. +fi
  13015. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  13016. +$as_echo "$lt_cv_ar_at_file" >&6; }
  13017. +
  13018. +if test "x$lt_cv_ar_at_file" = xno; then
  13019. + archiver_list_spec=
  13020. +else
  13021. + archiver_list_spec=$lt_cv_ar_at_file
  13022. +fi
  13023. +
  13024. +
  13025. +
  13026. +
  13027. +
  13028. +
  13029. +
  13030. if test -n "$ac_tool_prefix"; then
  13031. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  13032. set dummy ${ac_tool_prefix}strip; ac_word=$2
  13033. @@ -7006,8 +7320,8 @@ esac
  13034. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  13035. # Transform an extracted symbol line into symbol name and symbol address
  13036. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  13037. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  13038. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  13039. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  13040. # Handle CRLF in mingw tool chain
  13041. opt_cr=
  13042. @@ -7043,6 +7357,7 @@ for ac_symprfx in "" "_"; do
  13043. else
  13044. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  13045. fi
  13046. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  13047. # Check to see that the pipe works correctly.
  13048. pipe_works=no
  13049. @@ -7084,6 +7399,18 @@ _LT_EOF
  13050. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  13051. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  13052. cat <<_LT_EOF > conftest.$ac_ext
  13053. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  13054. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  13055. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  13056. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  13057. +# define LT_DLSYM_CONST
  13058. +#elif defined(__osf__)
  13059. +/* This system does not cope well with relocations in const data. */
  13060. +# define LT_DLSYM_CONST
  13061. +#else
  13062. +# define LT_DLSYM_CONST const
  13063. +#endif
  13064. +
  13065. #ifdef __cplusplus
  13066. extern "C" {
  13067. #endif
  13068. @@ -7095,7 +7422,7 @@ _LT_EOF
  13069. cat <<_LT_EOF >> conftest.$ac_ext
  13070. /* The mapping between symbol names and symbols. */
  13071. -const struct {
  13072. +LT_DLSYM_CONST struct {
  13073. const char *name;
  13074. void *address;
  13075. }
  13076. @@ -7121,8 +7448,8 @@ static const void *lt_preloaded_setup() {
  13077. _LT_EOF
  13078. # Now try linking the two files.
  13079. mv conftest.$ac_objext conftstm.$ac_objext
  13080. - lt_save_LIBS="$LIBS"
  13081. - lt_save_CFLAGS="$CFLAGS"
  13082. + lt_globsym_save_LIBS=$LIBS
  13083. + lt_globsym_save_CFLAGS=$CFLAGS
  13084. LIBS="conftstm.$ac_objext"
  13085. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  13086. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  13087. @@ -7132,8 +7459,8 @@ _LT_EOF
  13088. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  13089. pipe_works=yes
  13090. fi
  13091. - LIBS="$lt_save_LIBS"
  13092. - CFLAGS="$lt_save_CFLAGS"
  13093. + LIBS=$lt_globsym_save_LIBS
  13094. + CFLAGS=$lt_globsym_save_CFLAGS
  13095. else
  13096. echo "cannot find nm_test_func in $nlist" >&5
  13097. fi
  13098. @@ -7170,6 +7497,17 @@ else
  13099. $as_echo "ok" >&6; }
  13100. fi
  13101. +# Response file support.
  13102. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  13103. + nm_file_list_spec='@'
  13104. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  13105. + nm_file_list_spec='@'
  13106. +fi
  13107. +
  13108. +
  13109. +
  13110. +
  13111. +
  13112. @@ -7186,6 +7524,44 @@ fi
  13113. +
  13114. +
  13115. +
  13116. +
  13117. +
  13118. +
  13119. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  13120. +$as_echo_n "checking for sysroot... " >&6; }
  13121. +
  13122. +# Check whether --with-libtool-sysroot was given.
  13123. +if test "${with_libtool_sysroot+set}" = set; then :
  13124. + withval=$with_libtool_sysroot;
  13125. +else
  13126. + with_libtool_sysroot=no
  13127. +fi
  13128. +
  13129. +
  13130. +lt_sysroot=
  13131. +case ${with_libtool_sysroot} in #(
  13132. + yes)
  13133. + if test "$GCC" = yes; then
  13134. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  13135. + fi
  13136. + ;; #(
  13137. + /*)
  13138. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  13139. + ;; #(
  13140. + no|'')
  13141. + ;; #(
  13142. + *)
  13143. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  13144. +$as_echo "${with_libtool_sysroot}" >&6; }
  13145. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  13146. + ;;
  13147. +esac
  13148. +
  13149. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  13150. +$as_echo "${lt_sysroot:-no}" >&6; }
  13151. @@ -7397,6 +7773,123 @@ esac
  13152. need_locks="$enable_libtool_lock"
  13153. +if test -n "$ac_tool_prefix"; then
  13154. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  13155. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  13156. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  13157. +$as_echo_n "checking for $ac_word... " >&6; }
  13158. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  13159. + $as_echo_n "(cached) " >&6
  13160. +else
  13161. + if test -n "$MANIFEST_TOOL"; then
  13162. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  13163. +else
  13164. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  13165. +for as_dir in $PATH
  13166. +do
  13167. + IFS=$as_save_IFS
  13168. + test -z "$as_dir" && as_dir=.
  13169. + for ac_exec_ext in '' $ac_executable_extensions; do
  13170. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  13171. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  13172. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  13173. + break 2
  13174. + fi
  13175. +done
  13176. + done
  13177. +IFS=$as_save_IFS
  13178. +
  13179. +fi
  13180. +fi
  13181. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  13182. +if test -n "$MANIFEST_TOOL"; then
  13183. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  13184. +$as_echo "$MANIFEST_TOOL" >&6; }
  13185. +else
  13186. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  13187. +$as_echo "no" >&6; }
  13188. +fi
  13189. +
  13190. +
  13191. +fi
  13192. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  13193. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  13194. + # Extract the first word of "mt", so it can be a program name with args.
  13195. +set dummy mt; ac_word=$2
  13196. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  13197. +$as_echo_n "checking for $ac_word... " >&6; }
  13198. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  13199. + $as_echo_n "(cached) " >&6
  13200. +else
  13201. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  13202. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  13203. +else
  13204. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  13205. +for as_dir in $PATH
  13206. +do
  13207. + IFS=$as_save_IFS
  13208. + test -z "$as_dir" && as_dir=.
  13209. + for ac_exec_ext in '' $ac_executable_extensions; do
  13210. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  13211. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  13212. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  13213. + break 2
  13214. + fi
  13215. +done
  13216. + done
  13217. +IFS=$as_save_IFS
  13218. +
  13219. +fi
  13220. +fi
  13221. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  13222. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  13223. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  13224. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  13225. +else
  13226. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  13227. +$as_echo "no" >&6; }
  13228. +fi
  13229. +
  13230. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  13231. + MANIFEST_TOOL=":"
  13232. + else
  13233. + case $cross_compiling:$ac_tool_warned in
  13234. +yes:)
  13235. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  13236. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  13237. +ac_tool_warned=yes ;;
  13238. +esac
  13239. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  13240. + fi
  13241. +else
  13242. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  13243. +fi
  13244. +
  13245. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  13246. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  13247. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  13248. +if ${lt_cv_path_mainfest_tool+:} false; then :
  13249. + $as_echo_n "(cached) " >&6
  13250. +else
  13251. + lt_cv_path_mainfest_tool=no
  13252. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  13253. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  13254. + cat conftest.err >&5
  13255. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  13256. + lt_cv_path_mainfest_tool=yes
  13257. + fi
  13258. + rm -f conftest*
  13259. +fi
  13260. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  13261. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  13262. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  13263. + MANIFEST_TOOL=:
  13264. +fi
  13265. +
  13266. +
  13267. +
  13268. +
  13269. +
  13270. case $host_os in
  13271. rhapsody* | darwin*)
  13272. @@ -7960,6 +8453,8 @@ _LT_EOF
  13273. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  13274. echo "$AR cru libconftest.a conftest.o" >&5
  13275. $AR cru libconftest.a conftest.o 2>&5
  13276. + echo "$RANLIB libconftest.a" >&5
  13277. + $RANLIB libconftest.a 2>&5
  13278. cat > conftest.c << _LT_EOF
  13279. int main() { return 0;}
  13280. _LT_EOF
  13281. @@ -8028,6 +8523,16 @@ done
  13282. +func_stripname_cnf ()
  13283. +{
  13284. + case ${2} in
  13285. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  13286. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  13287. + esac
  13288. +} # func_stripname_cnf
  13289. +
  13290. +
  13291. +
  13292. # Set options
  13293. @@ -8543,8 +9048,6 @@ fi
  13294. lt_prog_compiler_pic=
  13295. lt_prog_compiler_static=
  13296. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  13297. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  13298. if test "$GCC" = yes; then
  13299. lt_prog_compiler_wl='-Wl,'
  13300. @@ -8710,6 +9213,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  13301. lt_prog_compiler_pic='--shared'
  13302. lt_prog_compiler_static='--static'
  13303. ;;
  13304. + nagfor*)
  13305. + # NAG Fortran compiler
  13306. + lt_prog_compiler_wl='-Wl,-Wl,,'
  13307. + lt_prog_compiler_pic='-PIC'
  13308. + lt_prog_compiler_static='-Bstatic'
  13309. + ;;
  13310. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  13311. # Portland Group compilers (*not* the Pentium gcc compiler,
  13312. # which looks to be a dead project)
  13313. @@ -8772,7 +9281,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  13314. lt_prog_compiler_pic='-KPIC'
  13315. lt_prog_compiler_static='-Bstatic'
  13316. case $cc_basename in
  13317. - f77* | f90* | f95*)
  13318. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  13319. lt_prog_compiler_wl='-Qoption ld ';;
  13320. *)
  13321. lt_prog_compiler_wl='-Wl,';;
  13322. @@ -8829,13 +9338,17 @@ case $host_os in
  13323. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  13324. ;;
  13325. esac
  13326. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  13327. -$as_echo "$lt_prog_compiler_pic" >&6; }
  13328. -
  13329. -
  13330. -
  13331. -
  13332. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  13333. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  13334. +if ${lt_cv_prog_compiler_pic+:} false; then :
  13335. + $as_echo_n "(cached) " >&6
  13336. +else
  13337. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  13338. +fi
  13339. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  13340. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  13341. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  13342. #
  13343. # Check to make sure the PIC flag actually works.
  13344. @@ -8896,6 +9409,11 @@ fi
  13345. +
  13346. +
  13347. +
  13348. +
  13349. +
  13350. #
  13351. # Check to make sure the static flag actually works.
  13352. #
  13353. @@ -9246,7 +9764,8 @@ _LT_EOF
  13354. allow_undefined_flag=unsupported
  13355. always_export_symbols=no
  13356. enable_shared_with_static_runtimes=yes
  13357. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  13358. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  13359. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  13360. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  13361. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  13362. @@ -9345,12 +9864,12 @@ _LT_EOF
  13363. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  13364. hardcode_libdir_flag_spec=
  13365. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  13366. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  13367. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  13368. if test "x$supports_anon_versioning" = xyes; then
  13369. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  13370. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  13371. echo "local: *; };" >> $output_objdir/$libname.ver~
  13372. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  13373. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  13374. fi
  13375. ;;
  13376. esac
  13377. @@ -9364,8 +9883,8 @@ _LT_EOF
  13378. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  13379. wlarc=
  13380. else
  13381. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  13382. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  13383. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  13384. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  13385. fi
  13386. ;;
  13387. @@ -9383,8 +9902,8 @@ _LT_EOF
  13388. _LT_EOF
  13389. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  13390. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  13391. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  13392. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  13393. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  13394. else
  13395. ld_shlibs=no
  13396. fi
  13397. @@ -9430,8 +9949,8 @@ _LT_EOF
  13398. *)
  13399. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  13400. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  13401. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  13402. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  13403. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  13404. else
  13405. ld_shlibs=no
  13406. fi
  13407. @@ -9561,7 +10080,13 @@ _LT_EOF
  13408. allow_undefined_flag='-berok'
  13409. # Determine the default libpath from the value encoded in an
  13410. # empty executable.
  13411. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13412. + if test "${lt_cv_aix_libpath+set}" = set; then
  13413. + aix_libpath=$lt_cv_aix_libpath
  13414. +else
  13415. + if ${lt_cv_aix_libpath_+:} false; then :
  13416. + $as_echo_n "(cached) " >&6
  13417. +else
  13418. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13419. /* end confdefs.h. */
  13420. int
  13421. @@ -9574,22 +10099,29 @@ main ()
  13422. _ACEOF
  13423. if ac_fn_c_try_link "$LINENO"; then :
  13424. -lt_aix_libpath_sed='
  13425. - /Import File Strings/,/^$/ {
  13426. - /^0/ {
  13427. - s/^0 *\(.*\)$/\1/
  13428. - p
  13429. - }
  13430. - }'
  13431. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13432. -# Check for a 64-bit object if we didn't find anything.
  13433. -if test -z "$aix_libpath"; then
  13434. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13435. -fi
  13436. + lt_aix_libpath_sed='
  13437. + /Import File Strings/,/^$/ {
  13438. + /^0/ {
  13439. + s/^0 *\([^ ]*\) *$/\1/
  13440. + p
  13441. + }
  13442. + }'
  13443. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13444. + # Check for a 64-bit object if we didn't find anything.
  13445. + if test -z "$lt_cv_aix_libpath_"; then
  13446. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13447. + fi
  13448. fi
  13449. rm -f core conftest.err conftest.$ac_objext \
  13450. conftest$ac_exeext conftest.$ac_ext
  13451. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13452. + if test -z "$lt_cv_aix_libpath_"; then
  13453. + lt_cv_aix_libpath_="/usr/lib:/lib"
  13454. + fi
  13455. +
  13456. +fi
  13457. +
  13458. + aix_libpath=$lt_cv_aix_libpath_
  13459. +fi
  13460. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  13461. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  13462. @@ -9601,7 +10133,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13463. else
  13464. # Determine the default libpath from the value encoded in an
  13465. # empty executable.
  13466. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13467. + if test "${lt_cv_aix_libpath+set}" = set; then
  13468. + aix_libpath=$lt_cv_aix_libpath
  13469. +else
  13470. + if ${lt_cv_aix_libpath_+:} false; then :
  13471. + $as_echo_n "(cached) " >&6
  13472. +else
  13473. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13474. /* end confdefs.h. */
  13475. int
  13476. @@ -9614,22 +10152,29 @@ main ()
  13477. _ACEOF
  13478. if ac_fn_c_try_link "$LINENO"; then :
  13479. -lt_aix_libpath_sed='
  13480. - /Import File Strings/,/^$/ {
  13481. - /^0/ {
  13482. - s/^0 *\(.*\)$/\1/
  13483. - p
  13484. - }
  13485. - }'
  13486. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13487. -# Check for a 64-bit object if we didn't find anything.
  13488. -if test -z "$aix_libpath"; then
  13489. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13490. -fi
  13491. + lt_aix_libpath_sed='
  13492. + /Import File Strings/,/^$/ {
  13493. + /^0/ {
  13494. + s/^0 *\([^ ]*\) *$/\1/
  13495. + p
  13496. + }
  13497. + }'
  13498. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13499. + # Check for a 64-bit object if we didn't find anything.
  13500. + if test -z "$lt_cv_aix_libpath_"; then
  13501. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13502. + fi
  13503. fi
  13504. rm -f core conftest.err conftest.$ac_objext \
  13505. conftest$ac_exeext conftest.$ac_ext
  13506. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13507. + if test -z "$lt_cv_aix_libpath_"; then
  13508. + lt_cv_aix_libpath_="/usr/lib:/lib"
  13509. + fi
  13510. +
  13511. +fi
  13512. +
  13513. + aix_libpath=$lt_cv_aix_libpath_
  13514. +fi
  13515. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  13516. # Warning - without using the other run time loading flags,
  13517. @@ -9673,21 +10218,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13518. # When not using gcc, we currently assume that we are using
  13519. # Microsoft Visual C++.
  13520. # hardcode_libdir_flag_spec is actually meaningless, as there is
  13521. - # no search path for DLLs.
  13522. - hardcode_libdir_flag_spec=' '
  13523. - allow_undefined_flag=unsupported
  13524. - # Tell ltmain to make .lib files, not .a files.
  13525. - libext=lib
  13526. - # Tell ltmain to make .dll files, not .so files.
  13527. - shrext_cmds=".dll"
  13528. - # FIXME: Setting linknames here is a bad hack.
  13529. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  13530. - # The linker will automatically build a .lib file if we build a DLL.
  13531. - old_archive_from_new_cmds='true'
  13532. - # FIXME: Should let the user specify the lib program.
  13533. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  13534. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  13535. - enable_shared_with_static_runtimes=yes
  13536. + # no search path for DLLs.
  13537. + case $cc_basename in
  13538. + cl*)
  13539. + # Native MSVC
  13540. + hardcode_libdir_flag_spec=' '
  13541. + allow_undefined_flag=unsupported
  13542. + always_export_symbols=yes
  13543. + file_list_spec='@'
  13544. + # Tell ltmain to make .lib files, not .a files.
  13545. + libext=lib
  13546. + # Tell ltmain to make .dll files, not .so files.
  13547. + shrext_cmds=".dll"
  13548. + # FIXME: Setting linknames here is a bad hack.
  13549. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  13550. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  13551. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  13552. + else
  13553. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  13554. + fi~
  13555. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  13556. + linknames='
  13557. + # The linker will not automatically build a static lib if we build a DLL.
  13558. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  13559. + enable_shared_with_static_runtimes=yes
  13560. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  13561. + # Don't use ranlib
  13562. + old_postinstall_cmds='chmod 644 $oldlib'
  13563. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  13564. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  13565. + case $lt_outputfile in
  13566. + *.exe|*.EXE) ;;
  13567. + *)
  13568. + lt_outputfile="$lt_outputfile.exe"
  13569. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  13570. + ;;
  13571. + esac~
  13572. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  13573. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  13574. + $RM "$lt_outputfile.manifest";
  13575. + fi'
  13576. + ;;
  13577. + *)
  13578. + # Assume MSVC wrapper
  13579. + hardcode_libdir_flag_spec=' '
  13580. + allow_undefined_flag=unsupported
  13581. + # Tell ltmain to make .lib files, not .a files.
  13582. + libext=lib
  13583. + # Tell ltmain to make .dll files, not .so files.
  13584. + shrext_cmds=".dll"
  13585. + # FIXME: Setting linknames here is a bad hack.
  13586. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  13587. + # The linker will automatically build a .lib file if we build a DLL.
  13588. + old_archive_from_new_cmds='true'
  13589. + # FIXME: Should let the user specify the lib program.
  13590. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  13591. + enable_shared_with_static_runtimes=yes
  13592. + ;;
  13593. + esac
  13594. ;;
  13595. darwin* | rhapsody*)
  13596. @@ -9748,7 +10336,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13597. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  13598. freebsd* | dragonfly*)
  13599. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  13600. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  13601. hardcode_libdir_flag_spec='-R$libdir'
  13602. hardcode_direct=yes
  13603. hardcode_shlibpath_var=no
  13604. @@ -9756,7 +10344,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13605. hpux9*)
  13606. if test "$GCC" = yes; then
  13607. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  13608. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  13609. else
  13610. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  13611. fi
  13612. @@ -9772,7 +10360,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13613. hpux10*)
  13614. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  13615. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  13616. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  13617. else
  13618. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  13619. fi
  13620. @@ -9796,10 +10384,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13621. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  13622. ;;
  13623. ia64*)
  13624. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  13625. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  13626. ;;
  13627. *)
  13628. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  13629. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  13630. ;;
  13631. esac
  13632. else
  13633. @@ -9878,23 +10466,36 @@ fi
  13634. irix5* | irix6* | nonstopux*)
  13635. if test "$GCC" = yes; then
  13636. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  13637. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  13638. # Try to use the -exported_symbol ld option, if it does not
  13639. # work, assume that -exports_file does not work either and
  13640. # implicitly export all symbols.
  13641. - save_LDFLAGS="$LDFLAGS"
  13642. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  13643. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13644. + # This should be the same for all languages, so no per-tag cache variable.
  13645. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  13646. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  13647. +if ${lt_cv_irix_exported_symbol+:} false; then :
  13648. + $as_echo_n "(cached) " >&6
  13649. +else
  13650. + save_LDFLAGS="$LDFLAGS"
  13651. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  13652. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13653. /* end confdefs.h. */
  13654. -int foo(void) {}
  13655. +int foo (void) { return 0; }
  13656. _ACEOF
  13657. if ac_fn_c_try_link "$LINENO"; then :
  13658. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  13659. -
  13660. + lt_cv_irix_exported_symbol=yes
  13661. +else
  13662. + lt_cv_irix_exported_symbol=no
  13663. fi
  13664. rm -f core conftest.err conftest.$ac_objext \
  13665. conftest$ac_exeext conftest.$ac_ext
  13666. - LDFLAGS="$save_LDFLAGS"
  13667. + LDFLAGS="$save_LDFLAGS"
  13668. +fi
  13669. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  13670. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  13671. + if test "$lt_cv_irix_exported_symbol" = yes; then
  13672. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  13673. + fi
  13674. else
  13675. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  13676. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  13677. @@ -9979,7 +10580,7 @@ rm -f core conftest.err conftest.$ac_objext \
  13678. osf4* | osf5*) # as osf3* with the addition of -msym flag
  13679. if test "$GCC" = yes; then
  13680. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  13681. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  13682. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  13683. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  13684. else
  13685. allow_undefined_flag=' -expect_unresolved \*'
  13686. @@ -9998,9 +10599,9 @@ rm -f core conftest.err conftest.$ac_objext \
  13687. no_undefined_flag=' -z defs'
  13688. if test "$GCC" = yes; then
  13689. wlarc='${wl}'
  13690. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  13691. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  13692. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  13693. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  13694. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  13695. else
  13696. case `$CC -V 2>&1` in
  13697. *"Compilers 5.0"*)
  13698. @@ -10576,8 +11177,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  13699. need_version=no
  13700. need_lib_prefix=no
  13701. - case $GCC,$host_os in
  13702. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  13703. + case $GCC,$cc_basename in
  13704. + yes,*)
  13705. + # gcc
  13706. library_names_spec='$libname.dll.a'
  13707. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  13708. postinstall_cmds='base_file=`basename \${file}`~
  13709. @@ -10610,13 +11212,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  13710. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  13711. ;;
  13712. esac
  13713. + dynamic_linker='Win32 ld.exe'
  13714. + ;;
  13715. +
  13716. + *,cl*)
  13717. + # Native MSVC
  13718. + libname_spec='$name'
  13719. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  13720. + library_names_spec='${libname}.dll.lib'
  13721. +
  13722. + case $build_os in
  13723. + mingw*)
  13724. + sys_lib_search_path_spec=
  13725. + lt_save_ifs=$IFS
  13726. + IFS=';'
  13727. + for lt_path in $LIB
  13728. + do
  13729. + IFS=$lt_save_ifs
  13730. + # Let DOS variable expansion print the short 8.3 style file name.
  13731. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  13732. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  13733. + done
  13734. + IFS=$lt_save_ifs
  13735. + # Convert to MSYS style.
  13736. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  13737. + ;;
  13738. + cygwin*)
  13739. + # Convert to unix form, then to dos form, then back to unix form
  13740. + # but this time dos style (no spaces!) so that the unix form looks
  13741. + # like /cygdrive/c/PROGRA~1:/cygdr...
  13742. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  13743. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  13744. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  13745. + ;;
  13746. + *)
  13747. + sys_lib_search_path_spec="$LIB"
  13748. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  13749. + # It is most probably a Windows format PATH.
  13750. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  13751. + else
  13752. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  13753. + fi
  13754. + # FIXME: find the short name or the path components, as spaces are
  13755. + # common. (e.g. "Program Files" -> "PROGRA~1")
  13756. + ;;
  13757. + esac
  13758. +
  13759. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  13760. + postinstall_cmds='base_file=`basename \${file}`~
  13761. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  13762. + dldir=$destdir/`dirname \$dlpath`~
  13763. + test -d \$dldir || mkdir -p \$dldir~
  13764. + $install_prog $dir/$dlname \$dldir/$dlname'
  13765. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  13766. + dlpath=$dir/\$dldll~
  13767. + $RM \$dlpath'
  13768. + shlibpath_overrides_runpath=yes
  13769. + dynamic_linker='Win32 link.exe'
  13770. ;;
  13771. *)
  13772. + # Assume MSVC wrapper
  13773. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  13774. + dynamic_linker='Win32 ld.exe'
  13775. ;;
  13776. esac
  13777. - dynamic_linker='Win32 ld.exe'
  13778. # FIXME: first we should search . and the directory the executable is in
  13779. shlibpath_var=PATH
  13780. ;;
  13781. @@ -11494,7 +12154,7 @@ else
  13782. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  13783. lt_status=$lt_dlunknown
  13784. cat > conftest.$ac_ext <<_LT_EOF
  13785. -#line 11494 "configure"
  13786. +#line $LINENO "configure"
  13787. #include "confdefs.h"
  13788. #if HAVE_DLFCN_H
  13789. @@ -11538,10 +12198,10 @@ else
  13790. /* When -fvisbility=hidden is used, assume the code has been annotated
  13791. correspondingly for the symbols needed. */
  13792. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  13793. -void fnord () __attribute__((visibility("default")));
  13794. +int fnord () __attribute__((visibility("default")));
  13795. #endif
  13796. -void fnord () { int i=42; }
  13797. +int fnord () { return 42; }
  13798. int main ()
  13799. {
  13800. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  13801. @@ -11600,7 +12260,7 @@ else
  13802. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  13803. lt_status=$lt_dlunknown
  13804. cat > conftest.$ac_ext <<_LT_EOF
  13805. -#line 11600 "configure"
  13806. +#line $LINENO "configure"
  13807. #include "confdefs.h"
  13808. #if HAVE_DLFCN_H
  13809. @@ -11644,10 +12304,10 @@ else
  13810. /* When -fvisbility=hidden is used, assume the code has been annotated
  13811. correspondingly for the symbols needed. */
  13812. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  13813. -void fnord () __attribute__((visibility("default")));
  13814. +int fnord () __attribute__((visibility("default")));
  13815. #endif
  13816. -void fnord () { int i=42; }
  13817. +int fnord () { return 42; }
  13818. int main ()
  13819. {
  13820. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  13821. @@ -12039,6 +12699,7 @@ $RM -r conftest*
  13822. # Allow CC to be a program name with arguments.
  13823. lt_save_CC=$CC
  13824. + lt_save_CFLAGS=$CFLAGS
  13825. lt_save_LD=$LD
  13826. lt_save_GCC=$GCC
  13827. GCC=$GXX
  13828. @@ -12056,6 +12717,7 @@ $RM -r conftest*
  13829. fi
  13830. test -z "${LDCXX+set}" || LD=$LDCXX
  13831. CC=${CXX-"c++"}
  13832. + CFLAGS=$CXXFLAGS
  13833. compiler=$CC
  13834. compiler_CXX=$CC
  13835. for cc_temp in $compiler""; do
  13836. @@ -12338,7 +13000,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  13837. allow_undefined_flag_CXX='-berok'
  13838. # Determine the default libpath from the value encoded in an empty
  13839. # executable.
  13840. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13841. + if test "${lt_cv_aix_libpath+set}" = set; then
  13842. + aix_libpath=$lt_cv_aix_libpath
  13843. +else
  13844. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  13845. + $as_echo_n "(cached) " >&6
  13846. +else
  13847. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13848. /* end confdefs.h. */
  13849. int
  13850. @@ -12351,22 +13019,29 @@ main ()
  13851. _ACEOF
  13852. if ac_fn_cxx_try_link "$LINENO"; then :
  13853. -lt_aix_libpath_sed='
  13854. - /Import File Strings/,/^$/ {
  13855. - /^0/ {
  13856. - s/^0 *\(.*\)$/\1/
  13857. - p
  13858. - }
  13859. - }'
  13860. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13861. -# Check for a 64-bit object if we didn't find anything.
  13862. -if test -z "$aix_libpath"; then
  13863. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13864. -fi
  13865. + lt_aix_libpath_sed='
  13866. + /Import File Strings/,/^$/ {
  13867. + /^0/ {
  13868. + s/^0 *\([^ ]*\) *$/\1/
  13869. + p
  13870. + }
  13871. + }'
  13872. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13873. + # Check for a 64-bit object if we didn't find anything.
  13874. + if test -z "$lt_cv_aix_libpath__CXX"; then
  13875. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13876. + fi
  13877. fi
  13878. rm -f core conftest.err conftest.$ac_objext \
  13879. conftest$ac_exeext conftest.$ac_ext
  13880. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13881. + if test -z "$lt_cv_aix_libpath__CXX"; then
  13882. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  13883. + fi
  13884. +
  13885. +fi
  13886. +
  13887. + aix_libpath=$lt_cv_aix_libpath__CXX
  13888. +fi
  13889. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  13890. @@ -12379,7 +13054,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13891. else
  13892. # Determine the default libpath from the value encoded in an
  13893. # empty executable.
  13894. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13895. + if test "${lt_cv_aix_libpath+set}" = set; then
  13896. + aix_libpath=$lt_cv_aix_libpath
  13897. +else
  13898. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  13899. + $as_echo_n "(cached) " >&6
  13900. +else
  13901. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  13902. /* end confdefs.h. */
  13903. int
  13904. @@ -12392,22 +13073,29 @@ main ()
  13905. _ACEOF
  13906. if ac_fn_cxx_try_link "$LINENO"; then :
  13907. -lt_aix_libpath_sed='
  13908. - /Import File Strings/,/^$/ {
  13909. - /^0/ {
  13910. - s/^0 *\(.*\)$/\1/
  13911. - p
  13912. - }
  13913. - }'
  13914. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13915. -# Check for a 64-bit object if we didn't find anything.
  13916. -if test -z "$aix_libpath"; then
  13917. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13918. -fi
  13919. + lt_aix_libpath_sed='
  13920. + /Import File Strings/,/^$/ {
  13921. + /^0/ {
  13922. + s/^0 *\([^ ]*\) *$/\1/
  13923. + p
  13924. + }
  13925. + }'
  13926. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13927. + # Check for a 64-bit object if we didn't find anything.
  13928. + if test -z "$lt_cv_aix_libpath__CXX"; then
  13929. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  13930. + fi
  13931. fi
  13932. rm -f core conftest.err conftest.$ac_objext \
  13933. conftest$ac_exeext conftest.$ac_ext
  13934. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13935. + if test -z "$lt_cv_aix_libpath__CXX"; then
  13936. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  13937. + fi
  13938. +
  13939. +fi
  13940. +
  13941. + aix_libpath=$lt_cv_aix_libpath__CXX
  13942. +fi
  13943. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  13944. # Warning - without using the other run time loading flags,
  13945. @@ -12450,29 +13138,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  13946. ;;
  13947. cygwin* | mingw* | pw32* | cegcc*)
  13948. - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  13949. - # as there is no search path for DLLs.
  13950. - hardcode_libdir_flag_spec_CXX='-L$libdir'
  13951. - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  13952. - allow_undefined_flag_CXX=unsupported
  13953. - always_export_symbols_CXX=no
  13954. - enable_shared_with_static_runtimes_CXX=yes
  13955. -
  13956. - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  13957. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  13958. - # If the export-symbols file already is a .def file (1st line
  13959. - # is EXPORTS), use it as is; otherwise, prepend...
  13960. - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  13961. - cp $export_symbols $output_objdir/$soname.def;
  13962. - else
  13963. - echo EXPORTS > $output_objdir/$soname.def;
  13964. - cat $export_symbols >> $output_objdir/$soname.def;
  13965. - fi~
  13966. - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  13967. - else
  13968. - ld_shlibs_CXX=no
  13969. - fi
  13970. - ;;
  13971. + case $GXX,$cc_basename in
  13972. + ,cl* | no,cl*)
  13973. + # Native MSVC
  13974. + # hardcode_libdir_flag_spec is actually meaningless, as there is
  13975. + # no search path for DLLs.
  13976. + hardcode_libdir_flag_spec_CXX=' '
  13977. + allow_undefined_flag_CXX=unsupported
  13978. + always_export_symbols_CXX=yes
  13979. + file_list_spec_CXX='@'
  13980. + # Tell ltmain to make .lib files, not .a files.
  13981. + libext=lib
  13982. + # Tell ltmain to make .dll files, not .so files.
  13983. + shrext_cmds=".dll"
  13984. + # FIXME: Setting linknames here is a bad hack.
  13985. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  13986. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  13987. + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  13988. + else
  13989. + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  13990. + fi~
  13991. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  13992. + linknames='
  13993. + # The linker will not automatically build a static lib if we build a DLL.
  13994. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
  13995. + enable_shared_with_static_runtimes_CXX=yes
  13996. + # Don't use ranlib
  13997. + old_postinstall_cmds_CXX='chmod 644 $oldlib'
  13998. + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
  13999. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  14000. + case $lt_outputfile in
  14001. + *.exe|*.EXE) ;;
  14002. + *)
  14003. + lt_outputfile="$lt_outputfile.exe"
  14004. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  14005. + ;;
  14006. + esac~
  14007. + func_to_tool_file "$lt_outputfile"~
  14008. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  14009. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  14010. + $RM "$lt_outputfile.manifest";
  14011. + fi'
  14012. + ;;
  14013. + *)
  14014. + # g++
  14015. + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  14016. + # as there is no search path for DLLs.
  14017. + hardcode_libdir_flag_spec_CXX='-L$libdir'
  14018. + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  14019. + allow_undefined_flag_CXX=unsupported
  14020. + always_export_symbols_CXX=no
  14021. + enable_shared_with_static_runtimes_CXX=yes
  14022. +
  14023. + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  14024. + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  14025. + # If the export-symbols file already is a .def file (1st line
  14026. + # is EXPORTS), use it as is; otherwise, prepend...
  14027. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  14028. + cp $export_symbols $output_objdir/$soname.def;
  14029. + else
  14030. + echo EXPORTS > $output_objdir/$soname.def;
  14031. + cat $export_symbols >> $output_objdir/$soname.def;
  14032. + fi~
  14033. + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  14034. + else
  14035. + ld_shlibs_CXX=no
  14036. + fi
  14037. + ;;
  14038. + esac
  14039. + ;;
  14040. darwin* | rhapsody*)
  14041. @@ -12578,7 +13312,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  14042. ;;
  14043. *)
  14044. if test "$GXX" = yes; then
  14045. - archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  14046. + archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  14047. else
  14048. # FIXME: insert proper C++ library support
  14049. ld_shlibs_CXX=no
  14050. @@ -12649,10 +13383,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  14051. archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  14052. ;;
  14053. ia64*)
  14054. - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  14055. + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  14056. ;;
  14057. *)
  14058. - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  14059. + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  14060. ;;
  14061. esac
  14062. fi
  14063. @@ -12693,9 +13427,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  14064. *)
  14065. if test "$GXX" = yes; then
  14066. if test "$with_gnu_ld" = no; then
  14067. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  14068. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  14069. else
  14070. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  14071. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  14072. fi
  14073. fi
  14074. link_all_deplibs_CXX=yes
  14075. @@ -12765,20 +13499,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  14076. prelink_cmds_CXX='tpldir=Template.dir~
  14077. rm -rf $tpldir~
  14078. $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  14079. - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
  14080. + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  14081. old_archive_cmds_CXX='tpldir=Template.dir~
  14082. rm -rf $tpldir~
  14083. $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  14084. - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
  14085. + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  14086. $RANLIB $oldlib'
  14087. archive_cmds_CXX='tpldir=Template.dir~
  14088. rm -rf $tpldir~
  14089. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  14090. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  14091. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  14092. archive_expsym_cmds_CXX='tpldir=Template.dir~
  14093. rm -rf $tpldir~
  14094. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  14095. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  14096. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  14097. ;;
  14098. *) # Version 6 and above use weak symbols
  14099. archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  14100. @@ -12973,7 +13707,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  14101. archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  14102. ;;
  14103. *)
  14104. - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  14105. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  14106. ;;
  14107. esac
  14108. @@ -13019,7 +13753,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  14109. solaris*)
  14110. case $cc_basename in
  14111. - CC*)
  14112. + CC* | sunCC*)
  14113. # Sun C++ 4.2, 5.x and Centerline C++
  14114. archive_cmds_need_lc_CXX=yes
  14115. no_undefined_flag_CXX=' -zdefs'
  14116. @@ -13060,9 +13794,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  14117. if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  14118. no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  14119. if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  14120. - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  14121. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  14122. archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  14123. - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  14124. + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  14125. # Commands to make compiler produce verbose output that lists
  14126. # what "hidden" libraries, object files and flags are used when
  14127. @@ -13197,6 +13931,13 @@ private:
  14128. };
  14129. _LT_EOF
  14130. +
  14131. +_lt_libdeps_save_CFLAGS=$CFLAGS
  14132. +case "$CC $CFLAGS " in #(
  14133. +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
  14134. +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
  14135. +esac
  14136. +
  14137. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  14138. (eval $ac_compile) 2>&5
  14139. ac_status=$?
  14140. @@ -13210,7 +13951,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  14141. pre_test_object_deps_done=no
  14142. for p in `eval "$output_verbose_link_cmd"`; do
  14143. - case $p in
  14144. + case ${prev}${p} in
  14145. -L* | -R* | -l*)
  14146. # Some compilers place space between "-{L,R}" and the path.
  14147. @@ -13219,13 +13960,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  14148. test $p = "-R"; then
  14149. prev=$p
  14150. continue
  14151. - else
  14152. - prev=
  14153. fi
  14154. + # Expand the sysroot to ease extracting the directories later.
  14155. + if test -z "$prev"; then
  14156. + case $p in
  14157. + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
  14158. + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
  14159. + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
  14160. + esac
  14161. + fi
  14162. + case $p in
  14163. + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
  14164. + esac
  14165. if test "$pre_test_object_deps_done" = no; then
  14166. - case $p in
  14167. - -L* | -R*)
  14168. + case ${prev} in
  14169. + -L | -R)
  14170. # Internal compiler library paths should come after those
  14171. # provided the user. The postdeps already come after the
  14172. # user supplied libs so there is no need to process them.
  14173. @@ -13245,8 +13995,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  14174. postdeps_CXX="${postdeps_CXX} ${prev}${p}"
  14175. fi
  14176. fi
  14177. + prev=
  14178. ;;
  14179. + *.lto.$objext) ;; # Ignore GCC LTO objects
  14180. *.$objext)
  14181. # This assumes that the test object file only shows up
  14182. # once in the compiler output.
  14183. @@ -13282,6 +14034,7 @@ else
  14184. fi
  14185. $RM -f confest.$objext
  14186. +CFLAGS=$_lt_libdeps_save_CFLAGS
  14187. # PORTME: override above test on systems where it is broken
  14188. case $host_os in
  14189. @@ -13317,7 +14070,7 @@ linux*)
  14190. solaris*)
  14191. case $cc_basename in
  14192. - CC*)
  14193. + CC* | sunCC*)
  14194. # The more standards-conforming stlport4 library is
  14195. # incompatible with the Cstd library. Avoid specifying
  14196. # it if it's in CXXFLAGS. Ignore libCrun as
  14197. @@ -13382,8 +14135,6 @@ fi
  14198. lt_prog_compiler_pic_CXX=
  14199. lt_prog_compiler_static_CXX=
  14200. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  14201. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  14202. # C++ specific cases for pic, static, wl, etc.
  14203. if test "$GXX" = yes; then
  14204. @@ -13488,6 +14239,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  14205. ;;
  14206. esac
  14207. ;;
  14208. + mingw* | cygwin* | os2* | pw32* | cegcc*)
  14209. + # This hack is so that the source file can tell whether it is being
  14210. + # built for inclusion in a dll (and should export symbols for example).
  14211. + lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
  14212. + ;;
  14213. dgux*)
  14214. case $cc_basename in
  14215. ec++*)
  14216. @@ -13640,7 +14396,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  14217. ;;
  14218. solaris*)
  14219. case $cc_basename in
  14220. - CC*)
  14221. + CC* | sunCC*)
  14222. # Sun C++ 4.2, 5.x and Centerline C++
  14223. lt_prog_compiler_pic_CXX='-KPIC'
  14224. lt_prog_compiler_static_CXX='-Bstatic'
  14225. @@ -13705,10 +14461,17 @@ case $host_os in
  14226. lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
  14227. ;;
  14228. esac
  14229. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
  14230. -$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  14231. -
  14232. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  14233. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  14234. +if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
  14235. + $as_echo_n "(cached) " >&6
  14236. +else
  14237. + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
  14238. +fi
  14239. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
  14240. +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
  14241. +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
  14242. #
  14243. # Check to make sure the PIC flag actually works.
  14244. @@ -13766,6 +14529,8 @@ fi
  14245. +
  14246. +
  14247. #
  14248. # Check to make sure the static flag actually works.
  14249. #
  14250. @@ -13943,6 +14708,7 @@ fi
  14251. $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  14252. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  14253. + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  14254. case $host_os in
  14255. aix[4-9]*)
  14256. # If we're using GNU nm, then we don't want the "-C" option.
  14257. @@ -13957,15 +14723,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  14258. ;;
  14259. pw32*)
  14260. export_symbols_cmds_CXX="$ltdll_cmds"
  14261. - ;;
  14262. + ;;
  14263. cygwin* | mingw* | cegcc*)
  14264. - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  14265. - ;;
  14266. + case $cc_basename in
  14267. + cl*) ;;
  14268. + *)
  14269. + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  14270. + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  14271. + ;;
  14272. + esac
  14273. + ;;
  14274. *)
  14275. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  14276. - ;;
  14277. + ;;
  14278. esac
  14279. - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  14280. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
  14281. $as_echo "$ld_shlibs_CXX" >&6; }
  14282. @@ -14228,8 +14999,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  14283. need_version=no
  14284. need_lib_prefix=no
  14285. - case $GCC,$host_os in
  14286. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  14287. + case $GCC,$cc_basename in
  14288. + yes,*)
  14289. + # gcc
  14290. library_names_spec='$libname.dll.a'
  14291. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  14292. postinstall_cmds='base_file=`basename \${file}`~
  14293. @@ -14261,13 +15033,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  14294. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  14295. ;;
  14296. esac
  14297. + dynamic_linker='Win32 ld.exe'
  14298. + ;;
  14299. +
  14300. + *,cl*)
  14301. + # Native MSVC
  14302. + libname_spec='$name'
  14303. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  14304. + library_names_spec='${libname}.dll.lib'
  14305. +
  14306. + case $build_os in
  14307. + mingw*)
  14308. + sys_lib_search_path_spec=
  14309. + lt_save_ifs=$IFS
  14310. + IFS=';'
  14311. + for lt_path in $LIB
  14312. + do
  14313. + IFS=$lt_save_ifs
  14314. + # Let DOS variable expansion print the short 8.3 style file name.
  14315. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  14316. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  14317. + done
  14318. + IFS=$lt_save_ifs
  14319. + # Convert to MSYS style.
  14320. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  14321. + ;;
  14322. + cygwin*)
  14323. + # Convert to unix form, then to dos form, then back to unix form
  14324. + # but this time dos style (no spaces!) so that the unix form looks
  14325. + # like /cygdrive/c/PROGRA~1:/cygdr...
  14326. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  14327. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  14328. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  14329. + ;;
  14330. + *)
  14331. + sys_lib_search_path_spec="$LIB"
  14332. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  14333. + # It is most probably a Windows format PATH.
  14334. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  14335. + else
  14336. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  14337. + fi
  14338. + # FIXME: find the short name or the path components, as spaces are
  14339. + # common. (e.g. "Program Files" -> "PROGRA~1")
  14340. + ;;
  14341. + esac
  14342. +
  14343. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  14344. + postinstall_cmds='base_file=`basename \${file}`~
  14345. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  14346. + dldir=$destdir/`dirname \$dlpath`~
  14347. + test -d \$dldir || mkdir -p \$dldir~
  14348. + $install_prog $dir/$dlname \$dldir/$dlname'
  14349. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  14350. + dlpath=$dir/\$dldll~
  14351. + $RM \$dlpath'
  14352. + shlibpath_overrides_runpath=yes
  14353. + dynamic_linker='Win32 link.exe'
  14354. ;;
  14355. *)
  14356. + # Assume MSVC wrapper
  14357. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  14358. + dynamic_linker='Win32 ld.exe'
  14359. ;;
  14360. esac
  14361. - dynamic_linker='Win32 ld.exe'
  14362. # FIXME: first we should search . and the directory the executable is in
  14363. shlibpath_var=PATH
  14364. ;;
  14365. @@ -14807,6 +15637,7 @@ fi
  14366. fi # test -n "$compiler"
  14367. CC=$lt_save_CC
  14368. + CFLAGS=$lt_save_CFLAGS
  14369. LDCXX=$LD
  14370. LD=$lt_save_LD
  14371. GCC=$lt_save_GCC
  14372. @@ -18172,13 +19003,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  14373. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  14374. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  14375. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  14376. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  14377. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  14378. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  14379. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  14380. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  14381. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  14382. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  14383. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  14384. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  14385. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  14386. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  14387. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  14388. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  14389. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  14390. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  14391. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  14392. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  14393. @@ -18193,14 +19031,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  14394. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  14395. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  14396. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  14397. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  14398. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  14399. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  14400. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  14401. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  14402. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  14403. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  14404. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  14405. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  14406. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  14407. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  14408. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  14409. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  14410. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  14411. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  14412. @@ -18233,12 +19074,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  14413. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  14414. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  14415. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  14416. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  14417. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  14418. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  14419. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  14420. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  14421. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  14422. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  14423. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  14424. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  14425. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  14426. @@ -18277,8 +19118,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
  14427. compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
  14428. GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
  14429. lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
  14430. -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  14431. lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
  14432. +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  14433. lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
  14434. lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
  14435. archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
  14436. @@ -18305,12 +19146,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
  14437. hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
  14438. inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
  14439. link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
  14440. -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
  14441. always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
  14442. export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  14443. exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  14444. include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  14445. prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  14446. +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  14447. file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
  14448. hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
  14449. compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
  14450. @@ -18348,8 +19189,13 @@ reload_flag \
  14451. OBJDUMP \
  14452. deplibs_check_method \
  14453. file_magic_cmd \
  14454. +file_magic_glob \
  14455. +want_nocaseglob \
  14456. +DLLTOOL \
  14457. +sharedlib_from_linklib_cmd \
  14458. AR \
  14459. AR_FLAGS \
  14460. +archiver_list_spec \
  14461. STRIP \
  14462. RANLIB \
  14463. CC \
  14464. @@ -18359,12 +19205,14 @@ lt_cv_sys_global_symbol_pipe \
  14465. lt_cv_sys_global_symbol_to_cdecl \
  14466. lt_cv_sys_global_symbol_to_c_name_address \
  14467. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  14468. +nm_file_list_spec \
  14469. lt_prog_compiler_no_builtin_flag \
  14470. -lt_prog_compiler_wl \
  14471. lt_prog_compiler_pic \
  14472. +lt_prog_compiler_wl \
  14473. lt_prog_compiler_static \
  14474. lt_cv_prog_compiler_c_o \
  14475. need_locks \
  14476. +MANIFEST_TOOL \
  14477. DSYMUTIL \
  14478. NMEDIT \
  14479. LIPO \
  14480. @@ -18380,7 +19228,6 @@ no_undefined_flag \
  14481. hardcode_libdir_flag_spec \
  14482. hardcode_libdir_flag_spec_ld \
  14483. hardcode_libdir_separator \
  14484. -fix_srcfile_path \
  14485. exclude_expsyms \
  14486. include_expsyms \
  14487. file_list_spec \
  14488. @@ -18402,8 +19249,8 @@ LD_CXX \
  14489. reload_flag_CXX \
  14490. compiler_CXX \
  14491. lt_prog_compiler_no_builtin_flag_CXX \
  14492. -lt_prog_compiler_wl_CXX \
  14493. lt_prog_compiler_pic_CXX \
  14494. +lt_prog_compiler_wl_CXX \
  14495. lt_prog_compiler_static_CXX \
  14496. lt_cv_prog_compiler_c_o_CXX \
  14497. export_dynamic_flag_spec_CXX \
  14498. @@ -18415,7 +19262,6 @@ no_undefined_flag_CXX \
  14499. hardcode_libdir_flag_spec_CXX \
  14500. hardcode_libdir_flag_spec_ld_CXX \
  14501. hardcode_libdir_separator_CXX \
  14502. -fix_srcfile_path_CXX \
  14503. exclude_expsyms_CXX \
  14504. include_expsyms_CXX \
  14505. file_list_spec_CXX \
  14506. @@ -18449,6 +19295,7 @@ module_cmds \
  14507. module_expsym_cmds \
  14508. export_symbols_cmds \
  14509. prelink_cmds \
  14510. +postlink_cmds \
  14511. postinstall_cmds \
  14512. postuninstall_cmds \
  14513. finish_cmds \
  14514. @@ -18463,7 +19310,8 @@ archive_expsym_cmds_CXX \
  14515. module_cmds_CXX \
  14516. module_expsym_cmds_CXX \
  14517. export_symbols_cmds_CXX \
  14518. -prelink_cmds_CXX; do
  14519. +prelink_cmds_CXX \
  14520. +postlink_cmds_CXX; do
  14521. case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  14522. *[\\\\\\\`\\"\\\$]*)
  14523. eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  14524. @@ -19228,7 +20076,8 @@ $as_echo X"$file" |
  14525. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  14526. #
  14527. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  14528. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  14529. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  14530. +# Inc.
  14531. # Written by Gordon Matzigkeit, 1996
  14532. #
  14533. # This file is part of GNU Libtool.
  14534. @@ -19331,19 +20180,42 @@ SP2NL=$lt_lt_SP2NL
  14535. # turn newlines into spaces.
  14536. NL2SP=$lt_lt_NL2SP
  14537. +# convert \$build file names to \$host format.
  14538. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  14539. +
  14540. +# convert \$build files to toolchain format.
  14541. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  14542. +
  14543. # An object symbol dumper.
  14544. OBJDUMP=$lt_OBJDUMP
  14545. # Method to check whether dependent libraries are shared objects.
  14546. deplibs_check_method=$lt_deplibs_check_method
  14547. -# Command to use when deplibs_check_method == "file_magic".
  14548. +# Command to use when deplibs_check_method = "file_magic".
  14549. file_magic_cmd=$lt_file_magic_cmd
  14550. +# How to find potential files when deplibs_check_method = "file_magic".
  14551. +file_magic_glob=$lt_file_magic_glob
  14552. +
  14553. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  14554. +want_nocaseglob=$lt_want_nocaseglob
  14555. +
  14556. +# DLL creation program.
  14557. +DLLTOOL=$lt_DLLTOOL
  14558. +
  14559. +# Command to associate shared and link libraries.
  14560. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  14561. +
  14562. # The archiver.
  14563. AR=$lt_AR
  14564. +
  14565. +# Flags to create an archive.
  14566. AR_FLAGS=$lt_AR_FLAGS
  14567. +# How to feed a file listing to the archiver.
  14568. +archiver_list_spec=$lt_archiver_list_spec
  14569. +
  14570. # A symbol stripping program.
  14571. STRIP=$lt_STRIP
  14572. @@ -19373,6 +20245,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  14573. # Transform the output of nm in a C name address pair when lib prefix is needed.
  14574. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  14575. +# Specify filename containing input files for \$NM.
  14576. +nm_file_list_spec=$lt_nm_file_list_spec
  14577. +
  14578. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  14579. +lt_sysroot=$lt_sysroot
  14580. +
  14581. # The name of the directory that contains temporary libtool files.
  14582. objdir=$objdir
  14583. @@ -19382,6 +20260,9 @@ MAGIC_CMD=$MAGIC_CMD
  14584. # Must we lock files when doing compilation?
  14585. need_locks=$lt_need_locks
  14586. +# Manifest tool.
  14587. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  14588. +
  14589. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  14590. DSYMUTIL=$lt_DSYMUTIL
  14591. @@ -19496,12 +20377,12 @@ with_gcc=$GCC
  14592. # Compiler flag to turn off builtin functions.
  14593. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  14594. -# How to pass a linker flag through the compiler.
  14595. -wl=$lt_lt_prog_compiler_wl
  14596. -
  14597. # Additional compiler flags for building library objects.
  14598. pic_flag=$lt_lt_prog_compiler_pic
  14599. +# How to pass a linker flag through the compiler.
  14600. +wl=$lt_lt_prog_compiler_wl
  14601. +
  14602. # Compiler flag to prevent dynamic linking.
  14603. link_static_flag=$lt_lt_prog_compiler_static
  14604. @@ -19588,9 +20469,6 @@ inherit_rpath=$inherit_rpath
  14605. # Whether libtool must link a program against all its dependency libraries.
  14606. link_all_deplibs=$link_all_deplibs
  14607. -# Fix the shell variable \$srcfile for the compiler.
  14608. -fix_srcfile_path=$lt_fix_srcfile_path
  14609. -
  14610. # Set to "yes" if exported symbols are required.
  14611. always_export_symbols=$always_export_symbols
  14612. @@ -19606,6 +20484,9 @@ include_expsyms=$lt_include_expsyms
  14613. # Commands necessary for linking programs (against libraries) with templates.
  14614. prelink_cmds=$lt_prelink_cmds
  14615. +# Commands necessary for finishing linking programs.
  14616. +postlink_cmds=$lt_postlink_cmds
  14617. +
  14618. # Specify filename containing input files.
  14619. file_list_spec=$lt_file_list_spec
  14620. @@ -19652,210 +20533,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  14621. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  14622. # text mode, it properly converts lines to CR/LF. This bash problem
  14623. # is reportedly fixed, but why not run on old versions too?
  14624. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  14625. - || (rm -f "$cfgfile"; exit 1)
  14626. -
  14627. - case $xsi_shell in
  14628. - yes)
  14629. - cat << \_LT_EOF >> "$cfgfile"
  14630. -
  14631. -# func_dirname file append nondir_replacement
  14632. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  14633. -# otherwise set result to NONDIR_REPLACEMENT.
  14634. -func_dirname ()
  14635. -{
  14636. - case ${1} in
  14637. - */*) func_dirname_result="${1%/*}${2}" ;;
  14638. - * ) func_dirname_result="${3}" ;;
  14639. - esac
  14640. -}
  14641. -
  14642. -# func_basename file
  14643. -func_basename ()
  14644. -{
  14645. - func_basename_result="${1##*/}"
  14646. -}
  14647. -
  14648. -# func_dirname_and_basename file append nondir_replacement
  14649. -# perform func_basename and func_dirname in a single function
  14650. -# call:
  14651. -# dirname: Compute the dirname of FILE. If nonempty,
  14652. -# add APPEND to the result, otherwise set result
  14653. -# to NONDIR_REPLACEMENT.
  14654. -# value returned in "$func_dirname_result"
  14655. -# basename: Compute filename of FILE.
  14656. -# value retuned in "$func_basename_result"
  14657. -# Implementation must be kept synchronized with func_dirname
  14658. -# and func_basename. For efficiency, we do not delegate to
  14659. -# those functions but instead duplicate the functionality here.
  14660. -func_dirname_and_basename ()
  14661. -{
  14662. - case ${1} in
  14663. - */*) func_dirname_result="${1%/*}${2}" ;;
  14664. - * ) func_dirname_result="${3}" ;;
  14665. - esac
  14666. - func_basename_result="${1##*/}"
  14667. -}
  14668. -
  14669. -# func_stripname prefix suffix name
  14670. -# strip PREFIX and SUFFIX off of NAME.
  14671. -# PREFIX and SUFFIX must not contain globbing or regex special
  14672. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  14673. -# dot (in which case that matches only a dot).
  14674. -func_stripname ()
  14675. -{
  14676. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  14677. - # positional parameters, so assign one to ordinary parameter first.
  14678. - func_stripname_result=${3}
  14679. - func_stripname_result=${func_stripname_result#"${1}"}
  14680. - func_stripname_result=${func_stripname_result%"${2}"}
  14681. -}
  14682. -
  14683. -# func_opt_split
  14684. -func_opt_split ()
  14685. -{
  14686. - func_opt_split_opt=${1%%=*}
  14687. - func_opt_split_arg=${1#*=}
  14688. -}
  14689. -
  14690. -# func_lo2o object
  14691. -func_lo2o ()
  14692. -{
  14693. - case ${1} in
  14694. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  14695. - *) func_lo2o_result=${1} ;;
  14696. - esac
  14697. -}
  14698. -
  14699. -# func_xform libobj-or-source
  14700. -func_xform ()
  14701. -{
  14702. - func_xform_result=${1%.*}.lo
  14703. -}
  14704. -
  14705. -# func_arith arithmetic-term...
  14706. -func_arith ()
  14707. -{
  14708. - func_arith_result=$(( $* ))
  14709. -}
  14710. -
  14711. -# func_len string
  14712. -# STRING may not start with a hyphen.
  14713. -func_len ()
  14714. -{
  14715. - func_len_result=${#1}
  14716. -}
  14717. -
  14718. -_LT_EOF
  14719. - ;;
  14720. - *) # Bourne compatible functions.
  14721. - cat << \_LT_EOF >> "$cfgfile"
  14722. -
  14723. -# func_dirname file append nondir_replacement
  14724. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  14725. -# otherwise set result to NONDIR_REPLACEMENT.
  14726. -func_dirname ()
  14727. -{
  14728. - # Extract subdirectory from the argument.
  14729. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  14730. - if test "X$func_dirname_result" = "X${1}"; then
  14731. - func_dirname_result="${3}"
  14732. - else
  14733. - func_dirname_result="$func_dirname_result${2}"
  14734. - fi
  14735. -}
  14736. -
  14737. -# func_basename file
  14738. -func_basename ()
  14739. -{
  14740. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  14741. -}
  14742. -
  14743. -
  14744. -# func_stripname prefix suffix name
  14745. -# strip PREFIX and SUFFIX off of NAME.
  14746. -# PREFIX and SUFFIX must not contain globbing or regex special
  14747. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  14748. -# dot (in which case that matches only a dot).
  14749. -# func_strip_suffix prefix name
  14750. -func_stripname ()
  14751. -{
  14752. - case ${2} in
  14753. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  14754. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  14755. - esac
  14756. -}
  14757. -
  14758. -# sed scripts:
  14759. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  14760. -my_sed_long_arg='1s/^-[^=]*=//'
  14761. -
  14762. -# func_opt_split
  14763. -func_opt_split ()
  14764. -{
  14765. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  14766. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  14767. -}
  14768. -
  14769. -# func_lo2o object
  14770. -func_lo2o ()
  14771. -{
  14772. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  14773. -}
  14774. -
  14775. -# func_xform libobj-or-source
  14776. -func_xform ()
  14777. -{
  14778. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  14779. -}
  14780. -
  14781. -# func_arith arithmetic-term...
  14782. -func_arith ()
  14783. -{
  14784. - func_arith_result=`expr "$@"`
  14785. -}
  14786. -
  14787. -# func_len string
  14788. -# STRING may not start with a hyphen.
  14789. -func_len ()
  14790. -{
  14791. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  14792. -}
  14793. -
  14794. -_LT_EOF
  14795. -esac
  14796. -
  14797. -case $lt_shell_append in
  14798. - yes)
  14799. - cat << \_LT_EOF >> "$cfgfile"
  14800. -
  14801. -# func_append var value
  14802. -# Append VALUE to the end of shell variable VAR.
  14803. -func_append ()
  14804. -{
  14805. - eval "$1+=\$2"
  14806. -}
  14807. -_LT_EOF
  14808. - ;;
  14809. - *)
  14810. - cat << \_LT_EOF >> "$cfgfile"
  14811. -
  14812. -# func_append var value
  14813. -# Append VALUE to the end of shell variable VAR.
  14814. -func_append ()
  14815. -{
  14816. - eval "$1=\$$1\$2"
  14817. -}
  14818. -
  14819. -_LT_EOF
  14820. - ;;
  14821. - esac
  14822. -
  14823. -
  14824. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  14825. - || (rm -f "$cfgfile"; exit 1)
  14826. -
  14827. - mv -f "$cfgfile" "$ofile" ||
  14828. + sed '$q' "$ltmain" >> "$cfgfile" \
  14829. + || (rm -f "$cfgfile"; exit 1)
  14830. +
  14831. + if test x"$xsi_shell" = xyes; then
  14832. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  14833. +func_dirname ()\
  14834. +{\
  14835. +\ case ${1} in\
  14836. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  14837. +\ * ) func_dirname_result="${3}" ;;\
  14838. +\ esac\
  14839. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  14840. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14841. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14842. +test 0 -eq $? || _lt_function_replace_fail=:
  14843. +
  14844. +
  14845. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  14846. +func_basename ()\
  14847. +{\
  14848. +\ func_basename_result="${1##*/}"\
  14849. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  14850. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14851. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14852. +test 0 -eq $? || _lt_function_replace_fail=:
  14853. +
  14854. +
  14855. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  14856. +func_dirname_and_basename ()\
  14857. +{\
  14858. +\ case ${1} in\
  14859. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  14860. +\ * ) func_dirname_result="${3}" ;;\
  14861. +\ esac\
  14862. +\ func_basename_result="${1##*/}"\
  14863. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  14864. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14865. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14866. +test 0 -eq $? || _lt_function_replace_fail=:
  14867. +
  14868. +
  14869. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  14870. +func_stripname ()\
  14871. +{\
  14872. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  14873. +\ # positional parameters, so assign one to ordinary parameter first.\
  14874. +\ func_stripname_result=${3}\
  14875. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  14876. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  14877. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  14878. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14879. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14880. +test 0 -eq $? || _lt_function_replace_fail=:
  14881. +
  14882. +
  14883. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  14884. +func_split_long_opt ()\
  14885. +{\
  14886. +\ func_split_long_opt_name=${1%%=*}\
  14887. +\ func_split_long_opt_arg=${1#*=}\
  14888. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  14889. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14890. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14891. +test 0 -eq $? || _lt_function_replace_fail=:
  14892. +
  14893. +
  14894. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  14895. +func_split_short_opt ()\
  14896. +{\
  14897. +\ func_split_short_opt_arg=${1#??}\
  14898. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  14899. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  14900. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14901. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14902. +test 0 -eq $? || _lt_function_replace_fail=:
  14903. +
  14904. +
  14905. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  14906. +func_lo2o ()\
  14907. +{\
  14908. +\ case ${1} in\
  14909. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  14910. +\ *) func_lo2o_result=${1} ;;\
  14911. +\ esac\
  14912. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  14913. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14914. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14915. +test 0 -eq $? || _lt_function_replace_fail=:
  14916. +
  14917. +
  14918. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  14919. +func_xform ()\
  14920. +{\
  14921. + func_xform_result=${1%.*}.lo\
  14922. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  14923. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14924. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14925. +test 0 -eq $? || _lt_function_replace_fail=:
  14926. +
  14927. +
  14928. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  14929. +func_arith ()\
  14930. +{\
  14931. + func_arith_result=$(( $* ))\
  14932. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  14933. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14934. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14935. +test 0 -eq $? || _lt_function_replace_fail=:
  14936. +
  14937. +
  14938. + sed -e '/^func_len ()$/,/^} # func_len /c\
  14939. +func_len ()\
  14940. +{\
  14941. + func_len_result=${#1}\
  14942. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  14943. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14944. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14945. +test 0 -eq $? || _lt_function_replace_fail=:
  14946. +
  14947. +fi
  14948. +
  14949. +if test x"$lt_shell_append" = xyes; then
  14950. + sed -e '/^func_append ()$/,/^} # func_append /c\
  14951. +func_append ()\
  14952. +{\
  14953. + eval "${1}+=\\${2}"\
  14954. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  14955. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14956. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14957. +test 0 -eq $? || _lt_function_replace_fail=:
  14958. +
  14959. +
  14960. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  14961. +func_append_quoted ()\
  14962. +{\
  14963. +\ func_quote_for_eval "${2}"\
  14964. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  14965. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  14966. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14967. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14968. +test 0 -eq $? || _lt_function_replace_fail=:
  14969. +
  14970. +
  14971. + # Save a `func_append' function call where possible by direct use of '+='
  14972. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  14973. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14974. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14975. + test 0 -eq $? || _lt_function_replace_fail=:
  14976. +else
  14977. + # Save a `func_append' function call even when '+=' is not available
  14978. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  14979. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  14980. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  14981. + test 0 -eq $? || _lt_function_replace_fail=:
  14982. +fi
  14983. +
  14984. +if test x"$_lt_function_replace_fail" = x":"; then
  14985. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  14986. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  14987. +fi
  14988. +
  14989. +
  14990. + mv -f "$cfgfile" "$ofile" ||
  14991. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  14992. chmod +x "$ofile"
  14993. @@ -19883,12 +20723,12 @@ with_gcc=$GCC_CXX
  14994. # Compiler flag to turn off builtin functions.
  14995. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  14996. -# How to pass a linker flag through the compiler.
  14997. -wl=$lt_lt_prog_compiler_wl_CXX
  14998. -
  14999. # Additional compiler flags for building library objects.
  15000. pic_flag=$lt_lt_prog_compiler_pic_CXX
  15001. +# How to pass a linker flag through the compiler.
  15002. +wl=$lt_lt_prog_compiler_wl_CXX
  15003. +
  15004. # Compiler flag to prevent dynamic linking.
  15005. link_static_flag=$lt_lt_prog_compiler_static_CXX
  15006. @@ -19975,9 +20815,6 @@ inherit_rpath=$inherit_rpath_CXX
  15007. # Whether libtool must link a program against all its dependency libraries.
  15008. link_all_deplibs=$link_all_deplibs_CXX
  15009. -# Fix the shell variable \$srcfile for the compiler.
  15010. -fix_srcfile_path=$lt_fix_srcfile_path_CXX
  15011. -
  15012. # Set to "yes" if exported symbols are required.
  15013. always_export_symbols=$always_export_symbols_CXX
  15014. @@ -19993,6 +20830,9 @@ include_expsyms=$lt_include_expsyms_CXX
  15015. # Commands necessary for linking programs (against libraries) with templates.
  15016. prelink_cmds=$lt_prelink_cmds_CXX
  15017. +# Commands necessary for finishing linking programs.
  15018. +postlink_cmds=$lt_postlink_cmds_CXX
  15019. +
  15020. # Specify filename containing input files.
  15021. file_list_spec=$lt_file_list_spec_CXX
  15022. diff --git a/libbacktrace/Makefile.in b/libbacktrace/Makefile.in
  15023. index e6a4c8e2ef3..3547e3649b7 100644
  15024. --- a/libbacktrace/Makefile.in
  15025. +++ b/libbacktrace/Makefile.in
  15026. @@ -827,6 +827,7 @@ CPP = @CPP@
  15027. CPPFLAGS = @CPPFLAGS@
  15028. CYGPATH_W = @CYGPATH_W@
  15029. DEFS = @DEFS@
  15030. +DLLTOOL = @DLLTOOL@
  15031. DSYMUTIL = @DSYMUTIL@
  15032. DUMPBIN = @DUMPBIN@
  15033. DWZ = @DWZ@
  15034. @@ -854,6 +855,7 @@ LN_S = @LN_S@
  15035. LTLIBOBJS = @LTLIBOBJS@
  15036. MAINT = @MAINT@
  15037. MAKEINFO = @MAKEINFO@
  15038. +MANIFEST_TOOL = @MANIFEST_TOOL@
  15039. MKDIR_P = @MKDIR_P@
  15040. NM = @NM@
  15041. NMEDIT = @NMEDIT@
  15042. @@ -886,6 +888,7 @@ abs_builddir = @abs_builddir@
  15043. abs_srcdir = @abs_srcdir@
  15044. abs_top_builddir = @abs_top_builddir@
  15045. abs_top_srcdir = @abs_top_srcdir@
  15046. +ac_ct_AR = @ac_ct_AR@
  15047. ac_ct_CC = @ac_ct_CC@
  15048. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  15049. am__leading_dot = @am__leading_dot@
  15050. diff --git a/libbacktrace/configure b/libbacktrace/configure
  15051. index 406b67b8cbc..b648da40aab 100755
  15052. --- a/libbacktrace/configure
  15053. +++ b/libbacktrace/configure
  15054. @@ -680,7 +680,10 @@ OTOOL
  15055. LIPO
  15056. NMEDIT
  15057. DSYMUTIL
  15058. +MANIFEST_TOOL
  15059. +ac_ct_AR
  15060. AR
  15061. +DLLTOOL
  15062. OBJDUMP
  15063. LN_S
  15064. NM
  15065. @@ -798,6 +801,7 @@ enable_static
  15066. with_pic
  15067. enable_fast_install
  15068. with_gnu_ld
  15069. +with_libtool_sysroot
  15070. enable_libtool_lock
  15071. enable_largefile
  15072. enable_cet
  15073. @@ -1458,6 +1462,8 @@ Optional Packages:
  15074. --with-pic try to use only PIC/non-PIC objects [default=use
  15075. both]
  15076. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  15077. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  15078. + (or the compiler's sysroot if not specified).
  15079. --with-system-libunwind use installed libunwind
  15080. Some influential environment variables:
  15081. @@ -5446,8 +5452,8 @@ esac
  15082. -macro_version='2.2.7a'
  15083. -macro_revision='1.3134'
  15084. +macro_version='2.4'
  15085. +macro_revision='1.3293'
  15086. @@ -5487,7 +5493,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  15087. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  15088. $as_echo_n "checking how to print strings... " >&6; }
  15089. # Test print first, because it will be a builtin if present.
  15090. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  15091. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  15092. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  15093. ECHO='print -r --'
  15094. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  15095. @@ -6180,8 +6186,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  15096. # Try some XSI features
  15097. xsi_shell=no
  15098. ( _lt_dummy="a/b/c"
  15099. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  15100. - = c,a/b,, \
  15101. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  15102. + = c,a/b,b/c, \
  15103. && eval 'test $(( 1 + 1 )) -eq 2 \
  15104. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  15105. && xsi_shell=yes
  15106. @@ -6230,6 +6236,80 @@ esac
  15107. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  15108. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  15109. +if ${lt_cv_to_host_file_cmd+:} false; then :
  15110. + $as_echo_n "(cached) " >&6
  15111. +else
  15112. + case $host in
  15113. + *-*-mingw* )
  15114. + case $build in
  15115. + *-*-mingw* ) # actually msys
  15116. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  15117. + ;;
  15118. + *-*-cygwin* )
  15119. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  15120. + ;;
  15121. + * ) # otherwise, assume *nix
  15122. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  15123. + ;;
  15124. + esac
  15125. + ;;
  15126. + *-*-cygwin* )
  15127. + case $build in
  15128. + *-*-mingw* ) # actually msys
  15129. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  15130. + ;;
  15131. + *-*-cygwin* )
  15132. + lt_cv_to_host_file_cmd=func_convert_file_noop
  15133. + ;;
  15134. + * ) # otherwise, assume *nix
  15135. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  15136. + ;;
  15137. + esac
  15138. + ;;
  15139. + * ) # unhandled hosts (and "normal" native builds)
  15140. + lt_cv_to_host_file_cmd=func_convert_file_noop
  15141. + ;;
  15142. +esac
  15143. +
  15144. +fi
  15145. +
  15146. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  15147. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  15148. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  15149. +
  15150. +
  15151. +
  15152. +
  15153. +
  15154. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  15155. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  15156. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  15157. + $as_echo_n "(cached) " >&6
  15158. +else
  15159. + #assume ordinary cross tools, or native build.
  15160. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  15161. +case $host in
  15162. + *-*-mingw* )
  15163. + case $build in
  15164. + *-*-mingw* ) # actually msys
  15165. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  15166. + ;;
  15167. + esac
  15168. + ;;
  15169. +esac
  15170. +
  15171. +fi
  15172. +
  15173. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  15174. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  15175. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  15176. +
  15177. +
  15178. +
  15179. +
  15180. +
  15181. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  15182. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  15183. if ${lt_cv_ld_reload_flag+:} false; then :
  15184. @@ -6246,6 +6326,11 @@ case $reload_flag in
  15185. esac
  15186. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  15187. case $host_os in
  15188. + cygwin* | mingw* | pw32* | cegcc*)
  15189. + if test "$GCC" != yes; then
  15190. + reload_cmds=false
  15191. + fi
  15192. + ;;
  15193. darwin*)
  15194. if test "$GCC" = yes; then
  15195. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  15196. @@ -6414,7 +6499,8 @@ mingw* | pw32*)
  15197. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  15198. lt_cv_file_magic_cmd='func_win32_libid'
  15199. else
  15200. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  15201. + # Keep this pattern in sync with the one in func_win32_libid.
  15202. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  15203. lt_cv_file_magic_cmd='$OBJDUMP -f'
  15204. fi
  15205. ;;
  15206. @@ -6568,6 +6654,21 @@ esac
  15207. fi
  15208. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  15209. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  15210. +
  15211. +file_magic_glob=
  15212. +want_nocaseglob=no
  15213. +if test "$build" = "$host"; then
  15214. + case $host_os in
  15215. + mingw* | pw32*)
  15216. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  15217. + want_nocaseglob=yes
  15218. + else
  15219. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  15220. + fi
  15221. + ;;
  15222. + esac
  15223. +fi
  15224. +
  15225. file_magic_cmd=$lt_cv_file_magic_cmd
  15226. deplibs_check_method=$lt_cv_deplibs_check_method
  15227. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  15228. @@ -6583,6 +6684,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  15229. +
  15230. +
  15231. +
  15232. +
  15233. +
  15234. +
  15235. +
  15236. +
  15237. +
  15238. +
  15239. +if test -n "$ac_tool_prefix"; then
  15240. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  15241. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  15242. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  15243. +$as_echo_n "checking for $ac_word... " >&6; }
  15244. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  15245. + $as_echo_n "(cached) " >&6
  15246. +else
  15247. + if test -n "$DLLTOOL"; then
  15248. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  15249. +else
  15250. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  15251. +for as_dir in $PATH
  15252. +do
  15253. + IFS=$as_save_IFS
  15254. + test -z "$as_dir" && as_dir=.
  15255. + for ac_exec_ext in '' $ac_executable_extensions; do
  15256. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  15257. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  15258. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  15259. + break 2
  15260. + fi
  15261. +done
  15262. + done
  15263. +IFS=$as_save_IFS
  15264. +
  15265. +fi
  15266. +fi
  15267. +DLLTOOL=$ac_cv_prog_DLLTOOL
  15268. +if test -n "$DLLTOOL"; then
  15269. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  15270. +$as_echo "$DLLTOOL" >&6; }
  15271. +else
  15272. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  15273. +$as_echo "no" >&6; }
  15274. +fi
  15275. +
  15276. +
  15277. +fi
  15278. +if test -z "$ac_cv_prog_DLLTOOL"; then
  15279. + ac_ct_DLLTOOL=$DLLTOOL
  15280. + # Extract the first word of "dlltool", so it can be a program name with args.
  15281. +set dummy dlltool; ac_word=$2
  15282. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  15283. +$as_echo_n "checking for $ac_word... " >&6; }
  15284. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  15285. + $as_echo_n "(cached) " >&6
  15286. +else
  15287. + if test -n "$ac_ct_DLLTOOL"; then
  15288. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  15289. +else
  15290. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  15291. +for as_dir in $PATH
  15292. +do
  15293. + IFS=$as_save_IFS
  15294. + test -z "$as_dir" && as_dir=.
  15295. + for ac_exec_ext in '' $ac_executable_extensions; do
  15296. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  15297. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  15298. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  15299. + break 2
  15300. + fi
  15301. +done
  15302. + done
  15303. +IFS=$as_save_IFS
  15304. +
  15305. +fi
  15306. +fi
  15307. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  15308. +if test -n "$ac_ct_DLLTOOL"; then
  15309. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  15310. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  15311. +else
  15312. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  15313. +$as_echo "no" >&6; }
  15314. +fi
  15315. +
  15316. + if test "x$ac_ct_DLLTOOL" = x; then
  15317. + DLLTOOL="false"
  15318. + else
  15319. + case $cross_compiling:$ac_tool_warned in
  15320. +yes:)
  15321. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  15322. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  15323. +ac_tool_warned=yes ;;
  15324. +esac
  15325. + DLLTOOL=$ac_ct_DLLTOOL
  15326. + fi
  15327. +else
  15328. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  15329. +fi
  15330. +
  15331. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  15332. +
  15333. +
  15334. +
  15335. +
  15336. +
  15337. +
  15338. +
  15339. +
  15340. +
  15341. +
  15342. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  15343. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  15344. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  15345. + $as_echo_n "(cached) " >&6
  15346. +else
  15347. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  15348. +
  15349. +case $host_os in
  15350. +cygwin* | mingw* | pw32* | cegcc*)
  15351. + # two different shell functions defined in ltmain.sh
  15352. + # decide which to use based on capabilities of $DLLTOOL
  15353. + case `$DLLTOOL --help 2>&1` in
  15354. + *--identify-strict*)
  15355. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  15356. + ;;
  15357. + *)
  15358. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  15359. + ;;
  15360. + esac
  15361. + ;;
  15362. +*)
  15363. + # fallback: assume linklib IS sharedlib
  15364. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  15365. + ;;
  15366. +esac
  15367. +
  15368. +fi
  15369. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  15370. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  15371. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  15372. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  15373. +
  15374. +
  15375. +
  15376. +
  15377. +
  15378. +
  15379. +
  15380. plugin_option=
  15381. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  15382. for plugin in $plugin_names; do
  15383. @@ -6597,8 +6849,10 @@ for plugin in $plugin_names; do
  15384. done
  15385. if test -n "$ac_tool_prefix"; then
  15386. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  15387. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  15388. + for ac_prog in ar
  15389. + do
  15390. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  15391. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  15392. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  15393. $as_echo_n "checking for $ac_word... " >&6; }
  15394. if ${ac_cv_prog_AR+:} false; then :
  15395. @@ -6614,7 +6868,7 @@ do
  15396. test -z "$as_dir" && as_dir=.
  15397. for ac_exec_ext in '' $ac_executable_extensions; do
  15398. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  15399. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  15400. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  15401. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  15402. break 2
  15403. fi
  15404. @@ -6634,11 +6888,15 @@ $as_echo "no" >&6; }
  15405. fi
  15406. + test -n "$AR" && break
  15407. + done
  15408. fi
  15409. -if test -z "$ac_cv_prog_AR"; then
  15410. +if test -z "$AR"; then
  15411. ac_ct_AR=$AR
  15412. - # Extract the first word of "ar", so it can be a program name with args.
  15413. -set dummy ar; ac_word=$2
  15414. + for ac_prog in ar
  15415. +do
  15416. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  15417. +set dummy $ac_prog; ac_word=$2
  15418. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  15419. $as_echo_n "checking for $ac_word... " >&6; }
  15420. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  15421. @@ -6654,7 +6912,7 @@ do
  15422. test -z "$as_dir" && as_dir=.
  15423. for ac_exec_ext in '' $ac_executable_extensions; do
  15424. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  15425. - ac_cv_prog_ac_ct_AR="ar"
  15426. + ac_cv_prog_ac_ct_AR="$ac_prog"
  15427. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  15428. break 2
  15429. fi
  15430. @@ -6673,6 +6931,10 @@ else
  15431. $as_echo "no" >&6; }
  15432. fi
  15433. +
  15434. + test -n "$ac_ct_AR" && break
  15435. +done
  15436. +
  15437. if test "x$ac_ct_AR" = x; then
  15438. AR="false"
  15439. else
  15440. @@ -6684,25 +6946,19 @@ ac_tool_warned=yes ;;
  15441. esac
  15442. AR=$ac_ct_AR
  15443. fi
  15444. -else
  15445. - AR="$ac_cv_prog_AR"
  15446. fi
  15447. -test -z "$AR" && AR=ar
  15448. -if test -n "$plugin_option"; then
  15449. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  15450. - touch conftest.c
  15451. - $AR $plugin_option rc conftest.a conftest.c
  15452. - if test "$?" != 0; then
  15453. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  15454. + touch conftest.c
  15455. + $AR $plugin_option rc conftest.a conftest.c
  15456. + if test "$?" != 0; then
  15457. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  15458. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  15459. - else
  15460. - AR="$AR $plugin_option"
  15461. - fi
  15462. - rm -f conftest.*
  15463. + else
  15464. + AR="$AR $plugin_option"
  15465. fi
  15466. -fi
  15467. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  15468. + rm -f conftest.*
  15469. +: ${AR=ar}
  15470. +: ${AR_FLAGS=cru}
  15471. @@ -6714,6 +6970,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  15472. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  15473. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  15474. +if ${lt_cv_ar_at_file+:} false; then :
  15475. + $as_echo_n "(cached) " >&6
  15476. +else
  15477. + lt_cv_ar_at_file=no
  15478. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15479. +/* end confdefs.h. */
  15480. +
  15481. +int
  15482. +main ()
  15483. +{
  15484. +
  15485. + ;
  15486. + return 0;
  15487. +}
  15488. +_ACEOF
  15489. +if ac_fn_c_try_compile "$LINENO"; then :
  15490. + echo conftest.$ac_objext > conftest.lst
  15491. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  15492. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  15493. + (eval $lt_ar_try) 2>&5
  15494. + ac_status=$?
  15495. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  15496. + test $ac_status = 0; }
  15497. + if test "$ac_status" -eq 0; then
  15498. + # Ensure the archiver fails upon bogus file names.
  15499. + rm -f conftest.$ac_objext libconftest.a
  15500. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  15501. + (eval $lt_ar_try) 2>&5
  15502. + ac_status=$?
  15503. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  15504. + test $ac_status = 0; }
  15505. + if test "$ac_status" -ne 0; then
  15506. + lt_cv_ar_at_file=@
  15507. + fi
  15508. + fi
  15509. + rm -f conftest.* libconftest.a
  15510. +
  15511. +fi
  15512. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  15513. +
  15514. +fi
  15515. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  15516. +$as_echo "$lt_cv_ar_at_file" >&6; }
  15517. +
  15518. +if test "x$lt_cv_ar_at_file" = xno; then
  15519. + archiver_list_spec=
  15520. +else
  15521. + archiver_list_spec=$lt_cv_ar_at_file
  15522. +fi
  15523. +
  15524. +
  15525. +
  15526. +
  15527. +
  15528. +
  15529. +
  15530. if test -n "$ac_tool_prefix"; then
  15531. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  15532. set dummy ${ac_tool_prefix}strip; ac_word=$2
  15533. @@ -7053,8 +7367,8 @@ esac
  15534. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  15535. # Transform an extracted symbol line into symbol name and symbol address
  15536. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  15537. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  15538. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  15539. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  15540. # Handle CRLF in mingw tool chain
  15541. opt_cr=
  15542. @@ -7090,6 +7404,7 @@ for ac_symprfx in "" "_"; do
  15543. else
  15544. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  15545. fi
  15546. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  15547. # Check to see that the pipe works correctly.
  15548. pipe_works=no
  15549. @@ -7131,6 +7446,18 @@ _LT_EOF
  15550. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  15551. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  15552. cat <<_LT_EOF > conftest.$ac_ext
  15553. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  15554. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  15555. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  15556. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  15557. +# define LT_DLSYM_CONST
  15558. +#elif defined(__osf__)
  15559. +/* This system does not cope well with relocations in const data. */
  15560. +# define LT_DLSYM_CONST
  15561. +#else
  15562. +# define LT_DLSYM_CONST const
  15563. +#endif
  15564. +
  15565. #ifdef __cplusplus
  15566. extern "C" {
  15567. #endif
  15568. @@ -7142,7 +7469,7 @@ _LT_EOF
  15569. cat <<_LT_EOF >> conftest.$ac_ext
  15570. /* The mapping between symbol names and symbols. */
  15571. -const struct {
  15572. +LT_DLSYM_CONST struct {
  15573. const char *name;
  15574. void *address;
  15575. }
  15576. @@ -7168,8 +7495,8 @@ static const void *lt_preloaded_setup() {
  15577. _LT_EOF
  15578. # Now try linking the two files.
  15579. mv conftest.$ac_objext conftstm.$ac_objext
  15580. - lt_save_LIBS="$LIBS"
  15581. - lt_save_CFLAGS="$CFLAGS"
  15582. + lt_globsym_save_LIBS=$LIBS
  15583. + lt_globsym_save_CFLAGS=$CFLAGS
  15584. LIBS="conftstm.$ac_objext"
  15585. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  15586. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  15587. @@ -7179,8 +7506,8 @@ _LT_EOF
  15588. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  15589. pipe_works=yes
  15590. fi
  15591. - LIBS="$lt_save_LIBS"
  15592. - CFLAGS="$lt_save_CFLAGS"
  15593. + LIBS=$lt_globsym_save_LIBS
  15594. + CFLAGS=$lt_globsym_save_CFLAGS
  15595. else
  15596. echo "cannot find nm_test_func in $nlist" >&5
  15597. fi
  15598. @@ -7217,6 +7544,18 @@ else
  15599. $as_echo "ok" >&6; }
  15600. fi
  15601. +# Response file support.
  15602. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  15603. + nm_file_list_spec='@'
  15604. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  15605. + nm_file_list_spec='@'
  15606. +fi
  15607. +
  15608. +
  15609. +
  15610. +
  15611. +
  15612. +
  15613. @@ -7233,6 +7572,43 @@ fi
  15614. +
  15615. +
  15616. +
  15617. +
  15618. +
  15619. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  15620. +$as_echo_n "checking for sysroot... " >&6; }
  15621. +
  15622. +# Check whether --with-libtool-sysroot was given.
  15623. +if test "${with_libtool_sysroot+set}" = set; then :
  15624. + withval=$with_libtool_sysroot;
  15625. +else
  15626. + with_libtool_sysroot=no
  15627. +fi
  15628. +
  15629. +
  15630. +lt_sysroot=
  15631. +case ${with_libtool_sysroot} in #(
  15632. + yes)
  15633. + if test "$GCC" = yes; then
  15634. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  15635. + fi
  15636. + ;; #(
  15637. + /*)
  15638. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  15639. + ;; #(
  15640. + no|'')
  15641. + ;; #(
  15642. + *)
  15643. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  15644. +$as_echo "${with_libtool_sysroot}" >&6; }
  15645. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  15646. + ;;
  15647. +esac
  15648. +
  15649. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  15650. +$as_echo "${lt_sysroot:-no}" >&6; }
  15651. @@ -7444,6 +7820,123 @@ esac
  15652. need_locks="$enable_libtool_lock"
  15653. +if test -n "$ac_tool_prefix"; then
  15654. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  15655. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  15656. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  15657. +$as_echo_n "checking for $ac_word... " >&6; }
  15658. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  15659. + $as_echo_n "(cached) " >&6
  15660. +else
  15661. + if test -n "$MANIFEST_TOOL"; then
  15662. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  15663. +else
  15664. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  15665. +for as_dir in $PATH
  15666. +do
  15667. + IFS=$as_save_IFS
  15668. + test -z "$as_dir" && as_dir=.
  15669. + for ac_exec_ext in '' $ac_executable_extensions; do
  15670. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  15671. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  15672. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  15673. + break 2
  15674. + fi
  15675. +done
  15676. + done
  15677. +IFS=$as_save_IFS
  15678. +
  15679. +fi
  15680. +fi
  15681. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  15682. +if test -n "$MANIFEST_TOOL"; then
  15683. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  15684. +$as_echo "$MANIFEST_TOOL" >&6; }
  15685. +else
  15686. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  15687. +$as_echo "no" >&6; }
  15688. +fi
  15689. +
  15690. +
  15691. +fi
  15692. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  15693. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  15694. + # Extract the first word of "mt", so it can be a program name with args.
  15695. +set dummy mt; ac_word=$2
  15696. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  15697. +$as_echo_n "checking for $ac_word... " >&6; }
  15698. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  15699. + $as_echo_n "(cached) " >&6
  15700. +else
  15701. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  15702. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  15703. +else
  15704. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  15705. +for as_dir in $PATH
  15706. +do
  15707. + IFS=$as_save_IFS
  15708. + test -z "$as_dir" && as_dir=.
  15709. + for ac_exec_ext in '' $ac_executable_extensions; do
  15710. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  15711. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  15712. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  15713. + break 2
  15714. + fi
  15715. +done
  15716. + done
  15717. +IFS=$as_save_IFS
  15718. +
  15719. +fi
  15720. +fi
  15721. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  15722. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  15723. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  15724. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  15725. +else
  15726. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  15727. +$as_echo "no" >&6; }
  15728. +fi
  15729. +
  15730. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  15731. + MANIFEST_TOOL=":"
  15732. + else
  15733. + case $cross_compiling:$ac_tool_warned in
  15734. +yes:)
  15735. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  15736. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  15737. +ac_tool_warned=yes ;;
  15738. +esac
  15739. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  15740. + fi
  15741. +else
  15742. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  15743. +fi
  15744. +
  15745. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  15746. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  15747. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  15748. +if ${lt_cv_path_mainfest_tool+:} false; then :
  15749. + $as_echo_n "(cached) " >&6
  15750. +else
  15751. + lt_cv_path_mainfest_tool=no
  15752. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  15753. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  15754. + cat conftest.err >&5
  15755. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  15756. + lt_cv_path_mainfest_tool=yes
  15757. + fi
  15758. + rm -f conftest*
  15759. +fi
  15760. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  15761. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  15762. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  15763. + MANIFEST_TOOL=:
  15764. +fi
  15765. +
  15766. +
  15767. +
  15768. +
  15769. +
  15770. case $host_os in
  15771. rhapsody* | darwin*)
  15772. @@ -8007,6 +8500,8 @@ _LT_EOF
  15773. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  15774. echo "$AR cru libconftest.a conftest.o" >&5
  15775. $AR cru libconftest.a conftest.o 2>&5
  15776. + echo "$RANLIB libconftest.a" >&5
  15777. + $RANLIB libconftest.a 2>&5
  15778. cat > conftest.c << _LT_EOF
  15779. int main() { return 0;}
  15780. _LT_EOF
  15781. @@ -8589,8 +9084,6 @@ fi
  15782. lt_prog_compiler_pic=
  15783. lt_prog_compiler_static=
  15784. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  15785. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  15786. if test "$GCC" = yes; then
  15787. lt_prog_compiler_wl='-Wl,'
  15788. @@ -8756,6 +9249,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  15789. lt_prog_compiler_pic='--shared'
  15790. lt_prog_compiler_static='--static'
  15791. ;;
  15792. + nagfor*)
  15793. + # NAG Fortran compiler
  15794. + lt_prog_compiler_wl='-Wl,-Wl,,'
  15795. + lt_prog_compiler_pic='-PIC'
  15796. + lt_prog_compiler_static='-Bstatic'
  15797. + ;;
  15798. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  15799. # Portland Group compilers (*not* the Pentium gcc compiler,
  15800. # which looks to be a dead project)
  15801. @@ -8818,7 +9317,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  15802. lt_prog_compiler_pic='-KPIC'
  15803. lt_prog_compiler_static='-Bstatic'
  15804. case $cc_basename in
  15805. - f77* | f90* | f95*)
  15806. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  15807. lt_prog_compiler_wl='-Qoption ld ';;
  15808. *)
  15809. lt_prog_compiler_wl='-Wl,';;
  15810. @@ -8875,13 +9374,17 @@ case $host_os in
  15811. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  15812. ;;
  15813. esac
  15814. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  15815. -$as_echo "$lt_prog_compiler_pic" >&6; }
  15816. -
  15817. -
  15818. -
  15819. -
  15820. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  15821. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  15822. +if ${lt_cv_prog_compiler_pic+:} false; then :
  15823. + $as_echo_n "(cached) " >&6
  15824. +else
  15825. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  15826. +fi
  15827. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  15828. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  15829. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  15830. #
  15831. # Check to make sure the PIC flag actually works.
  15832. @@ -8942,6 +9445,11 @@ fi
  15833. +
  15834. +
  15835. +
  15836. +
  15837. +
  15838. #
  15839. # Check to make sure the static flag actually works.
  15840. #
  15841. @@ -9292,7 +9800,8 @@ _LT_EOF
  15842. allow_undefined_flag=unsupported
  15843. always_export_symbols=no
  15844. enable_shared_with_static_runtimes=yes
  15845. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  15846. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  15847. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  15848. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  15849. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  15850. @@ -9391,12 +9900,12 @@ _LT_EOF
  15851. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  15852. hardcode_libdir_flag_spec=
  15853. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  15854. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  15855. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  15856. if test "x$supports_anon_versioning" = xyes; then
  15857. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  15858. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  15859. echo "local: *; };" >> $output_objdir/$libname.ver~
  15860. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  15861. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  15862. fi
  15863. ;;
  15864. esac
  15865. @@ -9410,8 +9919,8 @@ _LT_EOF
  15866. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  15867. wlarc=
  15868. else
  15869. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  15870. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  15871. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  15872. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  15873. fi
  15874. ;;
  15875. @@ -9429,8 +9938,8 @@ _LT_EOF
  15876. _LT_EOF
  15877. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  15878. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  15879. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  15880. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  15881. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  15882. else
  15883. ld_shlibs=no
  15884. fi
  15885. @@ -9476,8 +9985,8 @@ _LT_EOF
  15886. *)
  15887. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  15888. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  15889. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  15890. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  15891. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  15892. else
  15893. ld_shlibs=no
  15894. fi
  15895. @@ -9607,7 +10116,13 @@ _LT_EOF
  15896. allow_undefined_flag='-berok'
  15897. # Determine the default libpath from the value encoded in an
  15898. # empty executable.
  15899. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15900. + if test "${lt_cv_aix_libpath+set}" = set; then
  15901. + aix_libpath=$lt_cv_aix_libpath
  15902. +else
  15903. + if ${lt_cv_aix_libpath_+:} false; then :
  15904. + $as_echo_n "(cached) " >&6
  15905. +else
  15906. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15907. /* end confdefs.h. */
  15908. int
  15909. @@ -9620,22 +10135,29 @@ main ()
  15910. _ACEOF
  15911. if ac_fn_c_try_link "$LINENO"; then :
  15912. -lt_aix_libpath_sed='
  15913. - /Import File Strings/,/^$/ {
  15914. - /^0/ {
  15915. - s/^0 *\(.*\)$/\1/
  15916. - p
  15917. - }
  15918. - }'
  15919. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15920. -# Check for a 64-bit object if we didn't find anything.
  15921. -if test -z "$aix_libpath"; then
  15922. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15923. -fi
  15924. + lt_aix_libpath_sed='
  15925. + /Import File Strings/,/^$/ {
  15926. + /^0/ {
  15927. + s/^0 *\([^ ]*\) *$/\1/
  15928. + p
  15929. + }
  15930. + }'
  15931. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15932. + # Check for a 64-bit object if we didn't find anything.
  15933. + if test -z "$lt_cv_aix_libpath_"; then
  15934. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15935. + fi
  15936. fi
  15937. rm -f core conftest.err conftest.$ac_objext \
  15938. conftest$ac_exeext conftest.$ac_ext
  15939. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  15940. + if test -z "$lt_cv_aix_libpath_"; then
  15941. + lt_cv_aix_libpath_="/usr/lib:/lib"
  15942. + fi
  15943. +
  15944. +fi
  15945. +
  15946. + aix_libpath=$lt_cv_aix_libpath_
  15947. +fi
  15948. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  15949. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  15950. @@ -9647,7 +10169,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  15951. else
  15952. # Determine the default libpath from the value encoded in an
  15953. # empty executable.
  15954. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15955. + if test "${lt_cv_aix_libpath+set}" = set; then
  15956. + aix_libpath=$lt_cv_aix_libpath
  15957. +else
  15958. + if ${lt_cv_aix_libpath_+:} false; then :
  15959. + $as_echo_n "(cached) " >&6
  15960. +else
  15961. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  15962. /* end confdefs.h. */
  15963. int
  15964. @@ -9660,22 +10188,29 @@ main ()
  15965. _ACEOF
  15966. if ac_fn_c_try_link "$LINENO"; then :
  15967. -lt_aix_libpath_sed='
  15968. - /Import File Strings/,/^$/ {
  15969. - /^0/ {
  15970. - s/^0 *\(.*\)$/\1/
  15971. - p
  15972. - }
  15973. - }'
  15974. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15975. -# Check for a 64-bit object if we didn't find anything.
  15976. -if test -z "$aix_libpath"; then
  15977. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15978. -fi
  15979. + lt_aix_libpath_sed='
  15980. + /Import File Strings/,/^$/ {
  15981. + /^0/ {
  15982. + s/^0 *\([^ ]*\) *$/\1/
  15983. + p
  15984. + }
  15985. + }'
  15986. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15987. + # Check for a 64-bit object if we didn't find anything.
  15988. + if test -z "$lt_cv_aix_libpath_"; then
  15989. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  15990. + fi
  15991. fi
  15992. rm -f core conftest.err conftest.$ac_objext \
  15993. conftest$ac_exeext conftest.$ac_ext
  15994. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  15995. + if test -z "$lt_cv_aix_libpath_"; then
  15996. + lt_cv_aix_libpath_="/usr/lib:/lib"
  15997. + fi
  15998. +
  15999. +fi
  16000. +
  16001. + aix_libpath=$lt_cv_aix_libpath_
  16002. +fi
  16003. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  16004. # Warning - without using the other run time loading flags,
  16005. @@ -9720,20 +10255,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  16006. # Microsoft Visual C++.
  16007. # hardcode_libdir_flag_spec is actually meaningless, as there is
  16008. # no search path for DLLs.
  16009. - hardcode_libdir_flag_spec=' '
  16010. - allow_undefined_flag=unsupported
  16011. - # Tell ltmain to make .lib files, not .a files.
  16012. - libext=lib
  16013. - # Tell ltmain to make .dll files, not .so files.
  16014. - shrext_cmds=".dll"
  16015. - # FIXME: Setting linknames here is a bad hack.
  16016. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  16017. - # The linker will automatically build a .lib file if we build a DLL.
  16018. - old_archive_from_new_cmds='true'
  16019. - # FIXME: Should let the user specify the lib program.
  16020. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  16021. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  16022. - enable_shared_with_static_runtimes=yes
  16023. + case $cc_basename in
  16024. + cl*)
  16025. + # Native MSVC
  16026. + hardcode_libdir_flag_spec=' '
  16027. + allow_undefined_flag=unsupported
  16028. + always_export_symbols=yes
  16029. + file_list_spec='@'
  16030. + # Tell ltmain to make .lib files, not .a files.
  16031. + libext=lib
  16032. + # Tell ltmain to make .dll files, not .so files.
  16033. + shrext_cmds=".dll"
  16034. + # FIXME: Setting linknames here is a bad hack.
  16035. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  16036. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  16037. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  16038. + else
  16039. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  16040. + fi~
  16041. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  16042. + linknames='
  16043. + # The linker will not automatically build a static lib if we build a DLL.
  16044. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  16045. + enable_shared_with_static_runtimes=yes
  16046. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  16047. + # Don't use ranlib
  16048. + old_postinstall_cmds='chmod 644 $oldlib'
  16049. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  16050. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  16051. + case $lt_outputfile in
  16052. + *.exe|*.EXE) ;;
  16053. + *)
  16054. + lt_outputfile="$lt_outputfile.exe"
  16055. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  16056. + ;;
  16057. + esac~
  16058. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  16059. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  16060. + $RM "$lt_outputfile.manifest";
  16061. + fi'
  16062. + ;;
  16063. + *)
  16064. + # Assume MSVC wrapper
  16065. + hardcode_libdir_flag_spec=' '
  16066. + allow_undefined_flag=unsupported
  16067. + # Tell ltmain to make .lib files, not .a files.
  16068. + libext=lib
  16069. + # Tell ltmain to make .dll files, not .so files.
  16070. + shrext_cmds=".dll"
  16071. + # FIXME: Setting linknames here is a bad hack.
  16072. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  16073. + # The linker will automatically build a .lib file if we build a DLL.
  16074. + old_archive_from_new_cmds='true'
  16075. + # FIXME: Should let the user specify the lib program.
  16076. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  16077. + enable_shared_with_static_runtimes=yes
  16078. + ;;
  16079. + esac
  16080. ;;
  16081. darwin* | rhapsody*)
  16082. @@ -9794,7 +10372,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  16083. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  16084. freebsd* | dragonfly*)
  16085. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  16086. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  16087. hardcode_libdir_flag_spec='-R$libdir'
  16088. hardcode_direct=yes
  16089. hardcode_shlibpath_var=no
  16090. @@ -9802,7 +10380,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  16091. hpux9*)
  16092. if test "$GCC" = yes; then
  16093. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  16094. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  16095. else
  16096. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  16097. fi
  16098. @@ -9818,7 +10396,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  16099. hpux10*)
  16100. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  16101. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  16102. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  16103. else
  16104. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  16105. fi
  16106. @@ -9842,10 +10420,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  16107. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  16108. ;;
  16109. ia64*)
  16110. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  16111. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  16112. ;;
  16113. *)
  16114. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  16115. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  16116. ;;
  16117. esac
  16118. else
  16119. @@ -9924,23 +10502,36 @@ fi
  16120. irix5* | irix6* | nonstopux*)
  16121. if test "$GCC" = yes; then
  16122. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  16123. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  16124. # Try to use the -exported_symbol ld option, if it does not
  16125. # work, assume that -exports_file does not work either and
  16126. # implicitly export all symbols.
  16127. - save_LDFLAGS="$LDFLAGS"
  16128. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  16129. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  16130. + # This should be the same for all languages, so no per-tag cache variable.
  16131. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  16132. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  16133. +if ${lt_cv_irix_exported_symbol+:} false; then :
  16134. + $as_echo_n "(cached) " >&6
  16135. +else
  16136. + save_LDFLAGS="$LDFLAGS"
  16137. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  16138. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  16139. /* end confdefs.h. */
  16140. -int foo(void) {}
  16141. +int foo (void) { return 0; }
  16142. _ACEOF
  16143. if ac_fn_c_try_link "$LINENO"; then :
  16144. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  16145. -
  16146. + lt_cv_irix_exported_symbol=yes
  16147. +else
  16148. + lt_cv_irix_exported_symbol=no
  16149. fi
  16150. rm -f core conftest.err conftest.$ac_objext \
  16151. conftest$ac_exeext conftest.$ac_ext
  16152. - LDFLAGS="$save_LDFLAGS"
  16153. + LDFLAGS="$save_LDFLAGS"
  16154. +fi
  16155. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  16156. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  16157. + if test "$lt_cv_irix_exported_symbol" = yes; then
  16158. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  16159. + fi
  16160. else
  16161. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  16162. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  16163. @@ -10025,7 +10616,7 @@ rm -f core conftest.err conftest.$ac_objext \
  16164. osf4* | osf5*) # as osf3* with the addition of -msym flag
  16165. if test "$GCC" = yes; then
  16166. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  16167. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  16168. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  16169. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  16170. else
  16171. allow_undefined_flag=' -expect_unresolved \*'
  16172. @@ -10044,9 +10635,9 @@ rm -f core conftest.err conftest.$ac_objext \
  16173. no_undefined_flag=' -z defs'
  16174. if test "$GCC" = yes; then
  16175. wlarc='${wl}'
  16176. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  16177. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  16178. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  16179. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  16180. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  16181. else
  16182. case `$CC -V 2>&1` in
  16183. *"Compilers 5.0"*)
  16184. @@ -10622,8 +11213,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  16185. need_version=no
  16186. need_lib_prefix=no
  16187. - case $GCC,$host_os in
  16188. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  16189. + case $GCC,$cc_basename in
  16190. + yes,*)
  16191. + # gcc
  16192. library_names_spec='$libname.dll.a'
  16193. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  16194. postinstall_cmds='base_file=`basename \${file}`~
  16195. @@ -10656,13 +11248,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  16196. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  16197. ;;
  16198. esac
  16199. + dynamic_linker='Win32 ld.exe'
  16200. + ;;
  16201. +
  16202. + *,cl*)
  16203. + # Native MSVC
  16204. + libname_spec='$name'
  16205. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  16206. + library_names_spec='${libname}.dll.lib'
  16207. +
  16208. + case $build_os in
  16209. + mingw*)
  16210. + sys_lib_search_path_spec=
  16211. + lt_save_ifs=$IFS
  16212. + IFS=';'
  16213. + for lt_path in $LIB
  16214. + do
  16215. + IFS=$lt_save_ifs
  16216. + # Let DOS variable expansion print the short 8.3 style file name.
  16217. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  16218. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  16219. + done
  16220. + IFS=$lt_save_ifs
  16221. + # Convert to MSYS style.
  16222. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  16223. + ;;
  16224. + cygwin*)
  16225. + # Convert to unix form, then to dos form, then back to unix form
  16226. + # but this time dos style (no spaces!) so that the unix form looks
  16227. + # like /cygdrive/c/PROGRA~1:/cygdr...
  16228. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  16229. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  16230. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  16231. + ;;
  16232. + *)
  16233. + sys_lib_search_path_spec="$LIB"
  16234. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  16235. + # It is most probably a Windows format PATH.
  16236. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  16237. + else
  16238. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  16239. + fi
  16240. + # FIXME: find the short name or the path components, as spaces are
  16241. + # common. (e.g. "Program Files" -> "PROGRA~1")
  16242. + ;;
  16243. + esac
  16244. +
  16245. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  16246. + postinstall_cmds='base_file=`basename \${file}`~
  16247. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  16248. + dldir=$destdir/`dirname \$dlpath`~
  16249. + test -d \$dldir || mkdir -p \$dldir~
  16250. + $install_prog $dir/$dlname \$dldir/$dlname'
  16251. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  16252. + dlpath=$dir/\$dldll~
  16253. + $RM \$dlpath'
  16254. + shlibpath_overrides_runpath=yes
  16255. + dynamic_linker='Win32 link.exe'
  16256. ;;
  16257. *)
  16258. + # Assume MSVC wrapper
  16259. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  16260. + dynamic_linker='Win32 ld.exe'
  16261. ;;
  16262. esac
  16263. - dynamic_linker='Win32 ld.exe'
  16264. # FIXME: first we should search . and the directory the executable is in
  16265. shlibpath_var=PATH
  16266. ;;
  16267. @@ -11540,7 +12190,7 @@ else
  16268. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  16269. lt_status=$lt_dlunknown
  16270. cat > conftest.$ac_ext <<_LT_EOF
  16271. -#line 11543 "configure"
  16272. +#line $LINENO "configure"
  16273. #include "confdefs.h"
  16274. #if HAVE_DLFCN_H
  16275. @@ -11584,10 +12234,10 @@ else
  16276. /* When -fvisbility=hidden is used, assume the code has been annotated
  16277. correspondingly for the symbols needed. */
  16278. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  16279. -void fnord () __attribute__((visibility("default")));
  16280. +int fnord () __attribute__((visibility("default")));
  16281. #endif
  16282. -void fnord () { int i=42; }
  16283. +int fnord () { return 42; }
  16284. int main ()
  16285. {
  16286. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  16287. @@ -11646,7 +12296,7 @@ else
  16288. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  16289. lt_status=$lt_dlunknown
  16290. cat > conftest.$ac_ext <<_LT_EOF
  16291. -#line 11649 "configure"
  16292. +#line $LINENO "configure"
  16293. #include "confdefs.h"
  16294. #if HAVE_DLFCN_H
  16295. @@ -11690,10 +12340,10 @@ else
  16296. /* When -fvisbility=hidden is used, assume the code has been annotated
  16297. correspondingly for the symbols needed. */
  16298. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  16299. -void fnord () __attribute__((visibility("default")));
  16300. +int fnord () __attribute__((visibility("default")));
  16301. #endif
  16302. -void fnord () { int i=42; }
  16303. +int fnord () { return 42; }
  16304. int main ()
  16305. {
  16306. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  16307. @@ -14979,13 +15629,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  16308. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  16309. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  16310. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  16311. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  16312. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  16313. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  16314. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  16315. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  16316. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  16317. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  16318. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  16319. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  16320. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  16321. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  16322. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  16323. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  16324. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  16325. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  16326. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  16327. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  16328. @@ -15000,14 +15657,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  16329. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  16330. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  16331. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  16332. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  16333. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  16334. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  16335. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  16336. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  16337. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  16338. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  16339. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  16340. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  16341. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  16342. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  16343. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  16344. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  16345. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  16346. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  16347. @@ -15040,12 +15700,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  16348. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  16349. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  16350. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  16351. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  16352. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  16353. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  16354. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  16355. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  16356. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  16357. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  16358. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  16359. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  16360. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  16361. @@ -15100,8 +15760,13 @@ reload_flag \
  16362. OBJDUMP \
  16363. deplibs_check_method \
  16364. file_magic_cmd \
  16365. +file_magic_glob \
  16366. +want_nocaseglob \
  16367. +DLLTOOL \
  16368. +sharedlib_from_linklib_cmd \
  16369. AR \
  16370. AR_FLAGS \
  16371. +archiver_list_spec \
  16372. STRIP \
  16373. RANLIB \
  16374. CC \
  16375. @@ -15111,12 +15776,14 @@ lt_cv_sys_global_symbol_pipe \
  16376. lt_cv_sys_global_symbol_to_cdecl \
  16377. lt_cv_sys_global_symbol_to_c_name_address \
  16378. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  16379. +nm_file_list_spec \
  16380. lt_prog_compiler_no_builtin_flag \
  16381. -lt_prog_compiler_wl \
  16382. lt_prog_compiler_pic \
  16383. +lt_prog_compiler_wl \
  16384. lt_prog_compiler_static \
  16385. lt_cv_prog_compiler_c_o \
  16386. need_locks \
  16387. +MANIFEST_TOOL \
  16388. DSYMUTIL \
  16389. NMEDIT \
  16390. LIPO \
  16391. @@ -15132,7 +15799,6 @@ no_undefined_flag \
  16392. hardcode_libdir_flag_spec \
  16393. hardcode_libdir_flag_spec_ld \
  16394. hardcode_libdir_separator \
  16395. -fix_srcfile_path \
  16396. exclude_expsyms \
  16397. include_expsyms \
  16398. file_list_spec \
  16399. @@ -15168,6 +15834,7 @@ module_cmds \
  16400. module_expsym_cmds \
  16401. export_symbols_cmds \
  16402. prelink_cmds \
  16403. +postlink_cmds \
  16404. postinstall_cmds \
  16405. postuninstall_cmds \
  16406. finish_cmds \
  16407. @@ -15866,7 +16533,8 @@ esac ;;
  16408. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  16409. #
  16410. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  16411. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  16412. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  16413. +# Inc.
  16414. # Written by Gordon Matzigkeit, 1996
  16415. #
  16416. # This file is part of GNU Libtool.
  16417. @@ -15969,19 +16637,42 @@ SP2NL=$lt_lt_SP2NL
  16418. # turn newlines into spaces.
  16419. NL2SP=$lt_lt_NL2SP
  16420. +# convert \$build file names to \$host format.
  16421. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  16422. +
  16423. +# convert \$build files to toolchain format.
  16424. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  16425. +
  16426. # An object symbol dumper.
  16427. OBJDUMP=$lt_OBJDUMP
  16428. # Method to check whether dependent libraries are shared objects.
  16429. deplibs_check_method=$lt_deplibs_check_method
  16430. -# Command to use when deplibs_check_method == "file_magic".
  16431. +# Command to use when deplibs_check_method = "file_magic".
  16432. file_magic_cmd=$lt_file_magic_cmd
  16433. +# How to find potential files when deplibs_check_method = "file_magic".
  16434. +file_magic_glob=$lt_file_magic_glob
  16435. +
  16436. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  16437. +want_nocaseglob=$lt_want_nocaseglob
  16438. +
  16439. +# DLL creation program.
  16440. +DLLTOOL=$lt_DLLTOOL
  16441. +
  16442. +# Command to associate shared and link libraries.
  16443. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  16444. +
  16445. # The archiver.
  16446. AR=$lt_AR
  16447. +
  16448. +# Flags to create an archive.
  16449. AR_FLAGS=$lt_AR_FLAGS
  16450. +# How to feed a file listing to the archiver.
  16451. +archiver_list_spec=$lt_archiver_list_spec
  16452. +
  16453. # A symbol stripping program.
  16454. STRIP=$lt_STRIP
  16455. @@ -16011,6 +16702,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  16456. # Transform the output of nm in a C name address pair when lib prefix is needed.
  16457. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  16458. +# Specify filename containing input files for \$NM.
  16459. +nm_file_list_spec=$lt_nm_file_list_spec
  16460. +
  16461. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  16462. +lt_sysroot=$lt_sysroot
  16463. +
  16464. # The name of the directory that contains temporary libtool files.
  16465. objdir=$objdir
  16466. @@ -16020,6 +16717,9 @@ MAGIC_CMD=$MAGIC_CMD
  16467. # Must we lock files when doing compilation?
  16468. need_locks=$lt_need_locks
  16469. +# Manifest tool.
  16470. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  16471. +
  16472. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  16473. DSYMUTIL=$lt_DSYMUTIL
  16474. @@ -16134,12 +16834,12 @@ with_gcc=$GCC
  16475. # Compiler flag to turn off builtin functions.
  16476. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  16477. -# How to pass a linker flag through the compiler.
  16478. -wl=$lt_lt_prog_compiler_wl
  16479. -
  16480. # Additional compiler flags for building library objects.
  16481. pic_flag=$lt_lt_prog_compiler_pic
  16482. +# How to pass a linker flag through the compiler.
  16483. +wl=$lt_lt_prog_compiler_wl
  16484. +
  16485. # Compiler flag to prevent dynamic linking.
  16486. link_static_flag=$lt_lt_prog_compiler_static
  16487. @@ -16226,9 +16926,6 @@ inherit_rpath=$inherit_rpath
  16488. # Whether libtool must link a program against all its dependency libraries.
  16489. link_all_deplibs=$link_all_deplibs
  16490. -# Fix the shell variable \$srcfile for the compiler.
  16491. -fix_srcfile_path=$lt_fix_srcfile_path
  16492. -
  16493. # Set to "yes" if exported symbols are required.
  16494. always_export_symbols=$always_export_symbols
  16495. @@ -16244,6 +16941,9 @@ include_expsyms=$lt_include_expsyms
  16496. # Commands necessary for linking programs (against libraries) with templates.
  16497. prelink_cmds=$lt_prelink_cmds
  16498. +# Commands necessary for finishing linking programs.
  16499. +postlink_cmds=$lt_postlink_cmds
  16500. +
  16501. # Specify filename containing input files.
  16502. file_list_spec=$lt_file_list_spec
  16503. @@ -16276,210 +16976,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  16504. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  16505. # text mode, it properly converts lines to CR/LF. This bash problem
  16506. # is reportedly fixed, but why not run on old versions too?
  16507. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  16508. - || (rm -f "$cfgfile"; exit 1)
  16509. -
  16510. - case $xsi_shell in
  16511. - yes)
  16512. - cat << \_LT_EOF >> "$cfgfile"
  16513. -
  16514. -# func_dirname file append nondir_replacement
  16515. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  16516. -# otherwise set result to NONDIR_REPLACEMENT.
  16517. -func_dirname ()
  16518. -{
  16519. - case ${1} in
  16520. - */*) func_dirname_result="${1%/*}${2}" ;;
  16521. - * ) func_dirname_result="${3}" ;;
  16522. - esac
  16523. -}
  16524. -
  16525. -# func_basename file
  16526. -func_basename ()
  16527. -{
  16528. - func_basename_result="${1##*/}"
  16529. -}
  16530. -
  16531. -# func_dirname_and_basename file append nondir_replacement
  16532. -# perform func_basename and func_dirname in a single function
  16533. -# call:
  16534. -# dirname: Compute the dirname of FILE. If nonempty,
  16535. -# add APPEND to the result, otherwise set result
  16536. -# to NONDIR_REPLACEMENT.
  16537. -# value returned in "$func_dirname_result"
  16538. -# basename: Compute filename of FILE.
  16539. -# value retuned in "$func_basename_result"
  16540. -# Implementation must be kept synchronized with func_dirname
  16541. -# and func_basename. For efficiency, we do not delegate to
  16542. -# those functions but instead duplicate the functionality here.
  16543. -func_dirname_and_basename ()
  16544. -{
  16545. - case ${1} in
  16546. - */*) func_dirname_result="${1%/*}${2}" ;;
  16547. - * ) func_dirname_result="${3}" ;;
  16548. - esac
  16549. - func_basename_result="${1##*/}"
  16550. -}
  16551. -
  16552. -# func_stripname prefix suffix name
  16553. -# strip PREFIX and SUFFIX off of NAME.
  16554. -# PREFIX and SUFFIX must not contain globbing or regex special
  16555. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  16556. -# dot (in which case that matches only a dot).
  16557. -func_stripname ()
  16558. -{
  16559. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  16560. - # positional parameters, so assign one to ordinary parameter first.
  16561. - func_stripname_result=${3}
  16562. - func_stripname_result=${func_stripname_result#"${1}"}
  16563. - func_stripname_result=${func_stripname_result%"${2}"}
  16564. -}
  16565. -
  16566. -# func_opt_split
  16567. -func_opt_split ()
  16568. -{
  16569. - func_opt_split_opt=${1%%=*}
  16570. - func_opt_split_arg=${1#*=}
  16571. -}
  16572. -
  16573. -# func_lo2o object
  16574. -func_lo2o ()
  16575. -{
  16576. - case ${1} in
  16577. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  16578. - *) func_lo2o_result=${1} ;;
  16579. - esac
  16580. -}
  16581. -
  16582. -# func_xform libobj-or-source
  16583. -func_xform ()
  16584. -{
  16585. - func_xform_result=${1%.*}.lo
  16586. -}
  16587. -
  16588. -# func_arith arithmetic-term...
  16589. -func_arith ()
  16590. -{
  16591. - func_arith_result=$(( $* ))
  16592. -}
  16593. -
  16594. -# func_len string
  16595. -# STRING may not start with a hyphen.
  16596. -func_len ()
  16597. -{
  16598. - func_len_result=${#1}
  16599. -}
  16600. -
  16601. -_LT_EOF
  16602. - ;;
  16603. - *) # Bourne compatible functions.
  16604. - cat << \_LT_EOF >> "$cfgfile"
  16605. -
  16606. -# func_dirname file append nondir_replacement
  16607. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  16608. -# otherwise set result to NONDIR_REPLACEMENT.
  16609. -func_dirname ()
  16610. -{
  16611. - # Extract subdirectory from the argument.
  16612. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  16613. - if test "X$func_dirname_result" = "X${1}"; then
  16614. - func_dirname_result="${3}"
  16615. - else
  16616. - func_dirname_result="$func_dirname_result${2}"
  16617. - fi
  16618. -}
  16619. -
  16620. -# func_basename file
  16621. -func_basename ()
  16622. -{
  16623. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  16624. -}
  16625. -
  16626. -
  16627. -# func_stripname prefix suffix name
  16628. -# strip PREFIX and SUFFIX off of NAME.
  16629. -# PREFIX and SUFFIX must not contain globbing or regex special
  16630. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  16631. -# dot (in which case that matches only a dot).
  16632. -# func_strip_suffix prefix name
  16633. -func_stripname ()
  16634. -{
  16635. - case ${2} in
  16636. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  16637. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  16638. - esac
  16639. -}
  16640. -
  16641. -# sed scripts:
  16642. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  16643. -my_sed_long_arg='1s/^-[^=]*=//'
  16644. -
  16645. -# func_opt_split
  16646. -func_opt_split ()
  16647. -{
  16648. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  16649. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  16650. -}
  16651. -
  16652. -# func_lo2o object
  16653. -func_lo2o ()
  16654. -{
  16655. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  16656. -}
  16657. -
  16658. -# func_xform libobj-or-source
  16659. -func_xform ()
  16660. -{
  16661. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  16662. -}
  16663. -
  16664. -# func_arith arithmetic-term...
  16665. -func_arith ()
  16666. -{
  16667. - func_arith_result=`expr "$@"`
  16668. -}
  16669. -
  16670. -# func_len string
  16671. -# STRING may not start with a hyphen.
  16672. -func_len ()
  16673. -{
  16674. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  16675. -}
  16676. -
  16677. -_LT_EOF
  16678. -esac
  16679. -
  16680. -case $lt_shell_append in
  16681. - yes)
  16682. - cat << \_LT_EOF >> "$cfgfile"
  16683. -
  16684. -# func_append var value
  16685. -# Append VALUE to the end of shell variable VAR.
  16686. -func_append ()
  16687. -{
  16688. - eval "$1+=\$2"
  16689. -}
  16690. -_LT_EOF
  16691. - ;;
  16692. - *)
  16693. - cat << \_LT_EOF >> "$cfgfile"
  16694. -
  16695. -# func_append var value
  16696. -# Append VALUE to the end of shell variable VAR.
  16697. -func_append ()
  16698. -{
  16699. - eval "$1=\$$1\$2"
  16700. -}
  16701. -
  16702. -_LT_EOF
  16703. - ;;
  16704. - esac
  16705. -
  16706. -
  16707. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  16708. - || (rm -f "$cfgfile"; exit 1)
  16709. -
  16710. - mv -f "$cfgfile" "$ofile" ||
  16711. + sed '$q' "$ltmain" >> "$cfgfile" \
  16712. + || (rm -f "$cfgfile"; exit 1)
  16713. +
  16714. + if test x"$xsi_shell" = xyes; then
  16715. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  16716. +func_dirname ()\
  16717. +{\
  16718. +\ case ${1} in\
  16719. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  16720. +\ * ) func_dirname_result="${3}" ;;\
  16721. +\ esac\
  16722. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  16723. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16724. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16725. +test 0 -eq $? || _lt_function_replace_fail=:
  16726. +
  16727. +
  16728. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  16729. +func_basename ()\
  16730. +{\
  16731. +\ func_basename_result="${1##*/}"\
  16732. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  16733. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16734. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16735. +test 0 -eq $? || _lt_function_replace_fail=:
  16736. +
  16737. +
  16738. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  16739. +func_dirname_and_basename ()\
  16740. +{\
  16741. +\ case ${1} in\
  16742. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  16743. +\ * ) func_dirname_result="${3}" ;;\
  16744. +\ esac\
  16745. +\ func_basename_result="${1##*/}"\
  16746. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  16747. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16748. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16749. +test 0 -eq $? || _lt_function_replace_fail=:
  16750. +
  16751. +
  16752. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  16753. +func_stripname ()\
  16754. +{\
  16755. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  16756. +\ # positional parameters, so assign one to ordinary parameter first.\
  16757. +\ func_stripname_result=${3}\
  16758. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  16759. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  16760. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  16761. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16762. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16763. +test 0 -eq $? || _lt_function_replace_fail=:
  16764. +
  16765. +
  16766. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  16767. +func_split_long_opt ()\
  16768. +{\
  16769. +\ func_split_long_opt_name=${1%%=*}\
  16770. +\ func_split_long_opt_arg=${1#*=}\
  16771. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  16772. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16773. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16774. +test 0 -eq $? || _lt_function_replace_fail=:
  16775. +
  16776. +
  16777. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  16778. +func_split_short_opt ()\
  16779. +{\
  16780. +\ func_split_short_opt_arg=${1#??}\
  16781. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  16782. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  16783. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16784. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16785. +test 0 -eq $? || _lt_function_replace_fail=:
  16786. +
  16787. +
  16788. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  16789. +func_lo2o ()\
  16790. +{\
  16791. +\ case ${1} in\
  16792. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  16793. +\ *) func_lo2o_result=${1} ;;\
  16794. +\ esac\
  16795. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  16796. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16797. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16798. +test 0 -eq $? || _lt_function_replace_fail=:
  16799. +
  16800. +
  16801. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  16802. +func_xform ()\
  16803. +{\
  16804. + func_xform_result=${1%.*}.lo\
  16805. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  16806. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16807. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16808. +test 0 -eq $? || _lt_function_replace_fail=:
  16809. +
  16810. +
  16811. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  16812. +func_arith ()\
  16813. +{\
  16814. + func_arith_result=$(( $* ))\
  16815. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  16816. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16817. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16818. +test 0 -eq $? || _lt_function_replace_fail=:
  16819. +
  16820. +
  16821. + sed -e '/^func_len ()$/,/^} # func_len /c\
  16822. +func_len ()\
  16823. +{\
  16824. + func_len_result=${#1}\
  16825. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  16826. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16827. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16828. +test 0 -eq $? || _lt_function_replace_fail=:
  16829. +
  16830. +fi
  16831. +
  16832. +if test x"$lt_shell_append" = xyes; then
  16833. + sed -e '/^func_append ()$/,/^} # func_append /c\
  16834. +func_append ()\
  16835. +{\
  16836. + eval "${1}+=\\${2}"\
  16837. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  16838. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16839. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16840. +test 0 -eq $? || _lt_function_replace_fail=:
  16841. +
  16842. +
  16843. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  16844. +func_append_quoted ()\
  16845. +{\
  16846. +\ func_quote_for_eval "${2}"\
  16847. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  16848. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  16849. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16850. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16851. +test 0 -eq $? || _lt_function_replace_fail=:
  16852. +
  16853. +
  16854. + # Save a `func_append' function call where possible by direct use of '+='
  16855. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  16856. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16857. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16858. + test 0 -eq $? || _lt_function_replace_fail=:
  16859. +else
  16860. + # Save a `func_append' function call even when '+=' is not available
  16861. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  16862. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  16863. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  16864. + test 0 -eq $? || _lt_function_replace_fail=:
  16865. +fi
  16866. +
  16867. +if test x"$_lt_function_replace_fail" = x":"; then
  16868. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  16869. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  16870. +fi
  16871. +
  16872. +
  16873. + mv -f "$cfgfile" "$ofile" ||
  16874. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  16875. chmod +x "$ofile"
  16876. diff --git a/libctf/Makefile.in b/libctf/Makefile.in
  16877. index 1984f50867a..51a3dd26e87 100644
  16878. --- a/libctf/Makefile.in
  16879. +++ b/libctf/Makefile.in
  16880. @@ -393,6 +393,7 @@ CYGPATH_W = @CYGPATH_W@
  16881. DATADIRNAME = @DATADIRNAME@
  16882. DEFS = @DEFS@
  16883. DEPDIR = @DEPDIR@
  16884. +DLLTOOL = @DLLTOOL@
  16885. DSYMUTIL = @DSYMUTIL@
  16886. DUMPBIN = @DUMPBIN@
  16887. ECHO_C = @ECHO_C@
  16888. @@ -426,6 +427,7 @@ LN_S = @LN_S@
  16889. LTLIBOBJS = @LTLIBOBJS@
  16890. MAINT = @MAINT@
  16891. MAKEINFO = @MAKEINFO@
  16892. +MANIFEST_TOOL = @MANIFEST_TOOL@
  16893. MKDIR_P = @MKDIR_P@
  16894. NM = @NM@
  16895. NMEDIT = @NMEDIT@
  16896. diff --git a/libctf/configure b/libctf/configure
  16897. index 8704bc215f4..c1bf438bda6 100755
  16898. --- a/libctf/configure
  16899. +++ b/libctf/configure
  16900. @@ -669,6 +669,8 @@ OTOOL
  16901. LIPO
  16902. NMEDIT
  16903. DSYMUTIL
  16904. +MANIFEST_TOOL
  16905. +DLLTOOL
  16906. OBJDUMP
  16907. LN_S
  16908. NM
  16909. @@ -800,6 +802,7 @@ enable_static
  16910. with_pic
  16911. enable_fast_install
  16912. with_gnu_ld
  16913. +with_libtool_sysroot
  16914. enable_libtool_lock
  16915. enable_largefile
  16916. enable_werror_always
  16917. @@ -1463,6 +1466,8 @@ Optional Packages:
  16918. --with-pic try to use only PIC/non-PIC objects [default=use
  16919. both]
  16920. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  16921. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  16922. + (or the compiler's sysroot if not specified).
  16923. --with-system-zlib use installed libz
  16924. Some influential environment variables:
  16925. @@ -5571,8 +5576,8 @@ esac
  16926. -macro_version='2.2.7a'
  16927. -macro_revision='1.3134'
  16928. +macro_version='2.4'
  16929. +macro_revision='1.3293'
  16930. @@ -5612,7 +5617,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  16931. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  16932. $as_echo_n "checking how to print strings... " >&6; }
  16933. # Test print first, because it will be a builtin if present.
  16934. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  16935. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  16936. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  16937. ECHO='print -r --'
  16938. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  16939. @@ -6305,8 +6310,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  16940. # Try some XSI features
  16941. xsi_shell=no
  16942. ( _lt_dummy="a/b/c"
  16943. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  16944. - = c,a/b,, \
  16945. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  16946. + = c,a/b,b/c, \
  16947. && eval 'test $(( 1 + 1 )) -eq 2 \
  16948. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  16949. && xsi_shell=yes
  16950. @@ -6355,6 +6360,80 @@ esac
  16951. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  16952. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  16953. +if ${lt_cv_to_host_file_cmd+:} false; then :
  16954. + $as_echo_n "(cached) " >&6
  16955. +else
  16956. + case $host in
  16957. + *-*-mingw* )
  16958. + case $build in
  16959. + *-*-mingw* ) # actually msys
  16960. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  16961. + ;;
  16962. + *-*-cygwin* )
  16963. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  16964. + ;;
  16965. + * ) # otherwise, assume *nix
  16966. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  16967. + ;;
  16968. + esac
  16969. + ;;
  16970. + *-*-cygwin* )
  16971. + case $build in
  16972. + *-*-mingw* ) # actually msys
  16973. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  16974. + ;;
  16975. + *-*-cygwin* )
  16976. + lt_cv_to_host_file_cmd=func_convert_file_noop
  16977. + ;;
  16978. + * ) # otherwise, assume *nix
  16979. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  16980. + ;;
  16981. + esac
  16982. + ;;
  16983. + * ) # unhandled hosts (and "normal" native builds)
  16984. + lt_cv_to_host_file_cmd=func_convert_file_noop
  16985. + ;;
  16986. +esac
  16987. +
  16988. +fi
  16989. +
  16990. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  16991. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  16992. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  16993. +
  16994. +
  16995. +
  16996. +
  16997. +
  16998. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  16999. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  17000. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  17001. + $as_echo_n "(cached) " >&6
  17002. +else
  17003. + #assume ordinary cross tools, or native build.
  17004. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  17005. +case $host in
  17006. + *-*-mingw* )
  17007. + case $build in
  17008. + *-*-mingw* ) # actually msys
  17009. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  17010. + ;;
  17011. + esac
  17012. + ;;
  17013. +esac
  17014. +
  17015. +fi
  17016. +
  17017. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  17018. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  17019. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  17020. +
  17021. +
  17022. +
  17023. +
  17024. +
  17025. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  17026. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  17027. if ${lt_cv_ld_reload_flag+:} false; then :
  17028. @@ -6371,6 +6450,11 @@ case $reload_flag in
  17029. esac
  17030. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  17031. case $host_os in
  17032. + cygwin* | mingw* | pw32* | cegcc*)
  17033. + if test "$GCC" != yes; then
  17034. + reload_cmds=false
  17035. + fi
  17036. + ;;
  17037. darwin*)
  17038. if test "$GCC" = yes; then
  17039. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  17040. @@ -6539,7 +6623,8 @@ mingw* | pw32*)
  17041. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  17042. lt_cv_file_magic_cmd='func_win32_libid'
  17043. else
  17044. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  17045. + # Keep this pattern in sync with the one in func_win32_libid.
  17046. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  17047. lt_cv_file_magic_cmd='$OBJDUMP -f'
  17048. fi
  17049. ;;
  17050. @@ -6693,6 +6778,21 @@ esac
  17051. fi
  17052. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  17053. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  17054. +
  17055. +file_magic_glob=
  17056. +want_nocaseglob=no
  17057. +if test "$build" = "$host"; then
  17058. + case $host_os in
  17059. + mingw* | pw32*)
  17060. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  17061. + want_nocaseglob=yes
  17062. + else
  17063. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  17064. + fi
  17065. + ;;
  17066. + esac
  17067. +fi
  17068. +
  17069. file_magic_cmd=$lt_cv_file_magic_cmd
  17070. deplibs_check_method=$lt_cv_deplibs_check_method
  17071. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  17072. @@ -6708,6 +6808,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  17073. +
  17074. +
  17075. +
  17076. +
  17077. +
  17078. +
  17079. +
  17080. +
  17081. +
  17082. +
  17083. +if test -n "$ac_tool_prefix"; then
  17084. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  17085. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  17086. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  17087. +$as_echo_n "checking for $ac_word... " >&6; }
  17088. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  17089. + $as_echo_n "(cached) " >&6
  17090. +else
  17091. + if test -n "$DLLTOOL"; then
  17092. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  17093. +else
  17094. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  17095. +for as_dir in $PATH
  17096. +do
  17097. + IFS=$as_save_IFS
  17098. + test -z "$as_dir" && as_dir=.
  17099. + for ac_exec_ext in '' $ac_executable_extensions; do
  17100. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  17101. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  17102. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  17103. + break 2
  17104. + fi
  17105. +done
  17106. + done
  17107. +IFS=$as_save_IFS
  17108. +
  17109. +fi
  17110. +fi
  17111. +DLLTOOL=$ac_cv_prog_DLLTOOL
  17112. +if test -n "$DLLTOOL"; then
  17113. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  17114. +$as_echo "$DLLTOOL" >&6; }
  17115. +else
  17116. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  17117. +$as_echo "no" >&6; }
  17118. +fi
  17119. +
  17120. +
  17121. +fi
  17122. +if test -z "$ac_cv_prog_DLLTOOL"; then
  17123. + ac_ct_DLLTOOL=$DLLTOOL
  17124. + # Extract the first word of "dlltool", so it can be a program name with args.
  17125. +set dummy dlltool; ac_word=$2
  17126. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  17127. +$as_echo_n "checking for $ac_word... " >&6; }
  17128. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  17129. + $as_echo_n "(cached) " >&6
  17130. +else
  17131. + if test -n "$ac_ct_DLLTOOL"; then
  17132. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  17133. +else
  17134. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  17135. +for as_dir in $PATH
  17136. +do
  17137. + IFS=$as_save_IFS
  17138. + test -z "$as_dir" && as_dir=.
  17139. + for ac_exec_ext in '' $ac_executable_extensions; do
  17140. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  17141. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  17142. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  17143. + break 2
  17144. + fi
  17145. +done
  17146. + done
  17147. +IFS=$as_save_IFS
  17148. +
  17149. +fi
  17150. +fi
  17151. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  17152. +if test -n "$ac_ct_DLLTOOL"; then
  17153. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  17154. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  17155. +else
  17156. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  17157. +$as_echo "no" >&6; }
  17158. +fi
  17159. +
  17160. + if test "x$ac_ct_DLLTOOL" = x; then
  17161. + DLLTOOL="false"
  17162. + else
  17163. + case $cross_compiling:$ac_tool_warned in
  17164. +yes:)
  17165. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  17166. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  17167. +ac_tool_warned=yes ;;
  17168. +esac
  17169. + DLLTOOL=$ac_ct_DLLTOOL
  17170. + fi
  17171. +else
  17172. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  17173. +fi
  17174. +
  17175. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  17176. +
  17177. +
  17178. +
  17179. +
  17180. +
  17181. +
  17182. +
  17183. +
  17184. +
  17185. +
  17186. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  17187. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  17188. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  17189. + $as_echo_n "(cached) " >&6
  17190. +else
  17191. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  17192. +
  17193. +case $host_os in
  17194. +cygwin* | mingw* | pw32* | cegcc*)
  17195. + # two different shell functions defined in ltmain.sh
  17196. + # decide which to use based on capabilities of $DLLTOOL
  17197. + case `$DLLTOOL --help 2>&1` in
  17198. + *--identify-strict*)
  17199. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  17200. + ;;
  17201. + *)
  17202. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  17203. + ;;
  17204. + esac
  17205. + ;;
  17206. +*)
  17207. + # fallback: assume linklib IS sharedlib
  17208. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  17209. + ;;
  17210. +esac
  17211. +
  17212. +fi
  17213. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  17214. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  17215. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  17216. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  17217. +
  17218. +
  17219. +
  17220. +
  17221. +
  17222. +
  17223. +
  17224. plugin_option=
  17225. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  17226. for plugin in $plugin_names; do
  17227. @@ -6722,8 +6973,10 @@ for plugin in $plugin_names; do
  17228. done
  17229. if test -n "$ac_tool_prefix"; then
  17230. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  17231. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  17232. + for ac_prog in ar
  17233. + do
  17234. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  17235. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  17236. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  17237. $as_echo_n "checking for $ac_word... " >&6; }
  17238. if ${ac_cv_prog_AR+:} false; then :
  17239. @@ -6739,7 +6992,7 @@ do
  17240. test -z "$as_dir" && as_dir=.
  17241. for ac_exec_ext in '' $ac_executable_extensions; do
  17242. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  17243. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  17244. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  17245. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  17246. break 2
  17247. fi
  17248. @@ -6759,11 +7012,15 @@ $as_echo "no" >&6; }
  17249. fi
  17250. + test -n "$AR" && break
  17251. + done
  17252. fi
  17253. -if test -z "$ac_cv_prog_AR"; then
  17254. +if test -z "$AR"; then
  17255. ac_ct_AR=$AR
  17256. - # Extract the first word of "ar", so it can be a program name with args.
  17257. -set dummy ar; ac_word=$2
  17258. + for ac_prog in ar
  17259. +do
  17260. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  17261. +set dummy $ac_prog; ac_word=$2
  17262. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  17263. $as_echo_n "checking for $ac_word... " >&6; }
  17264. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  17265. @@ -6779,7 +7036,7 @@ do
  17266. test -z "$as_dir" && as_dir=.
  17267. for ac_exec_ext in '' $ac_executable_extensions; do
  17268. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  17269. - ac_cv_prog_ac_ct_AR="ar"
  17270. + ac_cv_prog_ac_ct_AR="$ac_prog"
  17271. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  17272. break 2
  17273. fi
  17274. @@ -6798,6 +7055,10 @@ else
  17275. $as_echo "no" >&6; }
  17276. fi
  17277. +
  17278. + test -n "$ac_ct_AR" && break
  17279. +done
  17280. +
  17281. if test "x$ac_ct_AR" = x; then
  17282. AR="false"
  17283. else
  17284. @@ -6809,25 +7070,19 @@ ac_tool_warned=yes ;;
  17285. esac
  17286. AR=$ac_ct_AR
  17287. fi
  17288. -else
  17289. - AR="$ac_cv_prog_AR"
  17290. fi
  17291. -test -z "$AR" && AR=ar
  17292. -if test -n "$plugin_option"; then
  17293. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  17294. - touch conftest.c
  17295. - $AR $plugin_option rc conftest.a conftest.c
  17296. - if test "$?" != 0; then
  17297. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  17298. + touch conftest.c
  17299. + $AR $plugin_option rc conftest.a conftest.c
  17300. + if test "$?" != 0; then
  17301. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  17302. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  17303. - else
  17304. - AR="$AR $plugin_option"
  17305. - fi
  17306. - rm -f conftest.*
  17307. + else
  17308. + AR="$AR $plugin_option"
  17309. fi
  17310. -fi
  17311. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  17312. + rm -f conftest.*
  17313. +: ${AR=ar}
  17314. +: ${AR_FLAGS=cru}
  17315. @@ -6839,6 +7094,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  17316. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  17317. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  17318. +if ${lt_cv_ar_at_file+:} false; then :
  17319. + $as_echo_n "(cached) " >&6
  17320. +else
  17321. + lt_cv_ar_at_file=no
  17322. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  17323. +/* end confdefs.h. */
  17324. +
  17325. +int
  17326. +main ()
  17327. +{
  17328. +
  17329. + ;
  17330. + return 0;
  17331. +}
  17332. +_ACEOF
  17333. +if ac_fn_c_try_compile "$LINENO"; then :
  17334. + echo conftest.$ac_objext > conftest.lst
  17335. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  17336. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  17337. + (eval $lt_ar_try) 2>&5
  17338. + ac_status=$?
  17339. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  17340. + test $ac_status = 0; }
  17341. + if test "$ac_status" -eq 0; then
  17342. + # Ensure the archiver fails upon bogus file names.
  17343. + rm -f conftest.$ac_objext libconftest.a
  17344. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  17345. + (eval $lt_ar_try) 2>&5
  17346. + ac_status=$?
  17347. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  17348. + test $ac_status = 0; }
  17349. + if test "$ac_status" -ne 0; then
  17350. + lt_cv_ar_at_file=@
  17351. + fi
  17352. + fi
  17353. + rm -f conftest.* libconftest.a
  17354. +
  17355. +fi
  17356. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  17357. +
  17358. +fi
  17359. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  17360. +$as_echo "$lt_cv_ar_at_file" >&6; }
  17361. +
  17362. +if test "x$lt_cv_ar_at_file" = xno; then
  17363. + archiver_list_spec=
  17364. +else
  17365. + archiver_list_spec=$lt_cv_ar_at_file
  17366. +fi
  17367. +
  17368. +
  17369. +
  17370. +
  17371. +
  17372. +
  17373. +
  17374. if test -n "$ac_tool_prefix"; then
  17375. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  17376. set dummy ${ac_tool_prefix}strip; ac_word=$2
  17377. @@ -7178,8 +7491,8 @@ esac
  17378. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  17379. # Transform an extracted symbol line into symbol name and symbol address
  17380. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  17381. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  17382. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  17383. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  17384. # Handle CRLF in mingw tool chain
  17385. opt_cr=
  17386. @@ -7215,6 +7528,7 @@ for ac_symprfx in "" "_"; do
  17387. else
  17388. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  17389. fi
  17390. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  17391. # Check to see that the pipe works correctly.
  17392. pipe_works=no
  17393. @@ -7256,6 +7570,18 @@ _LT_EOF
  17394. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  17395. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  17396. cat <<_LT_EOF > conftest.$ac_ext
  17397. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  17398. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  17399. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  17400. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  17401. +# define LT_DLSYM_CONST
  17402. +#elif defined(__osf__)
  17403. +/* This system does not cope well with relocations in const data. */
  17404. +# define LT_DLSYM_CONST
  17405. +#else
  17406. +# define LT_DLSYM_CONST const
  17407. +#endif
  17408. +
  17409. #ifdef __cplusplus
  17410. extern "C" {
  17411. #endif
  17412. @@ -7267,7 +7593,7 @@ _LT_EOF
  17413. cat <<_LT_EOF >> conftest.$ac_ext
  17414. /* The mapping between symbol names and symbols. */
  17415. -const struct {
  17416. +LT_DLSYM_CONST struct {
  17417. const char *name;
  17418. void *address;
  17419. }
  17420. @@ -7293,8 +7619,8 @@ static const void *lt_preloaded_setup() {
  17421. _LT_EOF
  17422. # Now try linking the two files.
  17423. mv conftest.$ac_objext conftstm.$ac_objext
  17424. - lt_save_LIBS="$LIBS"
  17425. - lt_save_CFLAGS="$CFLAGS"
  17426. + lt_globsym_save_LIBS=$LIBS
  17427. + lt_globsym_save_CFLAGS=$CFLAGS
  17428. LIBS="conftstm.$ac_objext"
  17429. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  17430. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  17431. @@ -7304,8 +7630,8 @@ _LT_EOF
  17432. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  17433. pipe_works=yes
  17434. fi
  17435. - LIBS="$lt_save_LIBS"
  17436. - CFLAGS="$lt_save_CFLAGS"
  17437. + LIBS=$lt_globsym_save_LIBS
  17438. + CFLAGS=$lt_globsym_save_CFLAGS
  17439. else
  17440. echo "cannot find nm_test_func in $nlist" >&5
  17441. fi
  17442. @@ -7342,6 +7668,14 @@ else
  17443. $as_echo "ok" >&6; }
  17444. fi
  17445. +# Response file support.
  17446. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  17447. + nm_file_list_spec='@'
  17448. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  17449. + nm_file_list_spec='@'
  17450. +fi
  17451. +
  17452. +
  17453. @@ -7360,6 +7694,47 @@ fi
  17454. +
  17455. +
  17456. +
  17457. +
  17458. +
  17459. +
  17460. +
  17461. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  17462. +$as_echo_n "checking for sysroot... " >&6; }
  17463. +
  17464. +# Check whether --with-libtool-sysroot was given.
  17465. +if test "${with_libtool_sysroot+set}" = set; then :
  17466. + withval=$with_libtool_sysroot;
  17467. +else
  17468. + with_libtool_sysroot=no
  17469. +fi
  17470. +
  17471. +
  17472. +lt_sysroot=
  17473. +case ${with_libtool_sysroot} in #(
  17474. + yes)
  17475. + if test "$GCC" = yes; then
  17476. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  17477. + fi
  17478. + ;; #(
  17479. + /*)
  17480. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  17481. + ;; #(
  17482. + no|'')
  17483. + ;; #(
  17484. + *)
  17485. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  17486. +$as_echo "${with_libtool_sysroot}" >&6; }
  17487. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  17488. + ;;
  17489. +esac
  17490. +
  17491. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  17492. +$as_echo "${lt_sysroot:-no}" >&6; }
  17493. +
  17494. +
  17495. @@ -7569,6 +7944,123 @@ esac
  17496. need_locks="$enable_libtool_lock"
  17497. +if test -n "$ac_tool_prefix"; then
  17498. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  17499. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  17500. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  17501. +$as_echo_n "checking for $ac_word... " >&6; }
  17502. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  17503. + $as_echo_n "(cached) " >&6
  17504. +else
  17505. + if test -n "$MANIFEST_TOOL"; then
  17506. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  17507. +else
  17508. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  17509. +for as_dir in $PATH
  17510. +do
  17511. + IFS=$as_save_IFS
  17512. + test -z "$as_dir" && as_dir=.
  17513. + for ac_exec_ext in '' $ac_executable_extensions; do
  17514. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  17515. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  17516. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  17517. + break 2
  17518. + fi
  17519. +done
  17520. + done
  17521. +IFS=$as_save_IFS
  17522. +
  17523. +fi
  17524. +fi
  17525. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  17526. +if test -n "$MANIFEST_TOOL"; then
  17527. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  17528. +$as_echo "$MANIFEST_TOOL" >&6; }
  17529. +else
  17530. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  17531. +$as_echo "no" >&6; }
  17532. +fi
  17533. +
  17534. +
  17535. +fi
  17536. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  17537. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  17538. + # Extract the first word of "mt", so it can be a program name with args.
  17539. +set dummy mt; ac_word=$2
  17540. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  17541. +$as_echo_n "checking for $ac_word... " >&6; }
  17542. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  17543. + $as_echo_n "(cached) " >&6
  17544. +else
  17545. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  17546. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  17547. +else
  17548. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  17549. +for as_dir in $PATH
  17550. +do
  17551. + IFS=$as_save_IFS
  17552. + test -z "$as_dir" && as_dir=.
  17553. + for ac_exec_ext in '' $ac_executable_extensions; do
  17554. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  17555. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  17556. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  17557. + break 2
  17558. + fi
  17559. +done
  17560. + done
  17561. +IFS=$as_save_IFS
  17562. +
  17563. +fi
  17564. +fi
  17565. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  17566. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  17567. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  17568. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  17569. +else
  17570. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  17571. +$as_echo "no" >&6; }
  17572. +fi
  17573. +
  17574. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  17575. + MANIFEST_TOOL=":"
  17576. + else
  17577. + case $cross_compiling:$ac_tool_warned in
  17578. +yes:)
  17579. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  17580. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  17581. +ac_tool_warned=yes ;;
  17582. +esac
  17583. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  17584. + fi
  17585. +else
  17586. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  17587. +fi
  17588. +
  17589. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  17590. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  17591. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  17592. +if ${lt_cv_path_mainfest_tool+:} false; then :
  17593. + $as_echo_n "(cached) " >&6
  17594. +else
  17595. + lt_cv_path_mainfest_tool=no
  17596. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  17597. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  17598. + cat conftest.err >&5
  17599. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  17600. + lt_cv_path_mainfest_tool=yes
  17601. + fi
  17602. + rm -f conftest*
  17603. +fi
  17604. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  17605. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  17606. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  17607. + MANIFEST_TOOL=:
  17608. +fi
  17609. +
  17610. +
  17611. +
  17612. +
  17613. +
  17614. case $host_os in
  17615. rhapsody* | darwin*)
  17616. @@ -8132,6 +8624,8 @@ _LT_EOF
  17617. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  17618. echo "$AR cru libconftest.a conftest.o" >&5
  17619. $AR cru libconftest.a conftest.o 2>&5
  17620. + echo "$RANLIB libconftest.a" >&5
  17621. + $RANLIB libconftest.a 2>&5
  17622. cat > conftest.c << _LT_EOF
  17623. int main() { return 0;}
  17624. _LT_EOF
  17625. @@ -8684,8 +9178,6 @@ fi
  17626. lt_prog_compiler_pic=
  17627. lt_prog_compiler_static=
  17628. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  17629. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  17630. if test "$GCC" = yes; then
  17631. lt_prog_compiler_wl='-Wl,'
  17632. @@ -8851,6 +9343,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  17633. lt_prog_compiler_pic='--shared'
  17634. lt_prog_compiler_static='--static'
  17635. ;;
  17636. + nagfor*)
  17637. + # NAG Fortran compiler
  17638. + lt_prog_compiler_wl='-Wl,-Wl,,'
  17639. + lt_prog_compiler_pic='-PIC'
  17640. + lt_prog_compiler_static='-Bstatic'
  17641. + ;;
  17642. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  17643. # Portland Group compilers (*not* the Pentium gcc compiler,
  17644. # which looks to be a dead project)
  17645. @@ -8913,7 +9411,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  17646. lt_prog_compiler_pic='-KPIC'
  17647. lt_prog_compiler_static='-Bstatic'
  17648. case $cc_basename in
  17649. - f77* | f90* | f95*)
  17650. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  17651. lt_prog_compiler_wl='-Qoption ld ';;
  17652. *)
  17653. lt_prog_compiler_wl='-Wl,';;
  17654. @@ -8970,13 +9468,17 @@ case $host_os in
  17655. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  17656. ;;
  17657. esac
  17658. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  17659. -$as_echo "$lt_prog_compiler_pic" >&6; }
  17660. -
  17661. -
  17662. -
  17663. -
  17664. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  17665. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  17666. +if ${lt_cv_prog_compiler_pic+:} false; then :
  17667. + $as_echo_n "(cached) " >&6
  17668. +else
  17669. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  17670. +fi
  17671. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  17672. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  17673. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  17674. #
  17675. # Check to make sure the PIC flag actually works.
  17676. @@ -9037,6 +9539,11 @@ fi
  17677. +
  17678. +
  17679. +
  17680. +
  17681. +
  17682. #
  17683. # Check to make sure the static flag actually works.
  17684. #
  17685. @@ -9387,7 +9894,8 @@ _LT_EOF
  17686. allow_undefined_flag=unsupported
  17687. always_export_symbols=no
  17688. enable_shared_with_static_runtimes=yes
  17689. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  17690. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  17691. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  17692. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  17693. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  17694. @@ -9486,12 +9994,12 @@ _LT_EOF
  17695. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  17696. hardcode_libdir_flag_spec=
  17697. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  17698. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  17699. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  17700. if test "x$supports_anon_versioning" = xyes; then
  17701. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  17702. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  17703. echo "local: *; };" >> $output_objdir/$libname.ver~
  17704. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  17705. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  17706. fi
  17707. ;;
  17708. esac
  17709. @@ -9505,8 +10013,8 @@ _LT_EOF
  17710. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  17711. wlarc=
  17712. else
  17713. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  17714. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  17715. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  17716. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  17717. fi
  17718. ;;
  17719. @@ -9524,8 +10032,8 @@ _LT_EOF
  17720. _LT_EOF
  17721. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  17722. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  17723. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  17724. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  17725. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  17726. else
  17727. ld_shlibs=no
  17728. fi
  17729. @@ -9571,8 +10079,8 @@ _LT_EOF
  17730. *)
  17731. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  17732. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  17733. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  17734. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  17735. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  17736. else
  17737. ld_shlibs=no
  17738. fi
  17739. @@ -9702,7 +10210,13 @@ _LT_EOF
  17740. allow_undefined_flag='-berok'
  17741. # Determine the default libpath from the value encoded in an
  17742. # empty executable.
  17743. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  17744. + if test "${lt_cv_aix_libpath+set}" = set; then
  17745. + aix_libpath=$lt_cv_aix_libpath
  17746. +else
  17747. + if ${lt_cv_aix_libpath_+:} false; then :
  17748. + $as_echo_n "(cached) " >&6
  17749. +else
  17750. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  17751. /* end confdefs.h. */
  17752. int
  17753. @@ -9715,22 +10229,29 @@ main ()
  17754. _ACEOF
  17755. if ac_fn_c_try_link "$LINENO"; then :
  17756. -lt_aix_libpath_sed='
  17757. - /Import File Strings/,/^$/ {
  17758. - /^0/ {
  17759. - s/^0 *\(.*\)$/\1/
  17760. - p
  17761. - }
  17762. - }'
  17763. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17764. -# Check for a 64-bit object if we didn't find anything.
  17765. -if test -z "$aix_libpath"; then
  17766. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17767. -fi
  17768. + lt_aix_libpath_sed='
  17769. + /Import File Strings/,/^$/ {
  17770. + /^0/ {
  17771. + s/^0 *\([^ ]*\) *$/\1/
  17772. + p
  17773. + }
  17774. + }'
  17775. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17776. + # Check for a 64-bit object if we didn't find anything.
  17777. + if test -z "$lt_cv_aix_libpath_"; then
  17778. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17779. + fi
  17780. fi
  17781. rm -f core conftest.err conftest.$ac_objext \
  17782. conftest$ac_exeext conftest.$ac_ext
  17783. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17784. + if test -z "$lt_cv_aix_libpath_"; then
  17785. + lt_cv_aix_libpath_="/usr/lib:/lib"
  17786. + fi
  17787. +
  17788. +fi
  17789. +
  17790. + aix_libpath=$lt_cv_aix_libpath_
  17791. +fi
  17792. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  17793. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  17794. @@ -9742,7 +10263,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17795. else
  17796. # Determine the default libpath from the value encoded in an
  17797. # empty executable.
  17798. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  17799. + if test "${lt_cv_aix_libpath+set}" = set; then
  17800. + aix_libpath=$lt_cv_aix_libpath
  17801. +else
  17802. + if ${lt_cv_aix_libpath_+:} false; then :
  17803. + $as_echo_n "(cached) " >&6
  17804. +else
  17805. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  17806. /* end confdefs.h. */
  17807. int
  17808. @@ -9755,22 +10282,29 @@ main ()
  17809. _ACEOF
  17810. if ac_fn_c_try_link "$LINENO"; then :
  17811. -lt_aix_libpath_sed='
  17812. - /Import File Strings/,/^$/ {
  17813. - /^0/ {
  17814. - s/^0 *\(.*\)$/\1/
  17815. - p
  17816. - }
  17817. - }'
  17818. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17819. -# Check for a 64-bit object if we didn't find anything.
  17820. -if test -z "$aix_libpath"; then
  17821. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17822. -fi
  17823. + lt_aix_libpath_sed='
  17824. + /Import File Strings/,/^$/ {
  17825. + /^0/ {
  17826. + s/^0 *\([^ ]*\) *$/\1/
  17827. + p
  17828. + }
  17829. + }'
  17830. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17831. + # Check for a 64-bit object if we didn't find anything.
  17832. + if test -z "$lt_cv_aix_libpath_"; then
  17833. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  17834. + fi
  17835. fi
  17836. rm -f core conftest.err conftest.$ac_objext \
  17837. conftest$ac_exeext conftest.$ac_ext
  17838. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17839. + if test -z "$lt_cv_aix_libpath_"; then
  17840. + lt_cv_aix_libpath_="/usr/lib:/lib"
  17841. + fi
  17842. +
  17843. +fi
  17844. +
  17845. + aix_libpath=$lt_cv_aix_libpath_
  17846. +fi
  17847. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  17848. # Warning - without using the other run time loading flags,
  17849. @@ -9815,20 +10349,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17850. # Microsoft Visual C++.
  17851. # hardcode_libdir_flag_spec is actually meaningless, as there is
  17852. # no search path for DLLs.
  17853. - hardcode_libdir_flag_spec=' '
  17854. - allow_undefined_flag=unsupported
  17855. - # Tell ltmain to make .lib files, not .a files.
  17856. - libext=lib
  17857. - # Tell ltmain to make .dll files, not .so files.
  17858. - shrext_cmds=".dll"
  17859. - # FIXME: Setting linknames here is a bad hack.
  17860. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  17861. - # The linker will automatically build a .lib file if we build a DLL.
  17862. - old_archive_from_new_cmds='true'
  17863. - # FIXME: Should let the user specify the lib program.
  17864. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  17865. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  17866. - enable_shared_with_static_runtimes=yes
  17867. + case $cc_basename in
  17868. + cl*)
  17869. + # Native MSVC
  17870. + hardcode_libdir_flag_spec=' '
  17871. + allow_undefined_flag=unsupported
  17872. + always_export_symbols=yes
  17873. + file_list_spec='@'
  17874. + # Tell ltmain to make .lib files, not .a files.
  17875. + libext=lib
  17876. + # Tell ltmain to make .dll files, not .so files.
  17877. + shrext_cmds=".dll"
  17878. + # FIXME: Setting linknames here is a bad hack.
  17879. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  17880. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  17881. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  17882. + else
  17883. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  17884. + fi~
  17885. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  17886. + linknames='
  17887. + # The linker will not automatically build a static lib if we build a DLL.
  17888. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  17889. + enable_shared_with_static_runtimes=yes
  17890. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  17891. + # Don't use ranlib
  17892. + old_postinstall_cmds='chmod 644 $oldlib'
  17893. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  17894. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  17895. + case $lt_outputfile in
  17896. + *.exe|*.EXE) ;;
  17897. + *)
  17898. + lt_outputfile="$lt_outputfile.exe"
  17899. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  17900. + ;;
  17901. + esac~
  17902. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  17903. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  17904. + $RM "$lt_outputfile.manifest";
  17905. + fi'
  17906. + ;;
  17907. + *)
  17908. + # Assume MSVC wrapper
  17909. + hardcode_libdir_flag_spec=' '
  17910. + allow_undefined_flag=unsupported
  17911. + # Tell ltmain to make .lib files, not .a files.
  17912. + libext=lib
  17913. + # Tell ltmain to make .dll files, not .so files.
  17914. + shrext_cmds=".dll"
  17915. + # FIXME: Setting linknames here is a bad hack.
  17916. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  17917. + # The linker will automatically build a .lib file if we build a DLL.
  17918. + old_archive_from_new_cmds='true'
  17919. + # FIXME: Should let the user specify the lib program.
  17920. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  17921. + enable_shared_with_static_runtimes=yes
  17922. + ;;
  17923. + esac
  17924. ;;
  17925. darwin* | rhapsody*)
  17926. @@ -9889,7 +10466,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17927. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  17928. freebsd* | dragonfly*)
  17929. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  17930. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  17931. hardcode_libdir_flag_spec='-R$libdir'
  17932. hardcode_direct=yes
  17933. hardcode_shlibpath_var=no
  17934. @@ -9897,7 +10474,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17935. hpux9*)
  17936. if test "$GCC" = yes; then
  17937. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  17938. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  17939. else
  17940. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  17941. fi
  17942. @@ -9913,7 +10490,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17943. hpux10*)
  17944. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  17945. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  17946. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  17947. else
  17948. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  17949. fi
  17950. @@ -9937,10 +10514,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  17951. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  17952. ;;
  17953. ia64*)
  17954. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  17955. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  17956. ;;
  17957. *)
  17958. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  17959. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  17960. ;;
  17961. esac
  17962. else
  17963. @@ -10019,23 +10596,36 @@ fi
  17964. irix5* | irix6* | nonstopux*)
  17965. if test "$GCC" = yes; then
  17966. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  17967. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  17968. # Try to use the -exported_symbol ld option, if it does not
  17969. # work, assume that -exports_file does not work either and
  17970. # implicitly export all symbols.
  17971. - save_LDFLAGS="$LDFLAGS"
  17972. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  17973. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  17974. + # This should be the same for all languages, so no per-tag cache variable.
  17975. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  17976. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  17977. +if ${lt_cv_irix_exported_symbol+:} false; then :
  17978. + $as_echo_n "(cached) " >&6
  17979. +else
  17980. + save_LDFLAGS="$LDFLAGS"
  17981. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  17982. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  17983. /* end confdefs.h. */
  17984. -int foo(void) {}
  17985. +int foo (void) { return 0; }
  17986. _ACEOF
  17987. if ac_fn_c_try_link "$LINENO"; then :
  17988. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  17989. -
  17990. + lt_cv_irix_exported_symbol=yes
  17991. +else
  17992. + lt_cv_irix_exported_symbol=no
  17993. fi
  17994. rm -f core conftest.err conftest.$ac_objext \
  17995. conftest$ac_exeext conftest.$ac_ext
  17996. - LDFLAGS="$save_LDFLAGS"
  17997. + LDFLAGS="$save_LDFLAGS"
  17998. +fi
  17999. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  18000. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  18001. + if test "$lt_cv_irix_exported_symbol" = yes; then
  18002. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  18003. + fi
  18004. else
  18005. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  18006. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  18007. @@ -10120,7 +10710,7 @@ rm -f core conftest.err conftest.$ac_objext \
  18008. osf4* | osf5*) # as osf3* with the addition of -msym flag
  18009. if test "$GCC" = yes; then
  18010. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  18011. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  18012. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  18013. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  18014. else
  18015. allow_undefined_flag=' -expect_unresolved \*'
  18016. @@ -10139,9 +10729,9 @@ rm -f core conftest.err conftest.$ac_objext \
  18017. no_undefined_flag=' -z defs'
  18018. if test "$GCC" = yes; then
  18019. wlarc='${wl}'
  18020. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  18021. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  18022. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  18023. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  18024. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  18025. else
  18026. case `$CC -V 2>&1` in
  18027. *"Compilers 5.0"*)
  18028. @@ -10717,8 +11307,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  18029. need_version=no
  18030. need_lib_prefix=no
  18031. - case $GCC,$host_os in
  18032. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  18033. + case $GCC,$cc_basename in
  18034. + yes,*)
  18035. + # gcc
  18036. library_names_spec='$libname.dll.a'
  18037. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  18038. postinstall_cmds='base_file=`basename \${file}`~
  18039. @@ -10751,13 +11342,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  18040. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  18041. ;;
  18042. esac
  18043. + dynamic_linker='Win32 ld.exe'
  18044. + ;;
  18045. +
  18046. + *,cl*)
  18047. + # Native MSVC
  18048. + libname_spec='$name'
  18049. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  18050. + library_names_spec='${libname}.dll.lib'
  18051. +
  18052. + case $build_os in
  18053. + mingw*)
  18054. + sys_lib_search_path_spec=
  18055. + lt_save_ifs=$IFS
  18056. + IFS=';'
  18057. + for lt_path in $LIB
  18058. + do
  18059. + IFS=$lt_save_ifs
  18060. + # Let DOS variable expansion print the short 8.3 style file name.
  18061. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  18062. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  18063. + done
  18064. + IFS=$lt_save_ifs
  18065. + # Convert to MSYS style.
  18066. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  18067. + ;;
  18068. + cygwin*)
  18069. + # Convert to unix form, then to dos form, then back to unix form
  18070. + # but this time dos style (no spaces!) so that the unix form looks
  18071. + # like /cygdrive/c/PROGRA~1:/cygdr...
  18072. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  18073. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  18074. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  18075. + ;;
  18076. + *)
  18077. + sys_lib_search_path_spec="$LIB"
  18078. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  18079. + # It is most probably a Windows format PATH.
  18080. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  18081. + else
  18082. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  18083. + fi
  18084. + # FIXME: find the short name or the path components, as spaces are
  18085. + # common. (e.g. "Program Files" -> "PROGRA~1")
  18086. + ;;
  18087. + esac
  18088. +
  18089. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  18090. + postinstall_cmds='base_file=`basename \${file}`~
  18091. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  18092. + dldir=$destdir/`dirname \$dlpath`~
  18093. + test -d \$dldir || mkdir -p \$dldir~
  18094. + $install_prog $dir/$dlname \$dldir/$dlname'
  18095. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  18096. + dlpath=$dir/\$dldll~
  18097. + $RM \$dlpath'
  18098. + shlibpath_overrides_runpath=yes
  18099. + dynamic_linker='Win32 link.exe'
  18100. ;;
  18101. *)
  18102. + # Assume MSVC wrapper
  18103. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  18104. + dynamic_linker='Win32 ld.exe'
  18105. ;;
  18106. esac
  18107. - dynamic_linker='Win32 ld.exe'
  18108. # FIXME: first we should search . and the directory the executable is in
  18109. shlibpath_var=PATH
  18110. ;;
  18111. @@ -11635,7 +12284,7 @@ else
  18112. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  18113. lt_status=$lt_dlunknown
  18114. cat > conftest.$ac_ext <<_LT_EOF
  18115. -#line 11638 "configure"
  18116. +#line $LINENO "configure"
  18117. #include "confdefs.h"
  18118. #if HAVE_DLFCN_H
  18119. @@ -11679,10 +12328,10 @@ else
  18120. /* When -fvisbility=hidden is used, assume the code has been annotated
  18121. correspondingly for the symbols needed. */
  18122. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  18123. -void fnord () __attribute__((visibility("default")));
  18124. +int fnord () __attribute__((visibility("default")));
  18125. #endif
  18126. -void fnord () { int i=42; }
  18127. +int fnord () { return 42; }
  18128. int main ()
  18129. {
  18130. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  18131. @@ -11741,7 +12390,7 @@ else
  18132. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  18133. lt_status=$lt_dlunknown
  18134. cat > conftest.$ac_ext <<_LT_EOF
  18135. -#line 11744 "configure"
  18136. +#line $LINENO "configure"
  18137. #include "confdefs.h"
  18138. #if HAVE_DLFCN_H
  18139. @@ -11785,10 +12434,10 @@ else
  18140. /* When -fvisbility=hidden is used, assume the code has been annotated
  18141. correspondingly for the symbols needed. */
  18142. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  18143. -void fnord () __attribute__((visibility("default")));
  18144. +int fnord () __attribute__((visibility("default")));
  18145. #endif
  18146. -void fnord () { int i=42; }
  18147. +int fnord () { return 42; }
  18148. int main ()
  18149. {
  18150. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  18151. @@ -14473,13 +15122,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  18152. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  18153. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  18154. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  18155. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  18156. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  18157. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  18158. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  18159. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  18160. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  18161. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  18162. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  18163. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  18164. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  18165. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  18166. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  18167. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  18168. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  18169. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  18170. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  18171. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  18172. @@ -14494,14 +15150,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  18173. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  18174. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  18175. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  18176. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  18177. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  18178. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  18179. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  18180. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  18181. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  18182. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  18183. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  18184. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  18185. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  18186. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  18187. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  18188. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  18189. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  18190. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  18191. @@ -14534,12 +15193,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  18192. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  18193. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  18194. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  18195. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  18196. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  18197. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  18198. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  18199. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  18200. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  18201. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  18202. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  18203. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  18204. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  18205. @@ -14594,8 +15253,13 @@ reload_flag \
  18206. OBJDUMP \
  18207. deplibs_check_method \
  18208. file_magic_cmd \
  18209. +file_magic_glob \
  18210. +want_nocaseglob \
  18211. +DLLTOOL \
  18212. +sharedlib_from_linklib_cmd \
  18213. AR \
  18214. AR_FLAGS \
  18215. +archiver_list_spec \
  18216. STRIP \
  18217. RANLIB \
  18218. CC \
  18219. @@ -14605,12 +15269,14 @@ lt_cv_sys_global_symbol_pipe \
  18220. lt_cv_sys_global_symbol_to_cdecl \
  18221. lt_cv_sys_global_symbol_to_c_name_address \
  18222. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  18223. +nm_file_list_spec \
  18224. lt_prog_compiler_no_builtin_flag \
  18225. -lt_prog_compiler_wl \
  18226. lt_prog_compiler_pic \
  18227. +lt_prog_compiler_wl \
  18228. lt_prog_compiler_static \
  18229. lt_cv_prog_compiler_c_o \
  18230. need_locks \
  18231. +MANIFEST_TOOL \
  18232. DSYMUTIL \
  18233. NMEDIT \
  18234. LIPO \
  18235. @@ -14626,7 +15292,6 @@ no_undefined_flag \
  18236. hardcode_libdir_flag_spec \
  18237. hardcode_libdir_flag_spec_ld \
  18238. hardcode_libdir_separator \
  18239. -fix_srcfile_path \
  18240. exclude_expsyms \
  18241. include_expsyms \
  18242. file_list_spec \
  18243. @@ -14662,6 +15327,7 @@ module_cmds \
  18244. module_expsym_cmds \
  18245. export_symbols_cmds \
  18246. prelink_cmds \
  18247. +postlink_cmds \
  18248. postinstall_cmds \
  18249. postuninstall_cmds \
  18250. finish_cmds \
  18251. @@ -15418,7 +16084,8 @@ $as_echo X"$file" |
  18252. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  18253. #
  18254. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  18255. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  18256. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  18257. +# Inc.
  18258. # Written by Gordon Matzigkeit, 1996
  18259. #
  18260. # This file is part of GNU Libtool.
  18261. @@ -15521,19 +16188,42 @@ SP2NL=$lt_lt_SP2NL
  18262. # turn newlines into spaces.
  18263. NL2SP=$lt_lt_NL2SP
  18264. +# convert \$build file names to \$host format.
  18265. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  18266. +
  18267. +# convert \$build files to toolchain format.
  18268. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  18269. +
  18270. # An object symbol dumper.
  18271. OBJDUMP=$lt_OBJDUMP
  18272. # Method to check whether dependent libraries are shared objects.
  18273. deplibs_check_method=$lt_deplibs_check_method
  18274. -# Command to use when deplibs_check_method == "file_magic".
  18275. +# Command to use when deplibs_check_method = "file_magic".
  18276. file_magic_cmd=$lt_file_magic_cmd
  18277. +# How to find potential files when deplibs_check_method = "file_magic".
  18278. +file_magic_glob=$lt_file_magic_glob
  18279. +
  18280. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  18281. +want_nocaseglob=$lt_want_nocaseglob
  18282. +
  18283. +# DLL creation program.
  18284. +DLLTOOL=$lt_DLLTOOL
  18285. +
  18286. +# Command to associate shared and link libraries.
  18287. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  18288. +
  18289. # The archiver.
  18290. AR=$lt_AR
  18291. +
  18292. +# Flags to create an archive.
  18293. AR_FLAGS=$lt_AR_FLAGS
  18294. +# How to feed a file listing to the archiver.
  18295. +archiver_list_spec=$lt_archiver_list_spec
  18296. +
  18297. # A symbol stripping program.
  18298. STRIP=$lt_STRIP
  18299. @@ -15563,6 +16253,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  18300. # Transform the output of nm in a C name address pair when lib prefix is needed.
  18301. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  18302. +# Specify filename containing input files for \$NM.
  18303. +nm_file_list_spec=$lt_nm_file_list_spec
  18304. +
  18305. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  18306. +lt_sysroot=$lt_sysroot
  18307. +
  18308. # The name of the directory that contains temporary libtool files.
  18309. objdir=$objdir
  18310. @@ -15572,6 +16268,9 @@ MAGIC_CMD=$MAGIC_CMD
  18311. # Must we lock files when doing compilation?
  18312. need_locks=$lt_need_locks
  18313. +# Manifest tool.
  18314. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  18315. +
  18316. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  18317. DSYMUTIL=$lt_DSYMUTIL
  18318. @@ -15686,12 +16385,12 @@ with_gcc=$GCC
  18319. # Compiler flag to turn off builtin functions.
  18320. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  18321. -# How to pass a linker flag through the compiler.
  18322. -wl=$lt_lt_prog_compiler_wl
  18323. -
  18324. # Additional compiler flags for building library objects.
  18325. pic_flag=$lt_lt_prog_compiler_pic
  18326. +# How to pass a linker flag through the compiler.
  18327. +wl=$lt_lt_prog_compiler_wl
  18328. +
  18329. # Compiler flag to prevent dynamic linking.
  18330. link_static_flag=$lt_lt_prog_compiler_static
  18331. @@ -15778,9 +16477,6 @@ inherit_rpath=$inherit_rpath
  18332. # Whether libtool must link a program against all its dependency libraries.
  18333. link_all_deplibs=$link_all_deplibs
  18334. -# Fix the shell variable \$srcfile for the compiler.
  18335. -fix_srcfile_path=$lt_fix_srcfile_path
  18336. -
  18337. # Set to "yes" if exported symbols are required.
  18338. always_export_symbols=$always_export_symbols
  18339. @@ -15796,6 +16492,9 @@ include_expsyms=$lt_include_expsyms
  18340. # Commands necessary for linking programs (against libraries) with templates.
  18341. prelink_cmds=$lt_prelink_cmds
  18342. +# Commands necessary for finishing linking programs.
  18343. +postlink_cmds=$lt_postlink_cmds
  18344. +
  18345. # Specify filename containing input files.
  18346. file_list_spec=$lt_file_list_spec
  18347. @@ -15828,210 +16527,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  18348. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  18349. # text mode, it properly converts lines to CR/LF. This bash problem
  18350. # is reportedly fixed, but why not run on old versions too?
  18351. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  18352. - || (rm -f "$cfgfile"; exit 1)
  18353. -
  18354. - case $xsi_shell in
  18355. - yes)
  18356. - cat << \_LT_EOF >> "$cfgfile"
  18357. -
  18358. -# func_dirname file append nondir_replacement
  18359. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  18360. -# otherwise set result to NONDIR_REPLACEMENT.
  18361. -func_dirname ()
  18362. -{
  18363. - case ${1} in
  18364. - */*) func_dirname_result="${1%/*}${2}" ;;
  18365. - * ) func_dirname_result="${3}" ;;
  18366. - esac
  18367. -}
  18368. -
  18369. -# func_basename file
  18370. -func_basename ()
  18371. -{
  18372. - func_basename_result="${1##*/}"
  18373. -}
  18374. -
  18375. -# func_dirname_and_basename file append nondir_replacement
  18376. -# perform func_basename and func_dirname in a single function
  18377. -# call:
  18378. -# dirname: Compute the dirname of FILE. If nonempty,
  18379. -# add APPEND to the result, otherwise set result
  18380. -# to NONDIR_REPLACEMENT.
  18381. -# value returned in "$func_dirname_result"
  18382. -# basename: Compute filename of FILE.
  18383. -# value retuned in "$func_basename_result"
  18384. -# Implementation must be kept synchronized with func_dirname
  18385. -# and func_basename. For efficiency, we do not delegate to
  18386. -# those functions but instead duplicate the functionality here.
  18387. -func_dirname_and_basename ()
  18388. -{
  18389. - case ${1} in
  18390. - */*) func_dirname_result="${1%/*}${2}" ;;
  18391. - * ) func_dirname_result="${3}" ;;
  18392. - esac
  18393. - func_basename_result="${1##*/}"
  18394. -}
  18395. -
  18396. -# func_stripname prefix suffix name
  18397. -# strip PREFIX and SUFFIX off of NAME.
  18398. -# PREFIX and SUFFIX must not contain globbing or regex special
  18399. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  18400. -# dot (in which case that matches only a dot).
  18401. -func_stripname ()
  18402. -{
  18403. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  18404. - # positional parameters, so assign one to ordinary parameter first.
  18405. - func_stripname_result=${3}
  18406. - func_stripname_result=${func_stripname_result#"${1}"}
  18407. - func_stripname_result=${func_stripname_result%"${2}"}
  18408. -}
  18409. -
  18410. -# func_opt_split
  18411. -func_opt_split ()
  18412. -{
  18413. - func_opt_split_opt=${1%%=*}
  18414. - func_opt_split_arg=${1#*=}
  18415. -}
  18416. -
  18417. -# func_lo2o object
  18418. -func_lo2o ()
  18419. -{
  18420. - case ${1} in
  18421. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  18422. - *) func_lo2o_result=${1} ;;
  18423. - esac
  18424. -}
  18425. -
  18426. -# func_xform libobj-or-source
  18427. -func_xform ()
  18428. -{
  18429. - func_xform_result=${1%.*}.lo
  18430. -}
  18431. -
  18432. -# func_arith arithmetic-term...
  18433. -func_arith ()
  18434. -{
  18435. - func_arith_result=$(( $* ))
  18436. -}
  18437. -
  18438. -# func_len string
  18439. -# STRING may not start with a hyphen.
  18440. -func_len ()
  18441. -{
  18442. - func_len_result=${#1}
  18443. -}
  18444. -
  18445. -_LT_EOF
  18446. - ;;
  18447. - *) # Bourne compatible functions.
  18448. - cat << \_LT_EOF >> "$cfgfile"
  18449. -
  18450. -# func_dirname file append nondir_replacement
  18451. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  18452. -# otherwise set result to NONDIR_REPLACEMENT.
  18453. -func_dirname ()
  18454. -{
  18455. - # Extract subdirectory from the argument.
  18456. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  18457. - if test "X$func_dirname_result" = "X${1}"; then
  18458. - func_dirname_result="${3}"
  18459. - else
  18460. - func_dirname_result="$func_dirname_result${2}"
  18461. - fi
  18462. -}
  18463. -
  18464. -# func_basename file
  18465. -func_basename ()
  18466. -{
  18467. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  18468. -}
  18469. -
  18470. -
  18471. -# func_stripname prefix suffix name
  18472. -# strip PREFIX and SUFFIX off of NAME.
  18473. -# PREFIX and SUFFIX must not contain globbing or regex special
  18474. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  18475. -# dot (in which case that matches only a dot).
  18476. -# func_strip_suffix prefix name
  18477. -func_stripname ()
  18478. -{
  18479. - case ${2} in
  18480. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  18481. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  18482. - esac
  18483. -}
  18484. -
  18485. -# sed scripts:
  18486. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  18487. -my_sed_long_arg='1s/^-[^=]*=//'
  18488. -
  18489. -# func_opt_split
  18490. -func_opt_split ()
  18491. -{
  18492. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  18493. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  18494. -}
  18495. -
  18496. -# func_lo2o object
  18497. -func_lo2o ()
  18498. -{
  18499. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  18500. -}
  18501. -
  18502. -# func_xform libobj-or-source
  18503. -func_xform ()
  18504. -{
  18505. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  18506. -}
  18507. -
  18508. -# func_arith arithmetic-term...
  18509. -func_arith ()
  18510. -{
  18511. - func_arith_result=`expr "$@"`
  18512. -}
  18513. -
  18514. -# func_len string
  18515. -# STRING may not start with a hyphen.
  18516. -func_len ()
  18517. -{
  18518. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  18519. -}
  18520. -
  18521. -_LT_EOF
  18522. -esac
  18523. -
  18524. -case $lt_shell_append in
  18525. - yes)
  18526. - cat << \_LT_EOF >> "$cfgfile"
  18527. -
  18528. -# func_append var value
  18529. -# Append VALUE to the end of shell variable VAR.
  18530. -func_append ()
  18531. -{
  18532. - eval "$1+=\$2"
  18533. -}
  18534. -_LT_EOF
  18535. - ;;
  18536. - *)
  18537. - cat << \_LT_EOF >> "$cfgfile"
  18538. -
  18539. -# func_append var value
  18540. -# Append VALUE to the end of shell variable VAR.
  18541. -func_append ()
  18542. -{
  18543. - eval "$1=\$$1\$2"
  18544. -}
  18545. -
  18546. -_LT_EOF
  18547. - ;;
  18548. - esac
  18549. -
  18550. -
  18551. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  18552. - || (rm -f "$cfgfile"; exit 1)
  18553. -
  18554. - mv -f "$cfgfile" "$ofile" ||
  18555. + sed '$q' "$ltmain" >> "$cfgfile" \
  18556. + || (rm -f "$cfgfile"; exit 1)
  18557. +
  18558. + if test x"$xsi_shell" = xyes; then
  18559. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  18560. +func_dirname ()\
  18561. +{\
  18562. +\ case ${1} in\
  18563. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  18564. +\ * ) func_dirname_result="${3}" ;;\
  18565. +\ esac\
  18566. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  18567. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18568. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18569. +test 0 -eq $? || _lt_function_replace_fail=:
  18570. +
  18571. +
  18572. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  18573. +func_basename ()\
  18574. +{\
  18575. +\ func_basename_result="${1##*/}"\
  18576. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  18577. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18578. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18579. +test 0 -eq $? || _lt_function_replace_fail=:
  18580. +
  18581. +
  18582. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  18583. +func_dirname_and_basename ()\
  18584. +{\
  18585. +\ case ${1} in\
  18586. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  18587. +\ * ) func_dirname_result="${3}" ;;\
  18588. +\ esac\
  18589. +\ func_basename_result="${1##*/}"\
  18590. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  18591. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18592. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18593. +test 0 -eq $? || _lt_function_replace_fail=:
  18594. +
  18595. +
  18596. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  18597. +func_stripname ()\
  18598. +{\
  18599. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  18600. +\ # positional parameters, so assign one to ordinary parameter first.\
  18601. +\ func_stripname_result=${3}\
  18602. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  18603. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  18604. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  18605. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18606. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18607. +test 0 -eq $? || _lt_function_replace_fail=:
  18608. +
  18609. +
  18610. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  18611. +func_split_long_opt ()\
  18612. +{\
  18613. +\ func_split_long_opt_name=${1%%=*}\
  18614. +\ func_split_long_opt_arg=${1#*=}\
  18615. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  18616. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18617. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18618. +test 0 -eq $? || _lt_function_replace_fail=:
  18619. +
  18620. +
  18621. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  18622. +func_split_short_opt ()\
  18623. +{\
  18624. +\ func_split_short_opt_arg=${1#??}\
  18625. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  18626. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  18627. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18628. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18629. +test 0 -eq $? || _lt_function_replace_fail=:
  18630. +
  18631. +
  18632. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  18633. +func_lo2o ()\
  18634. +{\
  18635. +\ case ${1} in\
  18636. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  18637. +\ *) func_lo2o_result=${1} ;;\
  18638. +\ esac\
  18639. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  18640. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18641. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18642. +test 0 -eq $? || _lt_function_replace_fail=:
  18643. +
  18644. +
  18645. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  18646. +func_xform ()\
  18647. +{\
  18648. + func_xform_result=${1%.*}.lo\
  18649. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  18650. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18651. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18652. +test 0 -eq $? || _lt_function_replace_fail=:
  18653. +
  18654. +
  18655. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  18656. +func_arith ()\
  18657. +{\
  18658. + func_arith_result=$(( $* ))\
  18659. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  18660. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18661. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18662. +test 0 -eq $? || _lt_function_replace_fail=:
  18663. +
  18664. +
  18665. + sed -e '/^func_len ()$/,/^} # func_len /c\
  18666. +func_len ()\
  18667. +{\
  18668. + func_len_result=${#1}\
  18669. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  18670. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18671. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18672. +test 0 -eq $? || _lt_function_replace_fail=:
  18673. +
  18674. +fi
  18675. +
  18676. +if test x"$lt_shell_append" = xyes; then
  18677. + sed -e '/^func_append ()$/,/^} # func_append /c\
  18678. +func_append ()\
  18679. +{\
  18680. + eval "${1}+=\\${2}"\
  18681. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  18682. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18683. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18684. +test 0 -eq $? || _lt_function_replace_fail=:
  18685. +
  18686. +
  18687. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  18688. +func_append_quoted ()\
  18689. +{\
  18690. +\ func_quote_for_eval "${2}"\
  18691. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  18692. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  18693. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18694. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18695. +test 0 -eq $? || _lt_function_replace_fail=:
  18696. +
  18697. +
  18698. + # Save a `func_append' function call where possible by direct use of '+='
  18699. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  18700. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18701. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18702. + test 0 -eq $? || _lt_function_replace_fail=:
  18703. +else
  18704. + # Save a `func_append' function call even when '+=' is not available
  18705. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  18706. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  18707. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  18708. + test 0 -eq $? || _lt_function_replace_fail=:
  18709. +fi
  18710. +
  18711. +if test x"$_lt_function_replace_fail" = x":"; then
  18712. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  18713. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  18714. +fi
  18715. +
  18716. +
  18717. + mv -f "$cfgfile" "$ofile" ||
  18718. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  18719. chmod +x "$ofile"
  18720. diff --git a/libtool.m4 b/libtool.m4
  18721. index ad63ebbb385..b65c22bf80d 100644
  18722. --- a/libtool.m4
  18723. +++ b/libtool.m4
  18724. @@ -1,7 +1,8 @@
  18725. # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  18726. #
  18727. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  18728. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  18729. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  18730. +# Inc.
  18731. # Written by Gordon Matzigkeit, 1996
  18732. #
  18733. # This file is free software; the Free Software Foundation gives
  18734. @@ -10,7 +11,8 @@
  18735. m4_define([_LT_COPYING], [dnl
  18736. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  18737. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  18738. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  18739. +# Inc.
  18740. # Written by Gordon Matzigkeit, 1996
  18741. #
  18742. # This file is part of GNU Libtool.
  18743. @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
  18744. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  18745. ])
  18746. -# serial 56 LT_INIT
  18747. +# serial 57 LT_INIT
  18748. # LT_PREREQ(VERSION)
  18749. @@ -166,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
  18750. dnl
  18751. m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  18752. m4_require([_LT_CHECK_SHELL_FEATURES])dnl
  18753. +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
  18754. m4_require([_LT_CMD_RELOAD])dnl
  18755. m4_require([_LT_CHECK_MAGIC_METHOD])dnl
  18756. +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
  18757. m4_require([_LT_CMD_OLD_ARCHIVE])dnl
  18758. m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
  18759. +m4_require([_LT_WITH_SYSROOT])dnl
  18760. _LT_CONFIG_LIBTOOL_INIT([
  18761. # See if we are running on zsh, and set the options which allow our
  18762. @@ -632,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
  18763. m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
  18764. configured by $[0], generated by m4_PACKAGE_STRING.
  18765. -Copyright (C) 2009 Free Software Foundation, Inc.
  18766. +Copyright (C) 2010 Free Software Foundation, Inc.
  18767. This config.lt script is free software; the Free Software Foundation
  18768. gives unlimited permision to copy, distribute and modify it."
  18769. @@ -746,15 +751,12 @@ _LT_EOF
  18770. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  18771. # text mode, it properly converts lines to CR/LF. This bash problem
  18772. # is reportedly fixed, but why not run on old versions too?
  18773. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  18774. - || (rm -f "$cfgfile"; exit 1)
  18775. + sed '$q' "$ltmain" >> "$cfgfile" \
  18776. + || (rm -f "$cfgfile"; exit 1)
  18777. - _LT_PROG_XSI_SHELLFNS
  18778. + _LT_PROG_REPLACE_SHELLFNS
  18779. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  18780. - || (rm -f "$cfgfile"; exit 1)
  18781. -
  18782. - mv -f "$cfgfile" "$ofile" ||
  18783. + mv -f "$cfgfile" "$ofile" ||
  18784. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  18785. chmod +x "$ofile"
  18786. ],
  18787. @@ -980,6 +982,8 @@ _LT_EOF
  18788. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
  18789. echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
  18790. $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
  18791. + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
  18792. + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
  18793. cat > conftest.c << _LT_EOF
  18794. int main() { return 0;}
  18795. _LT_EOF
  18796. @@ -1069,30 +1073,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
  18797. fi
  18798. ])
  18799. -# _LT_SYS_MODULE_PATH_AIX
  18800. -# -----------------------
  18801. +# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
  18802. +# ----------------------------------
  18803. # Links a minimal program and checks the executable
  18804. # for the system default hardcoded library path. In most cases,
  18805. # this is /usr/lib:/lib, but when the MPI compilers are used
  18806. # the location of the communication and MPI libs are included too.
  18807. # If we don't find anything, use the default library path according
  18808. # to the aix ld manual.
  18809. +# Store the results from the different compilers for each TAGNAME.
  18810. +# Allow to override them for all tags through lt_cv_aix_libpath.
  18811. m4_defun([_LT_SYS_MODULE_PATH_AIX],
  18812. [m4_require([_LT_DECL_SED])dnl
  18813. -AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[
  18814. -lt_aix_libpath_sed='
  18815. - /Import File Strings/,/^$/ {
  18816. - /^0/ {
  18817. - s/^0 *\(.*\)$/\1/
  18818. - p
  18819. - }
  18820. - }'
  18821. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18822. -# Check for a 64-bit object if we didn't find anything.
  18823. -if test -z "$aix_libpath"; then
  18824. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18825. -fi],[])
  18826. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  18827. +if test "${lt_cv_aix_libpath+set}" = set; then
  18828. + aix_libpath=$lt_cv_aix_libpath
  18829. +else
  18830. + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
  18831. + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
  18832. + lt_aix_libpath_sed='[
  18833. + /Import File Strings/,/^$/ {
  18834. + /^0/ {
  18835. + s/^0 *\([^ ]*\) *$/\1/
  18836. + p
  18837. + }
  18838. + }]'
  18839. + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18840. + # Check for a 64-bit object if we didn't find anything.
  18841. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  18842. + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18843. + fi],[])
  18844. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  18845. + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
  18846. + fi
  18847. + ])
  18848. + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
  18849. +fi
  18850. ])# _LT_SYS_MODULE_PATH_AIX
  18851. @@ -1117,7 +1132,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  18852. AC_MSG_CHECKING([how to print strings])
  18853. # Test print first, because it will be a builtin if present.
  18854. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  18855. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  18856. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  18857. ECHO='print -r --'
  18858. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  18859. @@ -1161,6 +1176,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
  18860. ])# _LT_PROG_ECHO_BACKSLASH
  18861. +# _LT_WITH_SYSROOT
  18862. +# ----------------
  18863. +AC_DEFUN([_LT_WITH_SYSROOT],
  18864. +[AC_MSG_CHECKING([for sysroot])
  18865. +AC_ARG_WITH([libtool-sysroot],
  18866. +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
  18867. + (or the compiler's sysroot if not specified).],
  18868. +[], [with_libtool_sysroot=no])
  18869. +
  18870. +dnl lt_sysroot will always be passed unquoted. We quote it here
  18871. +dnl in case the user passed a directory name.
  18872. +lt_sysroot=
  18873. +case ${with_libtool_sysroot} in #(
  18874. + yes)
  18875. + if test "$GCC" = yes; then
  18876. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  18877. + fi
  18878. + ;; #(
  18879. + /*)
  18880. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  18881. + ;; #(
  18882. + no|'')
  18883. + ;; #(
  18884. + *)
  18885. + AC_MSG_RESULT([${with_libtool_sysroot}])
  18886. + AC_MSG_ERROR([The sysroot must be an absolute path.])
  18887. + ;;
  18888. +esac
  18889. +
  18890. + AC_MSG_RESULT([${lt_sysroot:-no}])
  18891. +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
  18892. +[dependent libraries, and in which our libraries should be installed.])])
  18893. +
  18894. # _LT_ENABLE_LOCK
  18895. # ---------------
  18896. m4_defun([_LT_ENABLE_LOCK],
  18897. @@ -1320,6 +1368,51 @@ need_locks="$enable_libtool_lock"
  18898. ])# _LT_ENABLE_LOCK
  18899. +# _LT_PROG_AR
  18900. +# -----------
  18901. +m4_defun([_LT_PROG_AR],
  18902. +[AC_CHECK_TOOLS(AR, [ar], false)
  18903. + touch conftest.c
  18904. + $AR $plugin_option rc conftest.a conftest.c
  18905. + if test "$?" != 0; then
  18906. + AC_MSG_WARN([Failed: $AR $plugin_option rc])
  18907. + else
  18908. + AR="$AR $plugin_option"
  18909. + fi
  18910. + rm -f conftest.*
  18911. +: ${AR=ar}
  18912. +: ${AR_FLAGS=cru}
  18913. +_LT_DECL([], [AR], [1], [The archiver])
  18914. +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
  18915. +
  18916. +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
  18917. + [lt_cv_ar_at_file=no
  18918. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
  18919. + [echo conftest.$ac_objext > conftest.lst
  18920. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
  18921. + AC_TRY_EVAL([lt_ar_try])
  18922. + if test "$ac_status" -eq 0; then
  18923. + # Ensure the archiver fails upon bogus file names.
  18924. + rm -f conftest.$ac_objext libconftest.a
  18925. + AC_TRY_EVAL([lt_ar_try])
  18926. + if test "$ac_status" -ne 0; then
  18927. + lt_cv_ar_at_file=@
  18928. + fi
  18929. + fi
  18930. + rm -f conftest.* libconftest.a
  18931. + ])
  18932. + ])
  18933. +
  18934. +if test "x$lt_cv_ar_at_file" = xno; then
  18935. + archiver_list_spec=
  18936. +else
  18937. + archiver_list_spec=$lt_cv_ar_at_file
  18938. +fi
  18939. +_LT_DECL([], [archiver_list_spec], [1],
  18940. + [How to feed a file listing to the archiver])
  18941. +])# _LT_PROG_AR
  18942. +
  18943. +
  18944. # _LT_CMD_OLD_ARCHIVE
  18945. # -------------------
  18946. m4_defun([_LT_CMD_OLD_ARCHIVE],
  18947. @@ -1336,23 +1429,7 @@ for plugin in $plugin_names; do
  18948. fi
  18949. done
  18950. -AC_CHECK_TOOL(AR, ar, false)
  18951. -test -z "$AR" && AR=ar
  18952. -if test -n "$plugin_option"; then
  18953. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  18954. - touch conftest.c
  18955. - $AR $plugin_option rc conftest.a conftest.c
  18956. - if test "$?" != 0; then
  18957. - AC_MSG_WARN([Failed: $AR $plugin_option rc])
  18958. - else
  18959. - AR="$AR $plugin_option"
  18960. - fi
  18961. - rm -f conftest.*
  18962. - fi
  18963. -fi
  18964. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  18965. -_LT_DECL([], [AR], [1], [The archiver])
  18966. -_LT_DECL([], [AR_FLAGS], [1])
  18967. +_LT_PROG_AR
  18968. AC_CHECK_TOOL(STRIP, strip, :)
  18969. test -z "$STRIP" && STRIP=:
  18970. @@ -1653,7 +1730,7 @@ else
  18971. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  18972. lt_status=$lt_dlunknown
  18973. cat > conftest.$ac_ext <<_LT_EOF
  18974. -[#line __oline__ "configure"
  18975. +[#line $LINENO "configure"
  18976. #include "confdefs.h"
  18977. #if HAVE_DLFCN_H
  18978. @@ -1697,10 +1774,10 @@ else
  18979. /* When -fvisbility=hidden is used, assume the code has been annotated
  18980. correspondingly for the symbols needed. */
  18981. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  18982. -void fnord () __attribute__((visibility("default")));
  18983. +int fnord () __attribute__((visibility("default")));
  18984. #endif
  18985. -void fnord () { int i=42; }
  18986. +int fnord () { return 42; }
  18987. int main ()
  18988. {
  18989. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  18990. @@ -2240,8 +2317,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  18991. need_version=no
  18992. need_lib_prefix=no
  18993. - case $GCC,$host_os in
  18994. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  18995. + case $GCC,$cc_basename in
  18996. + yes,*)
  18997. + # gcc
  18998. library_names_spec='$libname.dll.a'
  18999. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  19000. postinstall_cmds='base_file=`basename \${file}`~
  19001. @@ -2274,13 +2352,71 @@ m4_if([$1], [],[
  19002. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
  19003. ;;
  19004. esac
  19005. + dynamic_linker='Win32 ld.exe'
  19006. + ;;
  19007. +
  19008. + *,cl*)
  19009. + # Native MSVC
  19010. + libname_spec='$name'
  19011. + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
  19012. + library_names_spec='${libname}.dll.lib'
  19013. +
  19014. + case $build_os in
  19015. + mingw*)
  19016. + sys_lib_search_path_spec=
  19017. + lt_save_ifs=$IFS
  19018. + IFS=';'
  19019. + for lt_path in $LIB
  19020. + do
  19021. + IFS=$lt_save_ifs
  19022. + # Let DOS variable expansion print the short 8.3 style file name.
  19023. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  19024. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  19025. + done
  19026. + IFS=$lt_save_ifs
  19027. + # Convert to MSYS style.
  19028. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
  19029. + ;;
  19030. + cygwin*)
  19031. + # Convert to unix form, then to dos form, then back to unix form
  19032. + # but this time dos style (no spaces!) so that the unix form looks
  19033. + # like /cygdrive/c/PROGRA~1:/cygdr...
  19034. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  19035. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  19036. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  19037. + ;;
  19038. + *)
  19039. + sys_lib_search_path_spec="$LIB"
  19040. + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
  19041. + # It is most probably a Windows format PATH.
  19042. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  19043. + else
  19044. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  19045. + fi
  19046. + # FIXME: find the short name or the path components, as spaces are
  19047. + # common. (e.g. "Program Files" -> "PROGRA~1")
  19048. + ;;
  19049. + esac
  19050. +
  19051. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  19052. + postinstall_cmds='base_file=`basename \${file}`~
  19053. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  19054. + dldir=$destdir/`dirname \$dlpath`~
  19055. + test -d \$dldir || mkdir -p \$dldir~
  19056. + $install_prog $dir/$dlname \$dldir/$dlname'
  19057. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  19058. + dlpath=$dir/\$dldll~
  19059. + $RM \$dlpath'
  19060. + shlibpath_overrides_runpath=yes
  19061. + dynamic_linker='Win32 link.exe'
  19062. ;;
  19063. *)
  19064. + # Assume MSVC wrapper
  19065. library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
  19066. + dynamic_linker='Win32 ld.exe'
  19067. ;;
  19068. esac
  19069. - dynamic_linker='Win32 ld.exe'
  19070. # FIXME: first we should search . and the directory the executable is in
  19071. shlibpath_var=PATH
  19072. ;;
  19073. @@ -2970,6 +3106,11 @@ case $reload_flag in
  19074. esac
  19075. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  19076. case $host_os in
  19077. + cygwin* | mingw* | pw32* | cegcc*)
  19078. + if test "$GCC" != yes; then
  19079. + reload_cmds=false
  19080. + fi
  19081. + ;;
  19082. darwin*)
  19083. if test "$GCC" = yes; then
  19084. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  19085. @@ -3036,7 +3177,8 @@ mingw* | pw32*)
  19086. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  19087. lt_cv_file_magic_cmd='func_win32_libid'
  19088. else
  19089. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  19090. + # Keep this pattern in sync with the one in func_win32_libid.
  19091. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  19092. lt_cv_file_magic_cmd='$OBJDUMP -f'
  19093. fi
  19094. ;;
  19095. @@ -3187,6 +3329,21 @@ tpf*)
  19096. ;;
  19097. esac
  19098. ])
  19099. +
  19100. +file_magic_glob=
  19101. +want_nocaseglob=no
  19102. +if test "$build" = "$host"; then
  19103. + case $host_os in
  19104. + mingw* | pw32*)
  19105. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  19106. + want_nocaseglob=yes
  19107. + else
  19108. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
  19109. + fi
  19110. + ;;
  19111. + esac
  19112. +fi
  19113. +
  19114. file_magic_cmd=$lt_cv_file_magic_cmd
  19115. deplibs_check_method=$lt_cv_deplibs_check_method
  19116. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  19117. @@ -3194,7 +3351,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  19118. _LT_DECL([], [deplibs_check_method], [1],
  19119. [Method to check whether dependent libraries are shared objects])
  19120. _LT_DECL([], [file_magic_cmd], [1],
  19121. - [Command to use when deplibs_check_method == "file_magic"])
  19122. + [Command to use when deplibs_check_method = "file_magic"])
  19123. +_LT_DECL([], [file_magic_glob], [1],
  19124. + [How to find potential files when deplibs_check_method = "file_magic"])
  19125. +_LT_DECL([], [want_nocaseglob], [1],
  19126. + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
  19127. ])# _LT_CHECK_MAGIC_METHOD
  19128. @@ -3305,6 +3466,67 @@ dnl aclocal-1.4 backwards compatibility:
  19129. dnl AC_DEFUN([AM_PROG_NM], [])
  19130. dnl AC_DEFUN([AC_PROG_NM], [])
  19131. +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
  19132. +# --------------------------------
  19133. +# how to determine the name of the shared library
  19134. +# associated with a specific link library.
  19135. +# -- PORTME fill in with the dynamic library characteristics
  19136. +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
  19137. +[m4_require([_LT_DECL_EGREP])
  19138. +m4_require([_LT_DECL_OBJDUMP])
  19139. +m4_require([_LT_DECL_DLLTOOL])
  19140. +AC_CACHE_CHECK([how to associate runtime and link libraries],
  19141. +lt_cv_sharedlib_from_linklib_cmd,
  19142. +[lt_cv_sharedlib_from_linklib_cmd='unknown'
  19143. +
  19144. +case $host_os in
  19145. +cygwin* | mingw* | pw32* | cegcc*)
  19146. + # two different shell functions defined in ltmain.sh
  19147. + # decide which to use based on capabilities of $DLLTOOL
  19148. + case `$DLLTOOL --help 2>&1` in
  19149. + *--identify-strict*)
  19150. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  19151. + ;;
  19152. + *)
  19153. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  19154. + ;;
  19155. + esac
  19156. + ;;
  19157. +*)
  19158. + # fallback: assume linklib IS sharedlib
  19159. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  19160. + ;;
  19161. +esac
  19162. +])
  19163. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  19164. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  19165. +
  19166. +_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
  19167. + [Command to associate shared and link libraries])
  19168. +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
  19169. +
  19170. +
  19171. +# _LT_PATH_MANIFEST_TOOL
  19172. +# ----------------------
  19173. +# locate the manifest tool
  19174. +m4_defun([_LT_PATH_MANIFEST_TOOL],
  19175. +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
  19176. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  19177. +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
  19178. + [lt_cv_path_mainfest_tool=no
  19179. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
  19180. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  19181. + cat conftest.err >&AS_MESSAGE_LOG_FD
  19182. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  19183. + lt_cv_path_mainfest_tool=yes
  19184. + fi
  19185. + rm -f conftest*])
  19186. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  19187. + MANIFEST_TOOL=:
  19188. +fi
  19189. +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
  19190. +])# _LT_PATH_MANIFEST_TOOL
  19191. +
  19192. # LT_LIB_M
  19193. # --------
  19194. @@ -3431,8 +3653,8 @@ esac
  19195. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  19196. # Transform an extracted symbol line into symbol name and symbol address
  19197. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
  19198. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  19199. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
  19200. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  19201. # Handle CRLF in mingw tool chain
  19202. opt_cr=
  19203. @@ -3468,6 +3690,7 @@ for ac_symprfx in "" "_"; do
  19204. else
  19205. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  19206. fi
  19207. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  19208. # Check to see that the pipe works correctly.
  19209. pipe_works=no
  19210. @@ -3501,6 +3724,18 @@ _LT_EOF
  19211. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  19212. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  19213. cat <<_LT_EOF > conftest.$ac_ext
  19214. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  19215. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  19216. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  19217. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  19218. +# define LT@&t@_DLSYM_CONST
  19219. +#elif defined(__osf__)
  19220. +/* This system does not cope well with relocations in const data. */
  19221. +# define LT@&t@_DLSYM_CONST
  19222. +#else
  19223. +# define LT@&t@_DLSYM_CONST const
  19224. +#endif
  19225. +
  19226. #ifdef __cplusplus
  19227. extern "C" {
  19228. #endif
  19229. @@ -3512,7 +3747,7 @@ _LT_EOF
  19230. cat <<_LT_EOF >> conftest.$ac_ext
  19231. /* The mapping between symbol names and symbols. */
  19232. -const struct {
  19233. +LT@&t@_DLSYM_CONST struct {
  19234. const char *name;
  19235. void *address;
  19236. }
  19237. @@ -3538,15 +3773,15 @@ static const void *lt_preloaded_setup() {
  19238. _LT_EOF
  19239. # Now try linking the two files.
  19240. mv conftest.$ac_objext conftstm.$ac_objext
  19241. - lt_save_LIBS="$LIBS"
  19242. - lt_save_CFLAGS="$CFLAGS"
  19243. + lt_globsym_save_LIBS=$LIBS
  19244. + lt_globsym_save_CFLAGS=$CFLAGS
  19245. LIBS="conftstm.$ac_objext"
  19246. CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
  19247. if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
  19248. pipe_works=yes
  19249. fi
  19250. - LIBS="$lt_save_LIBS"
  19251. - CFLAGS="$lt_save_CFLAGS"
  19252. + LIBS=$lt_globsym_save_LIBS
  19253. + CFLAGS=$lt_globsym_save_CFLAGS
  19254. else
  19255. echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
  19256. fi
  19257. @@ -3579,6 +3814,13 @@ else
  19258. AC_MSG_RESULT(ok)
  19259. fi
  19260. +# Response file support.
  19261. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  19262. + nm_file_list_spec='@'
  19263. +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
  19264. + nm_file_list_spec='@'
  19265. +fi
  19266. +
  19267. _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
  19268. [Take the output of nm and produce a listing of raw symbols and C names])
  19269. _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
  19270. @@ -3589,6 +3831,8 @@ _LT_DECL([global_symbol_to_c_name_address],
  19271. _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
  19272. [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
  19273. [Transform the output of nm in a C name address pair when lib prefix is needed])
  19274. +_LT_DECL([], [nm_file_list_spec], [1],
  19275. + [Specify filename containing input files for $NM])
  19276. ]) # _LT_CMD_GLOBAL_SYMBOLS
  19277. @@ -3600,7 +3844,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
  19278. _LT_TAGVAR(lt_prog_compiler_pic, $1)=
  19279. _LT_TAGVAR(lt_prog_compiler_static, $1)=
  19280. -AC_MSG_CHECKING([for $compiler option to produce PIC])
  19281. m4_if([$1], [CXX], [
  19282. # C++ specific cases for pic, static, wl, etc.
  19283. if test "$GXX" = yes; then
  19284. @@ -3706,6 +3949,12 @@ m4_if([$1], [CXX], [
  19285. ;;
  19286. esac
  19287. ;;
  19288. + mingw* | cygwin* | os2* | pw32* | cegcc*)
  19289. + # This hack is so that the source file can tell whether it is being
  19290. + # built for inclusion in a dll (and should export symbols for example).
  19291. + m4_if([$1], [GCJ], [],
  19292. + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
  19293. + ;;
  19294. dgux*)
  19295. case $cc_basename in
  19296. ec++*)
  19297. @@ -3858,7 +4107,7 @@ m4_if([$1], [CXX], [
  19298. ;;
  19299. solaris*)
  19300. case $cc_basename in
  19301. - CC*)
  19302. + CC* | sunCC*)
  19303. # Sun C++ 4.2, 5.x and Centerline C++
  19304. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  19305. _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  19306. @@ -4081,6 +4330,12 @@ m4_if([$1], [CXX], [
  19307. _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
  19308. _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
  19309. ;;
  19310. + nagfor*)
  19311. + # NAG Fortran compiler
  19312. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
  19313. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  19314. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  19315. + ;;
  19316. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  19317. # Portland Group compilers (*not* the Pentium gcc compiler,
  19318. # which looks to be a dead project)
  19319. @@ -4143,7 +4398,7 @@ m4_if([$1], [CXX], [
  19320. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  19321. _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  19322. case $cc_basename in
  19323. - f77* | f90* | f95*)
  19324. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  19325. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
  19326. *)
  19327. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
  19328. @@ -4200,9 +4455,11 @@ case $host_os in
  19329. _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
  19330. ;;
  19331. esac
  19332. -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
  19333. -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
  19334. - [How to pass a linker flag through the compiler])
  19335. +
  19336. +AC_CACHE_CHECK([for $compiler option to produce PIC],
  19337. + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
  19338. + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
  19339. +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
  19340. #
  19341. # Check to make sure the PIC flag actually works.
  19342. @@ -4221,6 +4478,8 @@ fi
  19343. _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
  19344. [Additional compiler flags for building library objects])
  19345. +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
  19346. + [How to pass a linker flag through the compiler])
  19347. #
  19348. # Check to make sure the static flag actually works.
  19349. #
  19350. @@ -4241,6 +4500,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
  19351. m4_defun([_LT_LINKER_SHLIBS],
  19352. [AC_REQUIRE([LT_PATH_LD])dnl
  19353. AC_REQUIRE([LT_PATH_NM])dnl
  19354. +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
  19355. m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  19356. m4_require([_LT_DECL_EGREP])dnl
  19357. m4_require([_LT_DECL_SED])dnl
  19358. @@ -4249,6 +4509,7 @@ m4_require([_LT_TAG_COMPILER])dnl
  19359. AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
  19360. m4_if([$1], [CXX], [
  19361. _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  19362. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
  19363. case $host_os in
  19364. aix[[4-9]]*)
  19365. # If we're using GNU nm, then we don't want the "-C" option.
  19366. @@ -4263,15 +4524,20 @@ m4_if([$1], [CXX], [
  19367. ;;
  19368. pw32*)
  19369. _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
  19370. - ;;
  19371. + ;;
  19372. cygwin* | mingw* | cegcc*)
  19373. - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
  19374. - ;;
  19375. + case $cc_basename in
  19376. + cl*) ;;
  19377. + *)
  19378. + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
  19379. + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
  19380. + ;;
  19381. + esac
  19382. + ;;
  19383. *)
  19384. _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  19385. - ;;
  19386. + ;;
  19387. esac
  19388. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
  19389. ], [
  19390. runpath_var=
  19391. _LT_TAGVAR(allow_undefined_flag, $1)=
  19392. @@ -4439,7 +4705,8 @@ _LT_EOF
  19393. _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  19394. _LT_TAGVAR(always_export_symbols, $1)=no
  19395. _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  19396. - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
  19397. + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
  19398. + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
  19399. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  19400. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  19401. @@ -4538,12 +4805,12 @@ _LT_EOF
  19402. _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
  19403. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
  19404. _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
  19405. - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  19406. + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  19407. if test "x$supports_anon_versioning" = xyes; then
  19408. _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
  19409. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  19410. echo "local: *; };" >> $output_objdir/$libname.ver~
  19411. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  19412. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  19413. fi
  19414. ;;
  19415. esac
  19416. @@ -4557,8 +4824,8 @@ _LT_EOF
  19417. _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  19418. wlarc=
  19419. else
  19420. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19421. - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19422. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19423. + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19424. fi
  19425. ;;
  19426. @@ -4576,8 +4843,8 @@ _LT_EOF
  19427. _LT_EOF
  19428. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  19429. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19430. - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19431. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19432. + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19433. else
  19434. _LT_TAGVAR(ld_shlibs, $1)=no
  19435. fi
  19436. @@ -4623,8 +4890,8 @@ _LT_EOF
  19437. *)
  19438. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  19439. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19440. - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19441. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19442. + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19443. else
  19444. _LT_TAGVAR(ld_shlibs, $1)=no
  19445. fi
  19446. @@ -4754,7 +5021,7 @@ _LT_EOF
  19447. _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
  19448. # Determine the default libpath from the value encoded in an
  19449. # empty executable.
  19450. - _LT_SYS_MODULE_PATH_AIX
  19451. + _LT_SYS_MODULE_PATH_AIX([$1])
  19452. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  19453. _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  19454. else
  19455. @@ -4765,7 +5032,7 @@ _LT_EOF
  19456. else
  19457. # Determine the default libpath from the value encoded in an
  19458. # empty executable.
  19459. - _LT_SYS_MODULE_PATH_AIX
  19460. + _LT_SYS_MODULE_PATH_AIX([$1])
  19461. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  19462. # Warning - without using the other run time loading flags,
  19463. # -berok will link without error, but may produce a broken library.
  19464. @@ -4809,20 +5076,63 @@ _LT_EOF
  19465. # Microsoft Visual C++.
  19466. # hardcode_libdir_flag_spec is actually meaningless, as there is
  19467. # no search path for DLLs.
  19468. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  19469. - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  19470. - # Tell ltmain to make .lib files, not .a files.
  19471. - libext=lib
  19472. - # Tell ltmain to make .dll files, not .so files.
  19473. - shrext_cmds=".dll"
  19474. - # FIXME: Setting linknames here is a bad hack.
  19475. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  19476. - # The linker will automatically build a .lib file if we build a DLL.
  19477. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  19478. - # FIXME: Should let the user specify the lib program.
  19479. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
  19480. - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
  19481. - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  19482. + case $cc_basename in
  19483. + cl*)
  19484. + # Native MSVC
  19485. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  19486. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  19487. + _LT_TAGVAR(always_export_symbols, $1)=yes
  19488. + _LT_TAGVAR(file_list_spec, $1)='@'
  19489. + # Tell ltmain to make .lib files, not .a files.
  19490. + libext=lib
  19491. + # Tell ltmain to make .dll files, not .so files.
  19492. + shrext_cmds=".dll"
  19493. + # FIXME: Setting linknames here is a bad hack.
  19494. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  19495. + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  19496. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  19497. + else
  19498. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  19499. + fi~
  19500. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  19501. + linknames='
  19502. + # The linker will not automatically build a static lib if we build a DLL.
  19503. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  19504. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  19505. + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
  19506. + # Don't use ranlib
  19507. + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
  19508. + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
  19509. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  19510. + case $lt_outputfile in
  19511. + *.exe|*.EXE) ;;
  19512. + *)
  19513. + lt_outputfile="$lt_outputfile.exe"
  19514. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  19515. + ;;
  19516. + esac~
  19517. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  19518. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  19519. + $RM "$lt_outputfile.manifest";
  19520. + fi'
  19521. + ;;
  19522. + *)
  19523. + # Assume MSVC wrapper
  19524. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  19525. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  19526. + # Tell ltmain to make .lib files, not .a files.
  19527. + libext=lib
  19528. + # Tell ltmain to make .dll files, not .so files.
  19529. + shrext_cmds=".dll"
  19530. + # FIXME: Setting linknames here is a bad hack.
  19531. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  19532. + # The linker will automatically build a .lib file if we build a DLL.
  19533. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  19534. + # FIXME: Should let the user specify the lib program.
  19535. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
  19536. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  19537. + ;;
  19538. + esac
  19539. ;;
  19540. darwin* | rhapsody*)
  19541. @@ -4856,7 +5166,7 @@ _LT_EOF
  19542. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  19543. freebsd* | dragonfly*)
  19544. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  19545. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  19546. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  19547. _LT_TAGVAR(hardcode_direct, $1)=yes
  19548. _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
  19549. @@ -4864,7 +5174,7 @@ _LT_EOF
  19550. hpux9*)
  19551. if test "$GCC" = yes; then
  19552. - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  19553. + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  19554. else
  19555. _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  19556. fi
  19557. @@ -4880,7 +5190,7 @@ _LT_EOF
  19558. hpux10*)
  19559. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  19560. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19561. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19562. else
  19563. _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  19564. fi
  19565. @@ -4904,10 +5214,10 @@ _LT_EOF
  19566. _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  19567. ;;
  19568. ia64*)
  19569. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  19570. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  19571. ;;
  19572. *)
  19573. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19574. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19575. ;;
  19576. esac
  19577. else
  19578. @@ -4954,16 +5264,31 @@ _LT_EOF
  19579. irix5* | irix6* | nonstopux*)
  19580. if test "$GCC" = yes; then
  19581. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19582. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19583. # Try to use the -exported_symbol ld option, if it does not
  19584. # work, assume that -exports_file does not work either and
  19585. # implicitly export all symbols.
  19586. - save_LDFLAGS="$LDFLAGS"
  19587. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  19588. - AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])],
  19589. - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  19590. - )
  19591. - LDFLAGS="$save_LDFLAGS"
  19592. + # This should be the same for all languages, so no per-tag cache variable.
  19593. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
  19594. + [lt_cv_irix_exported_symbol],
  19595. + [save_LDFLAGS="$LDFLAGS"
  19596. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  19597. + AC_LINK_IFELSE(
  19598. + [AC_LANG_SOURCE(
  19599. + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
  19600. + [C++], [[int foo (void) { return 0; }]],
  19601. + [Fortran 77], [[
  19602. + subroutine foo
  19603. + end]],
  19604. + [Fortran], [[
  19605. + subroutine foo
  19606. + end]])])],
  19607. + [lt_cv_irix_exported_symbol=yes],
  19608. + [lt_cv_irix_exported_symbol=no])
  19609. + LDFLAGS="$save_LDFLAGS"])
  19610. + if test "$lt_cv_irix_exported_symbol" = yes; then
  19611. + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  19612. + fi
  19613. else
  19614. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  19615. _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  19616. @@ -5048,7 +5373,7 @@ _LT_EOF
  19617. osf4* | osf5*) # as osf3* with the addition of -msym flag
  19618. if test "$GCC" = yes; then
  19619. _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
  19620. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19621. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19622. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  19623. else
  19624. _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  19625. @@ -5067,9 +5392,9 @@ _LT_EOF
  19626. _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
  19627. if test "$GCC" = yes; then
  19628. wlarc='${wl}'
  19629. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  19630. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  19631. _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  19632. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  19633. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  19634. else
  19635. case `$CC -V 2>&1` in
  19636. *"Compilers 5.0"*)
  19637. @@ -5341,8 +5666,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
  19638. to runtime path list])
  19639. _LT_TAGDECL([], [link_all_deplibs], [0],
  19640. [Whether libtool must link a program against all its dependency libraries])
  19641. -_LT_TAGDECL([], [fix_srcfile_path], [1],
  19642. - [Fix the shell variable $srcfile for the compiler])
  19643. _LT_TAGDECL([], [always_export_symbols], [0],
  19644. [Set to "yes" if exported symbols are required])
  19645. _LT_TAGDECL([], [export_symbols_cmds], [2],
  19646. @@ -5353,6 +5676,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
  19647. [Symbols that must always be exported])
  19648. _LT_TAGDECL([], [prelink_cmds], [2],
  19649. [Commands necessary for linking programs (against libraries) with templates])
  19650. +_LT_TAGDECL([], [postlink_cmds], [2],
  19651. + [Commands necessary for finishing linking programs])
  19652. _LT_TAGDECL([], [file_list_spec], [1],
  19653. [Specify filename containing input files])
  19654. dnl FIXME: Not yet implemented
  19655. @@ -5454,6 +5779,7 @@ CC="$lt_save_CC"
  19656. m4_defun([_LT_LANG_CXX_CONFIG],
  19657. [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  19658. m4_require([_LT_DECL_EGREP])dnl
  19659. +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
  19660. if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  19661. ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
  19662. (test "X$CXX" != "Xg++"))) ; then
  19663. @@ -5515,6 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19664. # Allow CC to be a program name with arguments.
  19665. lt_save_CC=$CC
  19666. + lt_save_CFLAGS=$CFLAGS
  19667. lt_save_LD=$LD
  19668. lt_save_GCC=$GCC
  19669. GCC=$GXX
  19670. @@ -5532,6 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19671. fi
  19672. test -z "${LDCXX+set}" || LD=$LDCXX
  19673. CC=${CXX-"c++"}
  19674. + CFLAGS=$CXXFLAGS
  19675. compiler=$CC
  19676. _LT_TAGVAR(compiler, $1)=$CC
  19677. _LT_CC_BASENAME([$compiler])
  19678. @@ -5695,7 +6023,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19679. _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
  19680. # Determine the default libpath from the value encoded in an empty
  19681. # executable.
  19682. - _LT_SYS_MODULE_PATH_AIX
  19683. + _LT_SYS_MODULE_PATH_AIX([$1])
  19684. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  19685. _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  19686. @@ -5707,7 +6035,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19687. else
  19688. # Determine the default libpath from the value encoded in an
  19689. # empty executable.
  19690. - _LT_SYS_MODULE_PATH_AIX
  19691. + _LT_SYS_MODULE_PATH_AIX([$1])
  19692. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  19693. # Warning - without using the other run time loading flags,
  19694. # -berok will link without error, but may produce a broken library.
  19695. @@ -5749,29 +6077,75 @@ if test "$_lt_caught_CXX_error" != yes; then
  19696. ;;
  19697. cygwin* | mingw* | pw32* | cegcc*)
  19698. - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
  19699. - # as there is no search path for DLLs.
  19700. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  19701. - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
  19702. - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  19703. - _LT_TAGVAR(always_export_symbols, $1)=no
  19704. - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  19705. -
  19706. - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  19707. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  19708. - # If the export-symbols file already is a .def file (1st line
  19709. - # is EXPORTS), use it as is; otherwise, prepend...
  19710. - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  19711. - cp $export_symbols $output_objdir/$soname.def;
  19712. - else
  19713. - echo EXPORTS > $output_objdir/$soname.def;
  19714. - cat $export_symbols >> $output_objdir/$soname.def;
  19715. - fi~
  19716. - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  19717. - else
  19718. - _LT_TAGVAR(ld_shlibs, $1)=no
  19719. - fi
  19720. - ;;
  19721. + case $GXX,$cc_basename in
  19722. + ,cl* | no,cl*)
  19723. + # Native MSVC
  19724. + # hardcode_libdir_flag_spec is actually meaningless, as there is
  19725. + # no search path for DLLs.
  19726. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  19727. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  19728. + _LT_TAGVAR(always_export_symbols, $1)=yes
  19729. + _LT_TAGVAR(file_list_spec, $1)='@'
  19730. + # Tell ltmain to make .lib files, not .a files.
  19731. + libext=lib
  19732. + # Tell ltmain to make .dll files, not .so files.
  19733. + shrext_cmds=".dll"
  19734. + # FIXME: Setting linknames here is a bad hack.
  19735. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  19736. + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  19737. + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  19738. + else
  19739. + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  19740. + fi~
  19741. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  19742. + linknames='
  19743. + # The linker will not automatically build a static lib if we build a DLL.
  19744. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  19745. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  19746. + # Don't use ranlib
  19747. + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
  19748. + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
  19749. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  19750. + case $lt_outputfile in
  19751. + *.exe|*.EXE) ;;
  19752. + *)
  19753. + lt_outputfile="$lt_outputfile.exe"
  19754. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  19755. + ;;
  19756. + esac~
  19757. + func_to_tool_file "$lt_outputfile"~
  19758. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  19759. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  19760. + $RM "$lt_outputfile.manifest";
  19761. + fi'
  19762. + ;;
  19763. + *)
  19764. + # g++
  19765. + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
  19766. + # as there is no search path for DLLs.
  19767. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  19768. + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
  19769. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  19770. + _LT_TAGVAR(always_export_symbols, $1)=no
  19771. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  19772. +
  19773. + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  19774. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  19775. + # If the export-symbols file already is a .def file (1st line
  19776. + # is EXPORTS), use it as is; otherwise, prepend...
  19777. + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  19778. + cp $export_symbols $output_objdir/$soname.def;
  19779. + else
  19780. + echo EXPORTS > $output_objdir/$soname.def;
  19781. + cat $export_symbols >> $output_objdir/$soname.def;
  19782. + fi~
  19783. + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  19784. + else
  19785. + _LT_TAGVAR(ld_shlibs, $1)=no
  19786. + fi
  19787. + ;;
  19788. + esac
  19789. + ;;
  19790. darwin* | rhapsody*)
  19791. _LT_DARWIN_LINKER_FEATURES($1)
  19792. ;;
  19793. @@ -5846,7 +6220,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19794. ;;
  19795. *)
  19796. if test "$GXX" = yes; then
  19797. - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  19798. + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  19799. else
  19800. # FIXME: insert proper C++ library support
  19801. _LT_TAGVAR(ld_shlibs, $1)=no
  19802. @@ -5917,10 +6291,10 @@ if test "$_lt_caught_CXX_error" != yes; then
  19803. _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  19804. ;;
  19805. ia64*)
  19806. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  19807. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  19808. ;;
  19809. *)
  19810. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  19811. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  19812. ;;
  19813. esac
  19814. fi
  19815. @@ -5961,9 +6335,9 @@ if test "$_lt_caught_CXX_error" != yes; then
  19816. *)
  19817. if test "$GXX" = yes; then
  19818. if test "$with_gnu_ld" = no; then
  19819. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19820. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19821. else
  19822. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  19823. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
  19824. fi
  19825. fi
  19826. _LT_TAGVAR(link_all_deplibs, $1)=yes
  19827. @@ -6033,20 +6407,20 @@ if test "$_lt_caught_CXX_error" != yes; then
  19828. _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
  19829. rm -rf $tpldir~
  19830. $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  19831. - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
  19832. + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  19833. _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
  19834. rm -rf $tpldir~
  19835. $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  19836. - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
  19837. + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  19838. $RANLIB $oldlib'
  19839. _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
  19840. rm -rf $tpldir~
  19841. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  19842. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  19843. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  19844. _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
  19845. rm -rf $tpldir~
  19846. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  19847. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  19848. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
  19849. ;;
  19850. *) # Version 6 and above use weak symbols
  19851. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  19852. @@ -6241,7 +6615,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19853. _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19854. ;;
  19855. *)
  19856. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19857. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  19858. ;;
  19859. esac
  19860. @@ -6287,7 +6661,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19861. solaris*)
  19862. case $cc_basename in
  19863. - CC*)
  19864. + CC* | sunCC*)
  19865. # Sun C++ 4.2, 5.x and Centerline C++
  19866. _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
  19867. _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
  19868. @@ -6328,9 +6702,9 @@ if test "$_lt_caught_CXX_error" != yes; then
  19869. if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  19870. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  19871. if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  19872. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  19873. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  19874. _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  19875. - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  19876. + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  19877. # Commands to make compiler produce verbose output that lists
  19878. # what "hidden" libraries, object files and flags are used when
  19879. @@ -6459,6 +6833,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  19880. fi # test -n "$compiler"
  19881. CC=$lt_save_CC
  19882. + CFLAGS=$lt_save_CFLAGS
  19883. LDCXX=$LD
  19884. LD=$lt_save_LD
  19885. GCC=$lt_save_GCC
  19886. @@ -6473,6 +6848,29 @@ AC_LANG_POP
  19887. ])# _LT_LANG_CXX_CONFIG
  19888. +# _LT_FUNC_STRIPNAME_CNF
  19889. +# ----------------------
  19890. +# func_stripname_cnf prefix suffix name
  19891. +# strip PREFIX and SUFFIX off of NAME.
  19892. +# PREFIX and SUFFIX must not contain globbing or regex special
  19893. +# characters, hashes, percent signs, but SUFFIX may contain a leading
  19894. +# dot (in which case that matches only a dot).
  19895. +#
  19896. +# This function is identical to the (non-XSI) version of func_stripname,
  19897. +# except this one can be used by m4 code that may be executed by configure,
  19898. +# rather than the libtool script.
  19899. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
  19900. +AC_REQUIRE([_LT_DECL_SED])
  19901. +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
  19902. +func_stripname_cnf ()
  19903. +{
  19904. + case ${2} in
  19905. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  19906. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  19907. + esac
  19908. +} # func_stripname_cnf
  19909. +])# _LT_FUNC_STRIPNAME_CNF
  19910. +
  19911. # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
  19912. # ---------------------------------
  19913. # Figure out "hidden" library dependencies from verbose
  19914. @@ -6481,6 +6879,7 @@ AC_LANG_POP
  19915. # objects, libraries and library flags.
  19916. m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
  19917. [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  19918. +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
  19919. # Dependencies to place before and after the object being linked:
  19920. _LT_TAGVAR(predep_objects, $1)=
  19921. _LT_TAGVAR(postdep_objects, $1)=
  19922. @@ -6531,6 +6930,13 @@ public class foo {
  19923. };
  19924. _LT_EOF
  19925. ])
  19926. +
  19927. +_lt_libdeps_save_CFLAGS=$CFLAGS
  19928. +case "$CC $CFLAGS " in #(
  19929. +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
  19930. +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
  19931. +esac
  19932. +
  19933. dnl Parse the compiler output and extract the necessary
  19934. dnl objects, libraries and library flags.
  19935. if AC_TRY_EVAL(ac_compile); then
  19936. @@ -6542,7 +6948,7 @@ if AC_TRY_EVAL(ac_compile); then
  19937. pre_test_object_deps_done=no
  19938. for p in `eval "$output_verbose_link_cmd"`; do
  19939. - case $p in
  19940. + case ${prev}${p} in
  19941. -L* | -R* | -l*)
  19942. # Some compilers place space between "-{L,R}" and the path.
  19943. @@ -6551,13 +6957,22 @@ if AC_TRY_EVAL(ac_compile); then
  19944. test $p = "-R"; then
  19945. prev=$p
  19946. continue
  19947. - else
  19948. - prev=
  19949. fi
  19950. + # Expand the sysroot to ease extracting the directories later.
  19951. + if test -z "$prev"; then
  19952. + case $p in
  19953. + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
  19954. + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
  19955. + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
  19956. + esac
  19957. + fi
  19958. + case $p in
  19959. + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
  19960. + esac
  19961. if test "$pre_test_object_deps_done" = no; then
  19962. - case $p in
  19963. - -L* | -R*)
  19964. + case ${prev} in
  19965. + -L | -R)
  19966. # Internal compiler library paths should come after those
  19967. # provided the user. The postdeps already come after the
  19968. # user supplied libs so there is no need to process them.
  19969. @@ -6577,8 +6992,10 @@ if AC_TRY_EVAL(ac_compile); then
  19970. _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
  19971. fi
  19972. fi
  19973. + prev=
  19974. ;;
  19975. + *.lto.$objext) ;; # Ignore GCC LTO objects
  19976. *.$objext)
  19977. # This assumes that the test object file only shows up
  19978. # once in the compiler output.
  19979. @@ -6614,6 +7031,7 @@ else
  19980. fi
  19981. $RM -f confest.$objext
  19982. +CFLAGS=$_lt_libdeps_save_CFLAGS
  19983. # PORTME: override above test on systems where it is broken
  19984. m4_if([$1], [CXX],
  19985. @@ -6650,7 +7068,7 @@ linux*)
  19986. solaris*)
  19987. case $cc_basename in
  19988. - CC*)
  19989. + CC* | sunCC*)
  19990. # The more standards-conforming stlport4 library is
  19991. # incompatible with the Cstd library. Avoid specifying
  19992. # it if it's in CXXFLAGS. Ignore libCrun as
  19993. @@ -6763,7 +7181,9 @@ if test "$_lt_disable_F77" != yes; then
  19994. # Allow CC to be a program name with arguments.
  19995. lt_save_CC="$CC"
  19996. lt_save_GCC=$GCC
  19997. + lt_save_CFLAGS=$CFLAGS
  19998. CC=${F77-"f77"}
  19999. + CFLAGS=$FFLAGS
  20000. compiler=$CC
  20001. _LT_TAGVAR(compiler, $1)=$CC
  20002. _LT_CC_BASENAME([$compiler])
  20003. @@ -6817,6 +7237,7 @@ if test "$_lt_disable_F77" != yes; then
  20004. GCC=$lt_save_GCC
  20005. CC="$lt_save_CC"
  20006. + CFLAGS="$lt_save_CFLAGS"
  20007. fi # test "$_lt_disable_F77" != yes
  20008. AC_LANG_POP
  20009. @@ -6893,7 +7314,9 @@ if test "$_lt_disable_FC" != yes; then
  20010. # Allow CC to be a program name with arguments.
  20011. lt_save_CC="$CC"
  20012. lt_save_GCC=$GCC
  20013. + lt_save_CFLAGS=$CFLAGS
  20014. CC=${FC-"f95"}
  20015. + CFLAGS=$FCFLAGS
  20016. compiler=$CC
  20017. GCC=$ac_cv_fc_compiler_gnu
  20018. @@ -6949,7 +7372,8 @@ if test "$_lt_disable_FC" != yes; then
  20019. fi # test -n "$compiler"
  20020. GCC=$lt_save_GCC
  20021. - CC="$lt_save_CC"
  20022. + CC=$lt_save_CC
  20023. + CFLAGS=$lt_save_CFLAGS
  20024. fi # test "$_lt_disable_FC" != yes
  20025. AC_LANG_POP
  20026. @@ -6986,10 +7410,12 @@ _LT_COMPILER_BOILERPLATE
  20027. _LT_LINKER_BOILERPLATE
  20028. # Allow CC to be a program name with arguments.
  20029. -lt_save_CC="$CC"
  20030. +lt_save_CC=$CC
  20031. +lt_save_CFLAGS=$CFLAGS
  20032. lt_save_GCC=$GCC
  20033. GCC=yes
  20034. CC=${GCJ-"gcj"}
  20035. +CFLAGS=$GCJFLAGS
  20036. compiler=$CC
  20037. _LT_TAGVAR(compiler, $1)=$CC
  20038. _LT_TAGVAR(LD, $1)="$LD"
  20039. @@ -7020,7 +7446,8 @@ fi
  20040. AC_LANG_RESTORE
  20041. GCC=$lt_save_GCC
  20042. -CC="$lt_save_CC"
  20043. +CC=$lt_save_CC
  20044. +CFLAGS=$lt_save_CFLAGS
  20045. ])# _LT_LANG_GCJ_CONFIG
  20046. @@ -7055,9 +7482,11 @@ _LT_LINKER_BOILERPLATE
  20047. # Allow CC to be a program name with arguments.
  20048. lt_save_CC="$CC"
  20049. +lt_save_CFLAGS=$CFLAGS
  20050. lt_save_GCC=$GCC
  20051. GCC=
  20052. CC=${RC-"windres"}
  20053. +CFLAGS=
  20054. compiler=$CC
  20055. _LT_TAGVAR(compiler, $1)=$CC
  20056. _LT_CC_BASENAME([$compiler])
  20057. @@ -7070,7 +7499,8 @@ fi
  20058. GCC=$lt_save_GCC
  20059. AC_LANG_RESTORE
  20060. -CC="$lt_save_CC"
  20061. +CC=$lt_save_CC
  20062. +CFLAGS=$lt_save_CFLAGS
  20063. ])# _LT_LANG_RC_CONFIG
  20064. @@ -7129,6 +7559,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
  20065. AC_SUBST([OBJDUMP])
  20066. ])
  20067. +# _LT_DECL_DLLTOOL
  20068. +# ----------------
  20069. +# Ensure DLLTOOL variable is set.
  20070. +m4_defun([_LT_DECL_DLLTOOL],
  20071. +[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
  20072. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  20073. +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
  20074. +AC_SUBST([DLLTOOL])
  20075. +])
  20076. # _LT_DECL_SED
  20077. # ------------
  20078. @@ -7222,8 +7661,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
  20079. # Try some XSI features
  20080. xsi_shell=no
  20081. ( _lt_dummy="a/b/c"
  20082. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  20083. - = c,a/b,, \
  20084. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  20085. + = c,a/b,b/c, \
  20086. && eval 'test $(( 1 + 1 )) -eq 2 \
  20087. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  20088. && xsi_shell=yes
  20089. @@ -7262,206 +7701,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
  20090. ])# _LT_CHECK_SHELL_FEATURES
  20091. -# _LT_PROG_XSI_SHELLFNS
  20092. -# ---------------------
  20093. -# Bourne and XSI compatible variants of some useful shell functions.
  20094. -m4_defun([_LT_PROG_XSI_SHELLFNS],
  20095. -[case $xsi_shell in
  20096. - yes)
  20097. - cat << \_LT_EOF >> "$cfgfile"
  20098. -
  20099. -# func_dirname file append nondir_replacement
  20100. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  20101. -# otherwise set result to NONDIR_REPLACEMENT.
  20102. -func_dirname ()
  20103. -{
  20104. - case ${1} in
  20105. - */*) func_dirname_result="${1%/*}${2}" ;;
  20106. - * ) func_dirname_result="${3}" ;;
  20107. - esac
  20108. -}
  20109. -
  20110. -# func_basename file
  20111. -func_basename ()
  20112. -{
  20113. - func_basename_result="${1##*/}"
  20114. -}
  20115. -
  20116. -# func_dirname_and_basename file append nondir_replacement
  20117. -# perform func_basename and func_dirname in a single function
  20118. -# call:
  20119. -# dirname: Compute the dirname of FILE. If nonempty,
  20120. -# add APPEND to the result, otherwise set result
  20121. -# to NONDIR_REPLACEMENT.
  20122. -# value returned in "$func_dirname_result"
  20123. -# basename: Compute filename of FILE.
  20124. -# value retuned in "$func_basename_result"
  20125. -# Implementation must be kept synchronized with func_dirname
  20126. -# and func_basename. For efficiency, we do not delegate to
  20127. -# those functions but instead duplicate the functionality here.
  20128. -func_dirname_and_basename ()
  20129. -{
  20130. - case ${1} in
  20131. - */*) func_dirname_result="${1%/*}${2}" ;;
  20132. - * ) func_dirname_result="${3}" ;;
  20133. - esac
  20134. - func_basename_result="${1##*/}"
  20135. -}
  20136. -
  20137. -# func_stripname prefix suffix name
  20138. -# strip PREFIX and SUFFIX off of NAME.
  20139. -# PREFIX and SUFFIX must not contain globbing or regex special
  20140. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  20141. -# dot (in which case that matches only a dot).
  20142. -func_stripname ()
  20143. -{
  20144. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  20145. - # positional parameters, so assign one to ordinary parameter first.
  20146. - func_stripname_result=${3}
  20147. - func_stripname_result=${func_stripname_result#"${1}"}
  20148. - func_stripname_result=${func_stripname_result%"${2}"}
  20149. -}
  20150. -
  20151. -# func_opt_split
  20152. -func_opt_split ()
  20153. -{
  20154. - func_opt_split_opt=${1%%=*}
  20155. - func_opt_split_arg=${1#*=}
  20156. -}
  20157. -
  20158. -# func_lo2o object
  20159. -func_lo2o ()
  20160. -{
  20161. - case ${1} in
  20162. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  20163. - *) func_lo2o_result=${1} ;;
  20164. - esac
  20165. -}
  20166. -
  20167. -# func_xform libobj-or-source
  20168. -func_xform ()
  20169. -{
  20170. - func_xform_result=${1%.*}.lo
  20171. -}
  20172. -
  20173. -# func_arith arithmetic-term...
  20174. -func_arith ()
  20175. -{
  20176. - func_arith_result=$(( $[*] ))
  20177. -}
  20178. -
  20179. -# func_len string
  20180. -# STRING may not start with a hyphen.
  20181. -func_len ()
  20182. -{
  20183. - func_len_result=${#1}
  20184. -}
  20185. +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
  20186. +# ------------------------------------------------------
  20187. +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
  20188. +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
  20189. +m4_defun([_LT_PROG_FUNCTION_REPLACE],
  20190. +[dnl {
  20191. +sed -e '/^$1 ()$/,/^} # $1 /c\
  20192. +$1 ()\
  20193. +{\
  20194. +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
  20195. +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
  20196. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20197. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20198. +test 0 -eq $? || _lt_function_replace_fail=:
  20199. +])
  20200. -_LT_EOF
  20201. - ;;
  20202. - *) # Bourne compatible functions.
  20203. - cat << \_LT_EOF >> "$cfgfile"
  20204. -# func_dirname file append nondir_replacement
  20205. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  20206. -# otherwise set result to NONDIR_REPLACEMENT.
  20207. -func_dirname ()
  20208. -{
  20209. - # Extract subdirectory from the argument.
  20210. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  20211. - if test "X$func_dirname_result" = "X${1}"; then
  20212. - func_dirname_result="${3}"
  20213. - else
  20214. - func_dirname_result="$func_dirname_result${2}"
  20215. - fi
  20216. -}
  20217. +# _LT_PROG_REPLACE_SHELLFNS
  20218. +# -------------------------
  20219. +# Replace existing portable implementations of several shell functions with
  20220. +# equivalent extended shell implementations where those features are available..
  20221. +m4_defun([_LT_PROG_REPLACE_SHELLFNS],
  20222. +[if test x"$xsi_shell" = xyes; then
  20223. + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
  20224. + case ${1} in
  20225. + */*) func_dirname_result="${1%/*}${2}" ;;
  20226. + * ) func_dirname_result="${3}" ;;
  20227. + esac])
  20228. +
  20229. + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
  20230. + func_basename_result="${1##*/}"])
  20231. +
  20232. + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
  20233. + case ${1} in
  20234. + */*) func_dirname_result="${1%/*}${2}" ;;
  20235. + * ) func_dirname_result="${3}" ;;
  20236. + esac
  20237. + func_basename_result="${1##*/}"])
  20238. -# func_basename file
  20239. -func_basename ()
  20240. -{
  20241. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  20242. -}
  20243. + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
  20244. + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  20245. + # positional parameters, so assign one to ordinary parameter first.
  20246. + func_stripname_result=${3}
  20247. + func_stripname_result=${func_stripname_result#"${1}"}
  20248. + func_stripname_result=${func_stripname_result%"${2}"}])
  20249. -dnl func_dirname_and_basename
  20250. -dnl A portable version of this function is already defined in general.m4sh
  20251. -dnl so there is no need for it here.
  20252. + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
  20253. + func_split_long_opt_name=${1%%=*}
  20254. + func_split_long_opt_arg=${1#*=}])
  20255. -# func_stripname prefix suffix name
  20256. -# strip PREFIX and SUFFIX off of NAME.
  20257. -# PREFIX and SUFFIX must not contain globbing or regex special
  20258. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  20259. -# dot (in which case that matches only a dot).
  20260. -# func_strip_suffix prefix name
  20261. -func_stripname ()
  20262. -{
  20263. - case ${2} in
  20264. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  20265. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  20266. - esac
  20267. -}
  20268. + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
  20269. + func_split_short_opt_arg=${1#??}
  20270. + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
  20271. -# sed scripts:
  20272. -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
  20273. -my_sed_long_arg='1s/^-[[^=]]*=//'
  20274. + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
  20275. + case ${1} in
  20276. + *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  20277. + *) func_lo2o_result=${1} ;;
  20278. + esac])
  20279. -# func_opt_split
  20280. -func_opt_split ()
  20281. -{
  20282. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  20283. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  20284. -}
  20285. + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
  20286. -# func_lo2o object
  20287. -func_lo2o ()
  20288. -{
  20289. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  20290. -}
  20291. + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
  20292. -# func_xform libobj-or-source
  20293. -func_xform ()
  20294. -{
  20295. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
  20296. -}
  20297. + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
  20298. +fi
  20299. -# func_arith arithmetic-term...
  20300. -func_arith ()
  20301. -{
  20302. - func_arith_result=`expr "$[@]"`
  20303. -}
  20304. +if test x"$lt_shell_append" = xyes; then
  20305. + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
  20306. -# func_len string
  20307. -# STRING may not start with a hyphen.
  20308. -func_len ()
  20309. -{
  20310. - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
  20311. -}
  20312. + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
  20313. + func_quote_for_eval "${2}"
  20314. +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
  20315. + eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
  20316. -_LT_EOF
  20317. -esac
  20318. + # Save a `func_append' function call where possible by direct use of '+='
  20319. + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  20320. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20321. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20322. + test 0 -eq $? || _lt_function_replace_fail=:
  20323. +else
  20324. + # Save a `func_append' function call even when '+=' is not available
  20325. + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  20326. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20327. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20328. + test 0 -eq $? || _lt_function_replace_fail=:
  20329. +fi
  20330. -case $lt_shell_append in
  20331. - yes)
  20332. - cat << \_LT_EOF >> "$cfgfile"
  20333. +if test x"$_lt_function_replace_fail" = x":"; then
  20334. + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
  20335. +fi
  20336. +])
  20337. -# func_append var value
  20338. -# Append VALUE to the end of shell variable VAR.
  20339. -func_append ()
  20340. -{
  20341. - eval "$[1]+=\$[2]"
  20342. -}
  20343. -_LT_EOF
  20344. +# _LT_PATH_CONVERSION_FUNCTIONS
  20345. +# -----------------------------
  20346. +# Determine which file name conversion functions should be used by
  20347. +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
  20348. +# for certain cross-compile configurations and native mingw.
  20349. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
  20350. +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
  20351. +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
  20352. +AC_MSG_CHECKING([how to convert $build file names to $host format])
  20353. +AC_CACHE_VAL(lt_cv_to_host_file_cmd,
  20354. +[case $host in
  20355. + *-*-mingw* )
  20356. + case $build in
  20357. + *-*-mingw* ) # actually msys
  20358. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  20359. + ;;
  20360. + *-*-cygwin* )
  20361. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  20362. + ;;
  20363. + * ) # otherwise, assume *nix
  20364. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  20365. + ;;
  20366. + esac
  20367. ;;
  20368. - *)
  20369. - cat << \_LT_EOF >> "$cfgfile"
  20370. -
  20371. -# func_append var value
  20372. -# Append VALUE to the end of shell variable VAR.
  20373. -func_append ()
  20374. -{
  20375. - eval "$[1]=\$$[1]\$[2]"
  20376. -}
  20377. -
  20378. -_LT_EOF
  20379. + *-*-cygwin* )
  20380. + case $build in
  20381. + *-*-mingw* ) # actually msys
  20382. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  20383. + ;;
  20384. + *-*-cygwin* )
  20385. + lt_cv_to_host_file_cmd=func_convert_file_noop
  20386. + ;;
  20387. + * ) # otherwise, assume *nix
  20388. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  20389. + ;;
  20390. + esac
  20391. ;;
  20392. - esac
  20393. + * ) # unhandled hosts (and "normal" native builds)
  20394. + lt_cv_to_host_file_cmd=func_convert_file_noop
  20395. + ;;
  20396. +esac
  20397. +])
  20398. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  20399. +AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
  20400. +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
  20401. + [0], [convert $build file names to $host format])dnl
  20402. +
  20403. +AC_MSG_CHECKING([how to convert $build file names to toolchain format])
  20404. +AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
  20405. +[#assume ordinary cross tools, or native build.
  20406. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  20407. +case $host in
  20408. + *-*-mingw* )
  20409. + case $build in
  20410. + *-*-mingw* ) # actually msys
  20411. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  20412. + ;;
  20413. + esac
  20414. + ;;
  20415. +esac
  20416. ])
  20417. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  20418. +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
  20419. +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
  20420. + [0], [convert $build files to toolchain format])dnl
  20421. +])# _LT_PATH_CONVERSION_FUNCTIONS
  20422. diff --git a/ltmain.sh b/ltmain.sh
  20423. index 9503ec85d70..70e856e0659 100644
  20424. --- a/ltmain.sh
  20425. +++ b/ltmain.sh
  20426. @@ -1,10 +1,9 @@
  20427. -# Generated from ltmain.m4sh.
  20428. -# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
  20429. +# libtool (GNU libtool) 2.4
  20430. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
  20431. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
  20432. -# 2007, 2008, 2009 Free Software Foundation, Inc.
  20433. +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  20434. # This is free software; see the source for copying conditions. There is NO
  20435. # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  20436. @@ -38,7 +37,6 @@
  20437. # -n, --dry-run display commands without modifying any files
  20438. # --features display basic configuration information and exit
  20439. # --mode=MODE use operation mode MODE
  20440. -# --no-finish let install mode avoid finish commands
  20441. # --preserve-dup-deps don't remove duplicate dependency libraries
  20442. # --quiet, --silent don't print informational messages
  20443. # --no-quiet, --no-silent
  20444. @@ -71,17 +69,19 @@
  20445. # compiler: $LTCC
  20446. # compiler flags: $LTCFLAGS
  20447. # linker: $LD (gnu? $with_gnu_ld)
  20448. -# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
  20449. +# $progname: (GNU libtool) 2.4
  20450. # automake: $automake_version
  20451. # autoconf: $autoconf_version
  20452. #
  20453. # Report bugs to <bug-libtool@gnu.org>.
  20454. +# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
  20455. +# General help using GNU software: <http://www.gnu.org/gethelp/>.
  20456. PROGRAM=libtool
  20457. PACKAGE=libtool
  20458. -VERSION=2.2.7a
  20459. -TIMESTAMP=" 1.3134 2009-11-29"
  20460. -package_revision=1.3134
  20461. +VERSION=2.4
  20462. +TIMESTAMP=""
  20463. +package_revision=1.3293
  20464. # Be Bourne compatible
  20465. if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  20466. @@ -106,9 +106,6 @@ _LTECHO_EOF'
  20467. }
  20468. # NLS nuisances: We save the old values to restore during execute mode.
  20469. -# Only set LANG and LC_ALL to C if already set.
  20470. -# These must not be set unconditionally because not all systems understand
  20471. -# e.g. LANG=C (notably SCO).
  20472. lt_user_locale=
  20473. lt_safe_locale=
  20474. for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
  20475. @@ -121,15 +118,13 @@ do
  20476. lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
  20477. fi"
  20478. done
  20479. +LC_ALL=C
  20480. +LANGUAGE=C
  20481. +export LANGUAGE LC_ALL
  20482. $lt_unset CDPATH
  20483. -
  20484. -
  20485. -
  20486. -
  20487. -
  20488. # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
  20489. # is ksh but when the shell is invoked as "sh" and the current value of
  20490. # the _XPG environment variable is not equal to 1 (one), the special
  20491. @@ -140,7 +135,7 @@ progpath="$0"
  20492. : ${CP="cp -f"}
  20493. -: ${ECHO=$as_echo}
  20494. +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
  20495. : ${EGREP="/bin/grep -E"}
  20496. : ${FGREP="/bin/grep -F"}
  20497. : ${GREP="/bin/grep"}
  20498. @@ -149,7 +144,7 @@ progpath="$0"
  20499. : ${MKDIR="mkdir"}
  20500. : ${MV="mv -f"}
  20501. : ${RM="rm -f"}
  20502. -: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
  20503. +: ${SED="/bin/sed"}
  20504. : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
  20505. : ${Xsed="$SED -e 1s/^X//"}
  20506. @@ -169,6 +164,27 @@ IFS=" $lt_nl"
  20507. dirname="s,/[^/]*$,,"
  20508. basename="s,^.*/,,"
  20509. +# func_dirname file append nondir_replacement
  20510. +# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  20511. +# otherwise set result to NONDIR_REPLACEMENT.
  20512. +func_dirname ()
  20513. +{
  20514. + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  20515. + if test "X$func_dirname_result" = "X${1}"; then
  20516. + func_dirname_result="${3}"
  20517. + else
  20518. + func_dirname_result="$func_dirname_result${2}"
  20519. + fi
  20520. +} # func_dirname may be replaced by extended shell implementation
  20521. +
  20522. +
  20523. +# func_basename file
  20524. +func_basename ()
  20525. +{
  20526. + func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  20527. +} # func_basename may be replaced by extended shell implementation
  20528. +
  20529. +
  20530. # func_dirname_and_basename file append nondir_replacement
  20531. # perform func_basename and func_dirname in a single function
  20532. # call:
  20533. @@ -183,17 +199,31 @@ basename="s,^.*/,,"
  20534. # those functions but instead duplicate the functionality here.
  20535. func_dirname_and_basename ()
  20536. {
  20537. - # Extract subdirectory from the argument.
  20538. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
  20539. - if test "X$func_dirname_result" = "X${1}"; then
  20540. - func_dirname_result="${3}"
  20541. - else
  20542. - func_dirname_result="$func_dirname_result${2}"
  20543. - fi
  20544. - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
  20545. -}
  20546. + # Extract subdirectory from the argument.
  20547. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
  20548. + if test "X$func_dirname_result" = "X${1}"; then
  20549. + func_dirname_result="${3}"
  20550. + else
  20551. + func_dirname_result="$func_dirname_result${2}"
  20552. + fi
  20553. + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
  20554. +} # func_dirname_and_basename may be replaced by extended shell implementation
  20555. +
  20556. +
  20557. +# func_stripname prefix suffix name
  20558. +# strip PREFIX and SUFFIX off of NAME.
  20559. +# PREFIX and SUFFIX must not contain globbing or regex special
  20560. +# characters, hashes, percent signs, but SUFFIX may contain a leading
  20561. +# dot (in which case that matches only a dot).
  20562. +# func_strip_suffix prefix name
  20563. +func_stripname ()
  20564. +{
  20565. + case ${2} in
  20566. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  20567. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  20568. + esac
  20569. +} # func_stripname may be replaced by extended shell implementation
  20570. -# Generated shell functions inserted here.
  20571. # These SED scripts presuppose an absolute path with a trailing slash.
  20572. pathcar='s,^/\([^/]*\).*$,\1,'
  20573. @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
  20574. # Same as above, but do not quote variable references.
  20575. double_quote_subst='s/\(["`\\]\)/\\\1/g'
  20576. +# Sed substitution that turns a string into a regex matching for the
  20577. +# string literally.
  20578. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
  20579. +
  20580. +# Sed substitution that converts a w32 file name or path
  20581. +# which contains forward slashes, into one that contains
  20582. +# (escaped) backslashes. A very naive implementation.
  20583. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
  20584. +
  20585. # Re-`\' parameter expansions in output of double_quote_subst that were
  20586. # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
  20587. # in input to double_quote_subst, that '$' was protected from expansion.
  20588. @@ -404,7 +443,7 @@ opt_warning=:
  20589. # name if it has been set yet.
  20590. func_echo ()
  20591. {
  20592. - $ECHO "$progname${mode+: }$mode: $*"
  20593. + $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
  20594. }
  20595. # func_verbose arg...
  20596. @@ -430,14 +469,14 @@ func_echo_all ()
  20597. # Echo program name prefixed message to standard error.
  20598. func_error ()
  20599. {
  20600. - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
  20601. + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
  20602. }
  20603. # func_warning arg...
  20604. # Echo program name prefixed warning message to standard error.
  20605. func_warning ()
  20606. {
  20607. - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
  20608. + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
  20609. # bash bug again:
  20610. :
  20611. @@ -656,19 +695,35 @@ func_show_eval_locale ()
  20612. fi
  20613. }
  20614. -
  20615. -
  20616. +# func_tr_sh
  20617. +# Turn $1 into a string suitable for a shell variable name.
  20618. +# Result is stored in $func_tr_sh_result. All characters
  20619. +# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
  20620. +# if $1 begins with a digit, a '_' is prepended as well.
  20621. +func_tr_sh ()
  20622. +{
  20623. + case $1 in
  20624. + [0-9]* | *[!a-zA-Z0-9_]*)
  20625. + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
  20626. + ;;
  20627. + * )
  20628. + func_tr_sh_result=$1
  20629. + ;;
  20630. + esac
  20631. +}
  20632. # func_version
  20633. # Echo version message to standard output and exit.
  20634. func_version ()
  20635. {
  20636. + $opt_debug
  20637. +
  20638. $SED -n '/(C)/!b go
  20639. :more
  20640. /\./!{
  20641. N
  20642. - s/\n# //
  20643. + s/\n# / /
  20644. b more
  20645. }
  20646. :go
  20647. @@ -685,7 +740,9 @@ func_version ()
  20648. # Echo short help message to standard output and exit.
  20649. func_usage ()
  20650. {
  20651. - $SED -n '/^# Usage:/,/^# *-h/ {
  20652. + $opt_debug
  20653. +
  20654. + $SED -n '/^# Usage:/,/^# *.*--help/ {
  20655. s/^# //
  20656. s/^# *$//
  20657. s/\$progname/'$progname'/
  20658. @@ -701,7 +758,10 @@ func_usage ()
  20659. # unless 'noexit' is passed as argument.
  20660. func_help ()
  20661. {
  20662. + $opt_debug
  20663. +
  20664. $SED -n '/^# Usage:/,/# Report bugs to/ {
  20665. + :print
  20666. s/^# //
  20667. s/^# *$//
  20668. s*\$progname*'$progname'*
  20669. @@ -714,7 +774,11 @@ func_help ()
  20670. s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
  20671. s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
  20672. p
  20673. - }' < "$progpath"
  20674. + d
  20675. + }
  20676. + /^# .* home page:/b print
  20677. + /^# General help using/b print
  20678. + ' < "$progpath"
  20679. ret=$?
  20680. if test -z "$1"; then
  20681. exit $ret
  20682. @@ -726,12 +790,39 @@ func_help ()
  20683. # exit_cmd.
  20684. func_missing_arg ()
  20685. {
  20686. - func_error "missing argument for $1"
  20687. + $opt_debug
  20688. +
  20689. + func_error "missing argument for $1."
  20690. exit_cmd=exit
  20691. }
  20692. -exit_cmd=:
  20693. +# func_split_short_opt shortopt
  20694. +# Set func_split_short_opt_name and func_split_short_opt_arg shell
  20695. +# variables after splitting SHORTOPT after the 2nd character.
  20696. +func_split_short_opt ()
  20697. +{
  20698. + my_sed_short_opt='1s/^\(..\).*$/\1/;q'
  20699. + my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
  20700. +
  20701. + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
  20702. + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
  20703. +} # func_split_short_opt may be replaced by extended shell implementation
  20704. +
  20705. +
  20706. +# func_split_long_opt longopt
  20707. +# Set func_split_long_opt_name and func_split_long_opt_arg shell
  20708. +# variables after splitting LONGOPT at the `=' sign.
  20709. +func_split_long_opt ()
  20710. +{
  20711. + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
  20712. + my_sed_long_arg='1s/^--[^=]*=//'
  20713. +
  20714. + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
  20715. + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
  20716. +} # func_split_long_opt may be replaced by extended shell implementation
  20717. +
  20718. +exit_cmd=:
  20719. @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
  20720. magic_exe="%%%MAGIC EXE variable%%%"
  20721. # Global variables.
  20722. -# $mode is unset
  20723. nonopt=
  20724. -execute_dlfiles=
  20725. preserve_args=
  20726. lo2o="s/\\.lo\$/.${objext}/"
  20727. o2lo="s/\\.${objext}\$/.lo/"
  20728. extracted_archives=
  20729. extracted_serial=0
  20730. -opt_dry_run=false
  20731. -opt_finish=:
  20732. -opt_duplicate_deps=false
  20733. -opt_silent=false
  20734. -opt_debug=:
  20735. -
  20736. # If this variable is set in any of the actions, the command in it
  20737. # will be execed at the end. This prevents here-documents from being
  20738. # left over by shells.
  20739. exec_cmd=
  20740. +# func_append var value
  20741. +# Append VALUE to the end of shell variable VAR.
  20742. +func_append ()
  20743. +{
  20744. + eval "${1}=\$${1}\${2}"
  20745. +} # func_append may be replaced by extended shell implementation
  20746. +
  20747. +# func_append_quoted var value
  20748. +# Quote VALUE and append to the end of shell variable VAR, separated
  20749. +# by a space.
  20750. +func_append_quoted ()
  20751. +{
  20752. + func_quote_for_eval "${2}"
  20753. + eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
  20754. +} # func_append_quoted may be replaced by extended shell implementation
  20755. +
  20756. +
  20757. +# func_arith arithmetic-term...
  20758. +func_arith ()
  20759. +{
  20760. + func_arith_result=`expr "${@}"`
  20761. +} # func_arith may be replaced by extended shell implementation
  20762. +
  20763. +
  20764. +# func_len string
  20765. +# STRING may not start with a hyphen.
  20766. +func_len ()
  20767. +{
  20768. + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
  20769. +} # func_len may be replaced by extended shell implementation
  20770. +
  20771. +
  20772. +# func_lo2o object
  20773. +func_lo2o ()
  20774. +{
  20775. + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  20776. +} # func_lo2o may be replaced by extended shell implementation
  20777. +
  20778. +
  20779. +# func_xform libobj-or-source
  20780. +func_xform ()
  20781. +{
  20782. + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  20783. +} # func_xform may be replaced by extended shell implementation
  20784. +
  20785. +
  20786. # func_fatal_configuration arg...
  20787. # Echo program name prefixed message to standard error, followed by
  20788. # a configuration failure hint, and exit.
  20789. @@ -850,130 +979,204 @@ func_enable_tag ()
  20790. esac
  20791. }
  20792. -# Parse options once, thoroughly. This comes as soon as possible in
  20793. -# the script to make things like `libtool --version' happen quickly.
  20794. +# func_check_version_match
  20795. +# Ensure that we are using m4 macros, and libtool script from the same
  20796. +# release of libtool.
  20797. +func_check_version_match ()
  20798. {
  20799. + if test "$package_revision" != "$macro_revision"; then
  20800. + if test "$VERSION" != "$macro_version"; then
  20801. + if test -z "$macro_version"; then
  20802. + cat >&2 <<_LT_EOF
  20803. +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  20804. +$progname: definition of this LT_INIT comes from an older release.
  20805. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  20806. +$progname: and run autoconf again.
  20807. +_LT_EOF
  20808. + else
  20809. + cat >&2 <<_LT_EOF
  20810. +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  20811. +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
  20812. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  20813. +$progname: and run autoconf again.
  20814. +_LT_EOF
  20815. + fi
  20816. + else
  20817. + cat >&2 <<_LT_EOF
  20818. +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
  20819. +$progname: but the definition of this LT_INIT comes from revision $macro_revision.
  20820. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision
  20821. +$progname: of $PACKAGE $VERSION and run autoconf again.
  20822. +_LT_EOF
  20823. + fi
  20824. - # Shorthand for --mode=foo, only valid as the first argument
  20825. - case $1 in
  20826. - clean|clea|cle|cl)
  20827. - shift; set dummy --mode clean ${1+"$@"}; shift
  20828. - ;;
  20829. - compile|compil|compi|comp|com|co|c)
  20830. - shift; set dummy --mode compile ${1+"$@"}; shift
  20831. - ;;
  20832. - execute|execut|execu|exec|exe|ex|e)
  20833. - shift; set dummy --mode execute ${1+"$@"}; shift
  20834. - ;;
  20835. - finish|finis|fini|fin|fi|f)
  20836. - shift; set dummy --mode finish ${1+"$@"}; shift
  20837. - ;;
  20838. - install|instal|insta|inst|ins|in|i)
  20839. - shift; set dummy --mode install ${1+"$@"}; shift
  20840. - ;;
  20841. - link|lin|li|l)
  20842. - shift; set dummy --mode link ${1+"$@"}; shift
  20843. - ;;
  20844. - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
  20845. - shift; set dummy --mode uninstall ${1+"$@"}; shift
  20846. - ;;
  20847. - esac
  20848. + exit $EXIT_MISMATCH
  20849. + fi
  20850. +}
  20851. +
  20852. +
  20853. +# Shorthand for --mode=foo, only valid as the first argument
  20854. +case $1 in
  20855. +clean|clea|cle|cl)
  20856. + shift; set dummy --mode clean ${1+"$@"}; shift
  20857. + ;;
  20858. +compile|compil|compi|comp|com|co|c)
  20859. + shift; set dummy --mode compile ${1+"$@"}; shift
  20860. + ;;
  20861. +execute|execut|execu|exec|exe|ex|e)
  20862. + shift; set dummy --mode execute ${1+"$@"}; shift
  20863. + ;;
  20864. +finish|finis|fini|fin|fi|f)
  20865. + shift; set dummy --mode finish ${1+"$@"}; shift
  20866. + ;;
  20867. +install|instal|insta|inst|ins|in|i)
  20868. + shift; set dummy --mode install ${1+"$@"}; shift
  20869. + ;;
  20870. +link|lin|li|l)
  20871. + shift; set dummy --mode link ${1+"$@"}; shift
  20872. + ;;
  20873. +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
  20874. + shift; set dummy --mode uninstall ${1+"$@"}; shift
  20875. + ;;
  20876. +esac
  20877. - # Parse non-mode specific arguments:
  20878. - while test "$#" -gt 0; do
  20879. +
  20880. +
  20881. +# Option defaults:
  20882. +opt_debug=:
  20883. +opt_dry_run=false
  20884. +opt_config=false
  20885. +opt_preserve_dup_deps=false
  20886. +opt_features=false
  20887. +opt_finish=false
  20888. +opt_help=false
  20889. +opt_help_all=false
  20890. +opt_silent=:
  20891. +opt_verbose=:
  20892. +opt_silent=false
  20893. +opt_verbose=false
  20894. +
  20895. +
  20896. +# Parse options once, thoroughly. This comes as soon as possible in the
  20897. +# script to make things like `--version' happen as quickly as we can.
  20898. +{
  20899. + # this just eases exit handling
  20900. + while test $# -gt 0; do
  20901. opt="$1"
  20902. shift
  20903. -
  20904. case $opt in
  20905. - --config) func_config ;;
  20906. -
  20907. - --debug) preserve_args="$preserve_args $opt"
  20908. + --debug|-x) opt_debug='set -x'
  20909. func_echo "enabling shell trace mode"
  20910. - opt_debug='set -x'
  20911. $opt_debug
  20912. ;;
  20913. -
  20914. - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
  20915. - execute_dlfiles="$execute_dlfiles $1"
  20916. - shift
  20917. + --dry-run|--dryrun|-n)
  20918. + opt_dry_run=:
  20919. ;;
  20920. -
  20921. - --dry-run | -n) opt_dry_run=: ;;
  20922. - --features) func_features ;;
  20923. - --finish) mode="finish" ;;
  20924. - --no-finish) opt_finish=false ;;
  20925. -
  20926. - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
  20927. - case $1 in
  20928. - # Valid mode arguments:
  20929. - clean) ;;
  20930. - compile) ;;
  20931. - execute) ;;
  20932. - finish) ;;
  20933. - install) ;;
  20934. - link) ;;
  20935. - relink) ;;
  20936. - uninstall) ;;
  20937. -
  20938. - # Catch anything else as an error
  20939. - *) func_error "invalid argument for $opt"
  20940. - exit_cmd=exit
  20941. - break
  20942. - ;;
  20943. - esac
  20944. -
  20945. - mode="$1"
  20946. + --config)
  20947. + opt_config=:
  20948. +func_config
  20949. + ;;
  20950. + --dlopen|-dlopen)
  20951. + optarg="$1"
  20952. + opt_dlopen="${opt_dlopen+$opt_dlopen
  20953. +}$optarg"
  20954. shift
  20955. ;;
  20956. -
  20957. --preserve-dup-deps)
  20958. - opt_duplicate_deps=: ;;
  20959. -
  20960. - --quiet|--silent) preserve_args="$preserve_args $opt"
  20961. - opt_silent=:
  20962. - opt_verbose=false
  20963. + opt_preserve_dup_deps=:
  20964. ;;
  20965. -
  20966. - --no-quiet|--no-silent)
  20967. - preserve_args="$preserve_args $opt"
  20968. - opt_silent=false
  20969. + --features)
  20970. + opt_features=:
  20971. +func_features
  20972. ;;
  20973. -
  20974. - --verbose| -v) preserve_args="$preserve_args $opt"
  20975. + --finish)
  20976. + opt_finish=:
  20977. +set dummy --mode finish ${1+"$@"}; shift
  20978. + ;;
  20979. + --help)
  20980. + opt_help=:
  20981. + ;;
  20982. + --help-all)
  20983. + opt_help_all=:
  20984. +opt_help=': help-all'
  20985. + ;;
  20986. + --mode)
  20987. + test $# = 0 && func_missing_arg $opt && break
  20988. + optarg="$1"
  20989. + opt_mode="$optarg"
  20990. +case $optarg in
  20991. + # Valid mode arguments:
  20992. + clean|compile|execute|finish|install|link|relink|uninstall) ;;
  20993. +
  20994. + # Catch anything else as an error
  20995. + *) func_error "invalid argument for $opt"
  20996. + exit_cmd=exit
  20997. + break
  20998. + ;;
  20999. +esac
  21000. + shift
  21001. + ;;
  21002. + --no-silent|--no-quiet)
  21003. opt_silent=false
  21004. - opt_verbose=:
  21005. +func_append preserve_args " $opt"
  21006. ;;
  21007. -
  21008. - --no-verbose) preserve_args="$preserve_args $opt"
  21009. + --no-verbose)
  21010. opt_verbose=false
  21011. +func_append preserve_args " $opt"
  21012. ;;
  21013. -
  21014. - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
  21015. - preserve_args="$preserve_args $opt $1"
  21016. - func_enable_tag "$1" # tagname is set here
  21017. + --silent|--quiet)
  21018. + opt_silent=:
  21019. +func_append preserve_args " $opt"
  21020. + opt_verbose=false
  21021. + ;;
  21022. + --verbose|-v)
  21023. + opt_verbose=:
  21024. +func_append preserve_args " $opt"
  21025. +opt_silent=false
  21026. + ;;
  21027. + --tag)
  21028. + test $# = 0 && func_missing_arg $opt && break
  21029. + optarg="$1"
  21030. + opt_tag="$optarg"
  21031. +func_append preserve_args " $opt $optarg"
  21032. +func_enable_tag "$optarg"
  21033. shift
  21034. ;;
  21035. + -\?|-h) func_usage ;;
  21036. + --help) func_help ;;
  21037. + --version) func_version ;;
  21038. +
  21039. # Separate optargs to long options:
  21040. - -dlopen=*|--mode=*|--tag=*)
  21041. - func_opt_split "$opt"
  21042. - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
  21043. + --*=*)
  21044. + func_split_long_opt "$opt"
  21045. + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
  21046. shift
  21047. ;;
  21048. - -\?|-h) func_usage ;;
  21049. - --help) opt_help=: ;;
  21050. - --help-all) opt_help=': help-all' ;;
  21051. - --version) func_version ;;
  21052. -
  21053. - -*) func_fatal_help "unrecognized option \`$opt'" ;;
  21054. -
  21055. - *) nonopt="$opt"
  21056. - break
  21057. + # Separate non-argument short options:
  21058. + -\?*|-h*|-n*|-v*)
  21059. + func_split_short_opt "$opt"
  21060. + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
  21061. + shift
  21062. ;;
  21063. +
  21064. + --) break ;;
  21065. + -*) func_fatal_help "unrecognized option \`$opt'" ;;
  21066. + *) set dummy "$opt" ${1+"$@"}; shift; break ;;
  21067. esac
  21068. done
  21069. + # Validate options:
  21070. +
  21071. + # save first non-option argument
  21072. + if test "$#" -gt 0; then
  21073. + nonopt="$opt"
  21074. + shift
  21075. + fi
  21076. +
  21077. + # preserve --debug
  21078. + test "$opt_debug" = : || func_append preserve_args " --debug"
  21079. case $host in
  21080. *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
  21081. @@ -981,82 +1184,44 @@ func_enable_tag ()
  21082. opt_duplicate_compiler_generated_deps=:
  21083. ;;
  21084. *)
  21085. - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
  21086. + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
  21087. ;;
  21088. esac
  21089. - # Having warned about all mis-specified options, bail out if
  21090. - # anything was wrong.
  21091. - $exit_cmd $EXIT_FAILURE
  21092. -}
  21093. + $opt_help || {
  21094. + # Sanity checks first:
  21095. + func_check_version_match
  21096. -# func_check_version_match
  21097. -# Ensure that we are using m4 macros, and libtool script from the same
  21098. -# release of libtool.
  21099. -func_check_version_match ()
  21100. -{
  21101. - if test "$package_revision" != "$macro_revision"; then
  21102. - if test "$VERSION" != "$macro_version"; then
  21103. - if test -z "$macro_version"; then
  21104. - cat >&2 <<_LT_EOF
  21105. -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  21106. -$progname: definition of this LT_INIT comes from an older release.
  21107. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  21108. -$progname: and run autoconf again.
  21109. -_LT_EOF
  21110. - else
  21111. - cat >&2 <<_LT_EOF
  21112. -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  21113. -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
  21114. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  21115. -$progname: and run autoconf again.
  21116. -_LT_EOF
  21117. - fi
  21118. - else
  21119. - cat >&2 <<_LT_EOF
  21120. -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
  21121. -$progname: but the definition of this LT_INIT comes from revision $macro_revision.
  21122. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision
  21123. -$progname: of $PACKAGE $VERSION and run autoconf again.
  21124. -_LT_EOF
  21125. + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
  21126. + func_fatal_configuration "not configured to build any kind of library"
  21127. fi
  21128. - exit $EXIT_MISMATCH
  21129. - fi
  21130. -}
  21131. -
  21132. + # Darwin sucks
  21133. + eval std_shrext=\"$shrext_cmds\"
  21134. -## ----------- ##
  21135. -## Main. ##
  21136. -## ----------- ##
  21137. -
  21138. -$opt_help || {
  21139. - # Sanity checks first:
  21140. - func_check_version_match
  21141. -
  21142. - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
  21143. - func_fatal_configuration "not configured to build any kind of library"
  21144. - fi
  21145. + # Only execute mode is allowed to have -dlopen flags.
  21146. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
  21147. + func_error "unrecognized option \`-dlopen'"
  21148. + $ECHO "$help" 1>&2
  21149. + exit $EXIT_FAILURE
  21150. + fi
  21151. - test -z "$mode" && func_fatal_error "error: you must specify a MODE."
  21152. + # Change the help message to a mode-specific one.
  21153. + generic_help="$help"
  21154. + help="Try \`$progname --help --mode=$opt_mode' for more information."
  21155. + }
  21156. - # Darwin sucks
  21157. - eval "std_shrext=\"$shrext_cmds\""
  21158. + # Bail if the options were screwed
  21159. + $exit_cmd $EXIT_FAILURE
  21160. +}
  21161. - # Only execute mode is allowed to have -dlopen flags.
  21162. - if test -n "$execute_dlfiles" && test "$mode" != execute; then
  21163. - func_error "unrecognized option \`-dlopen'"
  21164. - $ECHO "$help" 1>&2
  21165. - exit $EXIT_FAILURE
  21166. - fi
  21167. - # Change the help message to a mode-specific one.
  21168. - generic_help="$help"
  21169. - help="Try \`$progname --help --mode=$mode' for more information."
  21170. -}
  21171. +## ----------- ##
  21172. +## Main. ##
  21173. +## ----------- ##
  21174. # func_lalib_p file
  21175. # True iff FILE is a libtool `.la' library or `.lo' object file.
  21176. @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
  21177. # temporary ltwrapper_script.
  21178. func_ltwrapper_scriptname ()
  21179. {
  21180. - func_ltwrapper_scriptname_result=""
  21181. - if func_ltwrapper_executable_p "$1"; then
  21182. - func_dirname_and_basename "$1" "" "."
  21183. - func_stripname '' '.exe' "$func_basename_result"
  21184. - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
  21185. - fi
  21186. + func_dirname_and_basename "$1" "" "."
  21187. + func_stripname '' '.exe' "$func_basename_result"
  21188. + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
  21189. }
  21190. # func_ltwrapper_p file
  21191. @@ -1149,7 +1311,7 @@ func_execute_cmds ()
  21192. save_ifs=$IFS; IFS='~'
  21193. for cmd in $1; do
  21194. IFS=$save_ifs
  21195. - eval "cmd=\"$cmd\""
  21196. + eval cmd=\"$cmd\"
  21197. func_show_eval "$cmd" "${2-:}"
  21198. done
  21199. IFS=$save_ifs
  21200. @@ -1172,6 +1334,37 @@ func_source ()
  21201. }
  21202. +# func_resolve_sysroot PATH
  21203. +# Replace a leading = in PATH with a sysroot. Store the result into
  21204. +# func_resolve_sysroot_result
  21205. +func_resolve_sysroot ()
  21206. +{
  21207. + func_resolve_sysroot_result=$1
  21208. + case $func_resolve_sysroot_result in
  21209. + =*)
  21210. + func_stripname '=' '' "$func_resolve_sysroot_result"
  21211. + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
  21212. + ;;
  21213. + esac
  21214. +}
  21215. +
  21216. +# func_replace_sysroot PATH
  21217. +# If PATH begins with the sysroot, replace it with = and
  21218. +# store the result into func_replace_sysroot_result.
  21219. +func_replace_sysroot ()
  21220. +{
  21221. + case "$lt_sysroot:$1" in
  21222. + ?*:"$lt_sysroot"*)
  21223. + func_stripname "$lt_sysroot" '' "$1"
  21224. + func_replace_sysroot_result="=$func_stripname_result"
  21225. + ;;
  21226. + *)
  21227. + # Including no sysroot.
  21228. + func_replace_sysroot_result=$1
  21229. + ;;
  21230. + esac
  21231. +}
  21232. +
  21233. # func_infer_tag arg
  21234. # Infer tagged configuration to use if any are available and
  21235. # if one wasn't chosen via the "--tag" command line option.
  21236. @@ -1184,8 +1377,7 @@ func_infer_tag ()
  21237. if test -n "$available_tags" && test -z "$tagname"; then
  21238. CC_quoted=
  21239. for arg in $CC; do
  21240. - func_quote_for_eval "$arg"
  21241. - CC_quoted="$CC_quoted $func_quote_for_eval_result"
  21242. + func_append_quoted CC_quoted "$arg"
  21243. done
  21244. CC_expanded=`func_echo_all $CC`
  21245. CC_quoted_expanded=`func_echo_all $CC_quoted`
  21246. @@ -1204,8 +1396,7 @@ func_infer_tag ()
  21247. CC_quoted=
  21248. for arg in $CC; do
  21249. # Double-quote args containing other shell metacharacters.
  21250. - func_quote_for_eval "$arg"
  21251. - CC_quoted="$CC_quoted $func_quote_for_eval_result"
  21252. + func_append_quoted CC_quoted "$arg"
  21253. done
  21254. CC_expanded=`func_echo_all $CC`
  21255. CC_quoted_expanded=`func_echo_all $CC_quoted`
  21256. @@ -1274,6 +1465,486 @@ EOF
  21257. }
  21258. }
  21259. +
  21260. +##################################################
  21261. +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
  21262. +##################################################
  21263. +
  21264. +# func_convert_core_file_wine_to_w32 ARG
  21265. +# Helper function used by file name conversion functions when $build is *nix,
  21266. +# and $host is mingw, cygwin, or some other w32 environment. Relies on a
  21267. +# correctly configured wine environment available, with the winepath program
  21268. +# in $build's $PATH.
  21269. +#
  21270. +# ARG is the $build file name to be converted to w32 format.
  21271. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will
  21272. +# be empty on error (or when ARG is empty)
  21273. +func_convert_core_file_wine_to_w32 ()
  21274. +{
  21275. + $opt_debug
  21276. + func_convert_core_file_wine_to_w32_result="$1"
  21277. + if test -n "$1"; then
  21278. + # Unfortunately, winepath does not exit with a non-zero error code, so we
  21279. + # are forced to check the contents of stdout. On the other hand, if the
  21280. + # command is not found, the shell will set an exit code of 127 and print
  21281. + # *an error message* to stdout. So we must check for both error code of
  21282. + # zero AND non-empty stdout, which explains the odd construction:
  21283. + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
  21284. + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
  21285. + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
  21286. + $SED -e "$lt_sed_naive_backslashify"`
  21287. + else
  21288. + func_convert_core_file_wine_to_w32_result=
  21289. + fi
  21290. + fi
  21291. +}
  21292. +# end: func_convert_core_file_wine_to_w32
  21293. +
  21294. +
  21295. +# func_convert_core_path_wine_to_w32 ARG
  21296. +# Helper function used by path conversion functions when $build is *nix, and
  21297. +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
  21298. +# configured wine environment available, with the winepath program in $build's
  21299. +# $PATH. Assumes ARG has no leading or trailing path separator characters.
  21300. +#
  21301. +# ARG is path to be converted from $build format to win32.
  21302. +# Result is available in $func_convert_core_path_wine_to_w32_result.
  21303. +# Unconvertible file (directory) names in ARG are skipped; if no directory names
  21304. +# are convertible, then the result may be empty.
  21305. +func_convert_core_path_wine_to_w32 ()
  21306. +{
  21307. + $opt_debug
  21308. + # unfortunately, winepath doesn't convert paths, only file names
  21309. + func_convert_core_path_wine_to_w32_result=""
  21310. + if test -n "$1"; then
  21311. + oldIFS=$IFS
  21312. + IFS=:
  21313. + for func_convert_core_path_wine_to_w32_f in $1; do
  21314. + IFS=$oldIFS
  21315. + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
  21316. + if test -n "$func_convert_core_file_wine_to_w32_result" ; then
  21317. + if test -z "$func_convert_core_path_wine_to_w32_result"; then
  21318. + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
  21319. + else
  21320. + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
  21321. + fi
  21322. + fi
  21323. + done
  21324. + IFS=$oldIFS
  21325. + fi
  21326. +}
  21327. +# end: func_convert_core_path_wine_to_w32
  21328. +
  21329. +
  21330. +# func_cygpath ARGS...
  21331. +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
  21332. +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
  21333. +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
  21334. +# (2), returns the Cygwin file name or path in func_cygpath_result (input
  21335. +# file name or path is assumed to be in w32 format, as previously converted
  21336. +# from $build's *nix or MSYS format). In case (3), returns the w32 file name
  21337. +# or path in func_cygpath_result (input file name or path is assumed to be in
  21338. +# Cygwin format). Returns an empty string on error.
  21339. +#
  21340. +# ARGS are passed to cygpath, with the last one being the file name or path to
  21341. +# be converted.
  21342. +#
  21343. +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
  21344. +# environment variable; do not put it in $PATH.
  21345. +func_cygpath ()
  21346. +{
  21347. + $opt_debug
  21348. + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
  21349. + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
  21350. + if test "$?" -ne 0; then
  21351. + # on failure, ensure result is empty
  21352. + func_cygpath_result=
  21353. + fi
  21354. + else
  21355. + func_cygpath_result=
  21356. + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
  21357. + fi
  21358. +}
  21359. +#end: func_cygpath
  21360. +
  21361. +
  21362. +# func_convert_core_msys_to_w32 ARG
  21363. +# Convert file name or path ARG from MSYS format to w32 format. Return
  21364. +# result in func_convert_core_msys_to_w32_result.
  21365. +func_convert_core_msys_to_w32 ()
  21366. +{
  21367. + $opt_debug
  21368. + # awkward: cmd appends spaces to result
  21369. + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
  21370. + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
  21371. +}
  21372. +#end: func_convert_core_msys_to_w32
  21373. +
  21374. +
  21375. +# func_convert_file_check ARG1 ARG2
  21376. +# Verify that ARG1 (a file name in $build format) was converted to $host
  21377. +# format in ARG2. Otherwise, emit an error message, but continue (resetting
  21378. +# func_to_host_file_result to ARG1).
  21379. +func_convert_file_check ()
  21380. +{
  21381. + $opt_debug
  21382. + if test -z "$2" && test -n "$1" ; then
  21383. + func_error "Could not determine host file name corresponding to"
  21384. + func_error " \`$1'"
  21385. + func_error "Continuing, but uninstalled executables may not work."
  21386. + # Fallback:
  21387. + func_to_host_file_result="$1"
  21388. + fi
  21389. +}
  21390. +# end func_convert_file_check
  21391. +
  21392. +
  21393. +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
  21394. +# Verify that FROM_PATH (a path in $build format) was converted to $host
  21395. +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
  21396. +# func_to_host_file_result to a simplistic fallback value (see below).
  21397. +func_convert_path_check ()
  21398. +{
  21399. + $opt_debug
  21400. + if test -z "$4" && test -n "$3"; then
  21401. + func_error "Could not determine the host path corresponding to"
  21402. + func_error " \`$3'"
  21403. + func_error "Continuing, but uninstalled executables may not work."
  21404. + # Fallback. This is a deliberately simplistic "conversion" and
  21405. + # should not be "improved". See libtool.info.
  21406. + if test "x$1" != "x$2"; then
  21407. + lt_replace_pathsep_chars="s|$1|$2|g"
  21408. + func_to_host_path_result=`echo "$3" |
  21409. + $SED -e "$lt_replace_pathsep_chars"`
  21410. + else
  21411. + func_to_host_path_result="$3"
  21412. + fi
  21413. + fi
  21414. +}
  21415. +# end func_convert_path_check
  21416. +
  21417. +
  21418. +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
  21419. +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
  21420. +# and appending REPL if ORIG matches BACKPAT.
  21421. +func_convert_path_front_back_pathsep ()
  21422. +{
  21423. + $opt_debug
  21424. + case $4 in
  21425. + $1 ) func_to_host_path_result="$3$func_to_host_path_result"
  21426. + ;;
  21427. + esac
  21428. + case $4 in
  21429. + $2 ) func_append func_to_host_path_result "$3"
  21430. + ;;
  21431. + esac
  21432. +}
  21433. +# end func_convert_path_front_back_pathsep
  21434. +
  21435. +
  21436. +##################################################
  21437. +# $build to $host FILE NAME CONVERSION FUNCTIONS #
  21438. +##################################################
  21439. +# invoked via `$to_host_file_cmd ARG'
  21440. +#
  21441. +# In each case, ARG is the path to be converted from $build to $host format.
  21442. +# Result will be available in $func_to_host_file_result.
  21443. +
  21444. +
  21445. +# func_to_host_file ARG
  21446. +# Converts the file name ARG from $build format to $host format. Return result
  21447. +# in func_to_host_file_result.
  21448. +func_to_host_file ()
  21449. +{
  21450. + $opt_debug
  21451. + $to_host_file_cmd "$1"
  21452. +}
  21453. +# end func_to_host_file
  21454. +
  21455. +
  21456. +# func_to_tool_file ARG LAZY
  21457. +# converts the file name ARG from $build format to toolchain format. Return
  21458. +# result in func_to_tool_file_result. If the conversion in use is listed
  21459. +# in (the comma separated) LAZY, no conversion takes place.
  21460. +func_to_tool_file ()
  21461. +{
  21462. + $opt_debug
  21463. + case ,$2, in
  21464. + *,"$to_tool_file_cmd",*)
  21465. + func_to_tool_file_result=$1
  21466. + ;;
  21467. + *)
  21468. + $to_tool_file_cmd "$1"
  21469. + func_to_tool_file_result=$func_to_host_file_result
  21470. + ;;
  21471. + esac
  21472. +}
  21473. +# end func_to_tool_file
  21474. +
  21475. +
  21476. +# func_convert_file_noop ARG
  21477. +# Copy ARG to func_to_host_file_result.
  21478. +func_convert_file_noop ()
  21479. +{
  21480. + func_to_host_file_result="$1"
  21481. +}
  21482. +# end func_convert_file_noop
  21483. +
  21484. +
  21485. +# func_convert_file_msys_to_w32 ARG
  21486. +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
  21487. +# conversion to w32 is not available inside the cwrapper. Returns result in
  21488. +# func_to_host_file_result.
  21489. +func_convert_file_msys_to_w32 ()
  21490. +{
  21491. + $opt_debug
  21492. + func_to_host_file_result="$1"
  21493. + if test -n "$1"; then
  21494. + func_convert_core_msys_to_w32 "$1"
  21495. + func_to_host_file_result="$func_convert_core_msys_to_w32_result"
  21496. + fi
  21497. + func_convert_file_check "$1" "$func_to_host_file_result"
  21498. +}
  21499. +# end func_convert_file_msys_to_w32
  21500. +
  21501. +
  21502. +# func_convert_file_cygwin_to_w32 ARG
  21503. +# Convert file name ARG from Cygwin to w32 format. Returns result in
  21504. +# func_to_host_file_result.
  21505. +func_convert_file_cygwin_to_w32 ()
  21506. +{
  21507. + $opt_debug
  21508. + func_to_host_file_result="$1"
  21509. + if test -n "$1"; then
  21510. + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
  21511. + # LT_CYGPATH in this case.
  21512. + func_to_host_file_result=`cygpath -m "$1"`
  21513. + fi
  21514. + func_convert_file_check "$1" "$func_to_host_file_result"
  21515. +}
  21516. +# end func_convert_file_cygwin_to_w32
  21517. +
  21518. +
  21519. +# func_convert_file_nix_to_w32 ARG
  21520. +# Convert file name ARG from *nix to w32 format. Requires a wine environment
  21521. +# and a working winepath. Returns result in func_to_host_file_result.
  21522. +func_convert_file_nix_to_w32 ()
  21523. +{
  21524. + $opt_debug
  21525. + func_to_host_file_result="$1"
  21526. + if test -n "$1"; then
  21527. + func_convert_core_file_wine_to_w32 "$1"
  21528. + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
  21529. + fi
  21530. + func_convert_file_check "$1" "$func_to_host_file_result"
  21531. +}
  21532. +# end func_convert_file_nix_to_w32
  21533. +
  21534. +
  21535. +# func_convert_file_msys_to_cygwin ARG
  21536. +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
  21537. +# Returns result in func_to_host_file_result.
  21538. +func_convert_file_msys_to_cygwin ()
  21539. +{
  21540. + $opt_debug
  21541. + func_to_host_file_result="$1"
  21542. + if test -n "$1"; then
  21543. + func_convert_core_msys_to_w32 "$1"
  21544. + func_cygpath -u "$func_convert_core_msys_to_w32_result"
  21545. + func_to_host_file_result="$func_cygpath_result"
  21546. + fi
  21547. + func_convert_file_check "$1" "$func_to_host_file_result"
  21548. +}
  21549. +# end func_convert_file_msys_to_cygwin
  21550. +
  21551. +
  21552. +# func_convert_file_nix_to_cygwin ARG
  21553. +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
  21554. +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
  21555. +# in func_to_host_file_result.
  21556. +func_convert_file_nix_to_cygwin ()
  21557. +{
  21558. + $opt_debug
  21559. + func_to_host_file_result="$1"
  21560. + if test -n "$1"; then
  21561. + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
  21562. + func_convert_core_file_wine_to_w32 "$1"
  21563. + func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
  21564. + func_to_host_file_result="$func_cygpath_result"
  21565. + fi
  21566. + func_convert_file_check "$1" "$func_to_host_file_result"
  21567. +}
  21568. +# end func_convert_file_nix_to_cygwin
  21569. +
  21570. +
  21571. +#############################################
  21572. +# $build to $host PATH CONVERSION FUNCTIONS #
  21573. +#############################################
  21574. +# invoked via `$to_host_path_cmd ARG'
  21575. +#
  21576. +# In each case, ARG is the path to be converted from $build to $host format.
  21577. +# The result will be available in $func_to_host_path_result.
  21578. +#
  21579. +# Path separators are also converted from $build format to $host format. If
  21580. +# ARG begins or ends with a path separator character, it is preserved (but
  21581. +# converted to $host format) on output.
  21582. +#
  21583. +# All path conversion functions are named using the following convention:
  21584. +# file name conversion function : func_convert_file_X_to_Y ()
  21585. +# path conversion function : func_convert_path_X_to_Y ()
  21586. +# where, for any given $build/$host combination the 'X_to_Y' value is the
  21587. +# same. If conversion functions are added for new $build/$host combinations,
  21588. +# the two new functions must follow this pattern, or func_init_to_host_path_cmd
  21589. +# will break.
  21590. +
  21591. +
  21592. +# func_init_to_host_path_cmd
  21593. +# Ensures that function "pointer" variable $to_host_path_cmd is set to the
  21594. +# appropriate value, based on the value of $to_host_file_cmd.
  21595. +to_host_path_cmd=
  21596. +func_init_to_host_path_cmd ()
  21597. +{
  21598. + $opt_debug
  21599. + if test -z "$to_host_path_cmd"; then
  21600. + func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
  21601. + to_host_path_cmd="func_convert_path_${func_stripname_result}"
  21602. + fi
  21603. +}
  21604. +
  21605. +
  21606. +# func_to_host_path ARG
  21607. +# Converts the path ARG from $build format to $host format. Return result
  21608. +# in func_to_host_path_result.
  21609. +func_to_host_path ()
  21610. +{
  21611. + $opt_debug
  21612. + func_init_to_host_path_cmd
  21613. + $to_host_path_cmd "$1"
  21614. +}
  21615. +# end func_to_host_path
  21616. +
  21617. +
  21618. +# func_convert_path_noop ARG
  21619. +# Copy ARG to func_to_host_path_result.
  21620. +func_convert_path_noop ()
  21621. +{
  21622. + func_to_host_path_result="$1"
  21623. +}
  21624. +# end func_convert_path_noop
  21625. +
  21626. +
  21627. +# func_convert_path_msys_to_w32 ARG
  21628. +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
  21629. +# conversion to w32 is not available inside the cwrapper. Returns result in
  21630. +# func_to_host_path_result.
  21631. +func_convert_path_msys_to_w32 ()
  21632. +{
  21633. + $opt_debug
  21634. + func_to_host_path_result="$1"
  21635. + if test -n "$1"; then
  21636. + # Remove leading and trailing path separator characters from ARG. MSYS
  21637. + # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
  21638. + # and winepath ignores them completely.
  21639. + func_stripname : : "$1"
  21640. + func_to_host_path_tmp1=$func_stripname_result
  21641. + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
  21642. + func_to_host_path_result="$func_convert_core_msys_to_w32_result"
  21643. + func_convert_path_check : ";" \
  21644. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  21645. + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
  21646. + fi
  21647. +}
  21648. +# end func_convert_path_msys_to_w32
  21649. +
  21650. +
  21651. +# func_convert_path_cygwin_to_w32 ARG
  21652. +# Convert path ARG from Cygwin to w32 format. Returns result in
  21653. +# func_to_host_file_result.
  21654. +func_convert_path_cygwin_to_w32 ()
  21655. +{
  21656. + $opt_debug
  21657. + func_to_host_path_result="$1"
  21658. + if test -n "$1"; then
  21659. + # See func_convert_path_msys_to_w32:
  21660. + func_stripname : : "$1"
  21661. + func_to_host_path_tmp1=$func_stripname_result
  21662. + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
  21663. + func_convert_path_check : ";" \
  21664. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  21665. + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
  21666. + fi
  21667. +}
  21668. +# end func_convert_path_cygwin_to_w32
  21669. +
  21670. +
  21671. +# func_convert_path_nix_to_w32 ARG
  21672. +# Convert path ARG from *nix to w32 format. Requires a wine environment and
  21673. +# a working winepath. Returns result in func_to_host_file_result.
  21674. +func_convert_path_nix_to_w32 ()
  21675. +{
  21676. + $opt_debug
  21677. + func_to_host_path_result="$1"
  21678. + if test -n "$1"; then
  21679. + # See func_convert_path_msys_to_w32:
  21680. + func_stripname : : "$1"
  21681. + func_to_host_path_tmp1=$func_stripname_result
  21682. + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
  21683. + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
  21684. + func_convert_path_check : ";" \
  21685. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  21686. + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
  21687. + fi
  21688. +}
  21689. +# end func_convert_path_nix_to_w32
  21690. +
  21691. +
  21692. +# func_convert_path_msys_to_cygwin ARG
  21693. +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
  21694. +# Returns result in func_to_host_file_result.
  21695. +func_convert_path_msys_to_cygwin ()
  21696. +{
  21697. + $opt_debug
  21698. + func_to_host_path_result="$1"
  21699. + if test -n "$1"; then
  21700. + # See func_convert_path_msys_to_w32:
  21701. + func_stripname : : "$1"
  21702. + func_to_host_path_tmp1=$func_stripname_result
  21703. + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
  21704. + func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
  21705. + func_to_host_path_result="$func_cygpath_result"
  21706. + func_convert_path_check : : \
  21707. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  21708. + func_convert_path_front_back_pathsep ":*" "*:" : "$1"
  21709. + fi
  21710. +}
  21711. +# end func_convert_path_msys_to_cygwin
  21712. +
  21713. +
  21714. +# func_convert_path_nix_to_cygwin ARG
  21715. +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
  21716. +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
  21717. +# func_to_host_file_result.
  21718. +func_convert_path_nix_to_cygwin ()
  21719. +{
  21720. + $opt_debug
  21721. + func_to_host_path_result="$1"
  21722. + if test -n "$1"; then
  21723. + # Remove leading and trailing path separator characters from
  21724. + # ARG. msys behavior is inconsistent here, cygpath turns them
  21725. + # into '.;' and ';.', and winepath ignores them completely.
  21726. + func_stripname : : "$1"
  21727. + func_to_host_path_tmp1=$func_stripname_result
  21728. + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
  21729. + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
  21730. + func_to_host_path_result="$func_cygpath_result"
  21731. + func_convert_path_check : : \
  21732. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  21733. + func_convert_path_front_back_pathsep ":*" "*:" : "$1"
  21734. + fi
  21735. +}
  21736. +# end func_convert_path_nix_to_cygwin
  21737. +
  21738. +
  21739. # func_mode_compile arg...
  21740. func_mode_compile ()
  21741. {
  21742. @@ -1314,12 +1985,12 @@ func_mode_compile ()
  21743. ;;
  21744. -pie | -fpie | -fPIE)
  21745. - pie_flag="$pie_flag $arg"
  21746. + func_append pie_flag " $arg"
  21747. continue
  21748. ;;
  21749. -shared | -static | -prefer-pic | -prefer-non-pic)
  21750. - later="$later $arg"
  21751. + func_append later " $arg"
  21752. continue
  21753. ;;
  21754. @@ -1340,15 +2011,14 @@ func_mode_compile ()
  21755. save_ifs="$IFS"; IFS=','
  21756. for arg in $args; do
  21757. IFS="$save_ifs"
  21758. - func_quote_for_eval "$arg"
  21759. - lastarg="$lastarg $func_quote_for_eval_result"
  21760. + func_append_quoted lastarg "$arg"
  21761. done
  21762. IFS="$save_ifs"
  21763. func_stripname ' ' '' "$lastarg"
  21764. lastarg=$func_stripname_result
  21765. # Add the arguments to base_compile.
  21766. - base_compile="$base_compile $lastarg"
  21767. + func_append base_compile " $lastarg"
  21768. continue
  21769. ;;
  21770. @@ -1364,8 +2034,7 @@ func_mode_compile ()
  21771. esac # case $arg_mode
  21772. # Aesthetically quote the previous argument.
  21773. - func_quote_for_eval "$lastarg"
  21774. - base_compile="$base_compile $func_quote_for_eval_result"
  21775. + func_append_quoted base_compile "$lastarg"
  21776. done # for arg
  21777. case $arg_mode in
  21778. @@ -1496,17 +2165,16 @@ compiler."
  21779. $opt_dry_run || $RM $removelist
  21780. exit $EXIT_FAILURE
  21781. fi
  21782. - removelist="$removelist $output_obj"
  21783. + func_append removelist " $output_obj"
  21784. $ECHO "$srcfile" > "$lockfile"
  21785. fi
  21786. $opt_dry_run || $RM $removelist
  21787. - removelist="$removelist $lockfile"
  21788. + func_append removelist " $lockfile"
  21789. trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
  21790. - if test -n "$fix_srcfile_path"; then
  21791. - eval "srcfile=\"$fix_srcfile_path\""
  21792. - fi
  21793. + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
  21794. + srcfile=$func_to_tool_file_result
  21795. func_quote_for_eval "$srcfile"
  21796. qsrcfile=$func_quote_for_eval_result
  21797. @@ -1526,7 +2194,7 @@ compiler."
  21798. if test -z "$output_obj"; then
  21799. # Place PIC objects in $objdir
  21800. - command="$command -o $lobj"
  21801. + func_append command " -o $lobj"
  21802. fi
  21803. func_show_eval_locale "$command" \
  21804. @@ -1573,11 +2241,11 @@ compiler."
  21805. command="$base_compile $qsrcfile $pic_flag"
  21806. fi
  21807. if test "$compiler_c_o" = yes; then
  21808. - command="$command -o $obj"
  21809. + func_append command " -o $obj"
  21810. fi
  21811. # Suppress compiler output if we already did a PIC compilation.
  21812. - command="$command$suppress_output"
  21813. + func_append command "$suppress_output"
  21814. func_show_eval_locale "$command" \
  21815. '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
  21816. @@ -1622,13 +2290,13 @@ compiler."
  21817. }
  21818. $opt_help || {
  21819. - test "$mode" = compile && func_mode_compile ${1+"$@"}
  21820. + test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
  21821. }
  21822. func_mode_help ()
  21823. {
  21824. # We need to display help for each of the modes.
  21825. - case $mode in
  21826. + case $opt_mode in
  21827. "")
  21828. # Generic help is extracted from the usage comments
  21829. # at the start of this file.
  21830. @@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
  21831. -o OUTPUT-FILE set the output file name to OUTPUT-FILE
  21832. -no-suppress do not suppress compiler output for multiple passes
  21833. - -prefer-pic try to building PIC objects only
  21834. - -prefer-non-pic try to building non-PIC objects only
  21835. + -prefer-pic try to build PIC objects only
  21836. + -prefer-non-pic try to build non-PIC objects only
  21837. -shared do not build a \`.o' file suitable for static linking
  21838. -static only build a \`.o' file suitable for static linking
  21839. -Wc,FLAG pass FLAG directly to the compiler
  21840. @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
  21841. ;;
  21842. *)
  21843. - func_fatal_help "invalid operation mode \`$mode'"
  21844. + func_fatal_help "invalid operation mode \`$opt_mode'"
  21845. ;;
  21846. esac
  21847. @@ -1819,13 +2487,13 @@ if $opt_help; then
  21848. else
  21849. {
  21850. func_help noexit
  21851. - for mode in compile link execute install finish uninstall clean; do
  21852. + for opt_mode in compile link execute install finish uninstall clean; do
  21853. func_mode_help
  21854. done
  21855. } | sed -n '1p; 2,$s/^Usage:/ or: /p'
  21856. {
  21857. func_help noexit
  21858. - for mode in compile link execute install finish uninstall clean; do
  21859. + for opt_mode in compile link execute install finish uninstall clean; do
  21860. echo
  21861. func_mode_help
  21862. done
  21863. @@ -1854,13 +2522,16 @@ func_mode_execute ()
  21864. func_fatal_help "you must specify a COMMAND"
  21865. # Handle -dlopen flags immediately.
  21866. - for file in $execute_dlfiles; do
  21867. + for file in $opt_dlopen; do
  21868. test -f "$file" \
  21869. || func_fatal_help "\`$file' is not a file"
  21870. dir=
  21871. case $file in
  21872. *.la)
  21873. + func_resolve_sysroot "$file"
  21874. + file=$func_resolve_sysroot_result
  21875. +
  21876. # Check to see that this really is a libtool archive.
  21877. func_lalib_unsafe_p "$file" \
  21878. || func_fatal_help "\`$lib' is not a valid libtool archive"
  21879. @@ -1882,7 +2553,7 @@ func_mode_execute ()
  21880. dir="$func_dirname_result"
  21881. if test -f "$dir/$objdir/$dlname"; then
  21882. - dir="$dir/$objdir"
  21883. + func_append dir "/$objdir"
  21884. else
  21885. if test ! -f "$dir/$dlname"; then
  21886. func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
  21887. @@ -1907,10 +2578,10 @@ func_mode_execute ()
  21888. test -n "$absdir" && dir="$absdir"
  21889. # Now add the directory to shlibpath_var.
  21890. - if eval test -z \"\$$shlibpath_var\"; then
  21891. - eval $shlibpath_var=\$dir
  21892. + if eval "test -z \"\$$shlibpath_var\""; then
  21893. + eval "$shlibpath_var=\"\$dir\""
  21894. else
  21895. - eval $shlibpath_var=\$dir:\$$shlibpath_var
  21896. + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
  21897. fi
  21898. done
  21899. @@ -1939,8 +2610,7 @@ func_mode_execute ()
  21900. ;;
  21901. esac
  21902. # Quote arguments (to preserve shell metacharacters).
  21903. - func_quote_for_eval "$file"
  21904. - args="$args $func_quote_for_eval_result"
  21905. + func_append_quoted args "$file"
  21906. done
  21907. if test "X$opt_dry_run" = Xfalse; then
  21908. @@ -1972,22 +2642,59 @@ func_mode_execute ()
  21909. fi
  21910. }
  21911. -test "$mode" = execute && func_mode_execute ${1+"$@"}
  21912. +test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
  21913. # func_mode_finish arg...
  21914. func_mode_finish ()
  21915. {
  21916. $opt_debug
  21917. - libdirs="$nonopt"
  21918. + libs=
  21919. + libdirs=
  21920. admincmds=
  21921. - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
  21922. - for dir
  21923. - do
  21924. - libdirs="$libdirs $dir"
  21925. - done
  21926. + for opt in "$nonopt" ${1+"$@"}
  21927. + do
  21928. + if test -d "$opt"; then
  21929. + func_append libdirs " $opt"
  21930. + elif test -f "$opt"; then
  21931. + if func_lalib_unsafe_p "$opt"; then
  21932. + func_append libs " $opt"
  21933. + else
  21934. + func_warning "\`$opt' is not a valid libtool archive"
  21935. + fi
  21936. +
  21937. + else
  21938. + func_fatal_error "invalid argument \`$opt'"
  21939. + fi
  21940. + done
  21941. +
  21942. + if test -n "$libs"; then
  21943. + if test -n "$lt_sysroot"; then
  21944. + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
  21945. + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
  21946. + else
  21947. + sysroot_cmd=
  21948. + fi
  21949. +
  21950. + # Remove sysroot references
  21951. + if $opt_dry_run; then
  21952. + for lib in $libs; do
  21953. + echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
  21954. + done
  21955. + else
  21956. + tmpdir=`func_mktempdir`
  21957. + for lib in $libs; do
  21958. + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
  21959. + > $tmpdir/tmp-la
  21960. + mv -f $tmpdir/tmp-la $lib
  21961. + done
  21962. + ${RM}r "$tmpdir"
  21963. + fi
  21964. + fi
  21965. +
  21966. + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
  21967. for libdir in $libdirs; do
  21968. if test -n "$finish_cmds"; then
  21969. # Do each command in the finish commands.
  21970. @@ -1997,7 +2704,7 @@ func_mode_finish ()
  21971. if test -n "$finish_eval"; then
  21972. # Do the single finish_eval.
  21973. eval cmds=\"$finish_eval\"
  21974. - $opt_dry_run || eval "$cmds" || admincmds="$admincmds
  21975. + $opt_dry_run || eval "$cmds" || func_append admincmds "
  21976. $cmds"
  21977. fi
  21978. done
  21979. @@ -2006,53 +2713,55 @@ func_mode_finish ()
  21980. # Exit here if they wanted silent mode.
  21981. $opt_silent && exit $EXIT_SUCCESS
  21982. - echo "----------------------------------------------------------------------"
  21983. - echo "Libraries have been installed in:"
  21984. - for libdir in $libdirs; do
  21985. - $ECHO " $libdir"
  21986. - done
  21987. - echo
  21988. - echo "If you ever happen to want to link against installed libraries"
  21989. - echo "in a given directory, LIBDIR, you must either use libtool, and"
  21990. - echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
  21991. - echo "flag during linking and do at least one of the following:"
  21992. - if test -n "$shlibpath_var"; then
  21993. - echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
  21994. - echo " during execution"
  21995. - fi
  21996. - if test -n "$runpath_var"; then
  21997. - echo " - add LIBDIR to the \`$runpath_var' environment variable"
  21998. - echo " during linking"
  21999. - fi
  22000. - if test -n "$hardcode_libdir_flag_spec"; then
  22001. - libdir=LIBDIR
  22002. - eval "flag=\"$hardcode_libdir_flag_spec\""
  22003. + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
  22004. + echo "----------------------------------------------------------------------"
  22005. + echo "Libraries have been installed in:"
  22006. + for libdir in $libdirs; do
  22007. + $ECHO " $libdir"
  22008. + done
  22009. + echo
  22010. + echo "If you ever happen to want to link against installed libraries"
  22011. + echo "in a given directory, LIBDIR, you must either use libtool, and"
  22012. + echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
  22013. + echo "flag during linking and do at least one of the following:"
  22014. + if test -n "$shlibpath_var"; then
  22015. + echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
  22016. + echo " during execution"
  22017. + fi
  22018. + if test -n "$runpath_var"; then
  22019. + echo " - add LIBDIR to the \`$runpath_var' environment variable"
  22020. + echo " during linking"
  22021. + fi
  22022. + if test -n "$hardcode_libdir_flag_spec"; then
  22023. + libdir=LIBDIR
  22024. + eval flag=\"$hardcode_libdir_flag_spec\"
  22025. - $ECHO " - use the \`$flag' linker flag"
  22026. - fi
  22027. - if test -n "$admincmds"; then
  22028. - $ECHO " - have your system administrator run these commands:$admincmds"
  22029. - fi
  22030. - if test -f /etc/ld.so.conf; then
  22031. - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
  22032. - fi
  22033. - echo
  22034. + $ECHO " - use the \`$flag' linker flag"
  22035. + fi
  22036. + if test -n "$admincmds"; then
  22037. + $ECHO " - have your system administrator run these commands:$admincmds"
  22038. + fi
  22039. + if test -f /etc/ld.so.conf; then
  22040. + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
  22041. + fi
  22042. + echo
  22043. - echo "See any operating system documentation about shared libraries for"
  22044. - case $host in
  22045. - solaris2.[6789]|solaris2.1[0-9])
  22046. - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
  22047. - echo "pages."
  22048. - ;;
  22049. - *)
  22050. - echo "more information, such as the ld(1) and ld.so(8) manual pages."
  22051. - ;;
  22052. - esac
  22053. - echo "----------------------------------------------------------------------"
  22054. + echo "See any operating system documentation about shared libraries for"
  22055. + case $host in
  22056. + solaris2.[6789]|solaris2.1[0-9])
  22057. + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
  22058. + echo "pages."
  22059. + ;;
  22060. + *)
  22061. + echo "more information, such as the ld(1) and ld.so(8) manual pages."
  22062. + ;;
  22063. + esac
  22064. + echo "----------------------------------------------------------------------"
  22065. + fi
  22066. exit $EXIT_SUCCESS
  22067. }
  22068. -test "$mode" = finish && func_mode_finish ${1+"$@"}
  22069. +test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
  22070. # func_mode_install arg...
  22071. @@ -2077,7 +2786,7 @@ func_mode_install ()
  22072. # The real first argument should be the name of the installation program.
  22073. # Aesthetically quote it.
  22074. func_quote_for_eval "$arg"
  22075. - install_prog="$install_prog$func_quote_for_eval_result"
  22076. + func_append install_prog "$func_quote_for_eval_result"
  22077. install_shared_prog=$install_prog
  22078. case " $install_prog " in
  22079. *[\\\ /]cp\ *) install_cp=: ;;
  22080. @@ -2097,7 +2806,7 @@ func_mode_install ()
  22081. do
  22082. arg2=
  22083. if test -n "$dest"; then
  22084. - files="$files $dest"
  22085. + func_append files " $dest"
  22086. dest=$arg
  22087. continue
  22088. fi
  22089. @@ -2135,11 +2844,11 @@ func_mode_install ()
  22090. # Aesthetically quote the argument.
  22091. func_quote_for_eval "$arg"
  22092. - install_prog="$install_prog $func_quote_for_eval_result"
  22093. + func_append install_prog " $func_quote_for_eval_result"
  22094. if test -n "$arg2"; then
  22095. func_quote_for_eval "$arg2"
  22096. fi
  22097. - install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
  22098. + func_append install_shared_prog " $func_quote_for_eval_result"
  22099. done
  22100. test -z "$install_prog" && \
  22101. @@ -2151,7 +2860,7 @@ func_mode_install ()
  22102. if test -n "$install_override_mode" && $no_mode; then
  22103. if $install_cp; then :; else
  22104. func_quote_for_eval "$install_override_mode"
  22105. - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
  22106. + func_append install_shared_prog " -m $func_quote_for_eval_result"
  22107. fi
  22108. fi
  22109. @@ -2209,10 +2918,13 @@ func_mode_install ()
  22110. case $file in
  22111. *.$libext)
  22112. # Do the static libraries later.
  22113. - staticlibs="$staticlibs $file"
  22114. + func_append staticlibs " $file"
  22115. ;;
  22116. *.la)
  22117. + func_resolve_sysroot "$file"
  22118. + file=$func_resolve_sysroot_result
  22119. +
  22120. # Check to see that this really is a libtool archive.
  22121. func_lalib_unsafe_p "$file" \
  22122. || func_fatal_help "\`$file' is not a valid libtool archive"
  22123. @@ -2226,23 +2938,30 @@ func_mode_install ()
  22124. if test "X$destdir" = "X$libdir"; then
  22125. case "$current_libdirs " in
  22126. *" $libdir "*) ;;
  22127. - *) current_libdirs="$current_libdirs $libdir" ;;
  22128. + *) func_append current_libdirs " $libdir" ;;
  22129. esac
  22130. else
  22131. # Note the libdir as a future libdir.
  22132. case "$future_libdirs " in
  22133. *" $libdir "*) ;;
  22134. - *) future_libdirs="$future_libdirs $libdir" ;;
  22135. + *) func_append future_libdirs " $libdir" ;;
  22136. esac
  22137. fi
  22138. func_dirname "$file" "/" ""
  22139. dir="$func_dirname_result"
  22140. - dir="$dir$objdir"
  22141. + func_append dir "$objdir"
  22142. if test -n "$relink_command"; then
  22143. + # Strip any trailing slash from the destination.
  22144. + func_stripname '' '/' "$libdir"
  22145. + destlibdir=$func_stripname_result
  22146. +
  22147. + func_stripname '' '/' "$destdir"
  22148. + s_destdir=$func_stripname_result
  22149. +
  22150. # Determine the prefix the user has applied to our future dir.
  22151. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
  22152. + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
  22153. # Don't allow the user to place us outside of our expected
  22154. # location b/c this prevents finding dependent libraries that
  22155. @@ -2315,7 +3034,7 @@ func_mode_install ()
  22156. func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
  22157. # Maybe install the static library, too.
  22158. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
  22159. + test -n "$old_library" && func_append staticlibs " $dir/$old_library"
  22160. ;;
  22161. *.lo)
  22162. @@ -2503,7 +3222,7 @@ func_mode_install ()
  22163. test -n "$future_libdirs" && \
  22164. func_warning "remember to run \`$progname --finish$future_libdirs'"
  22165. - if test -n "$current_libdirs" && $opt_finish; then
  22166. + if test -n "$current_libdirs"; then
  22167. # Maybe just do a dry run.
  22168. $opt_dry_run && current_libdirs=" -n$current_libdirs"
  22169. exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
  22170. @@ -2512,7 +3231,7 @@ func_mode_install ()
  22171. fi
  22172. }
  22173. -test "$mode" = install && func_mode_install ${1+"$@"}
  22174. +test "$opt_mode" = install && func_mode_install ${1+"$@"}
  22175. # func_generate_dlsyms outputname originator pic_p
  22176. @@ -2559,6 +3278,18 @@ extern \"C\" {
  22177. #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
  22178. #endif
  22179. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  22180. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  22181. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  22182. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  22183. +# define LT_DLSYM_CONST
  22184. +#elif defined(__osf__)
  22185. +/* This system does not cope well with relocations in const data. */
  22186. +# define LT_DLSYM_CONST
  22187. +#else
  22188. +# define LT_DLSYM_CONST const
  22189. +#endif
  22190. +
  22191. /* External symbol declarations for the compiler. */\
  22192. "
  22193. @@ -2570,21 +3301,22 @@ extern \"C\" {
  22194. # Add our own program objects to the symbol list.
  22195. progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
  22196. for progfile in $progfiles; do
  22197. - func_verbose "extracting global C symbols from \`$progfile'"
  22198. - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
  22199. + func_to_tool_file "$progfile" func_convert_file_msys_to_w32
  22200. + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
  22201. + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
  22202. done
  22203. if test -n "$exclude_expsyms"; then
  22204. $opt_dry_run || {
  22205. - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
  22206. - $MV "$nlist"T "$nlist"
  22207. + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
  22208. + eval '$MV "$nlist"T "$nlist"'
  22209. }
  22210. fi
  22211. if test -n "$export_symbols_regex"; then
  22212. $opt_dry_run || {
  22213. - $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
  22214. - $MV "$nlist"T "$nlist"
  22215. + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
  22216. + eval '$MV "$nlist"T "$nlist"'
  22217. }
  22218. fi
  22219. @@ -2593,23 +3325,23 @@ extern \"C\" {
  22220. export_symbols="$output_objdir/$outputname.exp"
  22221. $opt_dry_run || {
  22222. $RM $export_symbols
  22223. - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
  22224. + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
  22225. case $host in
  22226. *cygwin* | *mingw* | *cegcc* )
  22227. - echo EXPORTS > "$output_objdir/$outputname.def"
  22228. - cat "$export_symbols" >> "$output_objdir/$outputname.def"
  22229. + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
  22230. + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
  22231. ;;
  22232. esac
  22233. }
  22234. else
  22235. $opt_dry_run || {
  22236. - ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
  22237. - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
  22238. - $MV "$nlist"T "$nlist"
  22239. + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
  22240. + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
  22241. + eval '$MV "$nlist"T "$nlist"'
  22242. case $host in
  22243. *cygwin* | *mingw* | *cegcc* )
  22244. - echo EXPORTS > "$output_objdir/$outputname.def"
  22245. - cat "$nlist" >> "$output_objdir/$outputname.def"
  22246. + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
  22247. + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
  22248. ;;
  22249. esac
  22250. }
  22251. @@ -2620,10 +3352,52 @@ extern \"C\" {
  22252. func_verbose "extracting global C symbols from \`$dlprefile'"
  22253. func_basename "$dlprefile"
  22254. name="$func_basename_result"
  22255. - $opt_dry_run || {
  22256. - $ECHO ": $name " >> "$nlist"
  22257. - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
  22258. - }
  22259. + case $host in
  22260. + *cygwin* | *mingw* | *cegcc* )
  22261. + # if an import library, we need to obtain dlname
  22262. + if func_win32_import_lib_p "$dlprefile"; then
  22263. + func_tr_sh "$dlprefile"
  22264. + eval "curr_lafile=\$libfile_$func_tr_sh_result"
  22265. + dlprefile_dlbasename=""
  22266. + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
  22267. + # Use subshell, to avoid clobbering current variable values
  22268. + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
  22269. + if test -n "$dlprefile_dlname" ; then
  22270. + func_basename "$dlprefile_dlname"
  22271. + dlprefile_dlbasename="$func_basename_result"
  22272. + else
  22273. + # no lafile. user explicitly requested -dlpreopen <import library>.
  22274. + $sharedlib_from_linklib_cmd "$dlprefile"
  22275. + dlprefile_dlbasename=$sharedlib_from_linklib_result
  22276. + fi
  22277. + fi
  22278. + $opt_dry_run || {
  22279. + if test -n "$dlprefile_dlbasename" ; then
  22280. + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
  22281. + else
  22282. + func_warning "Could not compute DLL name from $name"
  22283. + eval '$ECHO ": $name " >> "$nlist"'
  22284. + fi
  22285. + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
  22286. + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
  22287. + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
  22288. + }
  22289. + else # not an import lib
  22290. + $opt_dry_run || {
  22291. + eval '$ECHO ": $name " >> "$nlist"'
  22292. + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
  22293. + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
  22294. + }
  22295. + fi
  22296. + ;;
  22297. + *)
  22298. + $opt_dry_run || {
  22299. + eval '$ECHO ": $name " >> "$nlist"'
  22300. + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
  22301. + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
  22302. + }
  22303. + ;;
  22304. + esac
  22305. done
  22306. $opt_dry_run || {
  22307. @@ -2661,26 +3435,9 @@ typedef struct {
  22308. const char *name;
  22309. void *address;
  22310. } lt_dlsymlist;
  22311. -"
  22312. - case $host in
  22313. - *cygwin* | *mingw* | *cegcc* )
  22314. - echo >> "$output_objdir/$my_dlsyms" "\
  22315. -/* DATA imports from DLLs on WIN32 con't be const, because
  22316. - runtime relocations are performed -- see ld's documentation
  22317. - on pseudo-relocs. */"
  22318. - lt_dlsym_const= ;;
  22319. - *osf5*)
  22320. - echo >> "$output_objdir/$my_dlsyms" "\
  22321. -/* This system does not cope well with relocations in const data */"
  22322. - lt_dlsym_const= ;;
  22323. - *)
  22324. - lt_dlsym_const=const ;;
  22325. - esac
  22326. -
  22327. - echo >> "$output_objdir/$my_dlsyms" "\
  22328. -extern $lt_dlsym_const lt_dlsymlist
  22329. +extern LT_DLSYM_CONST lt_dlsymlist
  22330. lt_${my_prefix}_LTX_preloaded_symbols[];
  22331. -$lt_dlsym_const lt_dlsymlist
  22332. +LT_DLSYM_CONST lt_dlsymlist
  22333. lt_${my_prefix}_LTX_preloaded_symbols[] =
  22334. {\
  22335. { \"$my_originator\", (void *) 0 },"
  22336. @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
  22337. for arg in $LTCFLAGS; do
  22338. case $arg in
  22339. -pie | -fpie | -fPIE) ;;
  22340. - *) symtab_cflags="$symtab_cflags $arg" ;;
  22341. + *) func_append symtab_cflags " $arg" ;;
  22342. esac
  22343. done
  22344. @@ -2796,9 +3553,11 @@ func_win32_libid ()
  22345. win32_libid_type="x86 archive import"
  22346. ;;
  22347. *ar\ archive*) # could be an import, or static
  22348. - if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
  22349. - $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
  22350. - win32_nmres=`$NM -f posix -A "$1" |
  22351. + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
  22352. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
  22353. + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
  22354. + func_to_tool_file "$1" func_convert_file_msys_to_w32
  22355. + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
  22356. $SED -n -e '
  22357. 1,100{
  22358. / I /{
  22359. @@ -2827,6 +3586,131 @@ func_win32_libid ()
  22360. $ECHO "$win32_libid_type"
  22361. }
  22362. +# func_cygming_dll_for_implib ARG
  22363. +#
  22364. +# Platform-specific function to extract the
  22365. +# name of the DLL associated with the specified
  22366. +# import library ARG.
  22367. +# Invoked by eval'ing the libtool variable
  22368. +# $sharedlib_from_linklib_cmd
  22369. +# Result is available in the variable
  22370. +# $sharedlib_from_linklib_result
  22371. +func_cygming_dll_for_implib ()
  22372. +{
  22373. + $opt_debug
  22374. + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
  22375. +}
  22376. +
  22377. +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
  22378. +#
  22379. +# The is the core of a fallback implementation of a
  22380. +# platform-specific function to extract the name of the
  22381. +# DLL associated with the specified import library LIBNAME.
  22382. +#
  22383. +# SECTION_NAME is either .idata$6 or .idata$7, depending
  22384. +# on the platform and compiler that created the implib.
  22385. +#
  22386. +# Echos the name of the DLL associated with the
  22387. +# specified import library.
  22388. +func_cygming_dll_for_implib_fallback_core ()
  22389. +{
  22390. + $opt_debug
  22391. + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
  22392. + $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
  22393. + $SED '/^Contents of section '"$match_literal"':/{
  22394. + # Place marker at beginning of archive member dllname section
  22395. + s/.*/====MARK====/
  22396. + p
  22397. + d
  22398. + }
  22399. + # These lines can sometimes be longer than 43 characters, but
  22400. + # are always uninteresting
  22401. + /:[ ]*file format pe[i]\{,1\}-/d
  22402. + /^In archive [^:]*:/d
  22403. + # Ensure marker is printed
  22404. + /^====MARK====/p
  22405. + # Remove all lines with less than 43 characters
  22406. + /^.\{43\}/!d
  22407. + # From remaining lines, remove first 43 characters
  22408. + s/^.\{43\}//' |
  22409. + $SED -n '
  22410. + # Join marker and all lines until next marker into a single line
  22411. + /^====MARK====/ b para
  22412. + H
  22413. + $ b para
  22414. + b
  22415. + :para
  22416. + x
  22417. + s/\n//g
  22418. + # Remove the marker
  22419. + s/^====MARK====//
  22420. + # Remove trailing dots and whitespace
  22421. + s/[\. \t]*$//
  22422. + # Print
  22423. + /./p' |
  22424. + # we now have a list, one entry per line, of the stringified
  22425. + # contents of the appropriate section of all members of the
  22426. + # archive which possess that section. Heuristic: eliminate
  22427. + # all those which have a first or second character that is
  22428. + # a '.' (that is, objdump's representation of an unprintable
  22429. + # character.) This should work for all archives with less than
  22430. + # 0x302f exports -- but will fail for DLLs whose name actually
  22431. + # begins with a literal '.' or a single character followed by
  22432. + # a '.'.
  22433. + #
  22434. + # Of those that remain, print the first one.
  22435. + $SED -e '/^\./d;/^.\./d;q'
  22436. +}
  22437. +
  22438. +# func_cygming_gnu_implib_p ARG
  22439. +# This predicate returns with zero status (TRUE) if
  22440. +# ARG is a GNU/binutils-style import library. Returns
  22441. +# with nonzero status (FALSE) otherwise.
  22442. +func_cygming_gnu_implib_p ()
  22443. +{
  22444. + $opt_debug
  22445. + func_to_tool_file "$1" func_convert_file_msys_to_w32
  22446. + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
  22447. + test -n "$func_cygming_gnu_implib_tmp"
  22448. +}
  22449. +
  22450. +# func_cygming_ms_implib_p ARG
  22451. +# This predicate returns with zero status (TRUE) if
  22452. +# ARG is an MS-style import library. Returns
  22453. +# with nonzero status (FALSE) otherwise.
  22454. +func_cygming_ms_implib_p ()
  22455. +{
  22456. + $opt_debug
  22457. + func_to_tool_file "$1" func_convert_file_msys_to_w32
  22458. + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
  22459. + test -n "$func_cygming_ms_implib_tmp"
  22460. +}
  22461. +
  22462. +# func_cygming_dll_for_implib_fallback ARG
  22463. +# Platform-specific function to extract the
  22464. +# name of the DLL associated with the specified
  22465. +# import library ARG.
  22466. +#
  22467. +# This fallback implementation is for use when $DLLTOOL
  22468. +# does not support the --identify-strict option.
  22469. +# Invoked by eval'ing the libtool variable
  22470. +# $sharedlib_from_linklib_cmd
  22471. +# Result is available in the variable
  22472. +# $sharedlib_from_linklib_result
  22473. +func_cygming_dll_for_implib_fallback ()
  22474. +{
  22475. + $opt_debug
  22476. + if func_cygming_gnu_implib_p "$1" ; then
  22477. + # binutils import library
  22478. + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
  22479. + elif func_cygming_ms_implib_p "$1" ; then
  22480. + # ms-generated import library
  22481. + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
  22482. + else
  22483. + # unknown
  22484. + sharedlib_from_linklib_result=""
  22485. + fi
  22486. +}
  22487. # func_extract_an_archive dir oldlib
  22488. @@ -2917,7 +3801,7 @@ func_extract_archives ()
  22489. darwin_file=
  22490. darwin_files=
  22491. for darwin_file in $darwin_filelist; do
  22492. - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
  22493. + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
  22494. $LIPO -create -output "$darwin_file" $darwin_files
  22495. done # $darwin_filelist
  22496. $RM -rf unfat-$$
  22497. @@ -2932,7 +3816,7 @@ func_extract_archives ()
  22498. func_extract_an_archive "$my_xdir" "$my_xabs"
  22499. ;;
  22500. esac
  22501. - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
  22502. + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
  22503. done
  22504. func_extract_archives_result="$my_oldobjs"
  22505. @@ -3014,7 +3898,110 @@ func_fallback_echo ()
  22506. _LTECHO_EOF'
  22507. }
  22508. ECHO=\"$qECHO\"
  22509. - fi\
  22510. + fi
  22511. +
  22512. +# Very basic option parsing. These options are (a) specific to
  22513. +# the libtool wrapper, (b) are identical between the wrapper
  22514. +# /script/ and the wrapper /executable/ which is used only on
  22515. +# windows platforms, and (c) all begin with the string "--lt-"
  22516. +# (application programs are unlikely to have options which match
  22517. +# this pattern).
  22518. +#
  22519. +# There are only two supported options: --lt-debug and
  22520. +# --lt-dump-script. There is, deliberately, no --lt-help.
  22521. +#
  22522. +# The first argument to this parsing function should be the
  22523. +# script's $0 value, followed by "$@".
  22524. +lt_option_debug=
  22525. +func_parse_lt_options ()
  22526. +{
  22527. + lt_script_arg0=\$0
  22528. + shift
  22529. + for lt_opt
  22530. + do
  22531. + case \"\$lt_opt\" in
  22532. + --lt-debug) lt_option_debug=1 ;;
  22533. + --lt-dump-script)
  22534. + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
  22535. + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
  22536. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
  22537. + cat \"\$lt_dump_D/\$lt_dump_F\"
  22538. + exit 0
  22539. + ;;
  22540. + --lt-*)
  22541. + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
  22542. + exit 1
  22543. + ;;
  22544. + esac
  22545. + done
  22546. +
  22547. + # Print the debug banner immediately:
  22548. + if test -n \"\$lt_option_debug\"; then
  22549. + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
  22550. + fi
  22551. +}
  22552. +
  22553. +# Used when --lt-debug. Prints its arguments to stdout
  22554. +# (redirection is the responsibility of the caller)
  22555. +func_lt_dump_args ()
  22556. +{
  22557. + lt_dump_args_N=1;
  22558. + for lt_arg
  22559. + do
  22560. + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
  22561. + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
  22562. + done
  22563. +}
  22564. +
  22565. +# Core function for launching the target application
  22566. +func_exec_program_core ()
  22567. +{
  22568. +"
  22569. + case $host in
  22570. + # Backslashes separate directories on plain windows
  22571. + *-*-mingw | *-*-os2* | *-cegcc*)
  22572. + $ECHO "\
  22573. + if test -n \"\$lt_option_debug\"; then
  22574. + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
  22575. + func_lt_dump_args \${1+\"\$@\"} 1>&2
  22576. + fi
  22577. + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
  22578. +"
  22579. + ;;
  22580. +
  22581. + *)
  22582. + $ECHO "\
  22583. + if test -n \"\$lt_option_debug\"; then
  22584. + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
  22585. + func_lt_dump_args \${1+\"\$@\"} 1>&2
  22586. + fi
  22587. + exec \"\$progdir/\$program\" \${1+\"\$@\"}
  22588. +"
  22589. + ;;
  22590. + esac
  22591. + $ECHO "\
  22592. + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
  22593. + exit 1
  22594. +}
  22595. +
  22596. +# A function to encapsulate launching the target application
  22597. +# Strips options in the --lt-* namespace from \$@ and
  22598. +# launches target application with the remaining arguments.
  22599. +func_exec_program ()
  22600. +{
  22601. + for lt_wr_arg
  22602. + do
  22603. + case \$lt_wr_arg in
  22604. + --lt-*) ;;
  22605. + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
  22606. + esac
  22607. + shift
  22608. + done
  22609. + func_exec_program_core \${1+\"\$@\"}
  22610. +}
  22611. +
  22612. + # Parse options
  22613. + func_parse_lt_options \"\$0\" \${1+\"\$@\"}
  22614. # Find the directory that this script lives in.
  22615. thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
  22616. @@ -3078,7 +4065,7 @@ _LTECHO_EOF'
  22617. # relink executable if necessary
  22618. if test -n \"\$relink_command\"; then
  22619. - if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
  22620. + if relink_command_output=\`eval \$relink_command 2>&1\`; then :
  22621. else
  22622. $ECHO \"\$relink_command_output\" >&2
  22623. $RM \"\$progdir/\$file\"
  22624. @@ -3102,6 +4089,18 @@ _LTECHO_EOF'
  22625. if test -f \"\$progdir/\$program\"; then"
  22626. + # fixup the dll searchpath if we need to.
  22627. + #
  22628. + # Fix the DLL searchpath if we need to. Do this before prepending
  22629. + # to shlibpath, because on Windows, both are PATH and uninstalled
  22630. + # libraries must come first.
  22631. + if test -n "$dllsearchpath"; then
  22632. + $ECHO "\
  22633. + # Add the dll search path components to the executable PATH
  22634. + PATH=$dllsearchpath:\$PATH
  22635. +"
  22636. + fi
  22637. +
  22638. # Export our shlibpath_var if we have one.
  22639. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
  22640. $ECHO "\
  22641. @@ -3116,35 +4115,10 @@ _LTECHO_EOF'
  22642. "
  22643. fi
  22644. - # fixup the dll searchpath if we need to.
  22645. - if test -n "$dllsearchpath"; then
  22646. - $ECHO "\
  22647. - # Add the dll search path components to the executable PATH
  22648. - PATH=$dllsearchpath:\$PATH
  22649. -"
  22650. - fi
  22651. -
  22652. $ECHO "\
  22653. if test \"\$libtool_execute_magic\" != \"$magic\"; then
  22654. # Run the actual program with our arguments.
  22655. -"
  22656. - case $host in
  22657. - # Backslashes separate directories on plain windows
  22658. - *-*-mingw | *-*-os2* | *-cegcc*)
  22659. - $ECHO "\
  22660. - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
  22661. -"
  22662. - ;;
  22663. -
  22664. - *)
  22665. - $ECHO "\
  22666. - exec \"\$progdir/\$program\" \${1+\"\$@\"}
  22667. -"
  22668. - ;;
  22669. - esac
  22670. - $ECHO "\
  22671. - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
  22672. - exit 1
  22673. + func_exec_program \${1+\"\$@\"}
  22674. fi
  22675. else
  22676. # The program doesn't exist.
  22677. @@ -3158,166 +4132,6 @@ fi\
  22678. }
  22679. -# func_to_host_path arg
  22680. -#
  22681. -# Convert paths to host format when used with build tools.
  22682. -# Intended for use with "native" mingw (where libtool itself
  22683. -# is running under the msys shell), or in the following cross-
  22684. -# build environments:
  22685. -# $build $host
  22686. -# mingw (msys) mingw [e.g. native]
  22687. -# cygwin mingw
  22688. -# *nix + wine mingw
  22689. -# where wine is equipped with the `winepath' executable.
  22690. -# In the native mingw case, the (msys) shell automatically
  22691. -# converts paths for any non-msys applications it launches,
  22692. -# but that facility isn't available from inside the cwrapper.
  22693. -# Similar accommodations are necessary for $host mingw and
  22694. -# $build cygwin. Calling this function does no harm for other
  22695. -# $host/$build combinations not listed above.
  22696. -#
  22697. -# ARG is the path (on $build) that should be converted to
  22698. -# the proper representation for $host. The result is stored
  22699. -# in $func_to_host_path_result.
  22700. -func_to_host_path ()
  22701. -{
  22702. - func_to_host_path_result="$1"
  22703. - if test -n "$1"; then
  22704. - case $host in
  22705. - *mingw* )
  22706. - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
  22707. - case $build in
  22708. - *mingw* ) # actually, msys
  22709. - # awkward: cmd appends spaces to result
  22710. - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
  22711. - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
  22712. - ;;
  22713. - *cygwin* )
  22714. - func_to_host_path_result=`cygpath -w "$1" |
  22715. - $SED -e "$lt_sed_naive_backslashify"`
  22716. - ;;
  22717. - * )
  22718. - # Unfortunately, winepath does not exit with a non-zero
  22719. - # error code, so we are forced to check the contents of
  22720. - # stdout. On the other hand, if the command is not
  22721. - # found, the shell will set an exit code of 127 and print
  22722. - # *an error message* to stdout. So we must check for both
  22723. - # error code of zero AND non-empty stdout, which explains
  22724. - # the odd construction:
  22725. - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
  22726. - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
  22727. - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
  22728. - $SED -e "$lt_sed_naive_backslashify"`
  22729. - else
  22730. - # Allow warning below.
  22731. - func_to_host_path_result=
  22732. - fi
  22733. - ;;
  22734. - esac
  22735. - if test -z "$func_to_host_path_result" ; then
  22736. - func_error "Could not determine host path corresponding to"
  22737. - func_error " \`$1'"
  22738. - func_error "Continuing, but uninstalled executables may not work."
  22739. - # Fallback:
  22740. - func_to_host_path_result="$1"
  22741. - fi
  22742. - ;;
  22743. - esac
  22744. - fi
  22745. -}
  22746. -# end: func_to_host_path
  22747. -
  22748. -# func_to_host_pathlist arg
  22749. -#
  22750. -# Convert pathlists to host format when used with build tools.
  22751. -# See func_to_host_path(), above. This function supports the
  22752. -# following $build/$host combinations (but does no harm for
  22753. -# combinations not listed here):
  22754. -# $build $host
  22755. -# mingw (msys) mingw [e.g. native]
  22756. -# cygwin mingw
  22757. -# *nix + wine mingw
  22758. -#
  22759. -# Path separators are also converted from $build format to
  22760. -# $host format. If ARG begins or ends with a path separator
  22761. -# character, it is preserved (but converted to $host format)
  22762. -# on output.
  22763. -#
  22764. -# ARG is a pathlist (on $build) that should be converted to
  22765. -# the proper representation on $host. The result is stored
  22766. -# in $func_to_host_pathlist_result.
  22767. -func_to_host_pathlist ()
  22768. -{
  22769. - func_to_host_pathlist_result="$1"
  22770. - if test -n "$1"; then
  22771. - case $host in
  22772. - *mingw* )
  22773. - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
  22774. - # Remove leading and trailing path separator characters from
  22775. - # ARG. msys behavior is inconsistent here, cygpath turns them
  22776. - # into '.;' and ';.', and winepath ignores them completely.
  22777. - func_stripname : : "$1"
  22778. - func_to_host_pathlist_tmp1=$func_stripname_result
  22779. - case $build in
  22780. - *mingw* ) # Actually, msys.
  22781. - # Awkward: cmd appends spaces to result.
  22782. - func_to_host_pathlist_result=`
  22783. - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
  22784. - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
  22785. - ;;
  22786. - *cygwin* )
  22787. - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
  22788. - $SED -e "$lt_sed_naive_backslashify"`
  22789. - ;;
  22790. - * )
  22791. - # unfortunately, winepath doesn't convert pathlists
  22792. - func_to_host_pathlist_result=""
  22793. - func_to_host_pathlist_oldIFS=$IFS
  22794. - IFS=:
  22795. - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
  22796. - IFS=$func_to_host_pathlist_oldIFS
  22797. - if test -n "$func_to_host_pathlist_f" ; then
  22798. - func_to_host_path "$func_to_host_pathlist_f"
  22799. - if test -n "$func_to_host_path_result" ; then
  22800. - if test -z "$func_to_host_pathlist_result" ; then
  22801. - func_to_host_pathlist_result="$func_to_host_path_result"
  22802. - else
  22803. - func_append func_to_host_pathlist_result ";$func_to_host_path_result"
  22804. - fi
  22805. - fi
  22806. - fi
  22807. - done
  22808. - IFS=$func_to_host_pathlist_oldIFS
  22809. - ;;
  22810. - esac
  22811. - if test -z "$func_to_host_pathlist_result"; then
  22812. - func_error "Could not determine the host path(s) corresponding to"
  22813. - func_error " \`$1'"
  22814. - func_error "Continuing, but uninstalled executables may not work."
  22815. - # Fallback. This may break if $1 contains DOS-style drive
  22816. - # specifications. The fix is not to complicate the expression
  22817. - # below, but for the user to provide a working wine installation
  22818. - # with winepath so that path translation in the cross-to-mingw
  22819. - # case works properly.
  22820. - lt_replace_pathsep_nix_to_dos="s|:|;|g"
  22821. - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
  22822. - $SED -e "$lt_replace_pathsep_nix_to_dos"`
  22823. - fi
  22824. - # Now, add the leading and trailing path separators back
  22825. - case "$1" in
  22826. - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
  22827. - ;;
  22828. - esac
  22829. - case "$1" in
  22830. - *: ) func_append func_to_host_pathlist_result ";"
  22831. - ;;
  22832. - esac
  22833. - ;;
  22834. - esac
  22835. - fi
  22836. -}
  22837. -# end: func_to_host_pathlist
  22838. -
  22839. # func_emit_cwrapperexe_src
  22840. # emit the source code for a wrapper executable on stdout
  22841. # Must ONLY be called from within func_mode_link because
  22842. @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
  22843. This wrapper executable should never be moved out of the build directory.
  22844. If it is, it will not operate correctly.
  22845. -
  22846. - Currently, it simply execs the wrapper *script* "$SHELL $output",
  22847. - but could eventually absorb all of the scripts functionality and
  22848. - exec $objdir/$outputname directly.
  22849. */
  22850. EOF
  22851. cat <<"EOF"
  22852. @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
  22853. if (stale) { free ((void *) stale); stale = 0; } \
  22854. } while (0)
  22855. -#undef LTWRAPPER_DEBUGPRINTF
  22856. -#if defined LT_DEBUGWRAPPER
  22857. -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
  22858. -static void
  22859. -ltwrapper_debugprintf (const char *fmt, ...)
  22860. -{
  22861. - va_list args;
  22862. - va_start (args, fmt);
  22863. - (void) vfprintf (stderr, fmt, args);
  22864. - va_end (args);
  22865. -}
  22866. +#if defined(LT_DEBUGWRAPPER)
  22867. +static int lt_debug = 1;
  22868. #else
  22869. -# define LTWRAPPER_DEBUGPRINTF(args)
  22870. +static int lt_debug = 0;
  22871. #endif
  22872. -const char *program_name = NULL;
  22873. +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
  22874. void *xmalloc (size_t num);
  22875. char *xstrdup (const char *string);
  22876. @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
  22877. int make_executable (const char *path);
  22878. int check_executable (const char *path);
  22879. char *strendzap (char *str, const char *pat);
  22880. -void lt_fatal (const char *message, ...);
  22881. +void lt_debugprintf (const char *file, int line, const char *fmt, ...);
  22882. +void lt_fatal (const char *file, int line, const char *message, ...);
  22883. +static const char *nonnull (const char *s);
  22884. +static const char *nonempty (const char *s);
  22885. void lt_setenv (const char *name, const char *value);
  22886. char *lt_extend_str (const char *orig_value, const char *add, int to_end);
  22887. void lt_update_exe_path (const char *name, const char *value);
  22888. @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
  22889. EOF
  22890. cat <<EOF
  22891. -const char * MAGIC_EXE = "$magic_exe";
  22892. +volatile const char * MAGIC_EXE = "$magic_exe";
  22893. const char * LIB_PATH_VARNAME = "$shlibpath_var";
  22894. EOF
  22895. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
  22896. - func_to_host_pathlist "$temp_rpath"
  22897. + func_to_host_path "$temp_rpath"
  22898. cat <<EOF
  22899. -const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
  22900. +const char * LIB_PATH_VALUE = "$func_to_host_path_result";
  22901. EOF
  22902. else
  22903. cat <<"EOF"
  22904. @@ -3513,10 +4317,10 @@ EOF
  22905. fi
  22906. if test -n "$dllsearchpath"; then
  22907. - func_to_host_pathlist "$dllsearchpath:"
  22908. + func_to_host_path "$dllsearchpath:"
  22909. cat <<EOF
  22910. const char * EXE_PATH_VARNAME = "PATH";
  22911. -const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
  22912. +const char * EXE_PATH_VALUE = "$func_to_host_path_result";
  22913. EOF
  22914. else
  22915. cat <<"EOF"
  22916. @@ -3539,12 +4343,10 @@ EOF
  22917. cat <<"EOF"
  22918. #define LTWRAPPER_OPTION_PREFIX "--lt-"
  22919. -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
  22920. -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
  22921. static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
  22922. -
  22923. static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
  22924. +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
  22925. int
  22926. main (int argc, char *argv[])
  22927. @@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
  22928. int i;
  22929. program_name = (char *) xstrdup (base_name (argv[0]));
  22930. - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
  22931. - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
  22932. + newargz = XMALLOC (char *, argc + 1);
  22933. - /* very simple arg parsing; don't want to rely on getopt */
  22934. + /* very simple arg parsing; don't want to rely on getopt
  22935. + * also, copy all non cwrapper options to newargz, except
  22936. + * argz[0], which is handled differently
  22937. + */
  22938. + newargc=0;
  22939. for (i = 1; i < argc; i++)
  22940. {
  22941. if (strcmp (argv[i], dumpscript_opt) == 0)
  22942. @@ -3581,21 +4386,54 @@ EOF
  22943. lt_dump_script (stdout);
  22944. return 0;
  22945. }
  22946. + if (strcmp (argv[i], debug_opt) == 0)
  22947. + {
  22948. + lt_debug = 1;
  22949. + continue;
  22950. + }
  22951. + if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
  22952. + {
  22953. + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
  22954. + namespace, but it is not one of the ones we know about and
  22955. + have already dealt with, above (inluding dump-script), then
  22956. + report an error. Otherwise, targets might begin to believe
  22957. + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
  22958. + namespace. The first time any user complains about this, we'll
  22959. + need to make LTWRAPPER_OPTION_PREFIX a configure-time option
  22960. + or a configure.ac-settable value.
  22961. + */
  22962. + lt_fatal (__FILE__, __LINE__,
  22963. + "unrecognized %s option: '%s'",
  22964. + ltwrapper_option_prefix, argv[i]);
  22965. + }
  22966. + /* otherwise ... */
  22967. + newargz[++newargc] = xstrdup (argv[i]);
  22968. }
  22969. + newargz[++newargc] = NULL;
  22970. +
  22971. +EOF
  22972. + cat <<EOF
  22973. + /* The GNU banner must be the first non-error debug message */
  22974. + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
  22975. +EOF
  22976. + cat <<"EOF"
  22977. + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
  22978. + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
  22979. - newargz = XMALLOC (char *, argc + 1);
  22980. tmp_pathspec = find_executable (argv[0]);
  22981. if (tmp_pathspec == NULL)
  22982. - lt_fatal ("Couldn't find %s", argv[0]);
  22983. - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
  22984. - tmp_pathspec));
  22985. + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
  22986. + lt_debugprintf (__FILE__, __LINE__,
  22987. + "(main) found exe (before symlink chase) at: %s\n",
  22988. + tmp_pathspec);
  22989. actual_cwrapper_path = chase_symlinks (tmp_pathspec);
  22990. - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
  22991. - actual_cwrapper_path));
  22992. + lt_debugprintf (__FILE__, __LINE__,
  22993. + "(main) found exe (after symlink chase) at: %s\n",
  22994. + actual_cwrapper_path);
  22995. XFREE (tmp_pathspec);
  22996. - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
  22997. + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
  22998. strendzap (actual_cwrapper_path, actual_cwrapper_name);
  22999. /* wrapper name transforms */
  23000. @@ -3613,8 +4451,9 @@ EOF
  23001. target_name = tmp_pathspec;
  23002. tmp_pathspec = 0;
  23003. - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
  23004. - target_name));
  23005. + lt_debugprintf (__FILE__, __LINE__,
  23006. + "(main) libtool target name: %s\n",
  23007. + target_name);
  23008. EOF
  23009. cat <<EOF
  23010. @@ -3664,35 +4503,19 @@ EOF
  23011. lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
  23012. lt_setenv ("DUALCASE", "1"); /* for MSK sh */
  23013. - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
  23014. + /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
  23015. + be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
  23016. + because on Windows, both *_VARNAMEs are PATH but uninstalled
  23017. + libraries must come first. */
  23018. lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
  23019. + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
  23020. - newargc=0;
  23021. - for (i = 1; i < argc; i++)
  23022. - {
  23023. - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
  23024. - {
  23025. - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
  23026. - namespace, but it is not one of the ones we know about and
  23027. - have already dealt with, above (inluding dump-script), then
  23028. - report an error. Otherwise, targets might begin to believe
  23029. - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
  23030. - namespace. The first time any user complains about this, we'll
  23031. - need to make LTWRAPPER_OPTION_PREFIX a configure-time option
  23032. - or a configure.ac-settable value.
  23033. - */
  23034. - lt_fatal ("Unrecognized option in %s namespace: '%s'",
  23035. - ltwrapper_option_prefix, argv[i]);
  23036. - }
  23037. - /* otherwise ... */
  23038. - newargz[++newargc] = xstrdup (argv[i]);
  23039. - }
  23040. - newargz[++newargc] = NULL;
  23041. -
  23042. - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
  23043. + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
  23044. + nonnull (lt_argv_zero));
  23045. for (i = 0; i < newargc; i++)
  23046. {
  23047. - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
  23048. + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
  23049. + i, nonnull (newargz[i]));
  23050. }
  23051. EOF
  23052. @@ -3706,7 +4529,9 @@ EOF
  23053. if (rval == -1)
  23054. {
  23055. /* failed to start process */
  23056. - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
  23057. + lt_debugprintf (__FILE__, __LINE__,
  23058. + "(main) failed to launch target \"%s\": %s\n",
  23059. + lt_argv_zero, nonnull (strerror (errno)));
  23060. return 127;
  23061. }
  23062. return rval;
  23063. @@ -3728,7 +4553,7 @@ xmalloc (size_t num)
  23064. {
  23065. void *p = (void *) malloc (num);
  23066. if (!p)
  23067. - lt_fatal ("Memory exhausted");
  23068. + lt_fatal (__FILE__, __LINE__, "memory exhausted");
  23069. return p;
  23070. }
  23071. @@ -3762,8 +4587,8 @@ check_executable (const char *path)
  23072. {
  23073. struct stat st;
  23074. - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
  23075. - path ? (*path ? path : "EMPTY!") : "NULL!"));
  23076. + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
  23077. + nonempty (path));
  23078. if ((!path) || (!*path))
  23079. return 0;
  23080. @@ -3780,8 +4605,8 @@ make_executable (const char *path)
  23081. int rval = 0;
  23082. struct stat st;
  23083. - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
  23084. - path ? (*path ? path : "EMPTY!") : "NULL!"));
  23085. + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
  23086. + nonempty (path));
  23087. if ((!path) || (!*path))
  23088. return 0;
  23089. @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
  23090. int tmp_len;
  23091. char *concat_name;
  23092. - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
  23093. - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
  23094. + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
  23095. + nonempty (wrapper));
  23096. if ((wrapper == NULL) || (*wrapper == '\0'))
  23097. return NULL;
  23098. @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
  23099. {
  23100. /* empty path: current directory */
  23101. if (getcwd (tmp, LT_PATHMAX) == NULL)
  23102. - lt_fatal ("getcwd failed");
  23103. + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
  23104. + nonnull (strerror (errno)));
  23105. tmp_len = strlen (tmp);
  23106. concat_name =
  23107. XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
  23108. @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
  23109. }
  23110. /* Relative path | not found in path: prepend cwd */
  23111. if (getcwd (tmp, LT_PATHMAX) == NULL)
  23112. - lt_fatal ("getcwd failed");
  23113. + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
  23114. + nonnull (strerror (errno)));
  23115. tmp_len = strlen (tmp);
  23116. concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
  23117. memcpy (concat_name, tmp, tmp_len);
  23118. @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
  23119. int has_symlinks = 0;
  23120. while (strlen (tmp_pathspec) && !has_symlinks)
  23121. {
  23122. - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
  23123. - tmp_pathspec));
  23124. + lt_debugprintf (__FILE__, __LINE__,
  23125. + "checking path component for symlinks: %s\n",
  23126. + tmp_pathspec);
  23127. if (lstat (tmp_pathspec, &s) == 0)
  23128. {
  23129. if (S_ISLNK (s.st_mode) != 0)
  23130. @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
  23131. }
  23132. else
  23133. {
  23134. - char *errstr = strerror (errno);
  23135. - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
  23136. + lt_fatal (__FILE__, __LINE__,
  23137. + "error accessing file \"%s\": %s",
  23138. + tmp_pathspec, nonnull (strerror (errno)));
  23139. }
  23140. }
  23141. XFREE (tmp_pathspec);
  23142. @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
  23143. tmp_pathspec = realpath (pathspec, buf);
  23144. if (tmp_pathspec == 0)
  23145. {
  23146. - lt_fatal ("Could not follow symlinks for %s", pathspec);
  23147. + lt_fatal (__FILE__, __LINE__,
  23148. + "could not follow symlinks for %s", pathspec);
  23149. }
  23150. return xstrdup (tmp_pathspec);
  23151. #endif
  23152. @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
  23153. return str;
  23154. }
  23155. +void
  23156. +lt_debugprintf (const char *file, int line, const char *fmt, ...)
  23157. +{
  23158. + va_list args;
  23159. + if (lt_debug)
  23160. + {
  23161. + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
  23162. + va_start (args, fmt);
  23163. + (void) vfprintf (stderr, fmt, args);
  23164. + va_end (args);
  23165. + }
  23166. +}
  23167. +
  23168. static void
  23169. -lt_error_core (int exit_status, const char *mode,
  23170. +lt_error_core (int exit_status, const char *file,
  23171. + int line, const char *mode,
  23172. const char *message, va_list ap)
  23173. {
  23174. - fprintf (stderr, "%s: %s: ", program_name, mode);
  23175. + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
  23176. vfprintf (stderr, message, ap);
  23177. fprintf (stderr, ".\n");
  23178. @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
  23179. }
  23180. void
  23181. -lt_fatal (const char *message, ...)
  23182. +lt_fatal (const char *file, int line, const char *message, ...)
  23183. {
  23184. va_list ap;
  23185. va_start (ap, message);
  23186. - lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
  23187. + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
  23188. va_end (ap);
  23189. }
  23190. +static const char *
  23191. +nonnull (const char *s)
  23192. +{
  23193. + return s ? s : "(null)";
  23194. +}
  23195. +
  23196. +static const char *
  23197. +nonempty (const char *s)
  23198. +{
  23199. + return (s && !*s) ? "(empty)" : nonnull (s);
  23200. +}
  23201. +
  23202. void
  23203. lt_setenv (const char *name, const char *value)
  23204. {
  23205. - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
  23206. - (name ? name : "<NULL>"),
  23207. - (value ? value : "<NULL>")));
  23208. + lt_debugprintf (__FILE__, __LINE__,
  23209. + "(lt_setenv) setting '%s' to '%s'\n",
  23210. + nonnull (name), nonnull (value));
  23211. {
  23212. #ifdef HAVE_SETENV
  23213. /* always make a copy, for consistency with !HAVE_SETENV */
  23214. @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
  23215. void
  23216. lt_update_exe_path (const char *name, const char *value)
  23217. {
  23218. - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
  23219. - (name ? name : "<NULL>"),
  23220. - (value ? value : "<NULL>")));
  23221. + lt_debugprintf (__FILE__, __LINE__,
  23222. + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
  23223. + nonnull (name), nonnull (value));
  23224. if (name && *name && value && *value)
  23225. {
  23226. @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
  23227. void
  23228. lt_update_lib_path (const char *name, const char *value)
  23229. {
  23230. - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
  23231. - (name ? name : "<NULL>"),
  23232. - (value ? value : "<NULL>")));
  23233. + lt_debugprintf (__FILE__, __LINE__,
  23234. + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
  23235. + nonnull (name), nonnull (value));
  23236. if (name && *name && value && *value)
  23237. {
  23238. @@ -4222,7 +5078,7 @@ EOF
  23239. func_win32_import_lib_p ()
  23240. {
  23241. $opt_debug
  23242. - case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
  23243. + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
  23244. *import*) : ;;
  23245. *) false ;;
  23246. esac
  23247. @@ -4401,9 +5257,9 @@ func_mode_link ()
  23248. ;;
  23249. *)
  23250. if test "$prev" = dlfiles; then
  23251. - dlfiles="$dlfiles $arg"
  23252. + func_append dlfiles " $arg"
  23253. else
  23254. - dlprefiles="$dlprefiles $arg"
  23255. + func_append dlprefiles " $arg"
  23256. fi
  23257. prev=
  23258. continue
  23259. @@ -4427,7 +5283,7 @@ func_mode_link ()
  23260. *-*-darwin*)
  23261. case "$deplibs " in
  23262. *" $qarg.ltframework "*) ;;
  23263. - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
  23264. + *) func_append deplibs " $qarg.ltframework" # this is fixed later
  23265. ;;
  23266. esac
  23267. ;;
  23268. @@ -4446,7 +5302,7 @@ func_mode_link ()
  23269. moreargs=
  23270. for fil in `cat "$save_arg"`
  23271. do
  23272. -# moreargs="$moreargs $fil"
  23273. +# func_append moreargs " $fil"
  23274. arg=$fil
  23275. # A libtool-controlled object.
  23276. @@ -4475,7 +5331,7 @@ func_mode_link ()
  23277. if test "$prev" = dlfiles; then
  23278. if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
  23279. - dlfiles="$dlfiles $pic_object"
  23280. + func_append dlfiles " $pic_object"
  23281. prev=
  23282. continue
  23283. else
  23284. @@ -4487,7 +5343,7 @@ func_mode_link ()
  23285. # CHECK ME: I think I busted this. -Ossama
  23286. if test "$prev" = dlprefiles; then
  23287. # Preload the old-style object.
  23288. - dlprefiles="$dlprefiles $pic_object"
  23289. + func_append dlprefiles " $pic_object"
  23290. prev=
  23291. fi
  23292. @@ -4557,12 +5413,12 @@ func_mode_link ()
  23293. if test "$prev" = rpath; then
  23294. case "$rpath " in
  23295. *" $arg "*) ;;
  23296. - *) rpath="$rpath $arg" ;;
  23297. + *) func_append rpath " $arg" ;;
  23298. esac
  23299. else
  23300. case "$xrpath " in
  23301. *" $arg "*) ;;
  23302. - *) xrpath="$xrpath $arg" ;;
  23303. + *) func_append xrpath " $arg" ;;
  23304. esac
  23305. fi
  23306. prev=
  23307. @@ -4574,28 +5430,28 @@ func_mode_link ()
  23308. continue
  23309. ;;
  23310. weak)
  23311. - weak_libs="$weak_libs $arg"
  23312. + func_append weak_libs " $arg"
  23313. prev=
  23314. continue
  23315. ;;
  23316. xcclinker)
  23317. - linker_flags="$linker_flags $qarg"
  23318. - compiler_flags="$compiler_flags $qarg"
  23319. + func_append linker_flags " $qarg"
  23320. + func_append compiler_flags " $qarg"
  23321. prev=
  23322. func_append compile_command " $qarg"
  23323. func_append finalize_command " $qarg"
  23324. continue
  23325. ;;
  23326. xcompiler)
  23327. - compiler_flags="$compiler_flags $qarg"
  23328. + func_append compiler_flags " $qarg"
  23329. prev=
  23330. func_append compile_command " $qarg"
  23331. func_append finalize_command " $qarg"
  23332. continue
  23333. ;;
  23334. xlinker)
  23335. - linker_flags="$linker_flags $qarg"
  23336. - compiler_flags="$compiler_flags $wl$qarg"
  23337. + func_append linker_flags " $qarg"
  23338. + func_append compiler_flags " $wl$qarg"
  23339. prev=
  23340. func_append compile_command " $wl$qarg"
  23341. func_append finalize_command " $wl$qarg"
  23342. @@ -4686,15 +5542,16 @@ func_mode_link ()
  23343. ;;
  23344. -L*)
  23345. - func_stripname '-L' '' "$arg"
  23346. - dir=$func_stripname_result
  23347. - if test -z "$dir"; then
  23348. + func_stripname "-L" '' "$arg"
  23349. + if test -z "$func_stripname_result"; then
  23350. if test "$#" -gt 0; then
  23351. func_fatal_error "require no space between \`-L' and \`$1'"
  23352. else
  23353. func_fatal_error "need path for \`-L' option"
  23354. fi
  23355. fi
  23356. + func_resolve_sysroot "$func_stripname_result"
  23357. + dir=$func_resolve_sysroot_result
  23358. # We need an absolute path.
  23359. case $dir in
  23360. [\\/]* | [A-Za-z]:[\\/]*) ;;
  23361. @@ -4706,10 +5563,16 @@ func_mode_link ()
  23362. ;;
  23363. esac
  23364. case "$deplibs " in
  23365. - *" -L$dir "*) ;;
  23366. + *" -L$dir "* | *" $arg "*)
  23367. + # Will only happen for absolute or sysroot arguments
  23368. + ;;
  23369. *)
  23370. - deplibs="$deplibs -L$dir"
  23371. - lib_search_path="$lib_search_path $dir"
  23372. + # Preserve sysroot, but never include relative directories
  23373. + case $dir in
  23374. + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
  23375. + *) func_append deplibs " -L$dir" ;;
  23376. + esac
  23377. + func_append lib_search_path " $dir"
  23378. ;;
  23379. esac
  23380. case $host in
  23381. @@ -4718,12 +5581,12 @@ func_mode_link ()
  23382. case :$dllsearchpath: in
  23383. *":$dir:"*) ;;
  23384. ::) dllsearchpath=$dir;;
  23385. - *) dllsearchpath="$dllsearchpath:$dir";;
  23386. + *) func_append dllsearchpath ":$dir";;
  23387. esac
  23388. case :$dllsearchpath: in
  23389. *":$testbindir:"*) ;;
  23390. ::) dllsearchpath=$testbindir;;
  23391. - *) dllsearchpath="$dllsearchpath:$testbindir";;
  23392. + *) func_append dllsearchpath ":$testbindir";;
  23393. esac
  23394. ;;
  23395. esac
  23396. @@ -4747,7 +5610,7 @@ func_mode_link ()
  23397. ;;
  23398. *-*-rhapsody* | *-*-darwin1.[012])
  23399. # Rhapsody C and math libraries are in the System framework
  23400. - deplibs="$deplibs System.ltframework"
  23401. + func_append deplibs " System.ltframework"
  23402. continue
  23403. ;;
  23404. *-*-sco3.2v5* | *-*-sco5v6*)
  23405. @@ -4758,9 +5621,6 @@ func_mode_link ()
  23406. # Compiler inserts libc in the correct place for threads to work
  23407. test "X$arg" = "X-lc" && continue
  23408. ;;
  23409. - *-*-linux*)
  23410. - test "X$arg" = "X-lc" && continue
  23411. - ;;
  23412. esac
  23413. elif test "X$arg" = "X-lc_r"; then
  23414. case $host in
  23415. @@ -4770,7 +5630,7 @@ func_mode_link ()
  23416. ;;
  23417. esac
  23418. fi
  23419. - deplibs="$deplibs $arg"
  23420. + func_append deplibs " $arg"
  23421. continue
  23422. ;;
  23423. @@ -4782,8 +5642,8 @@ func_mode_link ()
  23424. # Tru64 UNIX uses -model [arg] to determine the layout of C++
  23425. # classes, name mangling, and exception handling.
  23426. # Darwin uses the -arch flag to determine output architecture.
  23427. - -model|-arch|-isysroot)
  23428. - compiler_flags="$compiler_flags $arg"
  23429. + -model|-arch|-isysroot|--sysroot)
  23430. + func_append compiler_flags " $arg"
  23431. func_append compile_command " $arg"
  23432. func_append finalize_command " $arg"
  23433. prev=xcompiler
  23434. @@ -4791,12 +5651,12 @@ func_mode_link ()
  23435. ;;
  23436. -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
  23437. - compiler_flags="$compiler_flags $arg"
  23438. + func_append compiler_flags " $arg"
  23439. func_append compile_command " $arg"
  23440. func_append finalize_command " $arg"
  23441. case "$new_inherited_linker_flags " in
  23442. *" $arg "*) ;;
  23443. - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
  23444. + * ) func_append new_inherited_linker_flags " $arg" ;;
  23445. esac
  23446. continue
  23447. ;;
  23448. @@ -4863,13 +5723,17 @@ func_mode_link ()
  23449. # We need an absolute path.
  23450. case $dir in
  23451. [\\/]* | [A-Za-z]:[\\/]*) ;;
  23452. + =*)
  23453. + func_stripname '=' '' "$dir"
  23454. + dir=$lt_sysroot$func_stripname_result
  23455. + ;;
  23456. *)
  23457. func_fatal_error "only absolute run-paths are allowed"
  23458. ;;
  23459. esac
  23460. case "$xrpath " in
  23461. *" $dir "*) ;;
  23462. - *) xrpath="$xrpath $dir" ;;
  23463. + *) func_append xrpath " $dir" ;;
  23464. esac
  23465. continue
  23466. ;;
  23467. @@ -4922,8 +5786,8 @@ func_mode_link ()
  23468. for flag in $args; do
  23469. IFS="$save_ifs"
  23470. func_quote_for_eval "$flag"
  23471. - arg="$arg $func_quote_for_eval_result"
  23472. - compiler_flags="$compiler_flags $func_quote_for_eval_result"
  23473. + func_append arg " $func_quote_for_eval_result"
  23474. + func_append compiler_flags " $func_quote_for_eval_result"
  23475. done
  23476. IFS="$save_ifs"
  23477. func_stripname ' ' '' "$arg"
  23478. @@ -4938,9 +5802,9 @@ func_mode_link ()
  23479. for flag in $args; do
  23480. IFS="$save_ifs"
  23481. func_quote_for_eval "$flag"
  23482. - arg="$arg $wl$func_quote_for_eval_result"
  23483. - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
  23484. - linker_flags="$linker_flags $func_quote_for_eval_result"
  23485. + func_append arg " $wl$func_quote_for_eval_result"
  23486. + func_append compiler_flags " $wl$func_quote_for_eval_result"
  23487. + func_append linker_flags " $func_quote_for_eval_result"
  23488. done
  23489. IFS="$save_ifs"
  23490. func_stripname ' ' '' "$arg"
  23491. @@ -4968,24 +5832,27 @@ func_mode_link ()
  23492. arg="$func_quote_for_eval_result"
  23493. ;;
  23494. - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
  23495. - # -r[0-9][0-9]* specifies the processor on the SGI compiler
  23496. - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
  23497. - # +DA*, +DD* enable 64-bit mode on the HP compiler
  23498. - # -q* pass through compiler args for the IBM compiler
  23499. - # -m*, -t[45]*, -txscale* pass through architecture-specific
  23500. - # compiler args for GCC
  23501. - # -F/path gives path to uninstalled frameworks, gcc on darwin
  23502. - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
  23503. - # @file GCC response files
  23504. - # -tp=* Portland pgcc target processor selection
  23505. + # Flags to be passed through unchanged, with rationale:
  23506. + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
  23507. + # -r[0-9][0-9]* specify processor for the SGI compiler
  23508. + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
  23509. + # +DA*, +DD* enable 64-bit mode for the HP compiler
  23510. + # -q* compiler args for the IBM compiler
  23511. + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
  23512. + # -F/path path to uninstalled frameworks, gcc on darwin
  23513. + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
  23514. + # @file GCC response files
  23515. + # -tp=* Portland pgcc target processor selection
  23516. + # --sysroot=* for sysroot support
  23517. + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
  23518. -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
  23519. - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
  23520. + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
  23521. + -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
  23522. func_quote_for_eval "$arg"
  23523. arg="$func_quote_for_eval_result"
  23524. func_append compile_command " $arg"
  23525. func_append finalize_command " $arg"
  23526. - compiler_flags="$compiler_flags $arg"
  23527. + func_append compiler_flags " $arg"
  23528. continue
  23529. ;;
  23530. @@ -4997,7 +5864,7 @@ func_mode_link ()
  23531. *.$objext)
  23532. # A standard object.
  23533. - objs="$objs $arg"
  23534. + func_append objs " $arg"
  23535. ;;
  23536. *.lo)
  23537. @@ -5028,7 +5895,7 @@ func_mode_link ()
  23538. if test "$prev" = dlfiles; then
  23539. if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
  23540. - dlfiles="$dlfiles $pic_object"
  23541. + func_append dlfiles " $pic_object"
  23542. prev=
  23543. continue
  23544. else
  23545. @@ -5040,7 +5907,7 @@ func_mode_link ()
  23546. # CHECK ME: I think I busted this. -Ossama
  23547. if test "$prev" = dlprefiles; then
  23548. # Preload the old-style object.
  23549. - dlprefiles="$dlprefiles $pic_object"
  23550. + func_append dlprefiles " $pic_object"
  23551. prev=
  23552. fi
  23553. @@ -5085,24 +5952,25 @@ func_mode_link ()
  23554. *.$libext)
  23555. # An archive.
  23556. - deplibs="$deplibs $arg"
  23557. - old_deplibs="$old_deplibs $arg"
  23558. + func_append deplibs " $arg"
  23559. + func_append old_deplibs " $arg"
  23560. continue
  23561. ;;
  23562. *.la)
  23563. # A libtool-controlled library.
  23564. + func_resolve_sysroot "$arg"
  23565. if test "$prev" = dlfiles; then
  23566. # This library was specified with -dlopen.
  23567. - dlfiles="$dlfiles $arg"
  23568. + func_append dlfiles " $func_resolve_sysroot_result"
  23569. prev=
  23570. elif test "$prev" = dlprefiles; then
  23571. # The library was specified with -dlpreopen.
  23572. - dlprefiles="$dlprefiles $arg"
  23573. + func_append dlprefiles " $func_resolve_sysroot_result"
  23574. prev=
  23575. else
  23576. - deplibs="$deplibs $arg"
  23577. + func_append deplibs " $func_resolve_sysroot_result"
  23578. fi
  23579. continue
  23580. ;;
  23581. @@ -5127,7 +5995,7 @@ func_mode_link ()
  23582. func_fatal_help "the \`$prevarg' option requires an argument"
  23583. if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
  23584. - eval "arg=\"$export_dynamic_flag_spec\""
  23585. + eval arg=\"$export_dynamic_flag_spec\"
  23586. func_append compile_command " $arg"
  23587. func_append finalize_command " $arg"
  23588. fi
  23589. @@ -5144,11 +6012,13 @@ func_mode_link ()
  23590. else
  23591. shlib_search_path=
  23592. fi
  23593. - eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
  23594. - eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
  23595. + eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
  23596. + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
  23597. func_dirname "$output" "/" ""
  23598. output_objdir="$func_dirname_result$objdir"
  23599. + func_to_tool_file "$output_objdir/"
  23600. + tool_output_objdir=$func_to_tool_file_result
  23601. # Create the object directory.
  23602. func_mkdir_p "$output_objdir"
  23603. @@ -5169,12 +6039,12 @@ func_mode_link ()
  23604. # Find all interdependent deplibs by searching for libraries
  23605. # that are linked more than once (e.g. -la -lb -la)
  23606. for deplib in $deplibs; do
  23607. - if $opt_duplicate_deps ; then
  23608. + if $opt_preserve_dup_deps ; then
  23609. case "$libs " in
  23610. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  23611. + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
  23612. esac
  23613. fi
  23614. - libs="$libs $deplib"
  23615. + func_append libs " $deplib"
  23616. done
  23617. if test "$linkmode" = lib; then
  23618. @@ -5187,9 +6057,9 @@ func_mode_link ()
  23619. if $opt_duplicate_compiler_generated_deps; then
  23620. for pre_post_dep in $predeps $postdeps; do
  23621. case "$pre_post_deps " in
  23622. - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
  23623. + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
  23624. esac
  23625. - pre_post_deps="$pre_post_deps $pre_post_dep"
  23626. + func_append pre_post_deps " $pre_post_dep"
  23627. done
  23628. fi
  23629. pre_post_deps=
  23630. @@ -5256,8 +6126,9 @@ func_mode_link ()
  23631. for lib in $dlprefiles; do
  23632. # Ignore non-libtool-libs
  23633. dependency_libs=
  23634. + func_resolve_sysroot "$lib"
  23635. case $lib in
  23636. - *.la) func_source "$lib" ;;
  23637. + *.la) func_source "$func_resolve_sysroot_result" ;;
  23638. esac
  23639. # Collect preopened libtool deplibs, except any this library
  23640. @@ -5267,7 +6138,7 @@ func_mode_link ()
  23641. deplib_base=$func_basename_result
  23642. case " $weak_libs " in
  23643. *" $deplib_base "*) ;;
  23644. - *) deplibs="$deplibs $deplib" ;;
  23645. + *) func_append deplibs " $deplib" ;;
  23646. esac
  23647. done
  23648. done
  23649. @@ -5288,11 +6159,11 @@ func_mode_link ()
  23650. compile_deplibs="$deplib $compile_deplibs"
  23651. finalize_deplibs="$deplib $finalize_deplibs"
  23652. else
  23653. - compiler_flags="$compiler_flags $deplib"
  23654. + func_append compiler_flags " $deplib"
  23655. if test "$linkmode" = lib ; then
  23656. case "$new_inherited_linker_flags " in
  23657. *" $deplib "*) ;;
  23658. - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
  23659. + * ) func_append new_inherited_linker_flags " $deplib" ;;
  23660. esac
  23661. fi
  23662. fi
  23663. @@ -5377,7 +6248,7 @@ func_mode_link ()
  23664. if test "$linkmode" = lib ; then
  23665. case "$new_inherited_linker_flags " in
  23666. *" $deplib "*) ;;
  23667. - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
  23668. + * ) func_append new_inherited_linker_flags " $deplib" ;;
  23669. esac
  23670. fi
  23671. fi
  23672. @@ -5390,7 +6261,8 @@ func_mode_link ()
  23673. test "$pass" = conv && continue
  23674. newdependency_libs="$deplib $newdependency_libs"
  23675. func_stripname '-L' '' "$deplib"
  23676. - newlib_search_path="$newlib_search_path $func_stripname_result"
  23677. + func_resolve_sysroot "$func_stripname_result"
  23678. + func_append newlib_search_path " $func_resolve_sysroot_result"
  23679. ;;
  23680. prog)
  23681. if test "$pass" = conv; then
  23682. @@ -5404,7 +6276,8 @@ func_mode_link ()
  23683. finalize_deplibs="$deplib $finalize_deplibs"
  23684. fi
  23685. func_stripname '-L' '' "$deplib"
  23686. - newlib_search_path="$newlib_search_path $func_stripname_result"
  23687. + func_resolve_sysroot "$func_stripname_result"
  23688. + func_append newlib_search_path " $func_resolve_sysroot_result"
  23689. ;;
  23690. *)
  23691. func_warning "\`-L' is ignored for archives/objects"
  23692. @@ -5415,17 +6288,21 @@ func_mode_link ()
  23693. -R*)
  23694. if test "$pass" = link; then
  23695. func_stripname '-R' '' "$deplib"
  23696. - dir=$func_stripname_result
  23697. + func_resolve_sysroot "$func_stripname_result"
  23698. + dir=$func_resolve_sysroot_result
  23699. # Make sure the xrpath contains only unique directories.
  23700. case "$xrpath " in
  23701. *" $dir "*) ;;
  23702. - *) xrpath="$xrpath $dir" ;;
  23703. + *) func_append xrpath " $dir" ;;
  23704. esac
  23705. fi
  23706. deplibs="$deplib $deplibs"
  23707. continue
  23708. ;;
  23709. - *.la) lib="$deplib" ;;
  23710. + *.la)
  23711. + func_resolve_sysroot "$deplib"
  23712. + lib=$func_resolve_sysroot_result
  23713. + ;;
  23714. *.$libext)
  23715. if test "$pass" = conv; then
  23716. deplibs="$deplib $deplibs"
  23717. @@ -5488,11 +6365,11 @@ func_mode_link ()
  23718. if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
  23719. # If there is no dlopen support or we're linking statically,
  23720. # we need to preload.
  23721. - newdlprefiles="$newdlprefiles $deplib"
  23722. + func_append newdlprefiles " $deplib"
  23723. compile_deplibs="$deplib $compile_deplibs"
  23724. finalize_deplibs="$deplib $finalize_deplibs"
  23725. else
  23726. - newdlfiles="$newdlfiles $deplib"
  23727. + func_append newdlfiles " $deplib"
  23728. fi
  23729. fi
  23730. continue
  23731. @@ -5538,7 +6415,7 @@ func_mode_link ()
  23732. for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
  23733. case " $new_inherited_linker_flags " in
  23734. *" $tmp_inherited_linker_flag "*) ;;
  23735. - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
  23736. + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
  23737. esac
  23738. done
  23739. fi
  23740. @@ -5546,8 +6423,8 @@ func_mode_link ()
  23741. if test "$linkmode,$pass" = "lib,link" ||
  23742. test "$linkmode,$pass" = "prog,scan" ||
  23743. { test "$linkmode" != prog && test "$linkmode" != lib; }; then
  23744. - test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
  23745. - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
  23746. + test -n "$dlopen" && func_append dlfiles " $dlopen"
  23747. + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
  23748. fi
  23749. if test "$pass" = conv; then
  23750. @@ -5558,20 +6435,20 @@ func_mode_link ()
  23751. func_fatal_error "cannot find name of link library for \`$lib'"
  23752. fi
  23753. # It is a libtool convenience library, so add in its objects.
  23754. - convenience="$convenience $ladir/$objdir/$old_library"
  23755. - old_convenience="$old_convenience $ladir/$objdir/$old_library"
  23756. + func_append convenience " $ladir/$objdir/$old_library"
  23757. + func_append old_convenience " $ladir/$objdir/$old_library"
  23758. elif test "$linkmode" != prog && test "$linkmode" != lib; then
  23759. func_fatal_error "\`$lib' is not a convenience library"
  23760. fi
  23761. tmp_libs=
  23762. for deplib in $dependency_libs; do
  23763. deplibs="$deplib $deplibs"
  23764. - if $opt_duplicate_deps ; then
  23765. + if $opt_preserve_dup_deps ; then
  23766. case "$tmp_libs " in
  23767. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  23768. + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
  23769. esac
  23770. fi
  23771. - tmp_libs="$tmp_libs $deplib"
  23772. + func_append tmp_libs " $deplib"
  23773. done
  23774. continue
  23775. fi # $pass = conv
  23776. @@ -5579,9 +6456,15 @@ func_mode_link ()
  23777. # Get the name of the library we link against.
  23778. linklib=
  23779. - for l in $old_library $library_names; do
  23780. - linklib="$l"
  23781. - done
  23782. + if test -n "$old_library" &&
  23783. + { test "$prefer_static_libs" = yes ||
  23784. + test "$prefer_static_libs,$installed" = "built,no"; }; then
  23785. + linklib=$old_library
  23786. + else
  23787. + for l in $old_library $library_names; do
  23788. + linklib="$l"
  23789. + done
  23790. + fi
  23791. if test -z "$linklib"; then
  23792. func_fatal_error "cannot find name of link library for \`$lib'"
  23793. fi
  23794. @@ -5598,9 +6481,9 @@ func_mode_link ()
  23795. # statically, we need to preload. We also need to preload any
  23796. # dependent libraries so libltdl's deplib preloader doesn't
  23797. # bomb out in the load deplibs phase.
  23798. - dlprefiles="$dlprefiles $lib $dependency_libs"
  23799. + func_append dlprefiles " $lib $dependency_libs"
  23800. else
  23801. - newdlfiles="$newdlfiles $lib"
  23802. + func_append newdlfiles " $lib"
  23803. fi
  23804. continue
  23805. fi # $pass = dlopen
  23806. @@ -5622,14 +6505,14 @@ func_mode_link ()
  23807. # Find the relevant object directory and library name.
  23808. if test "X$installed" = Xyes; then
  23809. - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
  23810. + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
  23811. func_warning "library \`$lib' was moved."
  23812. dir="$ladir"
  23813. absdir="$abs_ladir"
  23814. libdir="$abs_ladir"
  23815. else
  23816. - dir="$libdir"
  23817. - absdir="$libdir"
  23818. + dir="$lt_sysroot$libdir"
  23819. + absdir="$lt_sysroot$libdir"
  23820. fi
  23821. test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
  23822. else
  23823. @@ -5637,12 +6520,12 @@ func_mode_link ()
  23824. dir="$ladir"
  23825. absdir="$abs_ladir"
  23826. # Remove this search path later
  23827. - notinst_path="$notinst_path $abs_ladir"
  23828. + func_append notinst_path " $abs_ladir"
  23829. else
  23830. dir="$ladir/$objdir"
  23831. absdir="$abs_ladir/$objdir"
  23832. # Remove this search path later
  23833. - notinst_path="$notinst_path $abs_ladir"
  23834. + func_append notinst_path " $abs_ladir"
  23835. fi
  23836. fi # $installed = yes
  23837. func_stripname 'lib' '.la' "$laname"
  23838. @@ -5653,20 +6536,46 @@ func_mode_link ()
  23839. if test -z "$libdir" && test "$linkmode" = prog; then
  23840. func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
  23841. fi
  23842. - # Prefer using a static library (so that no silly _DYNAMIC symbols
  23843. - # are required to link).
  23844. - if test -n "$old_library"; then
  23845. - newdlprefiles="$newdlprefiles $dir/$old_library"
  23846. - # Keep a list of preopened convenience libraries to check
  23847. - # that they are being used correctly in the link pass.
  23848. - test -z "$libdir" && \
  23849. - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
  23850. - # Otherwise, use the dlname, so that lt_dlopen finds it.
  23851. - elif test -n "$dlname"; then
  23852. - newdlprefiles="$newdlprefiles $dir/$dlname"
  23853. - else
  23854. - newdlprefiles="$newdlprefiles $dir/$linklib"
  23855. - fi
  23856. + case "$host" in
  23857. + # special handling for platforms with PE-DLLs.
  23858. + *cygwin* | *mingw* | *cegcc* )
  23859. + # Linker will automatically link against shared library if both
  23860. + # static and shared are present. Therefore, ensure we extract
  23861. + # symbols from the import library if a shared library is present
  23862. + # (otherwise, the dlopen module name will be incorrect). We do
  23863. + # this by putting the import library name into $newdlprefiles.
  23864. + # We recover the dlopen module name by 'saving' the la file
  23865. + # name in a special purpose variable, and (later) extracting the
  23866. + # dlname from the la file.
  23867. + if test -n "$dlname"; then
  23868. + func_tr_sh "$dir/$linklib"
  23869. + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
  23870. + func_append newdlprefiles " $dir/$linklib"
  23871. + else
  23872. + func_append newdlprefiles " $dir/$old_library"
  23873. + # Keep a list of preopened convenience libraries to check
  23874. + # that they are being used correctly in the link pass.
  23875. + test -z "$libdir" && \
  23876. + func_append dlpreconveniencelibs " $dir/$old_library"
  23877. + fi
  23878. + ;;
  23879. + * )
  23880. + # Prefer using a static library (so that no silly _DYNAMIC symbols
  23881. + # are required to link).
  23882. + if test -n "$old_library"; then
  23883. + func_append newdlprefiles " $dir/$old_library"
  23884. + # Keep a list of preopened convenience libraries to check
  23885. + # that they are being used correctly in the link pass.
  23886. + test -z "$libdir" && \
  23887. + func_append dlpreconveniencelibs " $dir/$old_library"
  23888. + # Otherwise, use the dlname, so that lt_dlopen finds it.
  23889. + elif test -n "$dlname"; then
  23890. + func_append newdlprefiles " $dir/$dlname"
  23891. + else
  23892. + func_append newdlprefiles " $dir/$linklib"
  23893. + fi
  23894. + ;;
  23895. + esac
  23896. fi # $pass = dlpreopen
  23897. if test -z "$libdir"; then
  23898. @@ -5684,7 +6593,7 @@ func_mode_link ()
  23899. if test "$linkmode" = prog && test "$pass" != link; then
  23900. - newlib_search_path="$newlib_search_path $ladir"
  23901. + func_append newlib_search_path " $ladir"
  23902. deplibs="$lib $deplibs"
  23903. linkalldeplibs=no
  23904. @@ -5697,7 +6606,8 @@ func_mode_link ()
  23905. for deplib in $dependency_libs; do
  23906. case $deplib in
  23907. -L*) func_stripname '-L' '' "$deplib"
  23908. - newlib_search_path="$newlib_search_path $func_stripname_result"
  23909. + func_resolve_sysroot "$func_stripname_result"
  23910. + func_append newlib_search_path " $func_resolve_sysroot_result"
  23911. ;;
  23912. esac
  23913. # Need to link against all dependency_libs?
  23914. @@ -5708,12 +6618,12 @@ func_mode_link ()
  23915. # or/and link against static libraries
  23916. newdependency_libs="$deplib $newdependency_libs"
  23917. fi
  23918. - if $opt_duplicate_deps ; then
  23919. + if $opt_preserve_dup_deps ; then
  23920. case "$tmp_libs " in
  23921. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  23922. + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
  23923. esac
  23924. fi
  23925. - tmp_libs="$tmp_libs $deplib"
  23926. + func_append tmp_libs " $deplib"
  23927. done # for deplib
  23928. continue
  23929. fi # $linkmode = prog...
  23930. @@ -5728,7 +6638,7 @@ func_mode_link ()
  23931. # Make sure the rpath contains only unique directories.
  23932. case "$temp_rpath:" in
  23933. *"$absdir:"*) ;;
  23934. - *) temp_rpath="$temp_rpath$absdir:" ;;
  23935. + *) func_append temp_rpath "$absdir:" ;;
  23936. esac
  23937. fi
  23938. @@ -5740,7 +6650,7 @@ func_mode_link ()
  23939. *)
  23940. case "$compile_rpath " in
  23941. *" $absdir "*) ;;
  23942. - *) compile_rpath="$compile_rpath $absdir"
  23943. + *) func_append compile_rpath " $absdir" ;;
  23944. esac
  23945. ;;
  23946. esac
  23947. @@ -5749,7 +6659,7 @@ func_mode_link ()
  23948. *)
  23949. case "$finalize_rpath " in
  23950. *" $libdir "*) ;;
  23951. - *) finalize_rpath="$finalize_rpath $libdir"
  23952. + *) func_append finalize_rpath " $libdir" ;;
  23953. esac
  23954. ;;
  23955. esac
  23956. @@ -5774,12 +6684,12 @@ func_mode_link ()
  23957. case $host in
  23958. *cygwin* | *mingw* | *cegcc*)
  23959. # No point in relinking DLLs because paths are not encoded
  23960. - notinst_deplibs="$notinst_deplibs $lib"
  23961. + func_append notinst_deplibs " $lib"
  23962. need_relink=no
  23963. ;;
  23964. *)
  23965. if test "$installed" = no; then
  23966. - notinst_deplibs="$notinst_deplibs $lib"
  23967. + func_append notinst_deplibs " $lib"
  23968. need_relink=yes
  23969. fi
  23970. ;;
  23971. @@ -5814,7 +6724,7 @@ func_mode_link ()
  23972. *)
  23973. case "$compile_rpath " in
  23974. *" $absdir "*) ;;
  23975. - *) compile_rpath="$compile_rpath $absdir"
  23976. + *) func_append compile_rpath " $absdir" ;;
  23977. esac
  23978. ;;
  23979. esac
  23980. @@ -5823,7 +6733,7 @@ func_mode_link ()
  23981. *)
  23982. case "$finalize_rpath " in
  23983. *" $libdir "*) ;;
  23984. - *) finalize_rpath="$finalize_rpath $libdir"
  23985. + *) func_append finalize_rpath " $libdir" ;;
  23986. esac
  23987. ;;
  23988. esac
  23989. @@ -5835,7 +6745,7 @@ func_mode_link ()
  23990. shift
  23991. realname="$1"
  23992. shift
  23993. - eval "libname=\"$libname_spec\""
  23994. + libname=`eval "\\$ECHO \"$libname_spec\""`
  23995. # use dlname if we got it. it's perfectly good, no?
  23996. if test -n "$dlname"; then
  23997. soname="$dlname"
  23998. @@ -5848,7 +6758,7 @@ func_mode_link ()
  23999. versuffix="-$major"
  24000. ;;
  24001. esac
  24002. - eval "soname=\"$soname_spec\""
  24003. + eval soname=\"$soname_spec\"
  24004. else
  24005. soname="$realname"
  24006. fi
  24007. @@ -5877,7 +6787,7 @@ func_mode_link ()
  24008. linklib=$newlib
  24009. fi # test -n "$old_archive_from_expsyms_cmds"
  24010. - if test "$linkmode" = prog || test "$mode" != relink; then
  24011. + if test "$linkmode" = prog || test "$opt_mode" != relink; then
  24012. add_shlibpath=
  24013. add_dir=
  24014. add=
  24015. @@ -5933,7 +6843,7 @@ func_mode_link ()
  24016. if test -n "$inst_prefix_dir"; then
  24017. case $libdir in
  24018. [\\/]*)
  24019. - add_dir="$add_dir -L$inst_prefix_dir$libdir"
  24020. + func_append add_dir " -L$inst_prefix_dir$libdir"
  24021. ;;
  24022. esac
  24023. fi
  24024. @@ -5955,7 +6865,7 @@ func_mode_link ()
  24025. if test -n "$add_shlibpath"; then
  24026. case :$compile_shlibpath: in
  24027. *":$add_shlibpath:"*) ;;
  24028. - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
  24029. + *) func_append compile_shlibpath "$add_shlibpath:" ;;
  24030. esac
  24031. fi
  24032. if test "$linkmode" = prog; then
  24033. @@ -5969,13 +6879,13 @@ func_mode_link ()
  24034. test "$hardcode_shlibpath_var" = yes; then
  24035. case :$finalize_shlibpath: in
  24036. *":$libdir:"*) ;;
  24037. - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
  24038. + *) func_append finalize_shlibpath "$libdir:" ;;
  24039. esac
  24040. fi
  24041. fi
  24042. fi
  24043. - if test "$linkmode" = prog || test "$mode" = relink; then
  24044. + if test "$linkmode" = prog || test "$opt_mode" = relink; then
  24045. add_shlibpath=
  24046. add_dir=
  24047. add=
  24048. @@ -5989,7 +6899,7 @@ func_mode_link ()
  24049. elif test "$hardcode_shlibpath_var" = yes; then
  24050. case :$finalize_shlibpath: in
  24051. *":$libdir:"*) ;;
  24052. - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
  24053. + *) func_append finalize_shlibpath "$libdir:" ;;
  24054. esac
  24055. add="-l$name"
  24056. elif test "$hardcode_automatic" = yes; then
  24057. @@ -6001,12 +6911,12 @@ func_mode_link ()
  24058. fi
  24059. else
  24060. # We cannot seem to hardcode it, guess we'll fake it.
  24061. - add_dir="-L$libdir"
  24062. + add_dir="-L$lt_sysroot$libdir"
  24063. # Try looking first in the location we're being installed to.
  24064. if test -n "$inst_prefix_dir"; then
  24065. case $libdir in
  24066. [\\/]*)
  24067. - add_dir="$add_dir -L$inst_prefix_dir$libdir"
  24068. + func_append add_dir " -L$inst_prefix_dir$libdir"
  24069. ;;
  24070. esac
  24071. fi
  24072. @@ -6083,27 +6993,33 @@ func_mode_link ()
  24073. temp_xrpath=$func_stripname_result
  24074. case " $xrpath " in
  24075. *" $temp_xrpath "*) ;;
  24076. - *) xrpath="$xrpath $temp_xrpath";;
  24077. + *) func_append xrpath " $temp_xrpath";;
  24078. esac;;
  24079. - *) temp_deplibs="$temp_deplibs $libdir";;
  24080. + *) func_append temp_deplibs " $libdir";;
  24081. esac
  24082. done
  24083. dependency_libs="$temp_deplibs"
  24084. fi
  24085. - newlib_search_path="$newlib_search_path $absdir"
  24086. + func_append newlib_search_path " $absdir"
  24087. # Link against this library
  24088. test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
  24089. # ... and its dependency_libs
  24090. tmp_libs=
  24091. for deplib in $dependency_libs; do
  24092. newdependency_libs="$deplib $newdependency_libs"
  24093. - if $opt_duplicate_deps ; then
  24094. + case $deplib in
  24095. + -L*) func_stripname '-L' '' "$deplib"
  24096. + func_resolve_sysroot "$func_stripname_result";;
  24097. + *) func_resolve_sysroot "$deplib" ;;
  24098. + esac
  24099. + if $opt_preserve_dup_deps ; then
  24100. case "$tmp_libs " in
  24101. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  24102. + *" $func_resolve_sysroot_result "*)
  24103. + func_append specialdeplibs " $func_resolve_sysroot_result" ;;
  24104. esac
  24105. fi
  24106. - tmp_libs="$tmp_libs $deplib"
  24107. + func_append tmp_libs " $func_resolve_sysroot_result"
  24108. done
  24109. if test "$link_all_deplibs" != no; then
  24110. @@ -6113,8 +7029,10 @@ func_mode_link ()
  24111. case $deplib in
  24112. -L*) path="$deplib" ;;
  24113. *.la)
  24114. + func_resolve_sysroot "$deplib"
  24115. + deplib=$func_resolve_sysroot_result
  24116. func_dirname "$deplib" "" "."
  24117. - dir="$func_dirname_result"
  24118. + dir=$func_dirname_result
  24119. # We need an absolute path.
  24120. case $dir in
  24121. [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
  24122. @@ -6130,7 +7048,7 @@ func_mode_link ()
  24123. case $host in
  24124. *-*-darwin*)
  24125. depdepl=
  24126. - deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
  24127. + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
  24128. if test -n "$deplibrary_names" ; then
  24129. for tmp in $deplibrary_names ; do
  24130. depdepl=$tmp
  24131. @@ -6141,8 +7059,8 @@ func_mode_link ()
  24132. if test -z "$darwin_install_name"; then
  24133. darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
  24134. fi
  24135. - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
  24136. - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
  24137. + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
  24138. + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
  24139. path=
  24140. fi
  24141. fi
  24142. @@ -6152,7 +7070,7 @@ func_mode_link ()
  24143. ;;
  24144. esac
  24145. else
  24146. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  24147. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  24148. test -z "$libdir" && \
  24149. func_fatal_error "\`$deplib' is not a valid libtool archive"
  24150. test "$absdir" != "$libdir" && \
  24151. @@ -6192,7 +7110,7 @@ func_mode_link ()
  24152. for dir in $newlib_search_path; do
  24153. case "$lib_search_path " in
  24154. *" $dir "*) ;;
  24155. - *) lib_search_path="$lib_search_path $dir" ;;
  24156. + *) func_append lib_search_path " $dir" ;;
  24157. esac
  24158. done
  24159. newlib_search_path=
  24160. @@ -6205,7 +7123,7 @@ func_mode_link ()
  24161. fi
  24162. for var in $vars dependency_libs; do
  24163. # Add libraries to $var in reverse order
  24164. - eval tmp_libs=\$$var
  24165. + eval tmp_libs=\"\$$var\"
  24166. new_libs=
  24167. for deplib in $tmp_libs; do
  24168. # FIXME: Pedantically, this is the right thing to do, so
  24169. @@ -6250,13 +7168,13 @@ func_mode_link ()
  24170. -L*)
  24171. case " $tmp_libs " in
  24172. *" $deplib "*) ;;
  24173. - *) tmp_libs="$tmp_libs $deplib" ;;
  24174. + *) func_append tmp_libs " $deplib" ;;
  24175. esac
  24176. ;;
  24177. - *) tmp_libs="$tmp_libs $deplib" ;;
  24178. + *) func_append tmp_libs " $deplib" ;;
  24179. esac
  24180. done
  24181. - eval $var=\$tmp_libs
  24182. + eval $var=\"$tmp_libs\"
  24183. done # for var
  24184. fi
  24185. # Last step: remove runtime libs from dependency_libs
  24186. @@ -6269,7 +7187,7 @@ func_mode_link ()
  24187. ;;
  24188. esac
  24189. if test -n "$i" ; then
  24190. - tmp_libs="$tmp_libs $i"
  24191. + func_append tmp_libs " $i"
  24192. fi
  24193. done
  24194. dependency_libs=$tmp_libs
  24195. @@ -6310,7 +7228,7 @@ func_mode_link ()
  24196. # Now set the variables for building old libraries.
  24197. build_libtool_libs=no
  24198. oldlibs="$output"
  24199. - objs="$objs$old_deplibs"
  24200. + func_append objs "$old_deplibs"
  24201. ;;
  24202. lib)
  24203. @@ -6319,8 +7237,8 @@ func_mode_link ()
  24204. lib*)
  24205. func_stripname 'lib' '.la' "$outputname"
  24206. name=$func_stripname_result
  24207. - eval "shared_ext=\"$shrext_cmds\""
  24208. - eval "libname=\"$libname_spec\""
  24209. + eval shared_ext=\"$shrext_cmds\"
  24210. + eval libname=\"$libname_spec\"
  24211. ;;
  24212. *)
  24213. test "$module" = no && \
  24214. @@ -6330,8 +7248,8 @@ func_mode_link ()
  24215. # Add the "lib" prefix for modules if required
  24216. func_stripname '' '.la' "$outputname"
  24217. name=$func_stripname_result
  24218. - eval "shared_ext=\"$shrext_cmds\""
  24219. - eval "libname=\"$libname_spec\""
  24220. + eval shared_ext=\"$shrext_cmds\"
  24221. + eval libname=\"$libname_spec\"
  24222. else
  24223. func_stripname '' '.la' "$outputname"
  24224. libname=$func_stripname_result
  24225. @@ -6346,7 +7264,7 @@ func_mode_link ()
  24226. echo
  24227. $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
  24228. $ECHO "*** objects $objs is not portable!"
  24229. - libobjs="$libobjs $objs"
  24230. + func_append libobjs " $objs"
  24231. fi
  24232. fi
  24233. @@ -6544,7 +7462,7 @@ func_mode_link ()
  24234. done
  24235. # Make executables depend on our current version.
  24236. - verstring="$verstring:${current}.0"
  24237. + func_append verstring ":${current}.0"
  24238. ;;
  24239. qnx)
  24240. @@ -6612,10 +7530,10 @@ func_mode_link ()
  24241. fi
  24242. func_generate_dlsyms "$libname" "$libname" "yes"
  24243. - libobjs="$libobjs $symfileobj"
  24244. + func_append libobjs " $symfileobj"
  24245. test "X$libobjs" = "X " && libobjs=
  24246. - if test "$mode" != relink; then
  24247. + if test "$opt_mode" != relink; then
  24248. # Remove our outputs, but don't remove object files since they
  24249. # may have been created when compiling PIC objects.
  24250. removelist=
  24251. @@ -6631,7 +7549,7 @@ func_mode_link ()
  24252. continue
  24253. fi
  24254. fi
  24255. - removelist="$removelist $p"
  24256. + func_append removelist " $p"
  24257. ;;
  24258. *) ;;
  24259. esac
  24260. @@ -6642,7 +7560,7 @@ func_mode_link ()
  24261. # Now set the variables for building old libraries.
  24262. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
  24263. - oldlibs="$oldlibs $output_objdir/$libname.$libext"
  24264. + func_append oldlibs " $output_objdir/$libname.$libext"
  24265. # Transform .lo files to .o files.
  24266. oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
  24267. @@ -6659,10 +7577,11 @@ func_mode_link ()
  24268. # If the user specified any rpath flags, then add them.
  24269. temp_xrpath=
  24270. for libdir in $xrpath; do
  24271. - temp_xrpath="$temp_xrpath -R$libdir"
  24272. + func_replace_sysroot "$libdir"
  24273. + func_append temp_xrpath " -R$func_replace_sysroot_result"
  24274. case "$finalize_rpath " in
  24275. *" $libdir "*) ;;
  24276. - *) finalize_rpath="$finalize_rpath $libdir" ;;
  24277. + *) func_append finalize_rpath " $libdir" ;;
  24278. esac
  24279. done
  24280. if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
  24281. @@ -6676,7 +7595,7 @@ func_mode_link ()
  24282. for lib in $old_dlfiles; do
  24283. case " $dlprefiles $dlfiles " in
  24284. *" $lib "*) ;;
  24285. - *) dlfiles="$dlfiles $lib" ;;
  24286. + *) func_append dlfiles " $lib" ;;
  24287. esac
  24288. done
  24289. @@ -6686,7 +7605,7 @@ func_mode_link ()
  24290. for lib in $old_dlprefiles; do
  24291. case "$dlprefiles " in
  24292. *" $lib "*) ;;
  24293. - *) dlprefiles="$dlprefiles $lib" ;;
  24294. + *) func_append dlprefiles " $lib" ;;
  24295. esac
  24296. done
  24297. @@ -6698,7 +7617,7 @@ func_mode_link ()
  24298. ;;
  24299. *-*-rhapsody* | *-*-darwin1.[012])
  24300. # Rhapsody C library is in the System framework
  24301. - deplibs="$deplibs System.ltframework"
  24302. + func_append deplibs " System.ltframework"
  24303. ;;
  24304. *-*-netbsd*)
  24305. # Don't link with libc until the a.out ld.so is fixed.
  24306. @@ -6715,7 +7634,7 @@ func_mode_link ()
  24307. *)
  24308. # Add libc to deplibs on all other systems if necessary.
  24309. if test "$build_libtool_need_lc" = "yes"; then
  24310. - deplibs="$deplibs -lc"
  24311. + func_append deplibs " -lc"
  24312. fi
  24313. ;;
  24314. esac
  24315. @@ -6764,18 +7683,18 @@ EOF
  24316. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  24317. case " $predeps $postdeps " in
  24318. *" $i "*)
  24319. - newdeplibs="$newdeplibs $i"
  24320. + func_append newdeplibs " $i"
  24321. i=""
  24322. ;;
  24323. esac
  24324. fi
  24325. if test -n "$i" ; then
  24326. - eval "libname=\"$libname_spec\""
  24327. - eval "deplib_matches=\"$library_names_spec\""
  24328. + libname=`eval "\\$ECHO \"$libname_spec\""`
  24329. + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
  24330. set dummy $deplib_matches; shift
  24331. deplib_match=$1
  24332. if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
  24333. - newdeplibs="$newdeplibs $i"
  24334. + func_append newdeplibs " $i"
  24335. else
  24336. droppeddeps=yes
  24337. echo
  24338. @@ -6789,7 +7708,7 @@ EOF
  24339. fi
  24340. ;;
  24341. *)
  24342. - newdeplibs="$newdeplibs $i"
  24343. + func_append newdeplibs " $i"
  24344. ;;
  24345. esac
  24346. done
  24347. @@ -6807,18 +7726,18 @@ EOF
  24348. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  24349. case " $predeps $postdeps " in
  24350. *" $i "*)
  24351. - newdeplibs="$newdeplibs $i"
  24352. + func_append newdeplibs " $i"
  24353. i=""
  24354. ;;
  24355. esac
  24356. fi
  24357. if test -n "$i" ; then
  24358. - eval "libname=\"$libname_spec\""
  24359. - eval "deplib_matches=\"$library_names_spec\""
  24360. + libname=`eval "\\$ECHO \"$libname_spec\""`
  24361. + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
  24362. set dummy $deplib_matches; shift
  24363. deplib_match=$1
  24364. if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
  24365. - newdeplibs="$newdeplibs $i"
  24366. + func_append newdeplibs " $i"
  24367. else
  24368. droppeddeps=yes
  24369. echo
  24370. @@ -6840,7 +7759,7 @@ EOF
  24371. fi
  24372. ;;
  24373. *)
  24374. - newdeplibs="$newdeplibs $i"
  24375. + func_append newdeplibs " $i"
  24376. ;;
  24377. esac
  24378. done
  24379. @@ -6857,15 +7776,27 @@ EOF
  24380. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  24381. case " $predeps $postdeps " in
  24382. *" $a_deplib "*)
  24383. - newdeplibs="$newdeplibs $a_deplib"
  24384. + func_append newdeplibs " $a_deplib"
  24385. a_deplib=""
  24386. ;;
  24387. esac
  24388. fi
  24389. if test -n "$a_deplib" ; then
  24390. - eval "libname=\"$libname_spec\""
  24391. + libname=`eval "\\$ECHO \"$libname_spec\""`
  24392. + if test -n "$file_magic_glob"; then
  24393. + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
  24394. + else
  24395. + libnameglob=$libname
  24396. + fi
  24397. + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
  24398. for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  24399. - potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
  24400. + if test "$want_nocaseglob" = yes; then
  24401. + shopt -s nocaseglob
  24402. + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
  24403. + $nocaseglob
  24404. + else
  24405. + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
  24406. + fi
  24407. for potent_lib in $potential_libs; do
  24408. # Follow soft links.
  24409. if ls -lLd "$potent_lib" 2>/dev/null |
  24410. @@ -6885,10 +7816,10 @@ EOF
  24411. *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
  24412. esac
  24413. done
  24414. - if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
  24415. + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
  24416. $SED -e 10q |
  24417. $EGREP "$file_magic_regex" > /dev/null; then
  24418. - newdeplibs="$newdeplibs $a_deplib"
  24419. + func_append newdeplibs " $a_deplib"
  24420. a_deplib=""
  24421. break 2
  24422. fi
  24423. @@ -6913,7 +7844,7 @@ EOF
  24424. ;;
  24425. *)
  24426. # Add a -L argument.
  24427. - newdeplibs="$newdeplibs $a_deplib"
  24428. + func_append newdeplibs " $a_deplib"
  24429. ;;
  24430. esac
  24431. done # Gone through all deplibs.
  24432. @@ -6929,20 +7860,20 @@ EOF
  24433. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  24434. case " $predeps $postdeps " in
  24435. *" $a_deplib "*)
  24436. - newdeplibs="$newdeplibs $a_deplib"
  24437. + func_append newdeplibs " $a_deplib"
  24438. a_deplib=""
  24439. ;;
  24440. esac
  24441. fi
  24442. if test -n "$a_deplib" ; then
  24443. - eval "libname=\"$libname_spec\""
  24444. + libname=`eval "\\$ECHO \"$libname_spec\""`
  24445. for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  24446. potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
  24447. for potent_lib in $potential_libs; do
  24448. potlib="$potent_lib" # see symlink-check above in file_magic test
  24449. if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
  24450. $EGREP "$match_pattern_regex" > /dev/null; then
  24451. - newdeplibs="$newdeplibs $a_deplib"
  24452. + func_append newdeplibs " $a_deplib"
  24453. a_deplib=""
  24454. break 2
  24455. fi
  24456. @@ -6967,7 +7898,7 @@ EOF
  24457. ;;
  24458. *)
  24459. # Add a -L argument.
  24460. - newdeplibs="$newdeplibs $a_deplib"
  24461. + func_append newdeplibs " $a_deplib"
  24462. ;;
  24463. esac
  24464. done # Gone through all deplibs.
  24465. @@ -7071,7 +8002,7 @@ EOF
  24466. *)
  24467. case " $deplibs " in
  24468. *" -L$path/$objdir "*)
  24469. - new_libs="$new_libs -L$path/$objdir" ;;
  24470. + func_append new_libs " -L$path/$objdir" ;;
  24471. esac
  24472. ;;
  24473. esac
  24474. @@ -7081,10 +8012,10 @@ EOF
  24475. -L*)
  24476. case " $new_libs " in
  24477. *" $deplib "*) ;;
  24478. - *) new_libs="$new_libs $deplib" ;;
  24479. + *) func_append new_libs " $deplib" ;;
  24480. esac
  24481. ;;
  24482. - *) new_libs="$new_libs $deplib" ;;
  24483. + *) func_append new_libs " $deplib" ;;
  24484. esac
  24485. done
  24486. deplibs="$new_libs"
  24487. @@ -7101,10 +8032,12 @@ EOF
  24488. hardcode_libdirs=
  24489. dep_rpath=
  24490. rpath="$finalize_rpath"
  24491. - test "$mode" != relink && rpath="$compile_rpath$rpath"
  24492. + test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
  24493. for libdir in $rpath; do
  24494. if test -n "$hardcode_libdir_flag_spec"; then
  24495. if test -n "$hardcode_libdir_separator"; then
  24496. + func_replace_sysroot "$libdir"
  24497. + libdir=$func_replace_sysroot_result
  24498. if test -z "$hardcode_libdirs"; then
  24499. hardcode_libdirs="$libdir"
  24500. else
  24501. @@ -7113,18 +8046,18 @@ EOF
  24502. *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  24503. ;;
  24504. *)
  24505. - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
  24506. + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
  24507. ;;
  24508. esac
  24509. fi
  24510. else
  24511. - eval "flag=\"$hardcode_libdir_flag_spec\""
  24512. - dep_rpath="$dep_rpath $flag"
  24513. + eval flag=\"$hardcode_libdir_flag_spec\"
  24514. + func_append dep_rpath " $flag"
  24515. fi
  24516. elif test -n "$runpath_var"; then
  24517. case "$perm_rpath " in
  24518. *" $libdir "*) ;;
  24519. - *) perm_rpath="$perm_rpath $libdir" ;;
  24520. + *) func_apped perm_rpath " $libdir" ;;
  24521. esac
  24522. fi
  24523. done
  24524. @@ -7133,40 +8066,38 @@ EOF
  24525. test -n "$hardcode_libdirs"; then
  24526. libdir="$hardcode_libdirs"
  24527. if test -n "$hardcode_libdir_flag_spec_ld"; then
  24528. - eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
  24529. + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
  24530. else
  24531. - eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
  24532. + eval dep_rpath=\"$hardcode_libdir_flag_spec\"
  24533. fi
  24534. fi
  24535. if test -n "$runpath_var" && test -n "$perm_rpath"; then
  24536. # We should set the runpath_var.
  24537. rpath=
  24538. for dir in $perm_rpath; do
  24539. - rpath="$rpath$dir:"
  24540. + func_append rpath "$dir:"
  24541. done
  24542. - eval $runpath_var=\$rpath\$$runpath_var
  24543. - export $runpath_var
  24544. + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
  24545. fi
  24546. test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
  24547. fi
  24548. shlibpath="$finalize_shlibpath"
  24549. - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
  24550. + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
  24551. if test -n "$shlibpath"; then
  24552. - eval $shlibpath_var=\$shlibpath\$$shlibpath_var
  24553. - export $shlibpath_var
  24554. + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
  24555. fi
  24556. # Get the real and link names of the library.
  24557. - eval "shared_ext=\"$shrext_cmds\""
  24558. - eval "library_names=\"$library_names_spec\""
  24559. + eval shared_ext=\"$shrext_cmds\"
  24560. + eval library_names=\"$library_names_spec\"
  24561. set dummy $library_names
  24562. shift
  24563. realname="$1"
  24564. shift
  24565. if test -n "$soname_spec"; then
  24566. - eval "soname=\"$soname_spec\""
  24567. + eval soname=\"$soname_spec\"
  24568. else
  24569. soname="$realname"
  24570. fi
  24571. @@ -7178,7 +8109,7 @@ EOF
  24572. linknames=
  24573. for link
  24574. do
  24575. - linknames="$linknames $link"
  24576. + func_append linknames " $link"
  24577. done
  24578. # Use standard objects if they are pic
  24579. @@ -7189,7 +8120,7 @@ EOF
  24580. if test -n "$export_symbols" && test -n "$include_expsyms"; then
  24581. $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
  24582. export_symbols="$output_objdir/$libname.uexp"
  24583. - delfiles="$delfiles $export_symbols"
  24584. + func_append delfiles " $export_symbols"
  24585. fi
  24586. orig_export_symbols=
  24587. @@ -7220,13 +8151,45 @@ EOF
  24588. $opt_dry_run || $RM $export_symbols
  24589. cmds=$export_symbols_cmds
  24590. save_ifs="$IFS"; IFS='~'
  24591. - for cmd in $cmds; do
  24592. + for cmd1 in $cmds; do
  24593. IFS="$save_ifs"
  24594. - eval "cmd=\"$cmd\""
  24595. - func_len " $cmd"
  24596. - len=$func_len_result
  24597. - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  24598. + # Take the normal branch if the nm_file_list_spec branch
  24599. + # doesn't work or if tool conversion is not needed.
  24600. + case $nm_file_list_spec~$to_tool_file_cmd in
  24601. + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
  24602. + try_normal_branch=yes
  24603. + eval cmd=\"$cmd1\"
  24604. + func_len " $cmd"
  24605. + len=$func_len_result
  24606. + ;;
  24607. + *)
  24608. + try_normal_branch=no
  24609. + ;;
  24610. + esac
  24611. + if test "$try_normal_branch" = yes \
  24612. + && { test "$len" -lt "$max_cmd_len" \
  24613. + || test "$max_cmd_len" -le -1; }
  24614. + then
  24615. + func_show_eval "$cmd" 'exit $?'
  24616. + skipped_export=false
  24617. + elif test -n "$nm_file_list_spec"; then
  24618. + func_basename "$output"
  24619. + output_la=$func_basename_result
  24620. + save_libobjs=$libobjs
  24621. + save_output=$output
  24622. + output=${output_objdir}/${output_la}.nm
  24623. + func_to_tool_file "$output"
  24624. + libobjs=$nm_file_list_spec$func_to_tool_file_result
  24625. + func_append delfiles " $output"
  24626. + func_verbose "creating $NM input file list: $output"
  24627. + for obj in $save_libobjs; do
  24628. + func_to_tool_file "$obj"
  24629. + $ECHO "$func_to_tool_file_result"
  24630. + done > "$output"
  24631. + eval cmd=\"$cmd1\"
  24632. func_show_eval "$cmd" 'exit $?'
  24633. + output=$save_output
  24634. + libobjs=$save_libobjs
  24635. skipped_export=false
  24636. else
  24637. # The command line is too long to execute in one step.
  24638. @@ -7248,7 +8211,7 @@ EOF
  24639. if test -n "$export_symbols" && test -n "$include_expsyms"; then
  24640. tmp_export_symbols="$export_symbols"
  24641. test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
  24642. - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
  24643. + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
  24644. fi
  24645. if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
  24646. @@ -7260,7 +8223,7 @@ EOF
  24647. # global variables. join(1) would be nice here, but unfortunately
  24648. # isn't a blessed tool.
  24649. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
  24650. - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
  24651. + func_append delfiles " $export_symbols $output_objdir/$libname.filter"
  24652. export_symbols=$output_objdir/$libname.def
  24653. $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  24654. fi
  24655. @@ -7270,7 +8233,7 @@ EOF
  24656. case " $convenience " in
  24657. *" $test_deplib "*) ;;
  24658. *)
  24659. - tmp_deplibs="$tmp_deplibs $test_deplib"
  24660. + func_append tmp_deplibs " $test_deplib"
  24661. ;;
  24662. esac
  24663. done
  24664. @@ -7286,43 +8249,43 @@ EOF
  24665. fi
  24666. if test -n "$whole_archive_flag_spec"; then
  24667. save_libobjs=$libobjs
  24668. - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
  24669. + eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  24670. test "X$libobjs" = "X " && libobjs=
  24671. else
  24672. gentop="$output_objdir/${outputname}x"
  24673. - generated="$generated $gentop"
  24674. + func_append generated " $gentop"
  24675. func_extract_archives $gentop $convenience
  24676. - libobjs="$libobjs $func_extract_archives_result"
  24677. + func_append libobjs " $func_extract_archives_result"
  24678. test "X$libobjs" = "X " && libobjs=
  24679. fi
  24680. fi
  24681. if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
  24682. - eval "flag=\"$thread_safe_flag_spec\""
  24683. - linker_flags="$linker_flags $flag"
  24684. + eval flag=\"$thread_safe_flag_spec\"
  24685. + func_append linker_flags " $flag"
  24686. fi
  24687. # Make a backup of the uninstalled library when relinking
  24688. - if test "$mode" = relink; then
  24689. - $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
  24690. + if test "$opt_mode" = relink; then
  24691. + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
  24692. fi
  24693. # Do each of the archive commands.
  24694. if test "$module" = yes && test -n "$module_cmds" ; then
  24695. if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
  24696. - eval "test_cmds=\"$module_expsym_cmds\""
  24697. + eval test_cmds=\"$module_expsym_cmds\"
  24698. cmds=$module_expsym_cmds
  24699. else
  24700. - eval "test_cmds=\"$module_cmds\""
  24701. + eval test_cmds=\"$module_cmds\"
  24702. cmds=$module_cmds
  24703. fi
  24704. else
  24705. if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
  24706. - eval "test_cmds=\"$archive_expsym_cmds\""
  24707. + eval test_cmds=\"$archive_expsym_cmds\"
  24708. cmds=$archive_expsym_cmds
  24709. else
  24710. - eval "test_cmds=\"$archive_cmds\""
  24711. + eval test_cmds=\"$archive_cmds\"
  24712. cmds=$archive_cmds
  24713. fi
  24714. fi
  24715. @@ -7366,10 +8329,13 @@ EOF
  24716. echo 'INPUT (' > $output
  24717. for obj in $save_libobjs
  24718. do
  24719. - $ECHO "$obj" >> $output
  24720. + func_to_tool_file "$obj"
  24721. + $ECHO "$func_to_tool_file_result" >> $output
  24722. done
  24723. echo ')' >> $output
  24724. - delfiles="$delfiles $output"
  24725. + func_append delfiles " $output"
  24726. + func_to_tool_file "$output"
  24727. + output=$func_to_tool_file_result
  24728. elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
  24729. output=${output_objdir}/${output_la}.lnk
  24730. func_verbose "creating linker input file list: $output"
  24731. @@ -7383,15 +8349,17 @@ EOF
  24732. fi
  24733. for obj
  24734. do
  24735. - $ECHO "$obj" >> $output
  24736. + func_to_tool_file "$obj"
  24737. + $ECHO "$func_to_tool_file_result" >> $output
  24738. done
  24739. - delfiles="$delfiles $output"
  24740. - output=$firstobj\"$file_list_spec$output\"
  24741. + func_append delfiles " $output"
  24742. + func_to_tool_file "$output"
  24743. + output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
  24744. else
  24745. if test -n "$save_libobjs"; then
  24746. func_verbose "creating reloadable object files..."
  24747. output=$output_objdir/$output_la-${k}.$objext
  24748. - eval "test_cmds=\"$reload_cmds\""
  24749. + eval test_cmds=\"$reload_cmds\"
  24750. func_len " $test_cmds"
  24751. len0=$func_len_result
  24752. len=$len0
  24753. @@ -7411,12 +8379,12 @@ EOF
  24754. if test "$k" -eq 1 ; then
  24755. # The first file doesn't have a previous command to add.
  24756. reload_objs=$objlist
  24757. - eval "concat_cmds=\"$reload_cmds\""
  24758. + eval concat_cmds=\"$reload_cmds\"
  24759. else
  24760. # All subsequent reloadable object files will link in
  24761. # the last one created.
  24762. reload_objs="$objlist $last_robj"
  24763. - eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
  24764. + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
  24765. fi
  24766. last_robj=$output_objdir/$output_la-${k}.$objext
  24767. func_arith $k + 1
  24768. @@ -7433,11 +8401,11 @@ EOF
  24769. # files will link in the last one created.
  24770. test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  24771. reload_objs="$objlist $last_robj"
  24772. - eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
  24773. + eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
  24774. if test -n "$last_robj"; then
  24775. - eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
  24776. + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
  24777. fi
  24778. - delfiles="$delfiles $output"
  24779. + func_append delfiles " $output"
  24780. else
  24781. output=
  24782. @@ -7450,9 +8418,9 @@ EOF
  24783. libobjs=$output
  24784. # Append the command to create the export file.
  24785. test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  24786. - eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
  24787. + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
  24788. if test -n "$last_robj"; then
  24789. - eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
  24790. + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
  24791. fi
  24792. fi
  24793. @@ -7471,7 +8439,7 @@ EOF
  24794. lt_exit=$?
  24795. # Restore the uninstalled library and exit
  24796. - if test "$mode" = relink; then
  24797. + if test "$opt_mode" = relink; then
  24798. ( cd "$output_objdir" && \
  24799. $RM "${realname}T" && \
  24800. $MV "${realname}U" "$realname" )
  24801. @@ -7492,7 +8460,7 @@ EOF
  24802. if test -n "$export_symbols" && test -n "$include_expsyms"; then
  24803. tmp_export_symbols="$export_symbols"
  24804. test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
  24805. - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
  24806. + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
  24807. fi
  24808. if test -n "$orig_export_symbols"; then
  24809. @@ -7504,7 +8472,7 @@ EOF
  24810. # global variables. join(1) would be nice here, but unfortunately
  24811. # isn't a blessed tool.
  24812. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
  24813. - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
  24814. + func_append delfiles " $export_symbols $output_objdir/$libname.filter"
  24815. export_symbols=$output_objdir/$libname.def
  24816. $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  24817. fi
  24818. @@ -7515,7 +8483,7 @@ EOF
  24819. output=$save_output
  24820. if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
  24821. - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
  24822. + eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  24823. test "X$libobjs" = "X " && libobjs=
  24824. fi
  24825. # Expand the library linking commands again to reset the
  24826. @@ -7539,23 +8507,23 @@ EOF
  24827. if test -n "$delfiles"; then
  24828. # Append the command to remove temporary files to $cmds.
  24829. - eval "cmds=\"\$cmds~\$RM $delfiles\""
  24830. + eval cmds=\"\$cmds~\$RM $delfiles\"
  24831. fi
  24832. # Add any objects from preloaded convenience libraries
  24833. if test -n "$dlprefiles"; then
  24834. gentop="$output_objdir/${outputname}x"
  24835. - generated="$generated $gentop"
  24836. + func_append generated " $gentop"
  24837. func_extract_archives $gentop $dlprefiles
  24838. - libobjs="$libobjs $func_extract_archives_result"
  24839. + func_append libobjs " $func_extract_archives_result"
  24840. test "X$libobjs" = "X " && libobjs=
  24841. fi
  24842. save_ifs="$IFS"; IFS='~'
  24843. for cmd in $cmds; do
  24844. IFS="$save_ifs"
  24845. - eval "cmd=\"$cmd\""
  24846. + eval cmd=\"$cmd\"
  24847. $opt_silent || {
  24848. func_quote_for_expand "$cmd"
  24849. eval "func_echo $func_quote_for_expand_result"
  24850. @@ -7564,7 +8532,7 @@ EOF
  24851. lt_exit=$?
  24852. # Restore the uninstalled library and exit
  24853. - if test "$mode" = relink; then
  24854. + if test "$opt_mode" = relink; then
  24855. ( cd "$output_objdir" && \
  24856. $RM "${realname}T" && \
  24857. $MV "${realname}U" "$realname" )
  24858. @@ -7576,8 +8544,8 @@ EOF
  24859. IFS="$save_ifs"
  24860. # Restore the uninstalled library and exit
  24861. - if test "$mode" = relink; then
  24862. - $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
  24863. + if test "$opt_mode" = relink; then
  24864. + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
  24865. if test -n "$convenience"; then
  24866. if test -z "$whole_archive_flag_spec"; then
  24867. @@ -7656,17 +8624,20 @@ EOF
  24868. if test -n "$convenience"; then
  24869. if test -n "$whole_archive_flag_spec"; then
  24870. - eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
  24871. + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
  24872. reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
  24873. else
  24874. gentop="$output_objdir/${obj}x"
  24875. - generated="$generated $gentop"
  24876. + func_append generated " $gentop"
  24877. func_extract_archives $gentop $convenience
  24878. reload_conv_objs="$reload_objs $func_extract_archives_result"
  24879. fi
  24880. fi
  24881. + # If we're not building shared, we need to use non_pic_objs
  24882. + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
  24883. +
  24884. # Create the old-style object.
  24885. reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  24886. @@ -7690,7 +8661,7 @@ EOF
  24887. # Create an invalid libtool object if no PIC, so that we don't
  24888. # accidentally link it into a program.
  24889. # $show "echo timestamp > $libobj"
  24890. - # $opt_dry_run || echo timestamp > $libobj || exit $?
  24891. + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
  24892. exit $EXIT_SUCCESS
  24893. fi
  24894. @@ -7740,8 +8711,8 @@ EOF
  24895. if test "$tagname" = CXX ; then
  24896. case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
  24897. 10.[0123])
  24898. - compile_command="$compile_command ${wl}-bind_at_load"
  24899. - finalize_command="$finalize_command ${wl}-bind_at_load"
  24900. + func_append compile_command " ${wl}-bind_at_load"
  24901. + func_append finalize_command " ${wl}-bind_at_load"
  24902. ;;
  24903. esac
  24904. fi
  24905. @@ -7761,7 +8732,7 @@ EOF
  24906. *)
  24907. case " $compile_deplibs " in
  24908. *" -L$path/$objdir "*)
  24909. - new_libs="$new_libs -L$path/$objdir" ;;
  24910. + func_append new_libs " -L$path/$objdir" ;;
  24911. esac
  24912. ;;
  24913. esac
  24914. @@ -7771,17 +8742,17 @@ EOF
  24915. -L*)
  24916. case " $new_libs " in
  24917. *" $deplib "*) ;;
  24918. - *) new_libs="$new_libs $deplib" ;;
  24919. + *) func_append new_libs " $deplib" ;;
  24920. esac
  24921. ;;
  24922. - *) new_libs="$new_libs $deplib" ;;
  24923. + *) func_append new_libs " $deplib" ;;
  24924. esac
  24925. done
  24926. compile_deplibs="$new_libs"
  24927. - compile_command="$compile_command $compile_deplibs"
  24928. - finalize_command="$finalize_command $finalize_deplibs"
  24929. + func_append compile_command " $compile_deplibs"
  24930. + func_append finalize_command " $finalize_deplibs"
  24931. if test -n "$rpath$xrpath"; then
  24932. # If the user specified any rpath flags, then add them.
  24933. @@ -7789,7 +8760,7 @@ EOF
  24934. # This is the magic to use -rpath.
  24935. case "$finalize_rpath " in
  24936. *" $libdir "*) ;;
  24937. - *) finalize_rpath="$finalize_rpath $libdir" ;;
  24938. + *) func_append finalize_rpath " $libdir" ;;
  24939. esac
  24940. done
  24941. fi
  24942. @@ -7808,18 +8779,18 @@ EOF
  24943. *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  24944. ;;
  24945. *)
  24946. - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
  24947. + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
  24948. ;;
  24949. esac
  24950. fi
  24951. else
  24952. - eval "flag=\"$hardcode_libdir_flag_spec\""
  24953. - rpath="$rpath $flag"
  24954. + eval flag=\"$hardcode_libdir_flag_spec\"
  24955. + func_append rpath " $flag"
  24956. fi
  24957. elif test -n "$runpath_var"; then
  24958. case "$perm_rpath " in
  24959. *" $libdir "*) ;;
  24960. - *) perm_rpath="$perm_rpath $libdir" ;;
  24961. + *) func_append perm_rpath " $libdir" ;;
  24962. esac
  24963. fi
  24964. case $host in
  24965. @@ -7828,12 +8799,12 @@ EOF
  24966. case :$dllsearchpath: in
  24967. *":$libdir:"*) ;;
  24968. ::) dllsearchpath=$libdir;;
  24969. - *) dllsearchpath="$dllsearchpath:$libdir";;
  24970. + *) func_append dllsearchpath ":$libdir";;
  24971. esac
  24972. case :$dllsearchpath: in
  24973. *":$testbindir:"*) ;;
  24974. ::) dllsearchpath=$testbindir;;
  24975. - *) dllsearchpath="$dllsearchpath:$testbindir";;
  24976. + *) func_append dllsearchpath ":$testbindir";;
  24977. esac
  24978. ;;
  24979. esac
  24980. @@ -7842,7 +8813,7 @@ EOF
  24981. if test -n "$hardcode_libdir_separator" &&
  24982. test -n "$hardcode_libdirs"; then
  24983. libdir="$hardcode_libdirs"
  24984. - eval "rpath=\" $hardcode_libdir_flag_spec\""
  24985. + eval rpath=\" $hardcode_libdir_flag_spec\"
  24986. fi
  24987. compile_rpath="$rpath"
  24988. @@ -7859,18 +8830,18 @@ EOF
  24989. *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  24990. ;;
  24991. *)
  24992. - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
  24993. + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
  24994. ;;
  24995. esac
  24996. fi
  24997. else
  24998. - eval "flag=\"$hardcode_libdir_flag_spec\""
  24999. - rpath="$rpath $flag"
  25000. + eval flag=\"$hardcode_libdir_flag_spec\"
  25001. + func_append rpath " $flag"
  25002. fi
  25003. elif test -n "$runpath_var"; then
  25004. case "$finalize_perm_rpath " in
  25005. *" $libdir "*) ;;
  25006. - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
  25007. + *) func_append finalize_perm_rpath " $libdir" ;;
  25008. esac
  25009. fi
  25010. done
  25011. @@ -7878,7 +8849,7 @@ EOF
  25012. if test -n "$hardcode_libdir_separator" &&
  25013. test -n "$hardcode_libdirs"; then
  25014. libdir="$hardcode_libdirs"
  25015. - eval "rpath=\" $hardcode_libdir_flag_spec\""
  25016. + eval rpath=\" $hardcode_libdir_flag_spec\"
  25017. fi
  25018. finalize_rpath="$rpath"
  25019. @@ -7921,6 +8892,12 @@ EOF
  25020. exit_status=0
  25021. func_show_eval "$link_command" 'exit_status=$?'
  25022. + if test -n "$postlink_cmds"; then
  25023. + func_to_tool_file "$output"
  25024. + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
  25025. + func_execute_cmds "$postlink_cmds" 'exit $?'
  25026. + fi
  25027. +
  25028. # Delete the generated files.
  25029. if test -f "$output_objdir/${outputname}S.${objext}"; then
  25030. func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
  25031. @@ -7943,7 +8920,7 @@ EOF
  25032. # We should set the runpath_var.
  25033. rpath=
  25034. for dir in $perm_rpath; do
  25035. - rpath="$rpath$dir:"
  25036. + func_append rpath "$dir:"
  25037. done
  25038. compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
  25039. fi
  25040. @@ -7951,7 +8928,7 @@ EOF
  25041. # We should set the runpath_var.
  25042. rpath=
  25043. for dir in $finalize_perm_rpath; do
  25044. - rpath="$rpath$dir:"
  25045. + func_append rpath "$dir:"
  25046. done
  25047. finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
  25048. fi
  25049. @@ -7966,6 +8943,13 @@ EOF
  25050. $opt_dry_run || $RM $output
  25051. # Link the executable and exit
  25052. func_show_eval "$link_command" 'exit $?'
  25053. +
  25054. + if test -n "$postlink_cmds"; then
  25055. + func_to_tool_file "$output"
  25056. + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
  25057. + func_execute_cmds "$postlink_cmds" 'exit $?'
  25058. + fi
  25059. +
  25060. exit $EXIT_SUCCESS
  25061. fi
  25062. @@ -7999,6 +8983,12 @@ EOF
  25063. func_show_eval "$link_command" 'exit $?'
  25064. + if test -n "$postlink_cmds"; then
  25065. + func_to_tool_file "$output_objdir/$outputname"
  25066. + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
  25067. + func_execute_cmds "$postlink_cmds" 'exit $?'
  25068. + fi
  25069. +
  25070. # Now create the wrapper script.
  25071. func_verbose "creating $output"
  25072. @@ -8096,7 +9086,7 @@ EOF
  25073. else
  25074. oldobjs="$old_deplibs $non_pic_objects"
  25075. if test "$preload" = yes && test -f "$symfileobj"; then
  25076. - oldobjs="$oldobjs $symfileobj"
  25077. + func_append oldobjs " $symfileobj"
  25078. fi
  25079. fi
  25080. addlibs="$old_convenience"
  25081. @@ -8104,10 +9094,10 @@ EOF
  25082. if test -n "$addlibs"; then
  25083. gentop="$output_objdir/${outputname}x"
  25084. - generated="$generated $gentop"
  25085. + func_append generated " $gentop"
  25086. func_extract_archives $gentop $addlibs
  25087. - oldobjs="$oldobjs $func_extract_archives_result"
  25088. + func_append oldobjs " $func_extract_archives_result"
  25089. fi
  25090. # Do each command in the archive commands.
  25091. @@ -8118,10 +9108,10 @@ EOF
  25092. # Add any objects from preloaded convenience libraries
  25093. if test -n "$dlprefiles"; then
  25094. gentop="$output_objdir/${outputname}x"
  25095. - generated="$generated $gentop"
  25096. + func_append generated " $gentop"
  25097. func_extract_archives $gentop $dlprefiles
  25098. - oldobjs="$oldobjs $func_extract_archives_result"
  25099. + func_append oldobjs " $func_extract_archives_result"
  25100. fi
  25101. # POSIX demands no paths to be encoded in archives. We have
  25102. @@ -8139,7 +9129,7 @@ EOF
  25103. else
  25104. echo "copying selected object files to avoid basename conflicts..."
  25105. gentop="$output_objdir/${outputname}x"
  25106. - generated="$generated $gentop"
  25107. + func_append generated " $gentop"
  25108. func_mkdir_p "$gentop"
  25109. save_oldobjs=$oldobjs
  25110. oldobjs=
  25111. @@ -8163,18 +9153,28 @@ EOF
  25112. esac
  25113. done
  25114. func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
  25115. - oldobjs="$oldobjs $gentop/$newobj"
  25116. + func_append oldobjs " $gentop/$newobj"
  25117. ;;
  25118. - *) oldobjs="$oldobjs $obj" ;;
  25119. + *) func_append oldobjs " $obj" ;;
  25120. esac
  25121. done
  25122. fi
  25123. - eval "cmds=\"$old_archive_cmds\""
  25124. + eval cmds=\"$old_archive_cmds\"
  25125. func_len " $cmds"
  25126. len=$func_len_result
  25127. if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  25128. cmds=$old_archive_cmds
  25129. + elif test -n "$archiver_list_spec"; then
  25130. + func_verbose "using command file archive linking..."
  25131. + for obj in $oldobjs
  25132. + do
  25133. + func_to_tool_file "$obj"
  25134. + $ECHO "$func_to_tool_file_result"
  25135. + done > $output_objdir/$libname.libcmd
  25136. + func_to_tool_file "$output_objdir/$libname.libcmd"
  25137. + oldobjs=" $archiver_list_spec$func_to_tool_file_result"
  25138. + cmds=$old_archive_cmds
  25139. else
  25140. # the command line is too long to link in one step, link in parts
  25141. func_verbose "using piecewise archive linking..."
  25142. @@ -8189,7 +9189,7 @@ EOF
  25143. do
  25144. last_oldobj=$obj
  25145. done
  25146. - eval "test_cmds=\"$old_archive_cmds\""
  25147. + eval test_cmds=\"$old_archive_cmds\"
  25148. func_len " $test_cmds"
  25149. len0=$func_len_result
  25150. len=$len0
  25151. @@ -8208,7 +9208,7 @@ EOF
  25152. RANLIB=$save_RANLIB
  25153. fi
  25154. test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  25155. - eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
  25156. + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
  25157. objlist=
  25158. len=$len0
  25159. fi
  25160. @@ -8216,9 +9216,9 @@ EOF
  25161. RANLIB=$save_RANLIB
  25162. oldobjs=$objlist
  25163. if test "X$oldobjs" = "X" ; then
  25164. - eval "cmds=\"\$concat_cmds\""
  25165. + eval cmds=\"\$concat_cmds\"
  25166. else
  25167. - eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
  25168. + eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
  25169. fi
  25170. fi
  25171. fi
  25172. @@ -8268,12 +9268,23 @@ EOF
  25173. *.la)
  25174. func_basename "$deplib"
  25175. name="$func_basename_result"
  25176. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  25177. + func_resolve_sysroot "$deplib"
  25178. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
  25179. test -z "$libdir" && \
  25180. func_fatal_error "\`$deplib' is not a valid libtool archive"
  25181. - newdependency_libs="$newdependency_libs $libdir/$name"
  25182. + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
  25183. + ;;
  25184. + -L*)
  25185. + func_stripname -L '' "$deplib"
  25186. + func_replace_sysroot "$func_stripname_result"
  25187. + func_append newdependency_libs " -L$func_replace_sysroot_result"
  25188. ;;
  25189. - *) newdependency_libs="$newdependency_libs $deplib" ;;
  25190. + -R*)
  25191. + func_stripname -R '' "$deplib"
  25192. + func_replace_sysroot "$func_stripname_result"
  25193. + func_append newdependency_libs " -R$func_replace_sysroot_result"
  25194. + ;;
  25195. + *) func_append newdependency_libs " $deplib" ;;
  25196. esac
  25197. done
  25198. dependency_libs="$newdependency_libs"
  25199. @@ -8284,12 +9295,14 @@ EOF
  25200. *.la)
  25201. func_basename "$lib"
  25202. name="$func_basename_result"
  25203. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  25204. + func_resolve_sysroot "$lib"
  25205. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
  25206. +
  25207. test -z "$libdir" && \
  25208. func_fatal_error "\`$lib' is not a valid libtool archive"
  25209. - newdlfiles="$newdlfiles $libdir/$name"
  25210. + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
  25211. ;;
  25212. - *) newdlfiles="$newdlfiles $lib" ;;
  25213. + *) func_append newdlfiles " $lib" ;;
  25214. esac
  25215. done
  25216. dlfiles="$newdlfiles"
  25217. @@ -8303,10 +9316,11 @@ EOF
  25218. # the library:
  25219. func_basename "$lib"
  25220. name="$func_basename_result"
  25221. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  25222. + func_resolve_sysroot "$lib"
  25223. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
  25224. test -z "$libdir" && \
  25225. func_fatal_error "\`$lib' is not a valid libtool archive"
  25226. - newdlprefiles="$newdlprefiles $libdir/$name"
  25227. + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
  25228. ;;
  25229. esac
  25230. done
  25231. @@ -8318,7 +9332,7 @@ EOF
  25232. [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  25233. *) abs=`pwd`"/$lib" ;;
  25234. esac
  25235. - newdlfiles="$newdlfiles $abs"
  25236. + func_append newdlfiles " $abs"
  25237. done
  25238. dlfiles="$newdlfiles"
  25239. newdlprefiles=
  25240. @@ -8327,7 +9341,7 @@ EOF
  25241. [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  25242. *) abs=`pwd`"/$lib" ;;
  25243. esac
  25244. - newdlprefiles="$newdlprefiles $abs"
  25245. + func_append newdlprefiles " $abs"
  25246. done
  25247. dlprefiles="$newdlprefiles"
  25248. fi
  25249. @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
  25250. exit $EXIT_SUCCESS
  25251. }
  25252. -{ test "$mode" = link || test "$mode" = relink; } &&
  25253. +{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
  25254. func_mode_link ${1+"$@"}
  25255. @@ -8432,9 +9446,9 @@ func_mode_uninstall ()
  25256. for arg
  25257. do
  25258. case $arg in
  25259. - -f) RM="$RM $arg"; rmforce=yes ;;
  25260. - -*) RM="$RM $arg" ;;
  25261. - *) files="$files $arg" ;;
  25262. + -f) func_append RM " $arg"; rmforce=yes ;;
  25263. + -*) func_append RM " $arg" ;;
  25264. + *) func_append files " $arg" ;;
  25265. esac
  25266. done
  25267. @@ -8443,24 +9457,23 @@ func_mode_uninstall ()
  25268. rmdirs=
  25269. - origobjdir="$objdir"
  25270. for file in $files; do
  25271. func_dirname "$file" "" "."
  25272. dir="$func_dirname_result"
  25273. if test "X$dir" = X.; then
  25274. - objdir="$origobjdir"
  25275. + odir="$objdir"
  25276. else
  25277. - objdir="$dir/$origobjdir"
  25278. + odir="$dir/$objdir"
  25279. fi
  25280. func_basename "$file"
  25281. name="$func_basename_result"
  25282. - test "$mode" = uninstall && objdir="$dir"
  25283. + test "$opt_mode" = uninstall && odir="$dir"
  25284. - # Remember objdir for removal later, being careful to avoid duplicates
  25285. - if test "$mode" = clean; then
  25286. + # Remember odir for removal later, being careful to avoid duplicates
  25287. + if test "$opt_mode" = clean; then
  25288. case " $rmdirs " in
  25289. - *" $objdir "*) ;;
  25290. - *) rmdirs="$rmdirs $objdir" ;;
  25291. + *" $odir "*) ;;
  25292. + *) func_append rmdirs " $odir" ;;
  25293. esac
  25294. fi
  25295. @@ -8486,18 +9499,17 @@ func_mode_uninstall ()
  25296. # Delete the libtool libraries and symlinks.
  25297. for n in $library_names; do
  25298. - rmfiles="$rmfiles $objdir/$n"
  25299. + func_append rmfiles " $odir/$n"
  25300. done
  25301. - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
  25302. + test -n "$old_library" && func_append rmfiles " $odir/$old_library"
  25303. - case "$mode" in
  25304. + case "$opt_mode" in
  25305. clean)
  25306. - case " $library_names " in
  25307. - # " " in the beginning catches empty $dlname
  25308. + case " $library_names " in
  25309. *" $dlname "*) ;;
  25310. - *) rmfiles="$rmfiles $objdir/$dlname" ;;
  25311. + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
  25312. esac
  25313. - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
  25314. + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
  25315. ;;
  25316. uninstall)
  25317. if test -n "$library_names"; then
  25318. @@ -8525,19 +9537,19 @@ func_mode_uninstall ()
  25319. # Add PIC object to the list of files to remove.
  25320. if test -n "$pic_object" &&
  25321. test "$pic_object" != none; then
  25322. - rmfiles="$rmfiles $dir/$pic_object"
  25323. + func_append rmfiles " $dir/$pic_object"
  25324. fi
  25325. # Add non-PIC object to the list of files to remove.
  25326. if test -n "$non_pic_object" &&
  25327. test "$non_pic_object" != none; then
  25328. - rmfiles="$rmfiles $dir/$non_pic_object"
  25329. + func_append rmfiles " $dir/$non_pic_object"
  25330. fi
  25331. fi
  25332. ;;
  25333. *)
  25334. - if test "$mode" = clean ; then
  25335. + if test "$opt_mode" = clean ; then
  25336. noexename=$name
  25337. case $file in
  25338. *.exe)
  25339. @@ -8547,7 +9559,7 @@ func_mode_uninstall ()
  25340. noexename=$func_stripname_result
  25341. # $file with .exe has already been added to rmfiles,
  25342. # add $file without .exe
  25343. - rmfiles="$rmfiles $file"
  25344. + func_append rmfiles " $file"
  25345. ;;
  25346. esac
  25347. # Do a test to see if this is a libtool program.
  25348. @@ -8556,7 +9568,7 @@ func_mode_uninstall ()
  25349. func_ltwrapper_scriptname "$file"
  25350. relink_command=
  25351. func_source $func_ltwrapper_scriptname_result
  25352. - rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
  25353. + func_append rmfiles " $func_ltwrapper_scriptname_result"
  25354. else
  25355. relink_command=
  25356. func_source $dir/$noexename
  25357. @@ -8564,12 +9576,12 @@ func_mode_uninstall ()
  25358. # note $name still contains .exe if it was in $file originally
  25359. # as does the version of $file that was added into $rmfiles
  25360. - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
  25361. + func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
  25362. if test "$fast_install" = yes && test -n "$relink_command"; then
  25363. - rmfiles="$rmfiles $objdir/lt-$name"
  25364. + func_append rmfiles " $odir/lt-$name"
  25365. fi
  25366. if test "X$noexename" != "X$name" ; then
  25367. - rmfiles="$rmfiles $objdir/lt-${noexename}.c"
  25368. + func_append rmfiles " $odir/lt-${noexename}.c"
  25369. fi
  25370. fi
  25371. fi
  25372. @@ -8577,7 +9589,6 @@ func_mode_uninstall ()
  25373. esac
  25374. func_show_eval "$RM $rmfiles" 'exit_status=1'
  25375. done
  25376. - objdir="$origobjdir"
  25377. # Try to remove the ${objdir}s in the directories where we deleted files
  25378. for dir in $rmdirs; do
  25379. @@ -8589,16 +9600,16 @@ func_mode_uninstall ()
  25380. exit $exit_status
  25381. }
  25382. -{ test "$mode" = uninstall || test "$mode" = clean; } &&
  25383. +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
  25384. func_mode_uninstall ${1+"$@"}
  25385. -test -z "$mode" && {
  25386. +test -z "$opt_mode" && {
  25387. help="$generic_help"
  25388. func_fatal_help "you must specify a MODE"
  25389. }
  25390. test -z "$exec_cmd" && \
  25391. - func_fatal_help "invalid operation mode \`$mode'"
  25392. + func_fatal_help "invalid operation mode \`$opt_mode'"
  25393. if test -n "$exec_cmd"; then
  25394. eval exec "$exec_cmd"
  25395. diff --git a/ltoptions.m4 b/ltoptions.m4
  25396. index 5ef12ced2a8..17cfd51c0b3 100644
  25397. --- a/ltoptions.m4
  25398. +++ b/ltoptions.m4
  25399. @@ -8,7 +8,7 @@
  25400. # unlimited permission to copy and/or distribute it, with or without
  25401. # modifications, as long as this notice is preserved.
  25402. -# serial 6 ltoptions.m4
  25403. +# serial 7 ltoptions.m4
  25404. # This is to help aclocal find these macros, as it can't see m4_define.
  25405. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
  25406. diff --git a/ltversion.m4 b/ltversion.m4
  25407. index bf87f77132d..9c7b5d41185 100644
  25408. --- a/ltversion.m4
  25409. +++ b/ltversion.m4
  25410. @@ -7,17 +7,17 @@
  25411. # unlimited permission to copy and/or distribute it, with or without
  25412. # modifications, as long as this notice is preserved.
  25413. -# Generated from ltversion.in.
  25414. +# @configure_input@
  25415. -# serial 3134 ltversion.m4
  25416. +# serial 3293 ltversion.m4
  25417. # This file is part of GNU Libtool
  25418. -m4_define([LT_PACKAGE_VERSION], [2.2.7a])
  25419. -m4_define([LT_PACKAGE_REVISION], [1.3134])
  25420. +m4_define([LT_PACKAGE_VERSION], [2.4])
  25421. +m4_define([LT_PACKAGE_REVISION], [1.3293])
  25422. AC_DEFUN([LTVERSION_VERSION],
  25423. -[macro_version='2.2.7a'
  25424. -macro_revision='1.3134'
  25425. +[macro_version='2.4'
  25426. +macro_revision='1.3293'
  25427. _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
  25428. _LT_DECL(, macro_revision, 0)
  25429. ])
  25430. diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
  25431. index bf92b5e0790..c573da90c5c 100644
  25432. --- a/lt~obsolete.m4
  25433. +++ b/lt~obsolete.m4
  25434. @@ -7,7 +7,7 @@
  25435. # unlimited permission to copy and/or distribute it, with or without
  25436. # modifications, as long as this notice is preserved.
  25437. -# serial 4 lt~obsolete.m4
  25438. +# serial 5 lt~obsolete.m4
  25439. # These exist entirely to fool aclocal when bootstrapping libtool.
  25440. #
  25441. diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
  25442. index 2257b0872af..73aae3b210f 100644
  25443. --- a/opcodes/Makefile.in
  25444. +++ b/opcodes/Makefile.in
  25445. @@ -292,6 +292,7 @@ CYGPATH_W = @CYGPATH_W@
  25446. DATADIRNAME = @DATADIRNAME@
  25447. DEFS = @DEFS@
  25448. DEPDIR = @DEPDIR@
  25449. +DLLTOOL = @DLLTOOL@
  25450. DSYMUTIL = @DSYMUTIL@
  25451. DUMPBIN = @DUMPBIN@
  25452. ECHO_C = @ECHO_C@
  25453. @@ -325,6 +326,7 @@ LN_S = @LN_S@
  25454. LTLIBOBJS = @LTLIBOBJS@
  25455. MAINT = @MAINT@
  25456. MAKEINFO = @MAKEINFO@
  25457. +MANIFEST_TOOL = @MANIFEST_TOOL@
  25458. MKDIR_P = @MKDIR_P@
  25459. MKINSTALLDIRS = @MKINSTALLDIRS@
  25460. MSGFMT = @MSGFMT@
  25461. @@ -363,6 +365,7 @@ abs_builddir = @abs_builddir@
  25462. abs_srcdir = @abs_srcdir@
  25463. abs_top_builddir = @abs_top_builddir@
  25464. abs_top_srcdir = @abs_top_srcdir@
  25465. +ac_ct_AR = @ac_ct_AR@
  25466. ac_ct_CC = @ac_ct_CC@
  25467. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  25468. am__include = @am__include@
  25469. diff --git a/opcodes/configure b/opcodes/configure
  25470. index db023b48c28..c562aada2a4 100755
  25471. --- a/opcodes/configure
  25472. +++ b/opcodes/configure
  25473. @@ -682,6 +682,9 @@ OTOOL
  25474. LIPO
  25475. NMEDIT
  25476. DSYMUTIL
  25477. +MANIFEST_TOOL
  25478. +ac_ct_AR
  25479. +DLLTOOL
  25480. OBJDUMP
  25481. LN_S
  25482. NM
  25483. @@ -800,6 +803,7 @@ enable_static
  25484. with_pic
  25485. enable_fast_install
  25486. with_gnu_ld
  25487. +with_libtool_sysroot
  25488. enable_libtool_lock
  25489. enable_checking
  25490. enable_targets
  25491. @@ -1468,6 +1472,8 @@ Optional Packages:
  25492. --with-pic try to use only PIC/non-PIC objects [default=use
  25493. both]
  25494. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  25495. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  25496. + (or the compiler's sysroot if not specified).
  25497. Some influential environment variables:
  25498. CC C compiler command
  25499. @@ -4977,8 +4983,8 @@ esac
  25500. -macro_version='2.2.7a'
  25501. -macro_revision='1.3134'
  25502. +macro_version='2.4'
  25503. +macro_revision='1.3293'
  25504. @@ -5018,7 +5024,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  25505. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  25506. $as_echo_n "checking how to print strings... " >&6; }
  25507. # Test print first, because it will be a builtin if present.
  25508. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  25509. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  25510. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  25511. ECHO='print -r --'
  25512. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  25513. @@ -5711,8 +5717,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  25514. # Try some XSI features
  25515. xsi_shell=no
  25516. ( _lt_dummy="a/b/c"
  25517. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  25518. - = c,a/b,, \
  25519. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  25520. + = c,a/b,b/c, \
  25521. && eval 'test $(( 1 + 1 )) -eq 2 \
  25522. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  25523. && xsi_shell=yes
  25524. @@ -5761,6 +5767,80 @@ esac
  25525. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  25526. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  25527. +if ${lt_cv_to_host_file_cmd+:} false; then :
  25528. + $as_echo_n "(cached) " >&6
  25529. +else
  25530. + case $host in
  25531. + *-*-mingw* )
  25532. + case $build in
  25533. + *-*-mingw* ) # actually msys
  25534. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  25535. + ;;
  25536. + *-*-cygwin* )
  25537. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  25538. + ;;
  25539. + * ) # otherwise, assume *nix
  25540. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  25541. + ;;
  25542. + esac
  25543. + ;;
  25544. + *-*-cygwin* )
  25545. + case $build in
  25546. + *-*-mingw* ) # actually msys
  25547. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  25548. + ;;
  25549. + *-*-cygwin* )
  25550. + lt_cv_to_host_file_cmd=func_convert_file_noop
  25551. + ;;
  25552. + * ) # otherwise, assume *nix
  25553. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  25554. + ;;
  25555. + esac
  25556. + ;;
  25557. + * ) # unhandled hosts (and "normal" native builds)
  25558. + lt_cv_to_host_file_cmd=func_convert_file_noop
  25559. + ;;
  25560. +esac
  25561. +
  25562. +fi
  25563. +
  25564. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  25565. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  25566. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  25567. +
  25568. +
  25569. +
  25570. +
  25571. +
  25572. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  25573. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  25574. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  25575. + $as_echo_n "(cached) " >&6
  25576. +else
  25577. + #assume ordinary cross tools, or native build.
  25578. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  25579. +case $host in
  25580. + *-*-mingw* )
  25581. + case $build in
  25582. + *-*-mingw* ) # actually msys
  25583. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  25584. + ;;
  25585. + esac
  25586. + ;;
  25587. +esac
  25588. +
  25589. +fi
  25590. +
  25591. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  25592. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  25593. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  25594. +
  25595. +
  25596. +
  25597. +
  25598. +
  25599. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  25600. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  25601. if ${lt_cv_ld_reload_flag+:} false; then :
  25602. @@ -5777,6 +5857,11 @@ case $reload_flag in
  25603. esac
  25604. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  25605. case $host_os in
  25606. + cygwin* | mingw* | pw32* | cegcc*)
  25607. + if test "$GCC" != yes; then
  25608. + reload_cmds=false
  25609. + fi
  25610. + ;;
  25611. darwin*)
  25612. if test "$GCC" = yes; then
  25613. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  25614. @@ -5945,7 +6030,8 @@ mingw* | pw32*)
  25615. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  25616. lt_cv_file_magic_cmd='func_win32_libid'
  25617. else
  25618. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  25619. + # Keep this pattern in sync with the one in func_win32_libid.
  25620. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  25621. lt_cv_file_magic_cmd='$OBJDUMP -f'
  25622. fi
  25623. ;;
  25624. @@ -6099,6 +6185,21 @@ esac
  25625. fi
  25626. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  25627. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  25628. +
  25629. +file_magic_glob=
  25630. +want_nocaseglob=no
  25631. +if test "$build" = "$host"; then
  25632. + case $host_os in
  25633. + mingw* | pw32*)
  25634. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  25635. + want_nocaseglob=yes
  25636. + else
  25637. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  25638. + fi
  25639. + ;;
  25640. + esac
  25641. +fi
  25642. +
  25643. file_magic_cmd=$lt_cv_file_magic_cmd
  25644. deplibs_check_method=$lt_cv_deplibs_check_method
  25645. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  25646. @@ -6114,6 +6215,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  25647. +
  25648. +
  25649. +
  25650. +
  25651. +
  25652. +
  25653. +
  25654. +
  25655. +
  25656. +
  25657. +if test -n "$ac_tool_prefix"; then
  25658. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  25659. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  25660. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  25661. +$as_echo_n "checking for $ac_word... " >&6; }
  25662. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  25663. + $as_echo_n "(cached) " >&6
  25664. +else
  25665. + if test -n "$DLLTOOL"; then
  25666. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  25667. +else
  25668. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  25669. +for as_dir in $PATH
  25670. +do
  25671. + IFS=$as_save_IFS
  25672. + test -z "$as_dir" && as_dir=.
  25673. + for ac_exec_ext in '' $ac_executable_extensions; do
  25674. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  25675. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  25676. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  25677. + break 2
  25678. + fi
  25679. +done
  25680. + done
  25681. +IFS=$as_save_IFS
  25682. +
  25683. +fi
  25684. +fi
  25685. +DLLTOOL=$ac_cv_prog_DLLTOOL
  25686. +if test -n "$DLLTOOL"; then
  25687. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  25688. +$as_echo "$DLLTOOL" >&6; }
  25689. +else
  25690. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  25691. +$as_echo "no" >&6; }
  25692. +fi
  25693. +
  25694. +
  25695. +fi
  25696. +if test -z "$ac_cv_prog_DLLTOOL"; then
  25697. + ac_ct_DLLTOOL=$DLLTOOL
  25698. + # Extract the first word of "dlltool", so it can be a program name with args.
  25699. +set dummy dlltool; ac_word=$2
  25700. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  25701. +$as_echo_n "checking for $ac_word... " >&6; }
  25702. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  25703. + $as_echo_n "(cached) " >&6
  25704. +else
  25705. + if test -n "$ac_ct_DLLTOOL"; then
  25706. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  25707. +else
  25708. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  25709. +for as_dir in $PATH
  25710. +do
  25711. + IFS=$as_save_IFS
  25712. + test -z "$as_dir" && as_dir=.
  25713. + for ac_exec_ext in '' $ac_executable_extensions; do
  25714. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  25715. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  25716. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  25717. + break 2
  25718. + fi
  25719. +done
  25720. + done
  25721. +IFS=$as_save_IFS
  25722. +
  25723. +fi
  25724. +fi
  25725. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  25726. +if test -n "$ac_ct_DLLTOOL"; then
  25727. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  25728. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  25729. +else
  25730. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  25731. +$as_echo "no" >&6; }
  25732. +fi
  25733. +
  25734. + if test "x$ac_ct_DLLTOOL" = x; then
  25735. + DLLTOOL="false"
  25736. + else
  25737. + case $cross_compiling:$ac_tool_warned in
  25738. +yes:)
  25739. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  25740. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  25741. +ac_tool_warned=yes ;;
  25742. +esac
  25743. + DLLTOOL=$ac_ct_DLLTOOL
  25744. + fi
  25745. +else
  25746. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  25747. +fi
  25748. +
  25749. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  25750. +
  25751. +
  25752. +
  25753. +
  25754. +
  25755. +
  25756. +
  25757. +
  25758. +
  25759. +
  25760. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  25761. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  25762. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  25763. + $as_echo_n "(cached) " >&6
  25764. +else
  25765. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  25766. +
  25767. +case $host_os in
  25768. +cygwin* | mingw* | pw32* | cegcc*)
  25769. + # two different shell functions defined in ltmain.sh
  25770. + # decide which to use based on capabilities of $DLLTOOL
  25771. + case `$DLLTOOL --help 2>&1` in
  25772. + *--identify-strict*)
  25773. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  25774. + ;;
  25775. + *)
  25776. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  25777. + ;;
  25778. + esac
  25779. + ;;
  25780. +*)
  25781. + # fallback: assume linklib IS sharedlib
  25782. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  25783. + ;;
  25784. +esac
  25785. +
  25786. +fi
  25787. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  25788. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  25789. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  25790. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  25791. +
  25792. +
  25793. +
  25794. +
  25795. +
  25796. +
  25797. +
  25798. plugin_option=
  25799. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  25800. for plugin in $plugin_names; do
  25801. @@ -6128,8 +6380,10 @@ for plugin in $plugin_names; do
  25802. done
  25803. if test -n "$ac_tool_prefix"; then
  25804. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  25805. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  25806. + for ac_prog in ar
  25807. + do
  25808. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  25809. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  25810. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  25811. $as_echo_n "checking for $ac_word... " >&6; }
  25812. if ${ac_cv_prog_AR+:} false; then :
  25813. @@ -6145,7 +6399,7 @@ do
  25814. test -z "$as_dir" && as_dir=.
  25815. for ac_exec_ext in '' $ac_executable_extensions; do
  25816. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  25817. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  25818. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  25819. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  25820. break 2
  25821. fi
  25822. @@ -6165,11 +6419,15 @@ $as_echo "no" >&6; }
  25823. fi
  25824. + test -n "$AR" && break
  25825. + done
  25826. fi
  25827. -if test -z "$ac_cv_prog_AR"; then
  25828. +if test -z "$AR"; then
  25829. ac_ct_AR=$AR
  25830. - # Extract the first word of "ar", so it can be a program name with args.
  25831. -set dummy ar; ac_word=$2
  25832. + for ac_prog in ar
  25833. +do
  25834. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  25835. +set dummy $ac_prog; ac_word=$2
  25836. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  25837. $as_echo_n "checking for $ac_word... " >&6; }
  25838. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  25839. @@ -6185,7 +6443,7 @@ do
  25840. test -z "$as_dir" && as_dir=.
  25841. for ac_exec_ext in '' $ac_executable_extensions; do
  25842. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  25843. - ac_cv_prog_ac_ct_AR="ar"
  25844. + ac_cv_prog_ac_ct_AR="$ac_prog"
  25845. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  25846. break 2
  25847. fi
  25848. @@ -6204,6 +6462,10 @@ else
  25849. $as_echo "no" >&6; }
  25850. fi
  25851. +
  25852. + test -n "$ac_ct_AR" && break
  25853. +done
  25854. +
  25855. if test "x$ac_ct_AR" = x; then
  25856. AR="false"
  25857. else
  25858. @@ -6215,25 +6477,20 @@ ac_tool_warned=yes ;;
  25859. esac
  25860. AR=$ac_ct_AR
  25861. fi
  25862. -else
  25863. - AR="$ac_cv_prog_AR"
  25864. fi
  25865. -test -z "$AR" && AR=ar
  25866. -if test -n "$plugin_option"; then
  25867. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  25868. - touch conftest.c
  25869. - $AR $plugin_option rc conftest.a conftest.c
  25870. - if test "$?" != 0; then
  25871. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  25872. + touch conftest.c
  25873. + $AR $plugin_option rc conftest.a conftest.c
  25874. + if test "$?" != 0; then
  25875. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  25876. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  25877. - else
  25878. - AR="$AR $plugin_option"
  25879. - fi
  25880. - rm -f conftest.*
  25881. + else
  25882. + AR="$AR $plugin_option"
  25883. fi
  25884. -fi
  25885. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  25886. + rm -f conftest.*
  25887. +: ${AR=ar}
  25888. +: ${AR_FLAGS=cru}
  25889. +
  25890. @@ -6244,6 +6501,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  25891. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  25892. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  25893. +if ${lt_cv_ar_at_file+:} false; then :
  25894. + $as_echo_n "(cached) " >&6
  25895. +else
  25896. + lt_cv_ar_at_file=no
  25897. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  25898. +/* end confdefs.h. */
  25899. +
  25900. +int
  25901. +main ()
  25902. +{
  25903. +
  25904. + ;
  25905. + return 0;
  25906. +}
  25907. +_ACEOF
  25908. +if ac_fn_c_try_compile "$LINENO"; then :
  25909. + echo conftest.$ac_objext > conftest.lst
  25910. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  25911. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  25912. + (eval $lt_ar_try) 2>&5
  25913. + ac_status=$?
  25914. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  25915. + test $ac_status = 0; }
  25916. + if test "$ac_status" -eq 0; then
  25917. + # Ensure the archiver fails upon bogus file names.
  25918. + rm -f conftest.$ac_objext libconftest.a
  25919. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  25920. + (eval $lt_ar_try) 2>&5
  25921. + ac_status=$?
  25922. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  25923. + test $ac_status = 0; }
  25924. + if test "$ac_status" -ne 0; then
  25925. + lt_cv_ar_at_file=@
  25926. + fi
  25927. + fi
  25928. + rm -f conftest.* libconftest.a
  25929. +
  25930. +fi
  25931. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  25932. +
  25933. +fi
  25934. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  25935. +$as_echo "$lt_cv_ar_at_file" >&6; }
  25936. +
  25937. +if test "x$lt_cv_ar_at_file" = xno; then
  25938. + archiver_list_spec=
  25939. +else
  25940. + archiver_list_spec=$lt_cv_ar_at_file
  25941. +fi
  25942. +
  25943. +
  25944. +
  25945. +
  25946. +
  25947. +
  25948. if test -n "$ac_tool_prefix"; then
  25949. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  25950. @@ -6584,8 +6898,8 @@ esac
  25951. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  25952. # Transform an extracted symbol line into symbol name and symbol address
  25953. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  25954. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  25955. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  25956. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  25957. # Handle CRLF in mingw tool chain
  25958. opt_cr=
  25959. @@ -6621,6 +6935,7 @@ for ac_symprfx in "" "_"; do
  25960. else
  25961. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  25962. fi
  25963. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  25964. # Check to see that the pipe works correctly.
  25965. pipe_works=no
  25966. @@ -6662,6 +6977,18 @@ _LT_EOF
  25967. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  25968. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  25969. cat <<_LT_EOF > conftest.$ac_ext
  25970. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  25971. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  25972. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  25973. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  25974. +# define LT_DLSYM_CONST
  25975. +#elif defined(__osf__)
  25976. +/* This system does not cope well with relocations in const data. */
  25977. +# define LT_DLSYM_CONST
  25978. +#else
  25979. +# define LT_DLSYM_CONST const
  25980. +#endif
  25981. +
  25982. #ifdef __cplusplus
  25983. extern "C" {
  25984. #endif
  25985. @@ -6673,7 +7000,7 @@ _LT_EOF
  25986. cat <<_LT_EOF >> conftest.$ac_ext
  25987. /* The mapping between symbol names and symbols. */
  25988. -const struct {
  25989. +LT_DLSYM_CONST struct {
  25990. const char *name;
  25991. void *address;
  25992. }
  25993. @@ -6699,8 +7026,8 @@ static const void *lt_preloaded_setup() {
  25994. _LT_EOF
  25995. # Now try linking the two files.
  25996. mv conftest.$ac_objext conftstm.$ac_objext
  25997. - lt_save_LIBS="$LIBS"
  25998. - lt_save_CFLAGS="$CFLAGS"
  25999. + lt_globsym_save_LIBS=$LIBS
  26000. + lt_globsym_save_CFLAGS=$CFLAGS
  26001. LIBS="conftstm.$ac_objext"
  26002. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  26003. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  26004. @@ -6710,8 +7037,8 @@ _LT_EOF
  26005. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  26006. pipe_works=yes
  26007. fi
  26008. - LIBS="$lt_save_LIBS"
  26009. - CFLAGS="$lt_save_CFLAGS"
  26010. + LIBS=$lt_globsym_save_LIBS
  26011. + CFLAGS=$lt_globsym_save_CFLAGS
  26012. else
  26013. echo "cannot find nm_test_func in $nlist" >&5
  26014. fi
  26015. @@ -6748,6 +7075,14 @@ else
  26016. $as_echo "ok" >&6; }
  26017. fi
  26018. +# Response file support.
  26019. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  26020. + nm_file_list_spec='@'
  26021. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  26022. + nm_file_list_spec='@'
  26023. +fi
  26024. +
  26025. +
  26026. @@ -6766,6 +7101,47 @@ fi
  26027. +
  26028. +
  26029. +
  26030. +
  26031. +
  26032. +
  26033. +
  26034. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  26035. +$as_echo_n "checking for sysroot... " >&6; }
  26036. +
  26037. +# Check whether --with-libtool-sysroot was given.
  26038. +if test "${with_libtool_sysroot+set}" = set; then :
  26039. + withval=$with_libtool_sysroot;
  26040. +else
  26041. + with_libtool_sysroot=no
  26042. +fi
  26043. +
  26044. +
  26045. +lt_sysroot=
  26046. +case ${with_libtool_sysroot} in #(
  26047. + yes)
  26048. + if test "$GCC" = yes; then
  26049. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  26050. + fi
  26051. + ;; #(
  26052. + /*)
  26053. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  26054. + ;; #(
  26055. + no|'')
  26056. + ;; #(
  26057. + *)
  26058. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  26059. +$as_echo "${with_libtool_sysroot}" >&6; }
  26060. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  26061. + ;;
  26062. +esac
  26063. +
  26064. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  26065. +$as_echo "${lt_sysroot:-no}" >&6; }
  26066. +
  26067. +
  26068. @@ -6975,6 +7351,123 @@ esac
  26069. need_locks="$enable_libtool_lock"
  26070. +if test -n "$ac_tool_prefix"; then
  26071. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  26072. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  26073. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  26074. +$as_echo_n "checking for $ac_word... " >&6; }
  26075. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  26076. + $as_echo_n "(cached) " >&6
  26077. +else
  26078. + if test -n "$MANIFEST_TOOL"; then
  26079. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  26080. +else
  26081. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  26082. +for as_dir in $PATH
  26083. +do
  26084. + IFS=$as_save_IFS
  26085. + test -z "$as_dir" && as_dir=.
  26086. + for ac_exec_ext in '' $ac_executable_extensions; do
  26087. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  26088. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  26089. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  26090. + break 2
  26091. + fi
  26092. +done
  26093. + done
  26094. +IFS=$as_save_IFS
  26095. +
  26096. +fi
  26097. +fi
  26098. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  26099. +if test -n "$MANIFEST_TOOL"; then
  26100. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  26101. +$as_echo "$MANIFEST_TOOL" >&6; }
  26102. +else
  26103. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  26104. +$as_echo "no" >&6; }
  26105. +fi
  26106. +
  26107. +
  26108. +fi
  26109. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  26110. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  26111. + # Extract the first word of "mt", so it can be a program name with args.
  26112. +set dummy mt; ac_word=$2
  26113. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  26114. +$as_echo_n "checking for $ac_word... " >&6; }
  26115. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  26116. + $as_echo_n "(cached) " >&6
  26117. +else
  26118. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  26119. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  26120. +else
  26121. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  26122. +for as_dir in $PATH
  26123. +do
  26124. + IFS=$as_save_IFS
  26125. + test -z "$as_dir" && as_dir=.
  26126. + for ac_exec_ext in '' $ac_executable_extensions; do
  26127. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  26128. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  26129. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  26130. + break 2
  26131. + fi
  26132. +done
  26133. + done
  26134. +IFS=$as_save_IFS
  26135. +
  26136. +fi
  26137. +fi
  26138. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  26139. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  26140. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  26141. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  26142. +else
  26143. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  26144. +$as_echo "no" >&6; }
  26145. +fi
  26146. +
  26147. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  26148. + MANIFEST_TOOL=":"
  26149. + else
  26150. + case $cross_compiling:$ac_tool_warned in
  26151. +yes:)
  26152. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  26153. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  26154. +ac_tool_warned=yes ;;
  26155. +esac
  26156. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  26157. + fi
  26158. +else
  26159. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  26160. +fi
  26161. +
  26162. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  26163. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  26164. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  26165. +if ${lt_cv_path_mainfest_tool+:} false; then :
  26166. + $as_echo_n "(cached) " >&6
  26167. +else
  26168. + lt_cv_path_mainfest_tool=no
  26169. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  26170. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  26171. + cat conftest.err >&5
  26172. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  26173. + lt_cv_path_mainfest_tool=yes
  26174. + fi
  26175. + rm -f conftest*
  26176. +fi
  26177. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  26178. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  26179. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  26180. + MANIFEST_TOOL=:
  26181. +fi
  26182. +
  26183. +
  26184. +
  26185. +
  26186. +
  26187. case $host_os in
  26188. rhapsody* | darwin*)
  26189. @@ -7538,6 +8031,8 @@ _LT_EOF
  26190. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  26191. echo "$AR cru libconftest.a conftest.o" >&5
  26192. $AR cru libconftest.a conftest.o 2>&5
  26193. + echo "$RANLIB libconftest.a" >&5
  26194. + $RANLIB libconftest.a 2>&5
  26195. cat > conftest.c << _LT_EOF
  26196. int main() { return 0;}
  26197. _LT_EOF
  26198. @@ -8090,8 +8585,6 @@ fi
  26199. lt_prog_compiler_pic=
  26200. lt_prog_compiler_static=
  26201. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  26202. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  26203. if test "$GCC" = yes; then
  26204. lt_prog_compiler_wl='-Wl,'
  26205. @@ -8257,6 +8750,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  26206. lt_prog_compiler_pic='--shared'
  26207. lt_prog_compiler_static='--static'
  26208. ;;
  26209. + nagfor*)
  26210. + # NAG Fortran compiler
  26211. + lt_prog_compiler_wl='-Wl,-Wl,,'
  26212. + lt_prog_compiler_pic='-PIC'
  26213. + lt_prog_compiler_static='-Bstatic'
  26214. + ;;
  26215. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  26216. # Portland Group compilers (*not* the Pentium gcc compiler,
  26217. # which looks to be a dead project)
  26218. @@ -8319,7 +8818,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  26219. lt_prog_compiler_pic='-KPIC'
  26220. lt_prog_compiler_static='-Bstatic'
  26221. case $cc_basename in
  26222. - f77* | f90* | f95*)
  26223. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  26224. lt_prog_compiler_wl='-Qoption ld ';;
  26225. *)
  26226. lt_prog_compiler_wl='-Wl,';;
  26227. @@ -8376,13 +8875,17 @@ case $host_os in
  26228. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  26229. ;;
  26230. esac
  26231. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  26232. -$as_echo "$lt_prog_compiler_pic" >&6; }
  26233. -
  26234. -
  26235. -
  26236. -
  26237. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  26238. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  26239. +if ${lt_cv_prog_compiler_pic+:} false; then :
  26240. + $as_echo_n "(cached) " >&6
  26241. +else
  26242. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  26243. +fi
  26244. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  26245. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  26246. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  26247. #
  26248. # Check to make sure the PIC flag actually works.
  26249. @@ -8443,6 +8946,11 @@ fi
  26250. +
  26251. +
  26252. +
  26253. +
  26254. +
  26255. #
  26256. # Check to make sure the static flag actually works.
  26257. #
  26258. @@ -8793,7 +9301,8 @@ _LT_EOF
  26259. allow_undefined_flag=unsupported
  26260. always_export_symbols=no
  26261. enable_shared_with_static_runtimes=yes
  26262. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  26263. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  26264. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  26265. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  26266. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  26267. @@ -8892,12 +9401,12 @@ _LT_EOF
  26268. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  26269. hardcode_libdir_flag_spec=
  26270. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  26271. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  26272. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  26273. if test "x$supports_anon_versioning" = xyes; then
  26274. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  26275. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  26276. echo "local: *; };" >> $output_objdir/$libname.ver~
  26277. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  26278. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  26279. fi
  26280. ;;
  26281. esac
  26282. @@ -8911,8 +9420,8 @@ _LT_EOF
  26283. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  26284. wlarc=
  26285. else
  26286. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  26287. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  26288. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  26289. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  26290. fi
  26291. ;;
  26292. @@ -8930,8 +9439,8 @@ _LT_EOF
  26293. _LT_EOF
  26294. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  26295. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  26296. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  26297. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  26298. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  26299. else
  26300. ld_shlibs=no
  26301. fi
  26302. @@ -8977,8 +9486,8 @@ _LT_EOF
  26303. *)
  26304. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  26305. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  26306. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  26307. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  26308. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  26309. else
  26310. ld_shlibs=no
  26311. fi
  26312. @@ -9108,7 +9617,13 @@ _LT_EOF
  26313. allow_undefined_flag='-berok'
  26314. # Determine the default libpath from the value encoded in an
  26315. # empty executable.
  26316. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  26317. + if test "${lt_cv_aix_libpath+set}" = set; then
  26318. + aix_libpath=$lt_cv_aix_libpath
  26319. +else
  26320. + if ${lt_cv_aix_libpath_+:} false; then :
  26321. + $as_echo_n "(cached) " >&6
  26322. +else
  26323. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  26324. /* end confdefs.h. */
  26325. int
  26326. @@ -9121,22 +9636,29 @@ main ()
  26327. _ACEOF
  26328. if ac_fn_c_try_link "$LINENO"; then :
  26329. -lt_aix_libpath_sed='
  26330. - /Import File Strings/,/^$/ {
  26331. - /^0/ {
  26332. - s/^0 *\(.*\)$/\1/
  26333. - p
  26334. - }
  26335. - }'
  26336. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26337. -# Check for a 64-bit object if we didn't find anything.
  26338. -if test -z "$aix_libpath"; then
  26339. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26340. -fi
  26341. + lt_aix_libpath_sed='
  26342. + /Import File Strings/,/^$/ {
  26343. + /^0/ {
  26344. + s/^0 *\([^ ]*\) *$/\1/
  26345. + p
  26346. + }
  26347. + }'
  26348. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26349. + # Check for a 64-bit object if we didn't find anything.
  26350. + if test -z "$lt_cv_aix_libpath_"; then
  26351. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26352. + fi
  26353. fi
  26354. rm -f core conftest.err conftest.$ac_objext \
  26355. conftest$ac_exeext conftest.$ac_ext
  26356. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26357. + if test -z "$lt_cv_aix_libpath_"; then
  26358. + lt_cv_aix_libpath_="/usr/lib:/lib"
  26359. + fi
  26360. +
  26361. +fi
  26362. +
  26363. + aix_libpath=$lt_cv_aix_libpath_
  26364. +fi
  26365. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  26366. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  26367. @@ -9148,7 +9670,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26368. else
  26369. # Determine the default libpath from the value encoded in an
  26370. # empty executable.
  26371. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  26372. + if test "${lt_cv_aix_libpath+set}" = set; then
  26373. + aix_libpath=$lt_cv_aix_libpath
  26374. +else
  26375. + if ${lt_cv_aix_libpath_+:} false; then :
  26376. + $as_echo_n "(cached) " >&6
  26377. +else
  26378. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  26379. /* end confdefs.h. */
  26380. int
  26381. @@ -9161,22 +9689,29 @@ main ()
  26382. _ACEOF
  26383. if ac_fn_c_try_link "$LINENO"; then :
  26384. -lt_aix_libpath_sed='
  26385. - /Import File Strings/,/^$/ {
  26386. - /^0/ {
  26387. - s/^0 *\(.*\)$/\1/
  26388. - p
  26389. - }
  26390. - }'
  26391. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26392. -# Check for a 64-bit object if we didn't find anything.
  26393. -if test -z "$aix_libpath"; then
  26394. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26395. -fi
  26396. + lt_aix_libpath_sed='
  26397. + /Import File Strings/,/^$/ {
  26398. + /^0/ {
  26399. + s/^0 *\([^ ]*\) *$/\1/
  26400. + p
  26401. + }
  26402. + }'
  26403. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26404. + # Check for a 64-bit object if we didn't find anything.
  26405. + if test -z "$lt_cv_aix_libpath_"; then
  26406. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  26407. + fi
  26408. fi
  26409. rm -f core conftest.err conftest.$ac_objext \
  26410. conftest$ac_exeext conftest.$ac_ext
  26411. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26412. + if test -z "$lt_cv_aix_libpath_"; then
  26413. + lt_cv_aix_libpath_="/usr/lib:/lib"
  26414. + fi
  26415. +
  26416. +fi
  26417. +
  26418. + aix_libpath=$lt_cv_aix_libpath_
  26419. +fi
  26420. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  26421. # Warning - without using the other run time loading flags,
  26422. @@ -9221,20 +9756,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26423. # Microsoft Visual C++.
  26424. # hardcode_libdir_flag_spec is actually meaningless, as there is
  26425. # no search path for DLLs.
  26426. - hardcode_libdir_flag_spec=' '
  26427. - allow_undefined_flag=unsupported
  26428. - # Tell ltmain to make .lib files, not .a files.
  26429. - libext=lib
  26430. - # Tell ltmain to make .dll files, not .so files.
  26431. - shrext_cmds=".dll"
  26432. - # FIXME: Setting linknames here is a bad hack.
  26433. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  26434. - # The linker will automatically build a .lib file if we build a DLL.
  26435. - old_archive_from_new_cmds='true'
  26436. - # FIXME: Should let the user specify the lib program.
  26437. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  26438. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  26439. - enable_shared_with_static_runtimes=yes
  26440. + case $cc_basename in
  26441. + cl*)
  26442. + # Native MSVC
  26443. + hardcode_libdir_flag_spec=' '
  26444. + allow_undefined_flag=unsupported
  26445. + always_export_symbols=yes
  26446. + file_list_spec='@'
  26447. + # Tell ltmain to make .lib files, not .a files.
  26448. + libext=lib
  26449. + # Tell ltmain to make .dll files, not .so files.
  26450. + shrext_cmds=".dll"
  26451. + # FIXME: Setting linknames here is a bad hack.
  26452. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  26453. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  26454. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  26455. + else
  26456. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  26457. + fi~
  26458. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  26459. + linknames='
  26460. + # The linker will not automatically build a static lib if we build a DLL.
  26461. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  26462. + enable_shared_with_static_runtimes=yes
  26463. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  26464. + # Don't use ranlib
  26465. + old_postinstall_cmds='chmod 644 $oldlib'
  26466. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  26467. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  26468. + case $lt_outputfile in
  26469. + *.exe|*.EXE) ;;
  26470. + *)
  26471. + lt_outputfile="$lt_outputfile.exe"
  26472. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  26473. + ;;
  26474. + esac~
  26475. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  26476. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  26477. + $RM "$lt_outputfile.manifest";
  26478. + fi'
  26479. + ;;
  26480. + *)
  26481. + # Assume MSVC wrapper
  26482. + hardcode_libdir_flag_spec=' '
  26483. + allow_undefined_flag=unsupported
  26484. + # Tell ltmain to make .lib files, not .a files.
  26485. + libext=lib
  26486. + # Tell ltmain to make .dll files, not .so files.
  26487. + shrext_cmds=".dll"
  26488. + # FIXME: Setting linknames here is a bad hack.
  26489. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  26490. + # The linker will automatically build a .lib file if we build a DLL.
  26491. + old_archive_from_new_cmds='true'
  26492. + # FIXME: Should let the user specify the lib program.
  26493. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  26494. + enable_shared_with_static_runtimes=yes
  26495. + ;;
  26496. + esac
  26497. ;;
  26498. darwin* | rhapsody*)
  26499. @@ -9295,7 +9873,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26500. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  26501. freebsd* | dragonfly*)
  26502. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  26503. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  26504. hardcode_libdir_flag_spec='-R$libdir'
  26505. hardcode_direct=yes
  26506. hardcode_shlibpath_var=no
  26507. @@ -9303,7 +9881,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26508. hpux9*)
  26509. if test "$GCC" = yes; then
  26510. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  26511. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  26512. else
  26513. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  26514. fi
  26515. @@ -9319,7 +9897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26516. hpux10*)
  26517. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  26518. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  26519. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  26520. else
  26521. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  26522. fi
  26523. @@ -9343,10 +9921,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  26524. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  26525. ;;
  26526. ia64*)
  26527. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  26528. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  26529. ;;
  26530. *)
  26531. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  26532. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  26533. ;;
  26534. esac
  26535. else
  26536. @@ -9425,23 +10003,36 @@ fi
  26537. irix5* | irix6* | nonstopux*)
  26538. if test "$GCC" = yes; then
  26539. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  26540. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  26541. # Try to use the -exported_symbol ld option, if it does not
  26542. # work, assume that -exports_file does not work either and
  26543. # implicitly export all symbols.
  26544. - save_LDFLAGS="$LDFLAGS"
  26545. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  26546. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  26547. + # This should be the same for all languages, so no per-tag cache variable.
  26548. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  26549. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  26550. +if ${lt_cv_irix_exported_symbol+:} false; then :
  26551. + $as_echo_n "(cached) " >&6
  26552. +else
  26553. + save_LDFLAGS="$LDFLAGS"
  26554. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  26555. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  26556. /* end confdefs.h. */
  26557. -int foo(void) {}
  26558. +int foo (void) { return 0; }
  26559. _ACEOF
  26560. if ac_fn_c_try_link "$LINENO"; then :
  26561. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  26562. -
  26563. + lt_cv_irix_exported_symbol=yes
  26564. +else
  26565. + lt_cv_irix_exported_symbol=no
  26566. fi
  26567. rm -f core conftest.err conftest.$ac_objext \
  26568. conftest$ac_exeext conftest.$ac_ext
  26569. - LDFLAGS="$save_LDFLAGS"
  26570. + LDFLAGS="$save_LDFLAGS"
  26571. +fi
  26572. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  26573. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  26574. + if test "$lt_cv_irix_exported_symbol" = yes; then
  26575. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  26576. + fi
  26577. else
  26578. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  26579. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  26580. @@ -9526,7 +10117,7 @@ rm -f core conftest.err conftest.$ac_objext \
  26581. osf4* | osf5*) # as osf3* with the addition of -msym flag
  26582. if test "$GCC" = yes; then
  26583. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  26584. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  26585. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  26586. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  26587. else
  26588. allow_undefined_flag=' -expect_unresolved \*'
  26589. @@ -9545,9 +10136,9 @@ rm -f core conftest.err conftest.$ac_objext \
  26590. no_undefined_flag=' -z defs'
  26591. if test "$GCC" = yes; then
  26592. wlarc='${wl}'
  26593. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  26594. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  26595. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  26596. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  26597. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  26598. else
  26599. case `$CC -V 2>&1` in
  26600. *"Compilers 5.0"*)
  26601. @@ -10123,8 +10714,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  26602. need_version=no
  26603. need_lib_prefix=no
  26604. - case $GCC,$host_os in
  26605. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  26606. + case $GCC,$cc_basename in
  26607. + yes,*)
  26608. + # gcc
  26609. library_names_spec='$libname.dll.a'
  26610. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  26611. postinstall_cmds='base_file=`basename \${file}`~
  26612. @@ -10157,13 +10749,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  26613. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  26614. ;;
  26615. esac
  26616. + dynamic_linker='Win32 ld.exe'
  26617. + ;;
  26618. +
  26619. + *,cl*)
  26620. + # Native MSVC
  26621. + libname_spec='$name'
  26622. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  26623. + library_names_spec='${libname}.dll.lib'
  26624. +
  26625. + case $build_os in
  26626. + mingw*)
  26627. + sys_lib_search_path_spec=
  26628. + lt_save_ifs=$IFS
  26629. + IFS=';'
  26630. + for lt_path in $LIB
  26631. + do
  26632. + IFS=$lt_save_ifs
  26633. + # Let DOS variable expansion print the short 8.3 style file name.
  26634. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  26635. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  26636. + done
  26637. + IFS=$lt_save_ifs
  26638. + # Convert to MSYS style.
  26639. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  26640. + ;;
  26641. + cygwin*)
  26642. + # Convert to unix form, then to dos form, then back to unix form
  26643. + # but this time dos style (no spaces!) so that the unix form looks
  26644. + # like /cygdrive/c/PROGRA~1:/cygdr...
  26645. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  26646. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  26647. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  26648. + ;;
  26649. + *)
  26650. + sys_lib_search_path_spec="$LIB"
  26651. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  26652. + # It is most probably a Windows format PATH.
  26653. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  26654. + else
  26655. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  26656. + fi
  26657. + # FIXME: find the short name or the path components, as spaces are
  26658. + # common. (e.g. "Program Files" -> "PROGRA~1")
  26659. + ;;
  26660. + esac
  26661. +
  26662. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  26663. + postinstall_cmds='base_file=`basename \${file}`~
  26664. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  26665. + dldir=$destdir/`dirname \$dlpath`~
  26666. + test -d \$dldir || mkdir -p \$dldir~
  26667. + $install_prog $dir/$dlname \$dldir/$dlname'
  26668. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  26669. + dlpath=$dir/\$dldll~
  26670. + $RM \$dlpath'
  26671. + shlibpath_overrides_runpath=yes
  26672. + dynamic_linker='Win32 link.exe'
  26673. ;;
  26674. *)
  26675. + # Assume MSVC wrapper
  26676. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  26677. + dynamic_linker='Win32 ld.exe'
  26678. ;;
  26679. esac
  26680. - dynamic_linker='Win32 ld.exe'
  26681. # FIXME: first we should search . and the directory the executable is in
  26682. shlibpath_var=PATH
  26683. ;;
  26684. @@ -11041,7 +11691,7 @@ else
  26685. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  26686. lt_status=$lt_dlunknown
  26687. cat > conftest.$ac_ext <<_LT_EOF
  26688. -#line 11044 "configure"
  26689. +#line $LINENO "configure"
  26690. #include "confdefs.h"
  26691. #if HAVE_DLFCN_H
  26692. @@ -11085,10 +11735,10 @@ else
  26693. /* When -fvisbility=hidden is used, assume the code has been annotated
  26694. correspondingly for the symbols needed. */
  26695. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  26696. -void fnord () __attribute__((visibility("default")));
  26697. +int fnord () __attribute__((visibility("default")));
  26698. #endif
  26699. -void fnord () { int i=42; }
  26700. +int fnord () { return 42; }
  26701. int main ()
  26702. {
  26703. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  26704. @@ -11147,7 +11797,7 @@ else
  26705. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  26706. lt_status=$lt_dlunknown
  26707. cat > conftest.$ac_ext <<_LT_EOF
  26708. -#line 11150 "configure"
  26709. +#line $LINENO "configure"
  26710. #include "confdefs.h"
  26711. #if HAVE_DLFCN_H
  26712. @@ -11191,10 +11841,10 @@ else
  26713. /* When -fvisbility=hidden is used, assume the code has been annotated
  26714. correspondingly for the symbols needed. */
  26715. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  26716. -void fnord () __attribute__((visibility("default")));
  26717. +int fnord () __attribute__((visibility("default")));
  26718. #endif
  26719. -void fnord () { int i=42; }
  26720. +int fnord () { return 42; }
  26721. int main ()
  26722. {
  26723. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  26724. @@ -13396,13 +14046,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  26725. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  26726. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  26727. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  26728. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  26729. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  26730. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  26731. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  26732. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  26733. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  26734. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  26735. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  26736. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  26737. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  26738. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  26739. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  26740. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  26741. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  26742. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  26743. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  26744. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  26745. @@ -13417,14 +14074,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  26746. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  26747. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  26748. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  26749. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  26750. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  26751. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  26752. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  26753. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  26754. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  26755. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  26756. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  26757. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  26758. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  26759. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  26760. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  26761. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  26762. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  26763. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  26764. @@ -13457,12 +14117,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  26765. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  26766. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  26767. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  26768. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  26769. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  26770. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  26771. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  26772. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  26773. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  26774. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  26775. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  26776. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  26777. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  26778. @@ -13517,8 +14177,13 @@ reload_flag \
  26779. OBJDUMP \
  26780. deplibs_check_method \
  26781. file_magic_cmd \
  26782. +file_magic_glob \
  26783. +want_nocaseglob \
  26784. +DLLTOOL \
  26785. +sharedlib_from_linklib_cmd \
  26786. AR \
  26787. AR_FLAGS \
  26788. +archiver_list_spec \
  26789. STRIP \
  26790. RANLIB \
  26791. CC \
  26792. @@ -13528,12 +14193,14 @@ lt_cv_sys_global_symbol_pipe \
  26793. lt_cv_sys_global_symbol_to_cdecl \
  26794. lt_cv_sys_global_symbol_to_c_name_address \
  26795. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  26796. +nm_file_list_spec \
  26797. lt_prog_compiler_no_builtin_flag \
  26798. -lt_prog_compiler_wl \
  26799. lt_prog_compiler_pic \
  26800. +lt_prog_compiler_wl \
  26801. lt_prog_compiler_static \
  26802. lt_cv_prog_compiler_c_o \
  26803. need_locks \
  26804. +MANIFEST_TOOL \
  26805. DSYMUTIL \
  26806. NMEDIT \
  26807. LIPO \
  26808. @@ -13549,7 +14216,6 @@ no_undefined_flag \
  26809. hardcode_libdir_flag_spec \
  26810. hardcode_libdir_flag_spec_ld \
  26811. hardcode_libdir_separator \
  26812. -fix_srcfile_path \
  26813. exclude_expsyms \
  26814. include_expsyms \
  26815. file_list_spec \
  26816. @@ -13585,6 +14251,7 @@ module_cmds \
  26817. module_expsym_cmds \
  26818. export_symbols_cmds \
  26819. prelink_cmds \
  26820. +postlink_cmds \
  26821. postinstall_cmds \
  26822. postuninstall_cmds \
  26823. finish_cmds \
  26824. @@ -14350,7 +15017,8 @@ $as_echo X"$file" |
  26825. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  26826. #
  26827. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  26828. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  26829. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  26830. +# Inc.
  26831. # Written by Gordon Matzigkeit, 1996
  26832. #
  26833. # This file is part of GNU Libtool.
  26834. @@ -14453,19 +15121,42 @@ SP2NL=$lt_lt_SP2NL
  26835. # turn newlines into spaces.
  26836. NL2SP=$lt_lt_NL2SP
  26837. +# convert \$build file names to \$host format.
  26838. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  26839. +
  26840. +# convert \$build files to toolchain format.
  26841. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  26842. +
  26843. # An object symbol dumper.
  26844. OBJDUMP=$lt_OBJDUMP
  26845. # Method to check whether dependent libraries are shared objects.
  26846. deplibs_check_method=$lt_deplibs_check_method
  26847. -# Command to use when deplibs_check_method == "file_magic".
  26848. +# Command to use when deplibs_check_method = "file_magic".
  26849. file_magic_cmd=$lt_file_magic_cmd
  26850. +# How to find potential files when deplibs_check_method = "file_magic".
  26851. +file_magic_glob=$lt_file_magic_glob
  26852. +
  26853. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  26854. +want_nocaseglob=$lt_want_nocaseglob
  26855. +
  26856. +# DLL creation program.
  26857. +DLLTOOL=$lt_DLLTOOL
  26858. +
  26859. +# Command to associate shared and link libraries.
  26860. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  26861. +
  26862. # The archiver.
  26863. AR=$lt_AR
  26864. +
  26865. +# Flags to create an archive.
  26866. AR_FLAGS=$lt_AR_FLAGS
  26867. +# How to feed a file listing to the archiver.
  26868. +archiver_list_spec=$lt_archiver_list_spec
  26869. +
  26870. # A symbol stripping program.
  26871. STRIP=$lt_STRIP
  26872. @@ -14495,6 +15186,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  26873. # Transform the output of nm in a C name address pair when lib prefix is needed.
  26874. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  26875. +# Specify filename containing input files for \$NM.
  26876. +nm_file_list_spec=$lt_nm_file_list_spec
  26877. +
  26878. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  26879. +lt_sysroot=$lt_sysroot
  26880. +
  26881. # The name of the directory that contains temporary libtool files.
  26882. objdir=$objdir
  26883. @@ -14504,6 +15201,9 @@ MAGIC_CMD=$MAGIC_CMD
  26884. # Must we lock files when doing compilation?
  26885. need_locks=$lt_need_locks
  26886. +# Manifest tool.
  26887. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  26888. +
  26889. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  26890. DSYMUTIL=$lt_DSYMUTIL
  26891. @@ -14618,12 +15318,12 @@ with_gcc=$GCC
  26892. # Compiler flag to turn off builtin functions.
  26893. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  26894. -# How to pass a linker flag through the compiler.
  26895. -wl=$lt_lt_prog_compiler_wl
  26896. -
  26897. # Additional compiler flags for building library objects.
  26898. pic_flag=$lt_lt_prog_compiler_pic
  26899. +# How to pass a linker flag through the compiler.
  26900. +wl=$lt_lt_prog_compiler_wl
  26901. +
  26902. # Compiler flag to prevent dynamic linking.
  26903. link_static_flag=$lt_lt_prog_compiler_static
  26904. @@ -14710,9 +15410,6 @@ inherit_rpath=$inherit_rpath
  26905. # Whether libtool must link a program against all its dependency libraries.
  26906. link_all_deplibs=$link_all_deplibs
  26907. -# Fix the shell variable \$srcfile for the compiler.
  26908. -fix_srcfile_path=$lt_fix_srcfile_path
  26909. -
  26910. # Set to "yes" if exported symbols are required.
  26911. always_export_symbols=$always_export_symbols
  26912. @@ -14728,6 +15425,9 @@ include_expsyms=$lt_include_expsyms
  26913. # Commands necessary for linking programs (against libraries) with templates.
  26914. prelink_cmds=$lt_prelink_cmds
  26915. +# Commands necessary for finishing linking programs.
  26916. +postlink_cmds=$lt_postlink_cmds
  26917. +
  26918. # Specify filename containing input files.
  26919. file_list_spec=$lt_file_list_spec
  26920. @@ -14760,210 +15460,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  26921. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  26922. # text mode, it properly converts lines to CR/LF. This bash problem
  26923. # is reportedly fixed, but why not run on old versions too?
  26924. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  26925. - || (rm -f "$cfgfile"; exit 1)
  26926. -
  26927. - case $xsi_shell in
  26928. - yes)
  26929. - cat << \_LT_EOF >> "$cfgfile"
  26930. -
  26931. -# func_dirname file append nondir_replacement
  26932. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  26933. -# otherwise set result to NONDIR_REPLACEMENT.
  26934. -func_dirname ()
  26935. -{
  26936. - case ${1} in
  26937. - */*) func_dirname_result="${1%/*}${2}" ;;
  26938. - * ) func_dirname_result="${3}" ;;
  26939. - esac
  26940. -}
  26941. -
  26942. -# func_basename file
  26943. -func_basename ()
  26944. -{
  26945. - func_basename_result="${1##*/}"
  26946. -}
  26947. -
  26948. -# func_dirname_and_basename file append nondir_replacement
  26949. -# perform func_basename and func_dirname in a single function
  26950. -# call:
  26951. -# dirname: Compute the dirname of FILE. If nonempty,
  26952. -# add APPEND to the result, otherwise set result
  26953. -# to NONDIR_REPLACEMENT.
  26954. -# value returned in "$func_dirname_result"
  26955. -# basename: Compute filename of FILE.
  26956. -# value retuned in "$func_basename_result"
  26957. -# Implementation must be kept synchronized with func_dirname
  26958. -# and func_basename. For efficiency, we do not delegate to
  26959. -# those functions but instead duplicate the functionality here.
  26960. -func_dirname_and_basename ()
  26961. -{
  26962. - case ${1} in
  26963. - */*) func_dirname_result="${1%/*}${2}" ;;
  26964. - * ) func_dirname_result="${3}" ;;
  26965. - esac
  26966. - func_basename_result="${1##*/}"
  26967. -}
  26968. -
  26969. -# func_stripname prefix suffix name
  26970. -# strip PREFIX and SUFFIX off of NAME.
  26971. -# PREFIX and SUFFIX must not contain globbing or regex special
  26972. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  26973. -# dot (in which case that matches only a dot).
  26974. -func_stripname ()
  26975. -{
  26976. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  26977. - # positional parameters, so assign one to ordinary parameter first.
  26978. - func_stripname_result=${3}
  26979. - func_stripname_result=${func_stripname_result#"${1}"}
  26980. - func_stripname_result=${func_stripname_result%"${2}"}
  26981. -}
  26982. -
  26983. -# func_opt_split
  26984. -func_opt_split ()
  26985. -{
  26986. - func_opt_split_opt=${1%%=*}
  26987. - func_opt_split_arg=${1#*=}
  26988. -}
  26989. -
  26990. -# func_lo2o object
  26991. -func_lo2o ()
  26992. -{
  26993. - case ${1} in
  26994. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  26995. - *) func_lo2o_result=${1} ;;
  26996. - esac
  26997. -}
  26998. -
  26999. -# func_xform libobj-or-source
  27000. -func_xform ()
  27001. -{
  27002. - func_xform_result=${1%.*}.lo
  27003. -}
  27004. -
  27005. -# func_arith arithmetic-term...
  27006. -func_arith ()
  27007. -{
  27008. - func_arith_result=$(( $* ))
  27009. -}
  27010. -
  27011. -# func_len string
  27012. -# STRING may not start with a hyphen.
  27013. -func_len ()
  27014. -{
  27015. - func_len_result=${#1}
  27016. -}
  27017. -
  27018. -_LT_EOF
  27019. - ;;
  27020. - *) # Bourne compatible functions.
  27021. - cat << \_LT_EOF >> "$cfgfile"
  27022. -
  27023. -# func_dirname file append nondir_replacement
  27024. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  27025. -# otherwise set result to NONDIR_REPLACEMENT.
  27026. -func_dirname ()
  27027. -{
  27028. - # Extract subdirectory from the argument.
  27029. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  27030. - if test "X$func_dirname_result" = "X${1}"; then
  27031. - func_dirname_result="${3}"
  27032. - else
  27033. - func_dirname_result="$func_dirname_result${2}"
  27034. - fi
  27035. -}
  27036. -
  27037. -# func_basename file
  27038. -func_basename ()
  27039. -{
  27040. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  27041. -}
  27042. -
  27043. -
  27044. -# func_stripname prefix suffix name
  27045. -# strip PREFIX and SUFFIX off of NAME.
  27046. -# PREFIX and SUFFIX must not contain globbing or regex special
  27047. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  27048. -# dot (in which case that matches only a dot).
  27049. -# func_strip_suffix prefix name
  27050. -func_stripname ()
  27051. -{
  27052. - case ${2} in
  27053. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  27054. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  27055. - esac
  27056. -}
  27057. -
  27058. -# sed scripts:
  27059. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  27060. -my_sed_long_arg='1s/^-[^=]*=//'
  27061. -
  27062. -# func_opt_split
  27063. -func_opt_split ()
  27064. -{
  27065. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  27066. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  27067. -}
  27068. -
  27069. -# func_lo2o object
  27070. -func_lo2o ()
  27071. -{
  27072. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  27073. -}
  27074. -
  27075. -# func_xform libobj-or-source
  27076. -func_xform ()
  27077. -{
  27078. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  27079. -}
  27080. -
  27081. -# func_arith arithmetic-term...
  27082. -func_arith ()
  27083. -{
  27084. - func_arith_result=`expr "$@"`
  27085. -}
  27086. -
  27087. -# func_len string
  27088. -# STRING may not start with a hyphen.
  27089. -func_len ()
  27090. -{
  27091. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  27092. -}
  27093. -
  27094. -_LT_EOF
  27095. -esac
  27096. -
  27097. -case $lt_shell_append in
  27098. - yes)
  27099. - cat << \_LT_EOF >> "$cfgfile"
  27100. -
  27101. -# func_append var value
  27102. -# Append VALUE to the end of shell variable VAR.
  27103. -func_append ()
  27104. -{
  27105. - eval "$1+=\$2"
  27106. -}
  27107. -_LT_EOF
  27108. - ;;
  27109. - *)
  27110. - cat << \_LT_EOF >> "$cfgfile"
  27111. -
  27112. -# func_append var value
  27113. -# Append VALUE to the end of shell variable VAR.
  27114. -func_append ()
  27115. -{
  27116. - eval "$1=\$$1\$2"
  27117. -}
  27118. -
  27119. -_LT_EOF
  27120. - ;;
  27121. - esac
  27122. -
  27123. -
  27124. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  27125. - || (rm -f "$cfgfile"; exit 1)
  27126. -
  27127. - mv -f "$cfgfile" "$ofile" ||
  27128. + sed '$q' "$ltmain" >> "$cfgfile" \
  27129. + || (rm -f "$cfgfile"; exit 1)
  27130. +
  27131. + if test x"$xsi_shell" = xyes; then
  27132. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  27133. +func_dirname ()\
  27134. +{\
  27135. +\ case ${1} in\
  27136. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  27137. +\ * ) func_dirname_result="${3}" ;;\
  27138. +\ esac\
  27139. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  27140. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27141. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27142. +test 0 -eq $? || _lt_function_replace_fail=:
  27143. +
  27144. +
  27145. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  27146. +func_basename ()\
  27147. +{\
  27148. +\ func_basename_result="${1##*/}"\
  27149. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  27150. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27151. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27152. +test 0 -eq $? || _lt_function_replace_fail=:
  27153. +
  27154. +
  27155. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  27156. +func_dirname_and_basename ()\
  27157. +{\
  27158. +\ case ${1} in\
  27159. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  27160. +\ * ) func_dirname_result="${3}" ;;\
  27161. +\ esac\
  27162. +\ func_basename_result="${1##*/}"\
  27163. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  27164. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27165. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27166. +test 0 -eq $? || _lt_function_replace_fail=:
  27167. +
  27168. +
  27169. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  27170. +func_stripname ()\
  27171. +{\
  27172. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  27173. +\ # positional parameters, so assign one to ordinary parameter first.\
  27174. +\ func_stripname_result=${3}\
  27175. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  27176. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  27177. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  27178. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27179. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27180. +test 0 -eq $? || _lt_function_replace_fail=:
  27181. +
  27182. +
  27183. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  27184. +func_split_long_opt ()\
  27185. +{\
  27186. +\ func_split_long_opt_name=${1%%=*}\
  27187. +\ func_split_long_opt_arg=${1#*=}\
  27188. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  27189. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27190. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27191. +test 0 -eq $? || _lt_function_replace_fail=:
  27192. +
  27193. +
  27194. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  27195. +func_split_short_opt ()\
  27196. +{\
  27197. +\ func_split_short_opt_arg=${1#??}\
  27198. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  27199. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  27200. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27201. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27202. +test 0 -eq $? || _lt_function_replace_fail=:
  27203. +
  27204. +
  27205. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  27206. +func_lo2o ()\
  27207. +{\
  27208. +\ case ${1} in\
  27209. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  27210. +\ *) func_lo2o_result=${1} ;;\
  27211. +\ esac\
  27212. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  27213. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27214. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27215. +test 0 -eq $? || _lt_function_replace_fail=:
  27216. +
  27217. +
  27218. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  27219. +func_xform ()\
  27220. +{\
  27221. + func_xform_result=${1%.*}.lo\
  27222. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  27223. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27224. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27225. +test 0 -eq $? || _lt_function_replace_fail=:
  27226. +
  27227. +
  27228. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  27229. +func_arith ()\
  27230. +{\
  27231. + func_arith_result=$(( $* ))\
  27232. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  27233. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27234. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27235. +test 0 -eq $? || _lt_function_replace_fail=:
  27236. +
  27237. +
  27238. + sed -e '/^func_len ()$/,/^} # func_len /c\
  27239. +func_len ()\
  27240. +{\
  27241. + func_len_result=${#1}\
  27242. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  27243. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27244. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27245. +test 0 -eq $? || _lt_function_replace_fail=:
  27246. +
  27247. +fi
  27248. +
  27249. +if test x"$lt_shell_append" = xyes; then
  27250. + sed -e '/^func_append ()$/,/^} # func_append /c\
  27251. +func_append ()\
  27252. +{\
  27253. + eval "${1}+=\\${2}"\
  27254. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  27255. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27256. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27257. +test 0 -eq $? || _lt_function_replace_fail=:
  27258. +
  27259. +
  27260. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  27261. +func_append_quoted ()\
  27262. +{\
  27263. +\ func_quote_for_eval "${2}"\
  27264. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  27265. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  27266. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27267. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27268. +test 0 -eq $? || _lt_function_replace_fail=:
  27269. +
  27270. +
  27271. + # Save a `func_append' function call where possible by direct use of '+='
  27272. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  27273. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27274. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27275. + test 0 -eq $? || _lt_function_replace_fail=:
  27276. +else
  27277. + # Save a `func_append' function call even when '+=' is not available
  27278. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  27279. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  27280. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  27281. + test 0 -eq $? || _lt_function_replace_fail=:
  27282. +fi
  27283. +
  27284. +if test x"$_lt_function_replace_fail" = x":"; then
  27285. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  27286. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  27287. +fi
  27288. +
  27289. +
  27290. + mv -f "$cfgfile" "$ofile" ||
  27291. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  27292. chmod +x "$ofile"
  27293. diff --git a/sim/Makefile.in b/sim/Makefile.in
  27294. index dbbaa84224a..f819bbe0bdd 100644
  27295. --- a/sim/Makefile.in
  27296. +++ b/sim/Makefile.in
  27297. @@ -744,6 +744,7 @@ C_DIALECT = @C_DIALECT@
  27298. DATADIRNAME = @DATADIRNAME@
  27299. DEFS = @DEFS@
  27300. DEPDIR = @DEPDIR@
  27301. +DLLTOOL = @DLLTOOL@
  27302. DSYMUTIL = @DSYMUTIL@
  27303. DTC = @DTC@
  27304. DUMPBIN = @DUMPBIN@
  27305. @@ -809,6 +810,7 @@ LN_S = @LN_S@
  27306. LTLIBOBJS = @LTLIBOBJS@
  27307. MAINT = @MAINT@
  27308. MAKEINFO = @MAKEINFO@
  27309. +MANIFEST_TOOL = @MANIFEST_TOOL@
  27310. MKDIR_P = @MKDIR_P@
  27311. NM = @NM@
  27312. NMEDIT = @NMEDIT@
  27313. @@ -859,6 +861,7 @@ abs_builddir = @abs_builddir@
  27314. abs_srcdir = @abs_srcdir@
  27315. abs_top_builddir = @abs_top_builddir@
  27316. abs_top_srcdir = @abs_top_srcdir@
  27317. +ac_ct_AR = @ac_ct_AR@
  27318. ac_ct_CC = @ac_ct_CC@
  27319. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  27320. am__include = @am__include@
  27321. diff --git a/zlib/Makefile.in b/zlib/Makefile.in
  27322. index c7584492a65..0605835c14f 100644
  27323. --- a/zlib/Makefile.in
  27324. +++ b/zlib/Makefile.in
  27325. @@ -1,7 +1,7 @@
  27326. -# Makefile.in generated by automake 1.16.5 from Makefile.am.
  27327. +# Makefile.in generated by automake 1.15.1 from Makefile.am.
  27328. # @configure_input@
  27329. -# Copyright (C) 1994-2021 Free Software Foundation, Inc.
  27330. +# Copyright (C) 1994-2017 Free Software Foundation, Inc.
  27331. # This Makefile.in is free software; the Free Software Foundation
  27332. # gives unlimited permission to copy and/or distribute it,
  27333. @@ -138,7 +138,6 @@ am__uninstall_files_from_dir = { \
  27334. }
  27335. am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
  27336. LIBRARIES = $(toolexeclib_LIBRARIES)
  27337. -LTLIBRARIES = $(noinst_LTLIBRARIES)
  27338. ARFLAGS = cru
  27339. AM_V_AR = $(am__v_AR_@AM_V@)
  27340. am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
  27341. @@ -161,6 +160,7 @@ am__objects_1 = libz_a-adler32.$(OBJEXT) libz_a-compress.$(OBJEXT) \
  27342. libz_a-zutil.$(OBJEXT)
  27343. @TARGET_LIBRARY_FALSE@am_libz_a_OBJECTS = $(am__objects_1)
  27344. libz_a_OBJECTS = $(am_libz_a_OBJECTS)
  27345. +LTLIBRARIES = $(noinst_LTLIBRARIES)
  27346. libzgcj_convenience_la_LIBADD =
  27347. am__libzgcj_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \
  27348. crc32.h deflate.c deflate.h gzguts.h gzread.c gzclose.c \
  27349. @@ -192,22 +192,7 @@ am__v_at_0 = @
  27350. am__v_at_1 =
  27351. DEFAULT_INCLUDES = -I.@am__isrc@
  27352. depcomp = $(SHELL) $(top_srcdir)/../depcomp
  27353. -am__maybe_remake_depfiles = depfiles
  27354. -am__depfiles_remade = ./$(DEPDIR)/adler32.Plo ./$(DEPDIR)/compress.Plo \
  27355. - ./$(DEPDIR)/crc32.Plo ./$(DEPDIR)/deflate.Plo \
  27356. - ./$(DEPDIR)/gzclose.Plo ./$(DEPDIR)/gzlib.Plo \
  27357. - ./$(DEPDIR)/gzread.Plo ./$(DEPDIR)/gzwrite.Plo \
  27358. - ./$(DEPDIR)/infback.Plo ./$(DEPDIR)/inffast.Plo \
  27359. - ./$(DEPDIR)/inflate.Plo ./$(DEPDIR)/inftrees.Plo \
  27360. - ./$(DEPDIR)/libz_a-adler32.Po ./$(DEPDIR)/libz_a-compress.Po \
  27361. - ./$(DEPDIR)/libz_a-crc32.Po ./$(DEPDIR)/libz_a-deflate.Po \
  27362. - ./$(DEPDIR)/libz_a-gzclose.Po ./$(DEPDIR)/libz_a-gzlib.Po \
  27363. - ./$(DEPDIR)/libz_a-gzread.Po ./$(DEPDIR)/libz_a-gzwrite.Po \
  27364. - ./$(DEPDIR)/libz_a-infback.Po ./$(DEPDIR)/libz_a-inffast.Po \
  27365. - ./$(DEPDIR)/libz_a-inflate.Po ./$(DEPDIR)/libz_a-inftrees.Po \
  27366. - ./$(DEPDIR)/libz_a-trees.Po ./$(DEPDIR)/libz_a-uncompr.Po \
  27367. - ./$(DEPDIR)/libz_a-zutil.Po ./$(DEPDIR)/trees.Plo \
  27368. - ./$(DEPDIR)/uncompr.Plo ./$(DEPDIR)/zutil.Plo
  27369. +am__depfiles_maybe = depfiles
  27370. am__mv = mv -f
  27371. COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  27372. $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  27373. @@ -252,6 +237,9 @@ am__define_uniq_tagged_files = \
  27374. unique=`for i in $$list; do \
  27375. if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  27376. done | $(am__uniquify_input)`
  27377. +ETAGS = etags
  27378. +CTAGS = ctags
  27379. +CSCOPE = cscope
  27380. AM_RECURSIVE_TARGETS = cscope
  27381. am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../compile \
  27382. $(top_srcdir)/../config.guess $(top_srcdir)/../config.sub \
  27383. @@ -272,8 +260,6 @@ am__post_remove_distdir = $(am__remove_distdir)
  27384. DIST_ARCHIVES = $(distdir).tar.gz
  27385. GZIP_ENV = --best
  27386. DIST_TARGETS = dist-gzip
  27387. -# Exists only to be overridden by the user if desired.
  27388. -AM_DISTCHECK_DVI_TARGET = dvi
  27389. distuninstallcheck_listfiles = find . -type f -print
  27390. am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
  27391. | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
  27392. @@ -292,18 +278,16 @@ CFLAGS = @CFLAGS@
  27393. COMPPATH = @COMPPATH@
  27394. CPP = @CPP@
  27395. CPPFLAGS = @CPPFLAGS@
  27396. -CSCOPE = @CSCOPE@
  27397. -CTAGS = @CTAGS@
  27398. CYGPATH_W = @CYGPATH_W@
  27399. DEFS = @DEFS@
  27400. DEPDIR = @DEPDIR@
  27401. +DLLTOOL = @DLLTOOL@
  27402. DSYMUTIL = @DSYMUTIL@
  27403. DUMPBIN = @DUMPBIN@
  27404. ECHO_C = @ECHO_C@
  27405. ECHO_N = @ECHO_N@
  27406. ECHO_T = @ECHO_T@
  27407. EGREP = @EGREP@
  27408. -ETAGS = @ETAGS@
  27409. EXEEXT = @EXEEXT@
  27410. FGREP = @FGREP@
  27411. GREP = @GREP@
  27412. @@ -322,6 +306,7 @@ LN_S = @LN_S@
  27413. LTLIBOBJS = @LTLIBOBJS@
  27414. MAINT = @MAINT@
  27415. MAKEINFO = @MAKEINFO@
  27416. +MANIFEST_TOOL = @MANIFEST_TOOL@
  27417. MKDIR_P = @MKDIR_P@
  27418. NM = @NM@
  27419. NMEDIT = @NMEDIT@
  27420. @@ -348,6 +333,7 @@ abs_builddir = @abs_builddir@
  27421. abs_srcdir = @abs_srcdir@
  27422. abs_top_builddir = @abs_top_builddir@
  27423. abs_top_srcdir = @abs_top_srcdir@
  27424. +ac_ct_AR = @ac_ct_AR@
  27425. ac_ct_CC = @ac_ct_CC@
  27426. ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  27427. am__include = @am__include@
  27428. @@ -491,8 +477,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  27429. echo ' $(SHELL) ./config.status'; \
  27430. $(SHELL) ./config.status;; \
  27431. *) \
  27432. - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
  27433. - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
  27434. + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
  27435. + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
  27436. esac;
  27437. $(top_srcdir)/../multilib.am $(am__empty):
  27438. @@ -536,6 +522,11 @@ uninstall-toolexeclibLIBRARIES:
  27439. clean-toolexeclibLIBRARIES:
  27440. -test -z "$(toolexeclib_LIBRARIES)" || rm -f $(toolexeclib_LIBRARIES)
  27441. +libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES)
  27442. + $(AM_V_at)-rm -f libz.a
  27443. + $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
  27444. + $(AM_V_at)$(RANLIB) libz.a
  27445. +
  27446. clean-noinstLTLIBRARIES:
  27447. -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
  27448. @list='$(noinst_LTLIBRARIES)'; \
  27449. @@ -547,11 +538,6 @@ clean-noinstLTLIBRARIES:
  27450. rm -f $${locs}; \
  27451. }
  27452. -libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES)
  27453. - $(AM_V_at)-rm -f libz.a
  27454. - $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
  27455. - $(AM_V_at)$(RANLIB) libz.a
  27456. -
  27457. libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) $(EXTRA_libzgcj_convenience_la_DEPENDENCIES)
  27458. $(AM_V_CCLD)$(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS)
  27459. @@ -561,42 +547,36 @@ mostlyclean-compile:
  27460. distclean-compile:
  27461. -rm -f *.tab.c
  27462. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@ # am--include-marker
  27463. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ # am--include-marker
  27464. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@ # am--include-marker
  27465. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@ # am--include-marker
  27466. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@ # am--include-marker
  27467. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@ # am--include-marker
  27468. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@ # am--include-marker
  27469. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@ # am--include-marker
  27470. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@ # am--include-marker
  27471. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@ # am--include-marker
  27472. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@ # am--include-marker
  27473. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@ # am--include-marker
  27474. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@ # am--include-marker
  27475. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@ # am--include-marker
  27476. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@ # am--include-marker
  27477. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@ # am--include-marker
  27478. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@ # am--include-marker
  27479. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@ # am--include-marker
  27480. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@ # am--include-marker
  27481. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@ # am--include-marker
  27482. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@ # am--include-marker
  27483. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@ # am--include-marker
  27484. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@ # am--include-marker
  27485. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@ # am--include-marker
  27486. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@ # am--include-marker
  27487. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@ # am--include-marker
  27488. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@ # am--include-marker
  27489. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@ # am--include-marker
  27490. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@ # am--include-marker
  27491. -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@ # am--include-marker
  27492. -
  27493. -$(am__depfiles_remade):
  27494. - @$(MKDIR_P) $(@D)
  27495. - @echo '# dummy' >$@-t && $(am__mv) $@-t $@
  27496. -
  27497. -am--depfiles: $(am__depfiles_remade)
  27498. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Plo@am__quote@
  27499. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@
  27500. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Plo@am__quote@
  27501. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Plo@am__quote@
  27502. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzclose.Plo@am__quote@
  27503. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzlib.Plo@am__quote@
  27504. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzread.Plo@am__quote@
  27505. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzwrite.Plo@am__quote@
  27506. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infback.Plo@am__quote@
  27507. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Plo@am__quote@
  27508. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Plo@am__quote@
  27509. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Plo@am__quote@
  27510. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-adler32.Po@am__quote@
  27511. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-compress.Po@am__quote@
  27512. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-crc32.Po@am__quote@
  27513. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-deflate.Po@am__quote@
  27514. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzclose.Po@am__quote@
  27515. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzlib.Po@am__quote@
  27516. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzread.Po@am__quote@
  27517. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-gzwrite.Po@am__quote@
  27518. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-infback.Po@am__quote@
  27519. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inffast.Po@am__quote@
  27520. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inflate.Po@am__quote@
  27521. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-inftrees.Po@am__quote@
  27522. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-trees.Po@am__quote@
  27523. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-uncompr.Po@am__quote@
  27524. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libz_a-zutil.Po@am__quote@
  27525. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Plo@am__quote@
  27526. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Plo@am__quote@
  27527. +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Plo@am__quote@
  27528. .c.o:
  27529. @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
  27530. @@ -896,10 +876,8 @@ cscopelist-am: $(am__tagged_files)
  27531. distclean-tags:
  27532. -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  27533. -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
  27534. -distdir: $(BUILT_SOURCES)
  27535. - $(MAKE) $(AM_MAKEFLAGS) distdir-am
  27536. -distdir-am: $(DISTFILES)
  27537. +distdir: $(DISTFILES)
  27538. $(am__remove_distdir)
  27539. test -d "$(distdir)" || mkdir "$(distdir)"
  27540. @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  27541. @@ -954,10 +932,6 @@ dist-xz: distdir
  27542. tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
  27543. $(am__post_remove_distdir)
  27544. -dist-zstd: distdir
  27545. - tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
  27546. - $(am__post_remove_distdir)
  27547. -
  27548. dist-tarZ: distdir
  27549. @echo WARNING: "Support for distribution archives compressed with" \
  27550. "legacy program 'compress' is deprecated." >&2
  27551. @@ -1000,8 +974,6 @@ distcheck: dist
  27552. eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
  27553. *.zip*) \
  27554. unzip $(distdir).zip ;;\
  27555. - *.tar.zst*) \
  27556. - zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
  27557. esac
  27558. chmod -R a-w $(distdir)
  27559. chmod u+w $(distdir)
  27560. @@ -1017,7 +989,7 @@ distcheck: dist
  27561. $(DISTCHECK_CONFIGURE_FLAGS) \
  27562. --srcdir=../.. --prefix="$$dc_install_base" \
  27563. && $(MAKE) $(AM_MAKEFLAGS) \
  27564. - && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
  27565. + && $(MAKE) $(AM_MAKEFLAGS) dvi \
  27566. && $(MAKE) $(AM_MAKEFLAGS) check \
  27567. && $(MAKE) $(AM_MAKEFLAGS) install \
  27568. && $(MAKE) $(AM_MAKEFLAGS) installcheck \
  27569. @@ -1113,36 +1085,7 @@ clean-am: clean-generic clean-libtool clean-local \
  27570. distclean: distclean-am
  27571. -rm -f $(am__CONFIG_DISTCLEAN_FILES)
  27572. - -rm -f ./$(DEPDIR)/adler32.Plo
  27573. - -rm -f ./$(DEPDIR)/compress.Plo
  27574. - -rm -f ./$(DEPDIR)/crc32.Plo
  27575. - -rm -f ./$(DEPDIR)/deflate.Plo
  27576. - -rm -f ./$(DEPDIR)/gzclose.Plo
  27577. - -rm -f ./$(DEPDIR)/gzlib.Plo
  27578. - -rm -f ./$(DEPDIR)/gzread.Plo
  27579. - -rm -f ./$(DEPDIR)/gzwrite.Plo
  27580. - -rm -f ./$(DEPDIR)/infback.Plo
  27581. - -rm -f ./$(DEPDIR)/inffast.Plo
  27582. - -rm -f ./$(DEPDIR)/inflate.Plo
  27583. - -rm -f ./$(DEPDIR)/inftrees.Plo
  27584. - -rm -f ./$(DEPDIR)/libz_a-adler32.Po
  27585. - -rm -f ./$(DEPDIR)/libz_a-compress.Po
  27586. - -rm -f ./$(DEPDIR)/libz_a-crc32.Po
  27587. - -rm -f ./$(DEPDIR)/libz_a-deflate.Po
  27588. - -rm -f ./$(DEPDIR)/libz_a-gzclose.Po
  27589. - -rm -f ./$(DEPDIR)/libz_a-gzlib.Po
  27590. - -rm -f ./$(DEPDIR)/libz_a-gzread.Po
  27591. - -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po
  27592. - -rm -f ./$(DEPDIR)/libz_a-infback.Po
  27593. - -rm -f ./$(DEPDIR)/libz_a-inffast.Po
  27594. - -rm -f ./$(DEPDIR)/libz_a-inflate.Po
  27595. - -rm -f ./$(DEPDIR)/libz_a-inftrees.Po
  27596. - -rm -f ./$(DEPDIR)/libz_a-trees.Po
  27597. - -rm -f ./$(DEPDIR)/libz_a-uncompr.Po
  27598. - -rm -f ./$(DEPDIR)/libz_a-zutil.Po
  27599. - -rm -f ./$(DEPDIR)/trees.Plo
  27600. - -rm -f ./$(DEPDIR)/uncompr.Plo
  27601. - -rm -f ./$(DEPDIR)/zutil.Plo
  27602. + -rm -rf ./$(DEPDIR)
  27603. -rm -f Makefile
  27604. distclean-am: clean-am distclean-compile distclean-generic \
  27605. distclean-libtool distclean-local distclean-tags
  27606. @@ -1190,36 +1133,7 @@ installcheck-am:
  27607. maintainer-clean: maintainer-clean-am
  27608. -rm -f $(am__CONFIG_DISTCLEAN_FILES)
  27609. -rm -rf $(top_srcdir)/autom4te.cache
  27610. - -rm -f ./$(DEPDIR)/adler32.Plo
  27611. - -rm -f ./$(DEPDIR)/compress.Plo
  27612. - -rm -f ./$(DEPDIR)/crc32.Plo
  27613. - -rm -f ./$(DEPDIR)/deflate.Plo
  27614. - -rm -f ./$(DEPDIR)/gzclose.Plo
  27615. - -rm -f ./$(DEPDIR)/gzlib.Plo
  27616. - -rm -f ./$(DEPDIR)/gzread.Plo
  27617. - -rm -f ./$(DEPDIR)/gzwrite.Plo
  27618. - -rm -f ./$(DEPDIR)/infback.Plo
  27619. - -rm -f ./$(DEPDIR)/inffast.Plo
  27620. - -rm -f ./$(DEPDIR)/inflate.Plo
  27621. - -rm -f ./$(DEPDIR)/inftrees.Plo
  27622. - -rm -f ./$(DEPDIR)/libz_a-adler32.Po
  27623. - -rm -f ./$(DEPDIR)/libz_a-compress.Po
  27624. - -rm -f ./$(DEPDIR)/libz_a-crc32.Po
  27625. - -rm -f ./$(DEPDIR)/libz_a-deflate.Po
  27626. - -rm -f ./$(DEPDIR)/libz_a-gzclose.Po
  27627. - -rm -f ./$(DEPDIR)/libz_a-gzlib.Po
  27628. - -rm -f ./$(DEPDIR)/libz_a-gzread.Po
  27629. - -rm -f ./$(DEPDIR)/libz_a-gzwrite.Po
  27630. - -rm -f ./$(DEPDIR)/libz_a-infback.Po
  27631. - -rm -f ./$(DEPDIR)/libz_a-inffast.Po
  27632. - -rm -f ./$(DEPDIR)/libz_a-inflate.Po
  27633. - -rm -f ./$(DEPDIR)/libz_a-inftrees.Po
  27634. - -rm -f ./$(DEPDIR)/libz_a-trees.Po
  27635. - -rm -f ./$(DEPDIR)/libz_a-uncompr.Po
  27636. - -rm -f ./$(DEPDIR)/libz_a-zutil.Po
  27637. - -rm -f ./$(DEPDIR)/trees.Plo
  27638. - -rm -f ./$(DEPDIR)/uncompr.Plo
  27639. - -rm -f ./$(DEPDIR)/zutil.Plo
  27640. + -rm -rf ./$(DEPDIR)
  27641. -rm -f Makefile
  27642. maintainer-clean-am: distclean-am maintainer-clean-generic \
  27643. maintainer-clean-local
  27644. @@ -1241,17 +1155,17 @@ uninstall-am: uninstall-toolexeclibLIBRARIES
  27645. .MAKE: install-am install-strip
  27646. -.PHONY: CTAGS GTAGS TAGS all all-am all-local am--depfiles am--refresh \
  27647. - check check-am clean clean-cscope clean-generic clean-libtool \
  27648. +.PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \
  27649. + check-am clean clean-cscope clean-generic clean-libtool \
  27650. clean-local clean-noinstLTLIBRARIES clean-toolexeclibLIBRARIES \
  27651. cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
  27652. dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
  27653. - dist-zstd distcheck distclean distclean-compile \
  27654. - distclean-generic distclean-libtool distclean-local \
  27655. - distclean-tags distcleancheck distdir distuninstallcheck dvi \
  27656. - dvi-am html html-am info info-am install install-am \
  27657. - install-data install-data-am install-dvi install-dvi-am \
  27658. - install-exec install-exec-am install-exec-local install-html \
  27659. + distcheck distclean distclean-compile distclean-generic \
  27660. + distclean-libtool distclean-local distclean-tags \
  27661. + distcleancheck distdir distuninstallcheck dvi dvi-am html \
  27662. + html-am info info-am install install-am install-data \
  27663. + install-data-am install-dvi install-dvi-am install-exec \
  27664. + install-exec-am install-exec-local install-html \
  27665. install-html-am install-info install-info-am install-man \
  27666. install-pdf install-pdf-am install-ps install-ps-am \
  27667. install-strip install-toolexeclibLIBRARIES installcheck \
  27668. diff --git a/zlib/aclocal.m4 b/zlib/aclocal.m4
  27669. index 3538b0f0aea..e5eed57bd68 100644
  27670. --- a/zlib/aclocal.m4
  27671. +++ b/zlib/aclocal.m4
  27672. @@ -1,6 +1,6 @@
  27673. -# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
  27674. +# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
  27675. -# Copyright (C) 1996-2021 Free Software Foundation, Inc.
  27676. +# Copyright (C) 1996-2017 Free Software Foundation, Inc.
  27677. # This file is free software; the Free Software Foundation
  27678. # gives unlimited permission to copy and/or distribute it,
  27679. @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
  27680. If you have problems, you may need to regenerate the build system entirely.
  27681. To do so, use the procedure documented by the package, typically 'autoreconf'.])])
  27682. -# Copyright (C) 2002-2021 Free Software Foundation, Inc.
  27683. +# Copyright (C) 2002-2017 Free Software Foundation, Inc.
  27684. #
  27685. # This file is free software; the Free Software Foundation
  27686. # gives unlimited permission to copy and/or distribute it,
  27687. @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
  27688. # generated from the m4 files accompanying Automake X.Y.
  27689. # (This private macro should not be called outside this file.)
  27690. AC_DEFUN([AM_AUTOMAKE_VERSION],
  27691. -[am__api_version='1.16'
  27692. +[am__api_version='1.15'
  27693. dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
  27694. dnl require some minimum version. Point them to the right macro.
  27695. -m4_if([$1], [1.16.5], [],
  27696. +m4_if([$1], [1.15.1], [],
  27697. [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
  27698. ])
  27699. @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
  27700. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
  27701. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  27702. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
  27703. -[AM_AUTOMAKE_VERSION([1.16.5])dnl
  27704. +[AM_AUTOMAKE_VERSION([1.15.1])dnl
  27705. m4_ifndef([AC_AUTOCONF_VERSION],
  27706. [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
  27707. _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
  27708. # AM_AUX_DIR_EXPAND -*- Autoconf -*-
  27709. -# Copyright (C) 2001-2021 Free Software Foundation, Inc.
  27710. +# Copyright (C) 2001-2017 Free Software Foundation, Inc.
  27711. #
  27712. # This file is free software; the Free Software Foundation
  27713. # gives unlimited permission to copy and/or distribute it,
  27714. @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
  27715. # AM_CONDITIONAL -*- Autoconf -*-
  27716. -# Copyright (C) 1997-2021 Free Software Foundation, Inc.
  27717. +# Copyright (C) 1997-2017 Free Software Foundation, Inc.
  27718. #
  27719. # This file is free software; the Free Software Foundation
  27720. # gives unlimited permission to copy and/or distribute it,
  27721. @@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
  27722. Usually this means the macro was only invoked conditionally.]])
  27723. fi])])
  27724. -# Copyright (C) 1999-2021 Free Software Foundation, Inc.
  27725. +# Copyright (C) 1999-2017 Free Software Foundation, Inc.
  27726. #
  27727. # This file is free software; the Free Software Foundation
  27728. # gives unlimited permission to copy and/or distribute it,
  27729. @@ -332,12 +332,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
  27730. # Generate code to set up dependency tracking. -*- Autoconf -*-
  27731. -# Copyright (C) 1999-2021 Free Software Foundation, Inc.
  27732. +# Copyright (C) 1999-2017 Free Software Foundation, Inc.
  27733. #
  27734. # This file is free software; the Free Software Foundation
  27735. # gives unlimited permission to copy and/or distribute it,
  27736. # with or without modifications, as long as this notice is preserved.
  27737. +
  27738. # _AM_OUTPUT_DEPENDENCY_COMMANDS
  27739. # ------------------------------
  27740. AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  27741. @@ -345,43 +346,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  27742. # Older Autoconf quotes --file arguments for eval, but not when files
  27743. # are listed without --file. Let's play safe and only enable the eval
  27744. # if we detect the quoting.
  27745. - # TODO: see whether this extra hack can be removed once we start
  27746. - # requiring Autoconf 2.70 or later.
  27747. - AS_CASE([$CONFIG_FILES],
  27748. - [*\'*], [eval set x "$CONFIG_FILES"],
  27749. - [*], [set x $CONFIG_FILES])
  27750. + case $CONFIG_FILES in
  27751. + *\'*) eval set x "$CONFIG_FILES" ;;
  27752. + *) set x $CONFIG_FILES ;;
  27753. + esac
  27754. shift
  27755. - # Used to flag and report bootstrapping failures.
  27756. - am_rc=0
  27757. - for am_mf
  27758. + for mf
  27759. do
  27760. # Strip MF so we end up with the name of the file.
  27761. - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
  27762. - # Check whether this is an Automake generated Makefile which includes
  27763. - # dependency-tracking related rules and includes.
  27764. - # Grep'ing the whole file directly is not great: AIX grep has a line
  27765. + mf=`echo "$mf" | sed -e 's/:.*$//'`
  27766. + # Check whether this is an Automake generated Makefile or not.
  27767. + # We used to match only the files named 'Makefile.in', but
  27768. + # some people rename them; so instead we look at the file content.
  27769. + # Grep'ing the first line is not enough: some people post-process
  27770. + # each Makefile.in and add a new line on top of each file to say so.
  27771. + # Grep'ing the whole file is not good either: AIX grep has a line
  27772. # limit of 2048, but all sed's we know have understand at least 4000.
  27773. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
  27774. - || continue
  27775. - am_dirpart=`AS_DIRNAME(["$am_mf"])`
  27776. - am_filepart=`AS_BASENAME(["$am_mf"])`
  27777. - AM_RUN_LOG([cd "$am_dirpart" \
  27778. - && sed -e '/# am--include-marker/d' "$am_filepart" \
  27779. - | $MAKE -f - am--depfiles]) || am_rc=$?
  27780. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  27781. + dirpart=`AS_DIRNAME("$mf")`
  27782. + else
  27783. + continue
  27784. + fi
  27785. + # Extract the definition of DEPDIR, am__include, and am__quote
  27786. + # from the Makefile without running 'make'.
  27787. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  27788. + test -z "$DEPDIR" && continue
  27789. + am__include=`sed -n 's/^am__include = //p' < "$mf"`
  27790. + test -z "$am__include" && continue
  27791. + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  27792. + # Find all dependency output files, they are included files with
  27793. + # $(DEPDIR) in their names. We invoke sed twice because it is the
  27794. + # simplest approach to changing $(DEPDIR) to its actual value in the
  27795. + # expansion.
  27796. + for file in `sed -n "
  27797. + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  27798. + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
  27799. + # Make sure the directory exists.
  27800. + test -f "$dirpart/$file" && continue
  27801. + fdir=`AS_DIRNAME(["$file"])`
  27802. + AS_MKDIR_P([$dirpart/$fdir])
  27803. + # echo "creating $dirpart/$file"
  27804. + echo '# dummy' > "$dirpart/$file"
  27805. + done
  27806. done
  27807. - if test $am_rc -ne 0; then
  27808. - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
  27809. - for automatic dependency tracking. If GNU make was not used, consider
  27810. - re-running the configure script with MAKE="gmake" (or whatever is
  27811. - necessary). You can also try re-running configure with the
  27812. - '--disable-dependency-tracking' option to at least be able to build
  27813. - the package (albeit without support for automatic dependency tracking).])
  27814. - fi
  27815. - AS_UNSET([am_dirpart])
  27816. - AS_UNSET([am_filepart])
  27817. - AS_UNSET([am_mf])
  27818. - AS_UNSET([am_rc])
  27819. - rm -f conftest-deps.mk
  27820. }
  27821. ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
  27822. @@ -390,17 +397,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  27823. # -----------------------------
  27824. # This macro should only be invoked once -- use via AC_REQUIRE.
  27825. #
  27826. -# This code is only required when automatic dependency tracking is enabled.
  27827. -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
  27828. -# order to bootstrap the dependency handling code.
  27829. +# This code is only required when automatic dependency tracking
  27830. +# is enabled. FIXME. This creates each '.P' file that we will
  27831. +# need in order to bootstrap the dependency handling code.
  27832. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
  27833. [AC_CONFIG_COMMANDS([depfiles],
  27834. [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
  27835. - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
  27836. + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
  27837. +])
  27838. # Do all the work for Automake. -*- Autoconf -*-
  27839. -# Copyright (C) 1996-2021 Free Software Foundation, Inc.
  27840. +# Copyright (C) 1996-2017 Free Software Foundation, Inc.
  27841. #
  27842. # This file is free software; the Free Software Foundation
  27843. # gives unlimited permission to copy and/or distribute it,
  27844. @@ -428,10 +436,6 @@ m4_defn([AC_PROG_CC])
  27845. # release and drop the old call support.
  27846. AC_DEFUN([AM_INIT_AUTOMAKE],
  27847. [AC_PREREQ([2.65])dnl
  27848. -m4_ifdef([_$0_ALREADY_INIT],
  27849. - [m4_fatal([$0 expanded multiple times
  27850. -]m4_defn([_$0_ALREADY_INIT]))],
  27851. - [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
  27852. dnl Autoconf wants to disallow AM_ names. We explicitly allow
  27853. dnl the ones we care about.
  27854. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
  27855. @@ -468,7 +472,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  27856. [_AM_SET_OPTIONS([$1])dnl
  27857. dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
  27858. m4_if(
  27859. - m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
  27860. + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
  27861. [ok:ok],,
  27862. [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  27863. AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  27864. @@ -491,8 +495,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
  27865. AC_REQUIRE([AC_PROG_MKDIR_P])dnl
  27866. # For better backward compatibility. To be removed once Automake 1.9.x
  27867. # dies out for good. For more background, see:
  27868. -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  27869. -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  27870. +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  27871. +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  27872. AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
  27873. # We need awk for the "check" target (and possibly the TAP driver). The
  27874. # system "awk" is bad on some platforms.
  27875. @@ -520,20 +524,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
  27876. [m4_define([AC_PROG_OBJCXX],
  27877. m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
  27878. ])
  27879. -# Variables for tags utilities; see am/tags.am
  27880. -if test -z "$CTAGS"; then
  27881. - CTAGS=ctags
  27882. -fi
  27883. -AC_SUBST([CTAGS])
  27884. -if test -z "$ETAGS"; then
  27885. - ETAGS=etags
  27886. -fi
  27887. -AC_SUBST([ETAGS])
  27888. -if test -z "$CSCOPE"; then
  27889. - CSCOPE=cscope
  27890. -fi
  27891. -AC_SUBST([CSCOPE])
  27892. -
  27893. AC_REQUIRE([AM_SILENT_RULES])dnl
  27894. dnl The testsuite driver may need to know about EXEEXT, so add the
  27895. dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
  27896. @@ -573,7 +563,7 @@ END
  27897. Aborting the configuration process, to ensure you take notice of the issue.
  27898. You can download and install GNU coreutils to get an 'rm' implementation
  27899. -that behaves properly: <https://www.gnu.org/software/coreutils/>.
  27900. +that behaves properly: <http://www.gnu.org/software/coreutils/>.
  27901. If you want to complete the configuration process using your problematic
  27902. 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
  27903. @@ -615,7 +605,7 @@ for _am_header in $config_headers :; do
  27904. done
  27905. echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
  27906. -# Copyright (C) 2001-2021 Free Software Foundation, Inc.
  27907. +# Copyright (C) 2001-2017 Free Software Foundation, Inc.
  27908. #
  27909. # This file is free software; the Free Software Foundation
  27910. # gives unlimited permission to copy and/or distribute it,
  27911. @@ -639,7 +629,7 @@ AC_SUBST([install_sh])])
  27912. # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
  27913. # From Jim Meyering
  27914. -# Copyright (C) 1996-2021 Free Software Foundation, Inc.
  27915. +# Copyright (C) 1996-2017 Free Software Foundation, Inc.
  27916. #
  27917. # This file is free software; the Free Software Foundation
  27918. # gives unlimited permission to copy and/or distribute it,
  27919. @@ -674,7 +664,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
  27920. # Check to see how 'make' treats includes. -*- Autoconf -*-
  27921. -# Copyright (C) 2001-2021 Free Software Foundation, Inc.
  27922. +# Copyright (C) 2001-2017 Free Software Foundation, Inc.
  27923. #
  27924. # This file is free software; the Free Software Foundation
  27925. # gives unlimited permission to copy and/or distribute it,
  27926. @@ -682,42 +672,49 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
  27927. # AM_MAKE_INCLUDE()
  27928. # -----------------
  27929. -# Check whether make has an 'include' directive that can support all
  27930. -# the idioms we need for our automatic dependency tracking code.
  27931. +# Check to see how make treats includes.
  27932. AC_DEFUN([AM_MAKE_INCLUDE],
  27933. -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
  27934. -cat > confinc.mk << 'END'
  27935. +[am_make=${MAKE-make}
  27936. +cat > confinc << 'END'
  27937. am__doit:
  27938. - @echo this is the am__doit target >confinc.out
  27939. + @echo this is the am__doit target
  27940. .PHONY: am__doit
  27941. END
  27942. +# If we don't find an include directive, just comment out the code.
  27943. +AC_MSG_CHECKING([for style of include used by $am_make])
  27944. am__include="#"
  27945. am__quote=
  27946. -# BSD make does it like this.
  27947. -echo '.include "confinc.mk" # ignored' > confmf.BSD
  27948. -# Other make implementations (GNU, Solaris 10, AIX) do it like this.
  27949. -echo 'include confinc.mk # ignored' > confmf.GNU
  27950. -_am_result=no
  27951. -for s in GNU BSD; do
  27952. - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
  27953. - AS_CASE([$?:`cat confinc.out 2>/dev/null`],
  27954. - ['0:this is the am__doit target'],
  27955. - [AS_CASE([$s],
  27956. - [BSD], [am__include='.include' am__quote='"'],
  27957. - [am__include='include' am__quote=''])])
  27958. - if test "$am__include" != "#"; then
  27959. - _am_result="yes ($s style)"
  27960. - break
  27961. - fi
  27962. -done
  27963. -rm -f confinc.* confmf.*
  27964. -AC_MSG_RESULT([${_am_result}])
  27965. -AC_SUBST([am__include])])
  27966. -AC_SUBST([am__quote])])
  27967. +_am_result=none
  27968. +# First try GNU make style include.
  27969. +echo "include confinc" > confmf
  27970. +# Ignore all kinds of additional output from 'make'.
  27971. +case `$am_make -s -f confmf 2> /dev/null` in #(
  27972. +*the\ am__doit\ target*)
  27973. + am__include=include
  27974. + am__quote=
  27975. + _am_result=GNU
  27976. + ;;
  27977. +esac
  27978. +# Now try BSD make style include.
  27979. +if test "$am__include" = "#"; then
  27980. + echo '.include "confinc"' > confmf
  27981. + case `$am_make -s -f confmf 2> /dev/null` in #(
  27982. + *the\ am__doit\ target*)
  27983. + am__include=.include
  27984. + am__quote="\""
  27985. + _am_result=BSD
  27986. + ;;
  27987. + esac
  27988. +fi
  27989. +AC_SUBST([am__include])
  27990. +AC_SUBST([am__quote])
  27991. +AC_MSG_RESULT([$_am_result])
  27992. +rm -f confinc confmf
  27993. +])
  27994. # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
  27995. -# Copyright (C) 1997-2021 Free Software Foundation, Inc.
  27996. +# Copyright (C) 1997-2017 Free Software Foundation, Inc.
  27997. #
  27998. # This file is free software; the Free Software Foundation
  27999. # gives unlimited permission to copy and/or distribute it,
  28000. @@ -738,7 +735,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
  28001. [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
  28002. AC_REQUIRE_AUX_FILE([missing])dnl
  28003. if test x"${MISSING+set}" != xset; then
  28004. - MISSING="\${SHELL} '$am_aux_dir/missing'"
  28005. + case $am_aux_dir in
  28006. + *\ * | *\ *)
  28007. + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
  28008. + *)
  28009. + MISSING="\${SHELL} $am_aux_dir/missing" ;;
  28010. + esac
  28011. fi
  28012. # Use eval to expand $SHELL
  28013. if eval "$MISSING --is-lightweight"; then
  28014. @@ -751,7 +753,7 @@ fi
  28015. # Helper functions for option handling. -*- Autoconf -*-
  28016. -# Copyright (C) 2001-2021 Free Software Foundation, Inc.
  28017. +# Copyright (C) 2001-2017 Free Software Foundation, Inc.
  28018. #
  28019. # This file is free software; the Free Software Foundation
  28020. # gives unlimited permission to copy and/or distribute it,
  28021. @@ -780,7 +782,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
  28022. AC_DEFUN([_AM_IF_OPTION],
  28023. [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  28024. -# Copyright (C) 1999-2021 Free Software Foundation, Inc.
  28025. +# Copyright (C) 1999-2017 Free Software Foundation, Inc.
  28026. #
  28027. # This file is free software; the Free Software Foundation
  28028. # gives unlimited permission to copy and/or distribute it,
  28029. @@ -827,7 +829,7 @@ AC_LANG_POP([C])])
  28030. # For backward compatibility.
  28031. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
  28032. -# Copyright (C) 2001-2021 Free Software Foundation, Inc.
  28033. +# Copyright (C) 2001-2017 Free Software Foundation, Inc.
  28034. #
  28035. # This file is free software; the Free Software Foundation
  28036. # gives unlimited permission to copy and/or distribute it,
  28037. @@ -846,7 +848,7 @@ AC_DEFUN([AM_RUN_LOG],
  28038. # Check to make sure that the build environment is sane. -*- Autoconf -*-
  28039. -# Copyright (C) 1996-2021 Free Software Foundation, Inc.
  28040. +# Copyright (C) 1996-2017 Free Software Foundation, Inc.
  28041. #
  28042. # This file is free software; the Free Software Foundation
  28043. # gives unlimited permission to copy and/or distribute it,
  28044. @@ -927,7 +929,7 @@ AC_CONFIG_COMMANDS_PRE(
  28045. rm -f conftest.file
  28046. ])
  28047. -# Copyright (C) 2009-2021 Free Software Foundation, Inc.
  28048. +# Copyright (C) 2009-2017 Free Software Foundation, Inc.
  28049. #
  28050. # This file is free software; the Free Software Foundation
  28051. # gives unlimited permission to copy and/or distribute it,
  28052. @@ -987,7 +989,7 @@ AC_SUBST([AM_BACKSLASH])dnl
  28053. _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
  28054. ])
  28055. -# Copyright (C) 2001-2021 Free Software Foundation, Inc.
  28056. +# Copyright (C) 2001-2017 Free Software Foundation, Inc.
  28057. #
  28058. # This file is free software; the Free Software Foundation
  28059. # gives unlimited permission to copy and/or distribute it,
  28060. @@ -1015,7 +1017,7 @@ fi
  28061. INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  28062. AC_SUBST([INSTALL_STRIP_PROGRAM])])
  28063. -# Copyright (C) 2006-2021 Free Software Foundation, Inc.
  28064. +# Copyright (C) 2006-2017 Free Software Foundation, Inc.
  28065. #
  28066. # This file is free software; the Free Software Foundation
  28067. # gives unlimited permission to copy and/or distribute it,
  28068. @@ -1034,7 +1036,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
  28069. # Check how to create a tarball. -*- Autoconf -*-
  28070. -# Copyright (C) 2004-2021 Free Software Foundation, Inc.
  28071. +# Copyright (C) 2004-2017 Free Software Foundation, Inc.
  28072. #
  28073. # This file is free software; the Free Software Foundation
  28074. # gives unlimited permission to copy and/or distribute it,
  28075. diff --git a/zlib/configure b/zlib/configure
  28076. index 0a9ad9e8ccb..35b44e2819c 100755
  28077. --- a/zlib/configure
  28078. +++ b/zlib/configure
  28079. @@ -646,8 +646,11 @@ OTOOL
  28080. LIPO
  28081. NMEDIT
  28082. DSYMUTIL
  28083. +MANIFEST_TOOL
  28084. RANLIB
  28085. +ac_ct_AR
  28086. AR
  28087. +DLLTOOL
  28088. OBJDUMP
  28089. LN_S
  28090. NM
  28091. @@ -666,6 +669,7 @@ am__nodep
  28092. AMDEPBACKSLASH
  28093. AMDEP_FALSE
  28094. AMDEP_TRUE
  28095. +am__quote
  28096. am__include
  28097. DEPDIR
  28098. OBJEXT
  28099. @@ -683,9 +687,6 @@ AM_BACKSLASH
  28100. AM_DEFAULT_VERBOSITY
  28101. AM_DEFAULT_V
  28102. AM_V
  28103. -CSCOPE
  28104. -ETAGS
  28105. -CTAGS
  28106. am__untar
  28107. am__tar
  28108. AMTAR
  28109. @@ -760,8 +761,7 @@ PACKAGE_VERSION
  28110. PACKAGE_TARNAME
  28111. PACKAGE_NAME
  28112. PATH_SEPARATOR
  28113. -SHELL
  28114. -am__quote'
  28115. +SHELL'
  28116. ac_subst_files=''
  28117. ac_user_opts='
  28118. enable_option_checking
  28119. @@ -777,6 +777,7 @@ enable_static
  28120. with_pic
  28121. enable_fast_install
  28122. with_gnu_ld
  28123. +with_libtool_sysroot
  28124. enable_libtool_lock
  28125. enable_host_shared
  28126. '
  28127. @@ -1431,6 +1432,8 @@ Optional Packages:
  28128. --with-pic try to use only PIC/non-PIC objects [default=use
  28129. both]
  28130. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  28131. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  28132. + (or the compiler's sysroot if not specified).
  28133. Some influential environment variables:
  28134. CC C compiler command
  28135. @@ -2417,7 +2420,7 @@ test -n "$target_alias" &&
  28136. mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs"
  28137. -am__api_version='1.16'
  28138. +am__api_version='1.15'
  28139. # Find a good install program. We prefer a C program (faster),
  28140. # so one script is as good as another. But avoid the broken or
  28141. @@ -2593,7 +2596,12 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
  28142. am_aux_dir=`cd "$ac_aux_dir" && pwd`
  28143. if test x"${MISSING+set}" != xset; then
  28144. - MISSING="\${SHELL} '$am_aux_dir/missing'"
  28145. + case $am_aux_dir in
  28146. + *\ * | *\ *)
  28147. + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
  28148. + *)
  28149. + MISSING="\${SHELL} $am_aux_dir/missing" ;;
  28150. + esac
  28151. fi
  28152. # Use eval to expand $SHELL
  28153. if eval "$MISSING --is-lightweight"; then
  28154. @@ -2928,8 +2936,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  28155. # For better backward compatibility. To be removed once Automake 1.9.x
  28156. # dies out for good. For more background, see:
  28157. -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  28158. -# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  28159. +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
  28160. +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
  28161. mkdir_p='$(MKDIR_P)'
  28162. # We need awk for the "check" target (and possibly the TAP driver). The
  28163. @@ -2948,20 +2956,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
  28164. -# Variables for tags utilities; see am/tags.am
  28165. -if test -z "$CTAGS"; then
  28166. - CTAGS=ctags
  28167. -fi
  28168. -
  28169. -if test -z "$ETAGS"; then
  28170. - ETAGS=etags
  28171. -fi
  28172. -
  28173. -if test -z "$CSCOPE"; then
  28174. - CSCOPE=cscope
  28175. -fi
  28176. -
  28177. -
  28178. # POSIX will say in a future version that running "rm -f" with no argument
  28179. # is OK; and we want to be able to make that assumption in our Makefile
  28180. @@ -2994,7 +2988,7 @@ END
  28181. Aborting the configuration process, to ensure you take notice of the issue.
  28182. You can download and install GNU coreutils to get an 'rm' implementation
  28183. -that behaves properly: <https://www.gnu.org/software/coreutils/>.
  28184. +that behaves properly: <http://www.gnu.org/software/coreutils/>.
  28185. If you want to complete the configuration process using your problematic
  28186. 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
  28187. @@ -3998,45 +3992,45 @@ DEPDIR="${am__leading_dot}deps"
  28188. ac_config_commands="$ac_config_commands depfiles"
  28189. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
  28190. -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
  28191. -cat > confinc.mk << 'END'
  28192. +
  28193. +am_make=${MAKE-make}
  28194. +cat > confinc << 'END'
  28195. am__doit:
  28196. - @echo this is the am__doit target >confinc.out
  28197. + @echo this is the am__doit target
  28198. .PHONY: am__doit
  28199. END
  28200. +# If we don't find an include directive, just comment out the code.
  28201. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
  28202. +$as_echo_n "checking for style of include used by $am_make... " >&6; }
  28203. am__include="#"
  28204. am__quote=
  28205. -# BSD make does it like this.
  28206. -echo '.include "confinc.mk" # ignored' > confmf.BSD
  28207. -# Other make implementations (GNU, Solaris 10, AIX) do it like this.
  28208. -echo 'include confinc.mk # ignored' > confmf.GNU
  28209. -_am_result=no
  28210. -for s in GNU BSD; do
  28211. - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
  28212. - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
  28213. - ac_status=$?
  28214. - echo "$as_me:$LINENO: \$? = $ac_status" >&5
  28215. - (exit $ac_status); }
  28216. - case $?:`cat confinc.out 2>/dev/null` in #(
  28217. - '0:this is the am__doit target') :
  28218. - case $s in #(
  28219. - BSD) :
  28220. - am__include='.include' am__quote='"' ;; #(
  28221. - *) :
  28222. - am__include='include' am__quote='' ;;
  28223. -esac ;; #(
  28224. - *) :
  28225. - ;;
  28226. +_am_result=none
  28227. +# First try GNU make style include.
  28228. +echo "include confinc" > confmf
  28229. +# Ignore all kinds of additional output from 'make'.
  28230. +case `$am_make -s -f confmf 2> /dev/null` in #(
  28231. +*the\ am__doit\ target*)
  28232. + am__include=include
  28233. + am__quote=
  28234. + _am_result=GNU
  28235. + ;;
  28236. esac
  28237. - if test "$am__include" != "#"; then
  28238. - _am_result="yes ($s style)"
  28239. - break
  28240. - fi
  28241. -done
  28242. -rm -f confinc.* confmf.*
  28243. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
  28244. -$as_echo "${_am_result}" >&6; }
  28245. +# Now try BSD make style include.
  28246. +if test "$am__include" = "#"; then
  28247. + echo '.include "confinc"' > confmf
  28248. + case `$am_make -s -f confmf 2> /dev/null` in #(
  28249. + *the\ am__doit\ target*)
  28250. + am__include=.include
  28251. + am__quote="\""
  28252. + _am_result=BSD
  28253. + ;;
  28254. + esac
  28255. +fi
  28256. +
  28257. +
  28258. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
  28259. +$as_echo "$_am_result" >&6; }
  28260. +rm -f confinc confmf
  28261. # Check whether --enable-dependency-tracking was given.
  28262. if test "${enable_dependency_tracking+set}" = set; then :
  28263. @@ -4198,8 +4192,8 @@ esac
  28264. -macro_version='2.2.7a'
  28265. -macro_revision='1.3134'
  28266. +macro_version='2.4'
  28267. +macro_revision='1.3293'
  28268. @@ -4239,7 +4233,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  28269. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  28270. $as_echo_n "checking how to print strings... " >&6; }
  28271. # Test print first, because it will be a builtin if present.
  28272. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  28273. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  28274. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  28275. ECHO='print -r --'
  28276. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  28277. @@ -5062,8 +5056,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  28278. # Try some XSI features
  28279. xsi_shell=no
  28280. ( _lt_dummy="a/b/c"
  28281. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  28282. - = c,a/b,, \
  28283. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  28284. + = c,a/b,b/c, \
  28285. && eval 'test $(( 1 + 1 )) -eq 2 \
  28286. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  28287. && xsi_shell=yes
  28288. @@ -5112,6 +5106,80 @@ esac
  28289. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  28290. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  28291. +if ${lt_cv_to_host_file_cmd+:} false; then :
  28292. + $as_echo_n "(cached) " >&6
  28293. +else
  28294. + case $host in
  28295. + *-*-mingw* )
  28296. + case $build in
  28297. + *-*-mingw* ) # actually msys
  28298. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  28299. + ;;
  28300. + *-*-cygwin* )
  28301. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  28302. + ;;
  28303. + * ) # otherwise, assume *nix
  28304. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  28305. + ;;
  28306. + esac
  28307. + ;;
  28308. + *-*-cygwin* )
  28309. + case $build in
  28310. + *-*-mingw* ) # actually msys
  28311. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  28312. + ;;
  28313. + *-*-cygwin* )
  28314. + lt_cv_to_host_file_cmd=func_convert_file_noop
  28315. + ;;
  28316. + * ) # otherwise, assume *nix
  28317. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  28318. + ;;
  28319. + esac
  28320. + ;;
  28321. + * ) # unhandled hosts (and "normal" native builds)
  28322. + lt_cv_to_host_file_cmd=func_convert_file_noop
  28323. + ;;
  28324. +esac
  28325. +
  28326. +fi
  28327. +
  28328. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  28329. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  28330. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  28331. +
  28332. +
  28333. +
  28334. +
  28335. +
  28336. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  28337. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  28338. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  28339. + $as_echo_n "(cached) " >&6
  28340. +else
  28341. + #assume ordinary cross tools, or native build.
  28342. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  28343. +case $host in
  28344. + *-*-mingw* )
  28345. + case $build in
  28346. + *-*-mingw* ) # actually msys
  28347. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  28348. + ;;
  28349. + esac
  28350. + ;;
  28351. +esac
  28352. +
  28353. +fi
  28354. +
  28355. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  28356. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  28357. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  28358. +
  28359. +
  28360. +
  28361. +
  28362. +
  28363. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  28364. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  28365. if ${lt_cv_ld_reload_flag+:} false; then :
  28366. @@ -5128,6 +5196,11 @@ case $reload_flag in
  28367. esac
  28368. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  28369. case $host_os in
  28370. + cygwin* | mingw* | pw32* | cegcc*)
  28371. + if test "$GCC" != yes; then
  28372. + reload_cmds=false
  28373. + fi
  28374. + ;;
  28375. darwin*)
  28376. if test "$GCC" = yes; then
  28377. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  28378. @@ -5296,7 +5369,8 @@ mingw* | pw32*)
  28379. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  28380. lt_cv_file_magic_cmd='func_win32_libid'
  28381. else
  28382. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  28383. + # Keep this pattern in sync with the one in func_win32_libid.
  28384. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  28385. lt_cv_file_magic_cmd='$OBJDUMP -f'
  28386. fi
  28387. ;;
  28388. @@ -5450,6 +5524,21 @@ esac
  28389. fi
  28390. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  28391. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  28392. +
  28393. +file_magic_glob=
  28394. +want_nocaseglob=no
  28395. +if test "$build" = "$host"; then
  28396. + case $host_os in
  28397. + mingw* | pw32*)
  28398. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  28399. + want_nocaseglob=yes
  28400. + else
  28401. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  28402. + fi
  28403. + ;;
  28404. + esac
  28405. +fi
  28406. +
  28407. file_magic_cmd=$lt_cv_file_magic_cmd
  28408. deplibs_check_method=$lt_cv_deplibs_check_method
  28409. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  28410. @@ -5465,6 +5554,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  28411. +
  28412. +
  28413. +
  28414. +
  28415. +
  28416. +
  28417. +
  28418. +
  28419. +
  28420. +
  28421. +if test -n "$ac_tool_prefix"; then
  28422. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  28423. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  28424. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  28425. +$as_echo_n "checking for $ac_word... " >&6; }
  28426. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  28427. + $as_echo_n "(cached) " >&6
  28428. +else
  28429. + if test -n "$DLLTOOL"; then
  28430. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  28431. +else
  28432. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  28433. +for as_dir in $PATH
  28434. +do
  28435. + IFS=$as_save_IFS
  28436. + test -z "$as_dir" && as_dir=.
  28437. + for ac_exec_ext in '' $ac_executable_extensions; do
  28438. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  28439. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  28440. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  28441. + break 2
  28442. + fi
  28443. +done
  28444. + done
  28445. +IFS=$as_save_IFS
  28446. +
  28447. +fi
  28448. +fi
  28449. +DLLTOOL=$ac_cv_prog_DLLTOOL
  28450. +if test -n "$DLLTOOL"; then
  28451. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  28452. +$as_echo "$DLLTOOL" >&6; }
  28453. +else
  28454. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  28455. +$as_echo "no" >&6; }
  28456. +fi
  28457. +
  28458. +
  28459. +fi
  28460. +if test -z "$ac_cv_prog_DLLTOOL"; then
  28461. + ac_ct_DLLTOOL=$DLLTOOL
  28462. + # Extract the first word of "dlltool", so it can be a program name with args.
  28463. +set dummy dlltool; ac_word=$2
  28464. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  28465. +$as_echo_n "checking for $ac_word... " >&6; }
  28466. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  28467. + $as_echo_n "(cached) " >&6
  28468. +else
  28469. + if test -n "$ac_ct_DLLTOOL"; then
  28470. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  28471. +else
  28472. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  28473. +for as_dir in $PATH
  28474. +do
  28475. + IFS=$as_save_IFS
  28476. + test -z "$as_dir" && as_dir=.
  28477. + for ac_exec_ext in '' $ac_executable_extensions; do
  28478. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  28479. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  28480. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  28481. + break 2
  28482. + fi
  28483. +done
  28484. + done
  28485. +IFS=$as_save_IFS
  28486. +
  28487. +fi
  28488. +fi
  28489. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  28490. +if test -n "$ac_ct_DLLTOOL"; then
  28491. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  28492. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  28493. +else
  28494. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  28495. +$as_echo "no" >&6; }
  28496. +fi
  28497. +
  28498. + if test "x$ac_ct_DLLTOOL" = x; then
  28499. + DLLTOOL="false"
  28500. + else
  28501. + case $cross_compiling:$ac_tool_warned in
  28502. +yes:)
  28503. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  28504. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  28505. +ac_tool_warned=yes ;;
  28506. +esac
  28507. + DLLTOOL=$ac_ct_DLLTOOL
  28508. + fi
  28509. +else
  28510. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  28511. +fi
  28512. +
  28513. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  28514. +
  28515. +
  28516. +
  28517. +
  28518. +
  28519. +
  28520. +
  28521. +
  28522. +
  28523. +
  28524. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  28525. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  28526. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  28527. + $as_echo_n "(cached) " >&6
  28528. +else
  28529. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  28530. +
  28531. +case $host_os in
  28532. +cygwin* | mingw* | pw32* | cegcc*)
  28533. + # two different shell functions defined in ltmain.sh
  28534. + # decide which to use based on capabilities of $DLLTOOL
  28535. + case `$DLLTOOL --help 2>&1` in
  28536. + *--identify-strict*)
  28537. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  28538. + ;;
  28539. + *)
  28540. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  28541. + ;;
  28542. + esac
  28543. + ;;
  28544. +*)
  28545. + # fallback: assume linklib IS sharedlib
  28546. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  28547. + ;;
  28548. +esac
  28549. +
  28550. +fi
  28551. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  28552. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  28553. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  28554. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  28555. +
  28556. +
  28557. +
  28558. +
  28559. +
  28560. +
  28561. +
  28562. +
  28563. plugin_option=
  28564. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  28565. for plugin in $plugin_names; do
  28566. @@ -5479,8 +5720,10 @@ for plugin in $plugin_names; do
  28567. done
  28568. if test -n "$ac_tool_prefix"; then
  28569. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  28570. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  28571. + for ac_prog in ar
  28572. + do
  28573. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  28574. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  28575. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  28576. $as_echo_n "checking for $ac_word... " >&6; }
  28577. if ${ac_cv_prog_AR+:} false; then :
  28578. @@ -5496,7 +5739,7 @@ do
  28579. test -z "$as_dir" && as_dir=.
  28580. for ac_exec_ext in '' $ac_executable_extensions; do
  28581. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  28582. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  28583. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  28584. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  28585. break 2
  28586. fi
  28587. @@ -5516,11 +5759,15 @@ $as_echo "no" >&6; }
  28588. fi
  28589. + test -n "$AR" && break
  28590. + done
  28591. fi
  28592. -if test -z "$ac_cv_prog_AR"; then
  28593. +if test -z "$AR"; then
  28594. ac_ct_AR=$AR
  28595. - # Extract the first word of "ar", so it can be a program name with args.
  28596. -set dummy ar; ac_word=$2
  28597. + for ac_prog in ar
  28598. +do
  28599. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  28600. +set dummy $ac_prog; ac_word=$2
  28601. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  28602. $as_echo_n "checking for $ac_word... " >&6; }
  28603. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  28604. @@ -5536,7 +5783,7 @@ do
  28605. test -z "$as_dir" && as_dir=.
  28606. for ac_exec_ext in '' $ac_executable_extensions; do
  28607. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  28608. - ac_cv_prog_ac_ct_AR="ar"
  28609. + ac_cv_prog_ac_ct_AR="$ac_prog"
  28610. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  28611. break 2
  28612. fi
  28613. @@ -5555,6 +5802,10 @@ else
  28614. $as_echo "no" >&6; }
  28615. fi
  28616. +
  28617. + test -n "$ac_ct_AR" && break
  28618. +done
  28619. +
  28620. if test "x$ac_ct_AR" = x; then
  28621. AR="false"
  28622. else
  28623. @@ -5566,25 +5817,22 @@ ac_tool_warned=yes ;;
  28624. esac
  28625. AR=$ac_ct_AR
  28626. fi
  28627. -else
  28628. - AR="$ac_cv_prog_AR"
  28629. fi
  28630. -test -z "$AR" && AR=ar
  28631. -if test -n "$plugin_option"; then
  28632. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  28633. - touch conftest.c
  28634. - $AR $plugin_option rc conftest.a conftest.c
  28635. - if test "$?" != 0; then
  28636. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  28637. + touch conftest.c
  28638. + $AR $plugin_option rc conftest.a conftest.c
  28639. + if test "$?" != 0; then
  28640. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  28641. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  28642. - else
  28643. - AR="$AR $plugin_option"
  28644. - fi
  28645. - rm -f conftest.*
  28646. + else
  28647. + AR="$AR $plugin_option"
  28648. fi
  28649. -fi
  28650. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  28651. + rm -f conftest.*
  28652. +: ${AR=ar}
  28653. +: ${AR_FLAGS=cru}
  28654. +
  28655. +
  28656. +
  28657. @@ -5593,6 +5841,61 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  28658. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  28659. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  28660. +if ${lt_cv_ar_at_file+:} false; then :
  28661. + $as_echo_n "(cached) " >&6
  28662. +else
  28663. + lt_cv_ar_at_file=no
  28664. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  28665. +/* end confdefs.h. */
  28666. +
  28667. +int
  28668. +main ()
  28669. +{
  28670. +
  28671. + ;
  28672. + return 0;
  28673. +}
  28674. +_ACEOF
  28675. +if ac_fn_c_try_compile "$LINENO"; then :
  28676. + echo conftest.$ac_objext > conftest.lst
  28677. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  28678. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  28679. + (eval $lt_ar_try) 2>&5
  28680. + ac_status=$?
  28681. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  28682. + test $ac_status = 0; }
  28683. + if test "$ac_status" -eq 0; then
  28684. + # Ensure the archiver fails upon bogus file names.
  28685. + rm -f conftest.$ac_objext libconftest.a
  28686. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  28687. + (eval $lt_ar_try) 2>&5
  28688. + ac_status=$?
  28689. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  28690. + test $ac_status = 0; }
  28691. + if test "$ac_status" -ne 0; then
  28692. + lt_cv_ar_at_file=@
  28693. + fi
  28694. + fi
  28695. + rm -f conftest.* libconftest.a
  28696. +
  28697. +fi
  28698. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  28699. +
  28700. +fi
  28701. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  28702. +$as_echo "$lt_cv_ar_at_file" >&6; }
  28703. +
  28704. +if test "x$lt_cv_ar_at_file" = xno; then
  28705. + archiver_list_spec=
  28706. +else
  28707. + archiver_list_spec=$lt_cv_ar_at_file
  28708. +fi
  28709. +
  28710. +
  28711. +
  28712. +
  28713. @@ -5935,8 +6238,8 @@ esac
  28714. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  28715. # Transform an extracted symbol line into symbol name and symbol address
  28716. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  28717. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  28718. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  28719. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
  28720. # Handle CRLF in mingw tool chain
  28721. opt_cr=
  28722. @@ -5972,6 +6275,7 @@ for ac_symprfx in "" "_"; do
  28723. else
  28724. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  28725. fi
  28726. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  28727. # Check to see that the pipe works correctly.
  28728. pipe_works=no
  28729. @@ -6013,6 +6317,18 @@ _LT_EOF
  28730. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  28731. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  28732. cat <<_LT_EOF > conftest.$ac_ext
  28733. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  28734. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  28735. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  28736. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  28737. +# define LT_DLSYM_CONST
  28738. +#elif defined(__osf__)
  28739. +/* This system does not cope well with relocations in const data. */
  28740. +# define LT_DLSYM_CONST
  28741. +#else
  28742. +# define LT_DLSYM_CONST const
  28743. +#endif
  28744. +
  28745. #ifdef __cplusplus
  28746. extern "C" {
  28747. #endif
  28748. @@ -6024,7 +6340,7 @@ _LT_EOF
  28749. cat <<_LT_EOF >> conftest.$ac_ext
  28750. /* The mapping between symbol names and symbols. */
  28751. -const struct {
  28752. +LT_DLSYM_CONST struct {
  28753. const char *name;
  28754. void *address;
  28755. }
  28756. @@ -6050,8 +6366,8 @@ static const void *lt_preloaded_setup() {
  28757. _LT_EOF
  28758. # Now try linking the two files.
  28759. mv conftest.$ac_objext conftstm.$ac_objext
  28760. - lt_save_LIBS="$LIBS"
  28761. - lt_save_CFLAGS="$CFLAGS"
  28762. + lt_globsym_save_LIBS=$LIBS
  28763. + lt_globsym_save_CFLAGS=$CFLAGS
  28764. LIBS="conftstm.$ac_objext"
  28765. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  28766. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  28767. @@ -6061,8 +6377,8 @@ _LT_EOF
  28768. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  28769. pipe_works=yes
  28770. fi
  28771. - LIBS="$lt_save_LIBS"
  28772. - CFLAGS="$lt_save_CFLAGS"
  28773. + LIBS=$lt_globsym_save_LIBS
  28774. + CFLAGS=$lt_globsym_save_CFLAGS
  28775. else
  28776. echo "cannot find nm_test_func in $nlist" >&5
  28777. fi
  28778. @@ -6099,6 +6415,16 @@ else
  28779. $as_echo "ok" >&6; }
  28780. fi
  28781. +# Response file support.
  28782. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  28783. + nm_file_list_spec='@'
  28784. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  28785. + nm_file_list_spec='@'
  28786. +fi
  28787. +
  28788. +
  28789. +
  28790. +
  28791. @@ -6116,6 +6442,44 @@ fi
  28792. +
  28793. +
  28794. +
  28795. +
  28796. +
  28797. +
  28798. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  28799. +$as_echo_n "checking for sysroot... " >&6; }
  28800. +
  28801. +# Check whether --with-libtool-sysroot was given.
  28802. +if test "${with_libtool_sysroot+set}" = set; then :
  28803. + withval=$with_libtool_sysroot;
  28804. +else
  28805. + with_libtool_sysroot=no
  28806. +fi
  28807. +
  28808. +
  28809. +lt_sysroot=
  28810. +case ${with_libtool_sysroot} in #(
  28811. + yes)
  28812. + if test "$GCC" = yes; then
  28813. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  28814. + fi
  28815. + ;; #(
  28816. + /*)
  28817. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  28818. + ;; #(
  28819. + no|'')
  28820. + ;; #(
  28821. + *)
  28822. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  28823. +$as_echo "${with_libtool_sysroot}" >&6; }
  28824. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  28825. + ;;
  28826. +esac
  28827. +
  28828. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  28829. +$as_echo "${lt_sysroot:-no}" >&6; }
  28830. @@ -6324,11 +6688,128 @@ sparc*-*solaris*)
  28831. ;;
  28832. esac
  28833. fi
  28834. - rm -rf conftest*
  28835. - ;;
  28836. + rm -rf conftest*
  28837. + ;;
  28838. +esac
  28839. +
  28840. +need_locks="$enable_libtool_lock"
  28841. +
  28842. +if test -n "$ac_tool_prefix"; then
  28843. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  28844. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  28845. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  28846. +$as_echo_n "checking for $ac_word... " >&6; }
  28847. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  28848. + $as_echo_n "(cached) " >&6
  28849. +else
  28850. + if test -n "$MANIFEST_TOOL"; then
  28851. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  28852. +else
  28853. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  28854. +for as_dir in $PATH
  28855. +do
  28856. + IFS=$as_save_IFS
  28857. + test -z "$as_dir" && as_dir=.
  28858. + for ac_exec_ext in '' $ac_executable_extensions; do
  28859. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  28860. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  28861. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  28862. + break 2
  28863. + fi
  28864. +done
  28865. + done
  28866. +IFS=$as_save_IFS
  28867. +
  28868. +fi
  28869. +fi
  28870. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  28871. +if test -n "$MANIFEST_TOOL"; then
  28872. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  28873. +$as_echo "$MANIFEST_TOOL" >&6; }
  28874. +else
  28875. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  28876. +$as_echo "no" >&6; }
  28877. +fi
  28878. +
  28879. +
  28880. +fi
  28881. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  28882. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  28883. + # Extract the first word of "mt", so it can be a program name with args.
  28884. +set dummy mt; ac_word=$2
  28885. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  28886. +$as_echo_n "checking for $ac_word... " >&6; }
  28887. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  28888. + $as_echo_n "(cached) " >&6
  28889. +else
  28890. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  28891. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  28892. +else
  28893. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  28894. +for as_dir in $PATH
  28895. +do
  28896. + IFS=$as_save_IFS
  28897. + test -z "$as_dir" && as_dir=.
  28898. + for ac_exec_ext in '' $ac_executable_extensions; do
  28899. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  28900. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  28901. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  28902. + break 2
  28903. + fi
  28904. +done
  28905. + done
  28906. +IFS=$as_save_IFS
  28907. +
  28908. +fi
  28909. +fi
  28910. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  28911. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  28912. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  28913. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  28914. +else
  28915. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  28916. +$as_echo "no" >&6; }
  28917. +fi
  28918. +
  28919. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  28920. + MANIFEST_TOOL=":"
  28921. + else
  28922. + case $cross_compiling:$ac_tool_warned in
  28923. +yes:)
  28924. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  28925. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  28926. +ac_tool_warned=yes ;;
  28927. esac
  28928. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  28929. + fi
  28930. +else
  28931. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  28932. +fi
  28933. +
  28934. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  28935. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  28936. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  28937. +if ${lt_cv_path_mainfest_tool+:} false; then :
  28938. + $as_echo_n "(cached) " >&6
  28939. +else
  28940. + lt_cv_path_mainfest_tool=no
  28941. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  28942. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  28943. + cat conftest.err >&5
  28944. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  28945. + lt_cv_path_mainfest_tool=yes
  28946. + fi
  28947. + rm -f conftest*
  28948. +fi
  28949. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  28950. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  28951. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  28952. + MANIFEST_TOOL=:
  28953. +fi
  28954. +
  28955. +
  28956. +
  28957. -need_locks="$enable_libtool_lock"
  28958. case $host_os in
  28959. @@ -6896,6 +7377,8 @@ _LT_EOF
  28960. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  28961. echo "$AR cru libconftest.a conftest.o" >&5
  28962. $AR cru libconftest.a conftest.o 2>&5
  28963. + echo "$RANLIB libconftest.a" >&5
  28964. + $RANLIB libconftest.a 2>&5
  28965. cat > conftest.c << _LT_EOF
  28966. int main() { return 0;}
  28967. _LT_EOF
  28968. @@ -7745,8 +8228,6 @@ fi
  28969. lt_prog_compiler_pic=
  28970. lt_prog_compiler_static=
  28971. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  28972. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  28973. if test "$GCC" = yes; then
  28974. lt_prog_compiler_wl='-Wl,'
  28975. @@ -7912,6 +8393,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  28976. lt_prog_compiler_pic='--shared'
  28977. lt_prog_compiler_static='--static'
  28978. ;;
  28979. + nagfor*)
  28980. + # NAG Fortran compiler
  28981. + lt_prog_compiler_wl='-Wl,-Wl,,'
  28982. + lt_prog_compiler_pic='-PIC'
  28983. + lt_prog_compiler_static='-Bstatic'
  28984. + ;;
  28985. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  28986. # Portland Group compilers (*not* the Pentium gcc compiler,
  28987. # which looks to be a dead project)
  28988. @@ -7974,7 +8461,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  28989. lt_prog_compiler_pic='-KPIC'
  28990. lt_prog_compiler_static='-Bstatic'
  28991. case $cc_basename in
  28992. - f77* | f90* | f95*)
  28993. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  28994. lt_prog_compiler_wl='-Qoption ld ';;
  28995. *)
  28996. lt_prog_compiler_wl='-Wl,';;
  28997. @@ -8031,13 +8518,17 @@ case $host_os in
  28998. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  28999. ;;
  29000. esac
  29001. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  29002. -$as_echo "$lt_prog_compiler_pic" >&6; }
  29003. -
  29004. -
  29005. -
  29006. -
  29007. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  29008. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  29009. +if ${lt_cv_prog_compiler_pic+:} false; then :
  29010. + $as_echo_n "(cached) " >&6
  29011. +else
  29012. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  29013. +fi
  29014. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  29015. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  29016. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  29017. #
  29018. # Check to make sure the PIC flag actually works.
  29019. @@ -8098,6 +8589,11 @@ fi
  29020. +
  29021. +
  29022. +
  29023. +
  29024. +
  29025. #
  29026. # Check to make sure the static flag actually works.
  29027. #
  29028. @@ -8448,7 +8944,8 @@ _LT_EOF
  29029. allow_undefined_flag=unsupported
  29030. always_export_symbols=no
  29031. enable_shared_with_static_runtimes=yes
  29032. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  29033. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
  29034. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  29035. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  29036. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  29037. @@ -8547,12 +9044,12 @@ _LT_EOF
  29038. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  29039. hardcode_libdir_flag_spec=
  29040. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  29041. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  29042. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  29043. if test "x$supports_anon_versioning" = xyes; then
  29044. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  29045. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  29046. echo "local: *; };" >> $output_objdir/$libname.ver~
  29047. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  29048. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  29049. fi
  29050. ;;
  29051. esac
  29052. @@ -8566,8 +9063,8 @@ _LT_EOF
  29053. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  29054. wlarc=
  29055. else
  29056. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  29057. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  29058. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  29059. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  29060. fi
  29061. ;;
  29062. @@ -8585,8 +9082,8 @@ _LT_EOF
  29063. _LT_EOF
  29064. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  29065. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  29066. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  29067. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  29068. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  29069. else
  29070. ld_shlibs=no
  29071. fi
  29072. @@ -8632,8 +9129,8 @@ _LT_EOF
  29073. *)
  29074. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  29075. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  29076. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  29077. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  29078. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  29079. else
  29080. ld_shlibs=no
  29081. fi
  29082. @@ -8763,7 +9260,13 @@ _LT_EOF
  29083. allow_undefined_flag='-berok'
  29084. # Determine the default libpath from the value encoded in an
  29085. # empty executable.
  29086. - if test x$gcc_no_link = xyes; then
  29087. + if test "${lt_cv_aix_libpath+set}" = set; then
  29088. + aix_libpath=$lt_cv_aix_libpath
  29089. +else
  29090. + if ${lt_cv_aix_libpath_+:} false; then :
  29091. + $as_echo_n "(cached) " >&6
  29092. +else
  29093. + if test x$gcc_no_link = xyes; then
  29094. as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
  29095. fi
  29096. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  29097. @@ -8779,22 +9282,29 @@ main ()
  29098. _ACEOF
  29099. if ac_fn_c_try_link "$LINENO"; then :
  29100. -lt_aix_libpath_sed='
  29101. - /Import File Strings/,/^$/ {
  29102. - /^0/ {
  29103. - s/^0 *\(.*\)$/\1/
  29104. - p
  29105. - }
  29106. - }'
  29107. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29108. -# Check for a 64-bit object if we didn't find anything.
  29109. -if test -z "$aix_libpath"; then
  29110. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29111. -fi
  29112. + lt_aix_libpath_sed='
  29113. + /Import File Strings/,/^$/ {
  29114. + /^0/ {
  29115. + s/^0 *\([^ ]*\) *$/\1/
  29116. + p
  29117. + }
  29118. + }'
  29119. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29120. + # Check for a 64-bit object if we didn't find anything.
  29121. + if test -z "$lt_cv_aix_libpath_"; then
  29122. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29123. + fi
  29124. fi
  29125. rm -f core conftest.err conftest.$ac_objext \
  29126. conftest$ac_exeext conftest.$ac_ext
  29127. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29128. + if test -z "$lt_cv_aix_libpath_"; then
  29129. + lt_cv_aix_libpath_="/usr/lib:/lib"
  29130. + fi
  29131. +
  29132. +fi
  29133. +
  29134. + aix_libpath=$lt_cv_aix_libpath_
  29135. +fi
  29136. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  29137. archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
  29138. @@ -8806,7 +9316,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29139. else
  29140. # Determine the default libpath from the value encoded in an
  29141. # empty executable.
  29142. - if test x$gcc_no_link = xyes; then
  29143. + if test "${lt_cv_aix_libpath+set}" = set; then
  29144. + aix_libpath=$lt_cv_aix_libpath
  29145. +else
  29146. + if ${lt_cv_aix_libpath_+:} false; then :
  29147. + $as_echo_n "(cached) " >&6
  29148. +else
  29149. + if test x$gcc_no_link = xyes; then
  29150. as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
  29151. fi
  29152. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  29153. @@ -8822,22 +9338,29 @@ main ()
  29154. _ACEOF
  29155. if ac_fn_c_try_link "$LINENO"; then :
  29156. -lt_aix_libpath_sed='
  29157. - /Import File Strings/,/^$/ {
  29158. - /^0/ {
  29159. - s/^0 *\(.*\)$/\1/
  29160. - p
  29161. - }
  29162. - }'
  29163. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29164. -# Check for a 64-bit object if we didn't find anything.
  29165. -if test -z "$aix_libpath"; then
  29166. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29167. -fi
  29168. + lt_aix_libpath_sed='
  29169. + /Import File Strings/,/^$/ {
  29170. + /^0/ {
  29171. + s/^0 *\([^ ]*\) *$/\1/
  29172. + p
  29173. + }
  29174. + }'
  29175. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29176. + # Check for a 64-bit object if we didn't find anything.
  29177. + if test -z "$lt_cv_aix_libpath_"; then
  29178. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  29179. + fi
  29180. fi
  29181. rm -f core conftest.err conftest.$ac_objext \
  29182. conftest$ac_exeext conftest.$ac_ext
  29183. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29184. + if test -z "$lt_cv_aix_libpath_"; then
  29185. + lt_cv_aix_libpath_="/usr/lib:/lib"
  29186. + fi
  29187. +
  29188. +fi
  29189. +
  29190. + aix_libpath=$lt_cv_aix_libpath_
  29191. +fi
  29192. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  29193. # Warning - without using the other run time loading flags,
  29194. @@ -8882,20 +9405,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29195. # Microsoft Visual C++.
  29196. # hardcode_libdir_flag_spec is actually meaningless, as there is
  29197. # no search path for DLLs.
  29198. - hardcode_libdir_flag_spec=' '
  29199. - allow_undefined_flag=unsupported
  29200. - # Tell ltmain to make .lib files, not .a files.
  29201. - libext=lib
  29202. - # Tell ltmain to make .dll files, not .so files.
  29203. - shrext_cmds=".dll"
  29204. - # FIXME: Setting linknames here is a bad hack.
  29205. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  29206. - # The linker will automatically build a .lib file if we build a DLL.
  29207. - old_archive_from_new_cmds='true'
  29208. - # FIXME: Should let the user specify the lib program.
  29209. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  29210. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  29211. - enable_shared_with_static_runtimes=yes
  29212. + case $cc_basename in
  29213. + cl*)
  29214. + # Native MSVC
  29215. + hardcode_libdir_flag_spec=' '
  29216. + allow_undefined_flag=unsupported
  29217. + always_export_symbols=yes
  29218. + file_list_spec='@'
  29219. + # Tell ltmain to make .lib files, not .a files.
  29220. + libext=lib
  29221. + # Tell ltmain to make .dll files, not .so files.
  29222. + shrext_cmds=".dll"
  29223. + # FIXME: Setting linknames here is a bad hack.
  29224. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  29225. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  29226. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  29227. + else
  29228. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  29229. + fi~
  29230. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  29231. + linknames='
  29232. + # The linker will not automatically build a static lib if we build a DLL.
  29233. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  29234. + enable_shared_with_static_runtimes=yes
  29235. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  29236. + # Don't use ranlib
  29237. + old_postinstall_cmds='chmod 644 $oldlib'
  29238. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  29239. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  29240. + case $lt_outputfile in
  29241. + *.exe|*.EXE) ;;
  29242. + *)
  29243. + lt_outputfile="$lt_outputfile.exe"
  29244. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  29245. + ;;
  29246. + esac~
  29247. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  29248. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  29249. + $RM "$lt_outputfile.manifest";
  29250. + fi'
  29251. + ;;
  29252. + *)
  29253. + # Assume MSVC wrapper
  29254. + hardcode_libdir_flag_spec=' '
  29255. + allow_undefined_flag=unsupported
  29256. + # Tell ltmain to make .lib files, not .a files.
  29257. + libext=lib
  29258. + # Tell ltmain to make .dll files, not .so files.
  29259. + shrext_cmds=".dll"
  29260. + # FIXME: Setting linknames here is a bad hack.
  29261. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  29262. + # The linker will automatically build a .lib file if we build a DLL.
  29263. + old_archive_from_new_cmds='true'
  29264. + # FIXME: Should let the user specify the lib program.
  29265. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  29266. + enable_shared_with_static_runtimes=yes
  29267. + ;;
  29268. + esac
  29269. ;;
  29270. darwin* | rhapsody*)
  29271. @@ -8956,7 +9522,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29272. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  29273. freebsd* | dragonfly*)
  29274. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  29275. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  29276. hardcode_libdir_flag_spec='-R$libdir'
  29277. hardcode_direct=yes
  29278. hardcode_shlibpath_var=no
  29279. @@ -8964,7 +9530,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29280. hpux9*)
  29281. if test "$GCC" = yes; then
  29282. - archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  29283. + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  29284. else
  29285. archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
  29286. fi
  29287. @@ -8980,7 +9546,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29288. hpux10*)
  29289. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  29290. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  29291. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  29292. else
  29293. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  29294. fi
  29295. @@ -9004,10 +9570,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  29296. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  29297. ;;
  29298. ia64*)
  29299. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  29300. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  29301. ;;
  29302. *)
  29303. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  29304. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  29305. ;;
  29306. esac
  29307. else
  29308. @@ -9086,26 +9652,39 @@ fi
  29309. irix5* | irix6* | nonstopux*)
  29310. if test "$GCC" = yes; then
  29311. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  29312. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  29313. # Try to use the -exported_symbol ld option, if it does not
  29314. # work, assume that -exports_file does not work either and
  29315. # implicitly export all symbols.
  29316. - save_LDFLAGS="$LDFLAGS"
  29317. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  29318. - if test x$gcc_no_link = xyes; then
  29319. + # This should be the same for all languages, so no per-tag cache variable.
  29320. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  29321. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  29322. +if ${lt_cv_irix_exported_symbol+:} false; then :
  29323. + $as_echo_n "(cached) " >&6
  29324. +else
  29325. + save_LDFLAGS="$LDFLAGS"
  29326. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  29327. + if test x$gcc_no_link = xyes; then
  29328. as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
  29329. fi
  29330. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  29331. /* end confdefs.h. */
  29332. -int foo(void) {}
  29333. +int foo (void) { return 0; }
  29334. _ACEOF
  29335. if ac_fn_c_try_link "$LINENO"; then :
  29336. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  29337. -
  29338. + lt_cv_irix_exported_symbol=yes
  29339. +else
  29340. + lt_cv_irix_exported_symbol=no
  29341. fi
  29342. rm -f core conftest.err conftest.$ac_objext \
  29343. conftest$ac_exeext conftest.$ac_ext
  29344. - LDFLAGS="$save_LDFLAGS"
  29345. + LDFLAGS="$save_LDFLAGS"
  29346. +fi
  29347. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  29348. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  29349. + if test "$lt_cv_irix_exported_symbol" = yes; then
  29350. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  29351. + fi
  29352. else
  29353. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
  29354. archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
  29355. @@ -9190,7 +9769,7 @@ rm -f core conftest.err conftest.$ac_objext \
  29356. osf4* | osf5*) # as osf3* with the addition of -msym flag
  29357. if test "$GCC" = yes; then
  29358. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  29359. - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  29360. + archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
  29361. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  29362. else
  29363. allow_undefined_flag=' -expect_unresolved \*'
  29364. @@ -9209,9 +9788,9 @@ rm -f core conftest.err conftest.$ac_objext \
  29365. no_undefined_flag=' -z defs'
  29366. if test "$GCC" = yes; then
  29367. wlarc='${wl}'
  29368. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  29369. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  29370. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  29371. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  29372. + $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  29373. else
  29374. case `$CC -V 2>&1` in
  29375. *"Compilers 5.0"*)
  29376. @@ -9787,8 +10366,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  29377. need_version=no
  29378. need_lib_prefix=no
  29379. - case $GCC,$host_os in
  29380. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  29381. + case $GCC,$cc_basename in
  29382. + yes,*)
  29383. + # gcc
  29384. library_names_spec='$libname.dll.a'
  29385. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  29386. postinstall_cmds='base_file=`basename \${file}`~
  29387. @@ -9821,13 +10401,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  29388. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  29389. ;;
  29390. esac
  29391. + dynamic_linker='Win32 ld.exe'
  29392. + ;;
  29393. +
  29394. + *,cl*)
  29395. + # Native MSVC
  29396. + libname_spec='$name'
  29397. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  29398. + library_names_spec='${libname}.dll.lib'
  29399. +
  29400. + case $build_os in
  29401. + mingw*)
  29402. + sys_lib_search_path_spec=
  29403. + lt_save_ifs=$IFS
  29404. + IFS=';'
  29405. + for lt_path in $LIB
  29406. + do
  29407. + IFS=$lt_save_ifs
  29408. + # Let DOS variable expansion print the short 8.3 style file name.
  29409. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  29410. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  29411. + done
  29412. + IFS=$lt_save_ifs
  29413. + # Convert to MSYS style.
  29414. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  29415. + ;;
  29416. + cygwin*)
  29417. + # Convert to unix form, then to dos form, then back to unix form
  29418. + # but this time dos style (no spaces!) so that the unix form looks
  29419. + # like /cygdrive/c/PROGRA~1:/cygdr...
  29420. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  29421. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  29422. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  29423. + ;;
  29424. + *)
  29425. + sys_lib_search_path_spec="$LIB"
  29426. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  29427. + # It is most probably a Windows format PATH.
  29428. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  29429. + else
  29430. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  29431. + fi
  29432. + # FIXME: find the short name or the path components, as spaces are
  29433. + # common. (e.g. "Program Files" -> "PROGRA~1")
  29434. + ;;
  29435. + esac
  29436. +
  29437. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  29438. + postinstall_cmds='base_file=`basename \${file}`~
  29439. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  29440. + dldir=$destdir/`dirname \$dlpath`~
  29441. + test -d \$dldir || mkdir -p \$dldir~
  29442. + $install_prog $dir/$dlname \$dldir/$dlname'
  29443. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  29444. + dlpath=$dir/\$dldll~
  29445. + $RM \$dlpath'
  29446. + shlibpath_overrides_runpath=yes
  29447. + dynamic_linker='Win32 link.exe'
  29448. ;;
  29449. *)
  29450. + # Assume MSVC wrapper
  29451. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  29452. + dynamic_linker='Win32 ld.exe'
  29453. ;;
  29454. esac
  29455. - dynamic_linker='Win32 ld.exe'
  29456. # FIXME: first we should search . and the directory the executable is in
  29457. shlibpath_var=PATH
  29458. ;;
  29459. @@ -10723,7 +11361,7 @@ else
  29460. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  29461. lt_status=$lt_dlunknown
  29462. cat > conftest.$ac_ext <<_LT_EOF
  29463. -#line 10726 "configure"
  29464. +#line $LINENO "configure"
  29465. #include "confdefs.h"
  29466. #if HAVE_DLFCN_H
  29467. @@ -10767,10 +11405,10 @@ else
  29468. /* When -fvisbility=hidden is used, assume the code has been annotated
  29469. correspondingly for the symbols needed. */
  29470. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  29471. -void fnord () __attribute__((visibility("default")));
  29472. +int fnord () __attribute__((visibility("default")));
  29473. #endif
  29474. -void fnord () { int i=42; }
  29475. +int fnord () { return 42; }
  29476. int main ()
  29477. {
  29478. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  29479. @@ -10829,7 +11467,7 @@ else
  29480. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  29481. lt_status=$lt_dlunknown
  29482. cat > conftest.$ac_ext <<_LT_EOF
  29483. -#line 10832 "configure"
  29484. +#line $LINENO "configure"
  29485. #include "confdefs.h"
  29486. #if HAVE_DLFCN_H
  29487. @@ -10873,10 +11511,10 @@ else
  29488. /* When -fvisbility=hidden is used, assume the code has been annotated
  29489. correspondingly for the symbols needed. */
  29490. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  29491. -void fnord () __attribute__((visibility("default")));
  29492. +int fnord () __attribute__((visibility("default")));
  29493. #endif
  29494. -void fnord () { int i=42; }
  29495. +int fnord () { return 42; }
  29496. int main ()
  29497. {
  29498. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  29499. @@ -12308,7 +12946,7 @@ CC="$CC"
  29500. CXX="$CXX"
  29501. GFORTRAN="$GFORTRAN"
  29502. GDC="$GDC"
  29503. -AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
  29504. +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  29505. # The HP-UX ksh and POSIX shell print the target directory to stdout
  29506. @@ -12346,13 +12984,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  29507. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  29508. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  29509. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  29510. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  29511. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  29512. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  29513. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  29514. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  29515. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  29516. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  29517. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  29518. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  29519. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  29520. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  29521. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  29522. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  29523. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  29524. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  29525. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  29526. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  29527. @@ -12367,14 +13012,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  29528. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  29529. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  29530. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
  29531. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  29532. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  29533. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  29534. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  29535. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  29536. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  29537. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  29538. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  29539. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  29540. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  29541. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  29542. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  29543. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  29544. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  29545. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  29546. @@ -12407,12 +13055,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  29547. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  29548. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  29549. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  29550. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  29551. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  29552. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  29553. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  29554. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  29555. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  29556. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  29557. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  29558. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  29559. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  29560. @@ -12467,8 +13115,13 @@ reload_flag \
  29561. OBJDUMP \
  29562. deplibs_check_method \
  29563. file_magic_cmd \
  29564. +file_magic_glob \
  29565. +want_nocaseglob \
  29566. +DLLTOOL \
  29567. +sharedlib_from_linklib_cmd \
  29568. AR \
  29569. AR_FLAGS \
  29570. +archiver_list_spec \
  29571. STRIP \
  29572. RANLIB \
  29573. CC \
  29574. @@ -12478,12 +13131,14 @@ lt_cv_sys_global_symbol_pipe \
  29575. lt_cv_sys_global_symbol_to_cdecl \
  29576. lt_cv_sys_global_symbol_to_c_name_address \
  29577. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  29578. +nm_file_list_spec \
  29579. lt_prog_compiler_no_builtin_flag \
  29580. -lt_prog_compiler_wl \
  29581. lt_prog_compiler_pic \
  29582. +lt_prog_compiler_wl \
  29583. lt_prog_compiler_static \
  29584. lt_cv_prog_compiler_c_o \
  29585. need_locks \
  29586. +MANIFEST_TOOL \
  29587. DSYMUTIL \
  29588. NMEDIT \
  29589. LIPO \
  29590. @@ -12499,7 +13154,6 @@ no_undefined_flag \
  29591. hardcode_libdir_flag_spec \
  29592. hardcode_libdir_flag_spec_ld \
  29593. hardcode_libdir_separator \
  29594. -fix_srcfile_path \
  29595. exclude_expsyms \
  29596. include_expsyms \
  29597. file_list_spec \
  29598. @@ -12535,6 +13189,7 @@ module_cmds \
  29599. module_expsym_cmds \
  29600. export_symbols_cmds \
  29601. prelink_cmds \
  29602. +postlink_cmds \
  29603. postinstall_cmds \
  29604. postuninstall_cmds \
  29605. finish_cmds \
  29606. @@ -13023,35 +13678,29 @@ esac ;;
  29607. # Older Autoconf quotes --file arguments for eval, but not when files
  29608. # are listed without --file. Let's play safe and only enable the eval
  29609. # if we detect the quoting.
  29610. - # TODO: see whether this extra hack can be removed once we start
  29611. - # requiring Autoconf 2.70 or later.
  29612. - case $CONFIG_FILES in #(
  29613. - *\'*) :
  29614. - eval set x "$CONFIG_FILES" ;; #(
  29615. - *) :
  29616. - set x $CONFIG_FILES ;; #(
  29617. - *) :
  29618. - ;;
  29619. -esac
  29620. + case $CONFIG_FILES in
  29621. + *\'*) eval set x "$CONFIG_FILES" ;;
  29622. + *) set x $CONFIG_FILES ;;
  29623. + esac
  29624. shift
  29625. - # Used to flag and report bootstrapping failures.
  29626. - am_rc=0
  29627. - for am_mf
  29628. + for mf
  29629. do
  29630. # Strip MF so we end up with the name of the file.
  29631. - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
  29632. - # Check whether this is an Automake generated Makefile which includes
  29633. - # dependency-tracking related rules and includes.
  29634. - # Grep'ing the whole file directly is not great: AIX grep has a line
  29635. + mf=`echo "$mf" | sed -e 's/:.*$//'`
  29636. + # Check whether this is an Automake generated Makefile or not.
  29637. + # We used to match only the files named 'Makefile.in', but
  29638. + # some people rename them; so instead we look at the file content.
  29639. + # Grep'ing the first line is not enough: some people post-process
  29640. + # each Makefile.in and add a new line on top of each file to say so.
  29641. + # Grep'ing the whole file is not good either: AIX grep has a line
  29642. # limit of 2048, but all sed's we know have understand at least 4000.
  29643. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
  29644. - || continue
  29645. - am_dirpart=`$as_dirname -- "$am_mf" ||
  29646. -$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  29647. - X"$am_mf" : 'X\(//\)[^/]' \| \
  29648. - X"$am_mf" : 'X\(//\)$' \| \
  29649. - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
  29650. -$as_echo X"$am_mf" |
  29651. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
  29652. + dirpart=`$as_dirname -- "$mf" ||
  29653. +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  29654. + X"$mf" : 'X\(//\)[^/]' \| \
  29655. + X"$mf" : 'X\(//\)$' \| \
  29656. + X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
  29657. +$as_echo X"$mf" |
  29658. sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  29659. s//\1/
  29660. q
  29661. @@ -13069,50 +13718,53 @@ $as_echo X"$am_mf" |
  29662. q
  29663. }
  29664. s/.*/./; q'`
  29665. - am_filepart=`$as_basename -- "$am_mf" ||
  29666. -$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
  29667. - X"$am_mf" : 'X\(//\)$' \| \
  29668. - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
  29669. -$as_echo X/"$am_mf" |
  29670. - sed '/^.*\/\([^/][^/]*\)\/*$/{
  29671. + else
  29672. + continue
  29673. + fi
  29674. + # Extract the definition of DEPDIR, am__include, and am__quote
  29675. + # from the Makefile without running 'make'.
  29676. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
  29677. + test -z "$DEPDIR" && continue
  29678. + am__include=`sed -n 's/^am__include = //p' < "$mf"`
  29679. + test -z "$am__include" && continue
  29680. + am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
  29681. + # Find all dependency output files, they are included files with
  29682. + # $(DEPDIR) in their names. We invoke sed twice because it is the
  29683. + # simplest approach to changing $(DEPDIR) to its actual value in the
  29684. + # expansion.
  29685. + for file in `sed -n "
  29686. + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
  29687. + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
  29688. + # Make sure the directory exists.
  29689. + test -f "$dirpart/$file" && continue
  29690. + fdir=`$as_dirname -- "$file" ||
  29691. +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  29692. + X"$file" : 'X\(//\)[^/]' \| \
  29693. + X"$file" : 'X\(//\)$' \| \
  29694. + X"$file" : 'X\(/\)' \| . 2>/dev/null ||
  29695. +$as_echo X"$file" |
  29696. + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  29697. s//\1/
  29698. q
  29699. }
  29700. - /^X\/\(\/\/\)$/{
  29701. + /^X\(\/\/\)[^/].*/{
  29702. s//\1/
  29703. q
  29704. }
  29705. - /^X\/\(\/\).*/{
  29706. + /^X\(\/\/\)$/{
  29707. + s//\1/
  29708. + q
  29709. + }
  29710. + /^X\(\/\).*/{
  29711. s//\1/
  29712. q
  29713. }
  29714. s/.*/./; q'`
  29715. - { echo "$as_me:$LINENO: cd "$am_dirpart" \
  29716. - && sed -e '/# am--include-marker/d' "$am_filepart" \
  29717. - | $MAKE -f - am--depfiles" >&5
  29718. - (cd "$am_dirpart" \
  29719. - && sed -e '/# am--include-marker/d' "$am_filepart" \
  29720. - | $MAKE -f - am--depfiles) >&5 2>&5
  29721. - ac_status=$?
  29722. - echo "$as_me:$LINENO: \$? = $ac_status" >&5
  29723. - (exit $ac_status); } || am_rc=$?
  29724. + as_dir=$dirpart/$fdir; as_fn_mkdir_p
  29725. + # echo "creating $dirpart/$file"
  29726. + echo '# dummy' > "$dirpart/$file"
  29727. + done
  29728. done
  29729. - if test $am_rc -ne 0; then
  29730. - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
  29731. -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  29732. -as_fn_error $? "Something went wrong bootstrapping makefile fragments
  29733. - for automatic dependency tracking. If GNU make was not used, consider
  29734. - re-running the configure script with MAKE=\"gmake\" (or whatever is
  29735. - necessary). You can also try re-running configure with the
  29736. - '--disable-dependency-tracking' option to at least be able to build
  29737. - the package (albeit without support for automatic dependency tracking).
  29738. -See \`config.log' for more details" "$LINENO" 5; }
  29739. - fi
  29740. - { am_dirpart=; unset am_dirpart;}
  29741. - { am_filepart=; unset am_filepart;}
  29742. - { am_mf=; unset am_mf;}
  29743. - { am_rc=; unset am_rc;}
  29744. - rm -f conftest-deps.mk
  29745. }
  29746. ;;
  29747. "libtool":C)
  29748. @@ -13136,7 +13788,8 @@ See \`config.log' for more details" "$LINENO" 5; }
  29749. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  29750. #
  29751. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  29752. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  29753. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  29754. +# Inc.
  29755. # Written by Gordon Matzigkeit, 1996
  29756. #
  29757. # This file is part of GNU Libtool.
  29758. @@ -13239,19 +13892,42 @@ SP2NL=$lt_lt_SP2NL
  29759. # turn newlines into spaces.
  29760. NL2SP=$lt_lt_NL2SP
  29761. +# convert \$build file names to \$host format.
  29762. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  29763. +
  29764. +# convert \$build files to toolchain format.
  29765. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  29766. +
  29767. # An object symbol dumper.
  29768. OBJDUMP=$lt_OBJDUMP
  29769. # Method to check whether dependent libraries are shared objects.
  29770. deplibs_check_method=$lt_deplibs_check_method
  29771. -# Command to use when deplibs_check_method == "file_magic".
  29772. +# Command to use when deplibs_check_method = "file_magic".
  29773. file_magic_cmd=$lt_file_magic_cmd
  29774. +# How to find potential files when deplibs_check_method = "file_magic".
  29775. +file_magic_glob=$lt_file_magic_glob
  29776. +
  29777. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  29778. +want_nocaseglob=$lt_want_nocaseglob
  29779. +
  29780. +# DLL creation program.
  29781. +DLLTOOL=$lt_DLLTOOL
  29782. +
  29783. +# Command to associate shared and link libraries.
  29784. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  29785. +
  29786. # The archiver.
  29787. AR=$lt_AR
  29788. +
  29789. +# Flags to create an archive.
  29790. AR_FLAGS=$lt_AR_FLAGS
  29791. +# How to feed a file listing to the archiver.
  29792. +archiver_list_spec=$lt_archiver_list_spec
  29793. +
  29794. # A symbol stripping program.
  29795. STRIP=$lt_STRIP
  29796. @@ -13281,6 +13957,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  29797. # Transform the output of nm in a C name address pair when lib prefix is needed.
  29798. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  29799. +# Specify filename containing input files for \$NM.
  29800. +nm_file_list_spec=$lt_nm_file_list_spec
  29801. +
  29802. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  29803. +lt_sysroot=$lt_sysroot
  29804. +
  29805. # The name of the directory that contains temporary libtool files.
  29806. objdir=$objdir
  29807. @@ -13290,6 +13972,9 @@ MAGIC_CMD=$MAGIC_CMD
  29808. # Must we lock files when doing compilation?
  29809. need_locks=$lt_need_locks
  29810. +# Manifest tool.
  29811. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  29812. +
  29813. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  29814. DSYMUTIL=$lt_DSYMUTIL
  29815. @@ -13404,12 +14089,12 @@ with_gcc=$GCC
  29816. # Compiler flag to turn off builtin functions.
  29817. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  29818. -# How to pass a linker flag through the compiler.
  29819. -wl=$lt_lt_prog_compiler_wl
  29820. -
  29821. # Additional compiler flags for building library objects.
  29822. pic_flag=$lt_lt_prog_compiler_pic
  29823. +# How to pass a linker flag through the compiler.
  29824. +wl=$lt_lt_prog_compiler_wl
  29825. +
  29826. # Compiler flag to prevent dynamic linking.
  29827. link_static_flag=$lt_lt_prog_compiler_static
  29828. @@ -13496,9 +14181,6 @@ inherit_rpath=$inherit_rpath
  29829. # Whether libtool must link a program against all its dependency libraries.
  29830. link_all_deplibs=$link_all_deplibs
  29831. -# Fix the shell variable \$srcfile for the compiler.
  29832. -fix_srcfile_path=$lt_fix_srcfile_path
  29833. -
  29834. # Set to "yes" if exported symbols are required.
  29835. always_export_symbols=$always_export_symbols
  29836. @@ -13514,6 +14196,9 @@ include_expsyms=$lt_include_expsyms
  29837. # Commands necessary for linking programs (against libraries) with templates.
  29838. prelink_cmds=$lt_prelink_cmds
  29839. +# Commands necessary for finishing linking programs.
  29840. +postlink_cmds=$lt_postlink_cmds
  29841. +
  29842. # Specify filename containing input files.
  29843. file_list_spec=$lt_file_list_spec
  29844. @@ -13546,210 +14231,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  29845. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  29846. # text mode, it properly converts lines to CR/LF. This bash problem
  29847. # is reportedly fixed, but why not run on old versions too?
  29848. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  29849. - || (rm -f "$cfgfile"; exit 1)
  29850. -
  29851. - case $xsi_shell in
  29852. - yes)
  29853. - cat << \_LT_EOF >> "$cfgfile"
  29854. -
  29855. -# func_dirname file append nondir_replacement
  29856. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  29857. -# otherwise set result to NONDIR_REPLACEMENT.
  29858. -func_dirname ()
  29859. -{
  29860. - case ${1} in
  29861. - */*) func_dirname_result="${1%/*}${2}" ;;
  29862. - * ) func_dirname_result="${3}" ;;
  29863. - esac
  29864. -}
  29865. -
  29866. -# func_basename file
  29867. -func_basename ()
  29868. -{
  29869. - func_basename_result="${1##*/}"
  29870. -}
  29871. -
  29872. -# func_dirname_and_basename file append nondir_replacement
  29873. -# perform func_basename and func_dirname in a single function
  29874. -# call:
  29875. -# dirname: Compute the dirname of FILE. If nonempty,
  29876. -# add APPEND to the result, otherwise set result
  29877. -# to NONDIR_REPLACEMENT.
  29878. -# value returned in "$func_dirname_result"
  29879. -# basename: Compute filename of FILE.
  29880. -# value retuned in "$func_basename_result"
  29881. -# Implementation must be kept synchronized with func_dirname
  29882. -# and func_basename. For efficiency, we do not delegate to
  29883. -# those functions but instead duplicate the functionality here.
  29884. -func_dirname_and_basename ()
  29885. -{
  29886. - case ${1} in
  29887. - */*) func_dirname_result="${1%/*}${2}" ;;
  29888. - * ) func_dirname_result="${3}" ;;
  29889. - esac
  29890. - func_basename_result="${1##*/}"
  29891. -}
  29892. -
  29893. -# func_stripname prefix suffix name
  29894. -# strip PREFIX and SUFFIX off of NAME.
  29895. -# PREFIX and SUFFIX must not contain globbing or regex special
  29896. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  29897. -# dot (in which case that matches only a dot).
  29898. -func_stripname ()
  29899. -{
  29900. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  29901. - # positional parameters, so assign one to ordinary parameter first.
  29902. - func_stripname_result=${3}
  29903. - func_stripname_result=${func_stripname_result#"${1}"}
  29904. - func_stripname_result=${func_stripname_result%"${2}"}
  29905. -}
  29906. -
  29907. -# func_opt_split
  29908. -func_opt_split ()
  29909. -{
  29910. - func_opt_split_opt=${1%%=*}
  29911. - func_opt_split_arg=${1#*=}
  29912. -}
  29913. -
  29914. -# func_lo2o object
  29915. -func_lo2o ()
  29916. -{
  29917. - case ${1} in
  29918. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  29919. - *) func_lo2o_result=${1} ;;
  29920. - esac
  29921. -}
  29922. -
  29923. -# func_xform libobj-or-source
  29924. -func_xform ()
  29925. -{
  29926. - func_xform_result=${1%.*}.lo
  29927. -}
  29928. -
  29929. -# func_arith arithmetic-term...
  29930. -func_arith ()
  29931. -{
  29932. - func_arith_result=$(( $* ))
  29933. -}
  29934. -
  29935. -# func_len string
  29936. -# STRING may not start with a hyphen.
  29937. -func_len ()
  29938. -{
  29939. - func_len_result=${#1}
  29940. -}
  29941. -
  29942. -_LT_EOF
  29943. - ;;
  29944. - *) # Bourne compatible functions.
  29945. - cat << \_LT_EOF >> "$cfgfile"
  29946. -
  29947. -# func_dirname file append nondir_replacement
  29948. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  29949. -# otherwise set result to NONDIR_REPLACEMENT.
  29950. -func_dirname ()
  29951. -{
  29952. - # Extract subdirectory from the argument.
  29953. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  29954. - if test "X$func_dirname_result" = "X${1}"; then
  29955. - func_dirname_result="${3}"
  29956. - else
  29957. - func_dirname_result="$func_dirname_result${2}"
  29958. - fi
  29959. -}
  29960. -
  29961. -# func_basename file
  29962. -func_basename ()
  29963. -{
  29964. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  29965. -}
  29966. -
  29967. -
  29968. -# func_stripname prefix suffix name
  29969. -# strip PREFIX and SUFFIX off of NAME.
  29970. -# PREFIX and SUFFIX must not contain globbing or regex special
  29971. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  29972. -# dot (in which case that matches only a dot).
  29973. -# func_strip_suffix prefix name
  29974. -func_stripname ()
  29975. -{
  29976. - case ${2} in
  29977. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  29978. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  29979. - esac
  29980. -}
  29981. -
  29982. -# sed scripts:
  29983. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  29984. -my_sed_long_arg='1s/^-[^=]*=//'
  29985. -
  29986. -# func_opt_split
  29987. -func_opt_split ()
  29988. -{
  29989. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  29990. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  29991. -}
  29992. -
  29993. -# func_lo2o object
  29994. -func_lo2o ()
  29995. -{
  29996. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  29997. -}
  29998. -
  29999. -# func_xform libobj-or-source
  30000. -func_xform ()
  30001. -{
  30002. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  30003. -}
  30004. -
  30005. -# func_arith arithmetic-term...
  30006. -func_arith ()
  30007. -{
  30008. - func_arith_result=`expr "$@"`
  30009. -}
  30010. -
  30011. -# func_len string
  30012. -# STRING may not start with a hyphen.
  30013. -func_len ()
  30014. -{
  30015. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  30016. -}
  30017. -
  30018. -_LT_EOF
  30019. -esac
  30020. -
  30021. -case $lt_shell_append in
  30022. - yes)
  30023. - cat << \_LT_EOF >> "$cfgfile"
  30024. -
  30025. -# func_append var value
  30026. -# Append VALUE to the end of shell variable VAR.
  30027. -func_append ()
  30028. -{
  30029. - eval "$1+=\$2"
  30030. -}
  30031. -_LT_EOF
  30032. - ;;
  30033. - *)
  30034. - cat << \_LT_EOF >> "$cfgfile"
  30035. -
  30036. -# func_append var value
  30037. -# Append VALUE to the end of shell variable VAR.
  30038. -func_append ()
  30039. -{
  30040. - eval "$1=\$$1\$2"
  30041. -}
  30042. -
  30043. -_LT_EOF
  30044. - ;;
  30045. - esac
  30046. -
  30047. -
  30048. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  30049. - || (rm -f "$cfgfile"; exit 1)
  30050. -
  30051. - mv -f "$cfgfile" "$ofile" ||
  30052. + sed '$q' "$ltmain" >> "$cfgfile" \
  30053. + || (rm -f "$cfgfile"; exit 1)
  30054. +
  30055. + if test x"$xsi_shell" = xyes; then
  30056. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  30057. +func_dirname ()\
  30058. +{\
  30059. +\ case ${1} in\
  30060. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  30061. +\ * ) func_dirname_result="${3}" ;;\
  30062. +\ esac\
  30063. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  30064. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30065. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30066. +test 0 -eq $? || _lt_function_replace_fail=:
  30067. +
  30068. +
  30069. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  30070. +func_basename ()\
  30071. +{\
  30072. +\ func_basename_result="${1##*/}"\
  30073. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  30074. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30075. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30076. +test 0 -eq $? || _lt_function_replace_fail=:
  30077. +
  30078. +
  30079. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  30080. +func_dirname_and_basename ()\
  30081. +{\
  30082. +\ case ${1} in\
  30083. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  30084. +\ * ) func_dirname_result="${3}" ;;\
  30085. +\ esac\
  30086. +\ func_basename_result="${1##*/}"\
  30087. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  30088. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30089. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30090. +test 0 -eq $? || _lt_function_replace_fail=:
  30091. +
  30092. +
  30093. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  30094. +func_stripname ()\
  30095. +{\
  30096. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  30097. +\ # positional parameters, so assign one to ordinary parameter first.\
  30098. +\ func_stripname_result=${3}\
  30099. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  30100. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  30101. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  30102. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30103. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30104. +test 0 -eq $? || _lt_function_replace_fail=:
  30105. +
  30106. +
  30107. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  30108. +func_split_long_opt ()\
  30109. +{\
  30110. +\ func_split_long_opt_name=${1%%=*}\
  30111. +\ func_split_long_opt_arg=${1#*=}\
  30112. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  30113. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30114. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30115. +test 0 -eq $? || _lt_function_replace_fail=:
  30116. +
  30117. +
  30118. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  30119. +func_split_short_opt ()\
  30120. +{\
  30121. +\ func_split_short_opt_arg=${1#??}\
  30122. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  30123. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  30124. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30125. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30126. +test 0 -eq $? || _lt_function_replace_fail=:
  30127. +
  30128. +
  30129. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  30130. +func_lo2o ()\
  30131. +{\
  30132. +\ case ${1} in\
  30133. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  30134. +\ *) func_lo2o_result=${1} ;;\
  30135. +\ esac\
  30136. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  30137. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30138. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30139. +test 0 -eq $? || _lt_function_replace_fail=:
  30140. +
  30141. +
  30142. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  30143. +func_xform ()\
  30144. +{\
  30145. + func_xform_result=${1%.*}.lo\
  30146. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  30147. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30148. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30149. +test 0 -eq $? || _lt_function_replace_fail=:
  30150. +
  30151. +
  30152. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  30153. +func_arith ()\
  30154. +{\
  30155. + func_arith_result=$(( $* ))\
  30156. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  30157. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30158. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30159. +test 0 -eq $? || _lt_function_replace_fail=:
  30160. +
  30161. +
  30162. + sed -e '/^func_len ()$/,/^} # func_len /c\
  30163. +func_len ()\
  30164. +{\
  30165. + func_len_result=${#1}\
  30166. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  30167. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30168. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30169. +test 0 -eq $? || _lt_function_replace_fail=:
  30170. +
  30171. +fi
  30172. +
  30173. +if test x"$lt_shell_append" = xyes; then
  30174. + sed -e '/^func_append ()$/,/^} # func_append /c\
  30175. +func_append ()\
  30176. +{\
  30177. + eval "${1}+=\\${2}"\
  30178. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  30179. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30180. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30181. +test 0 -eq $? || _lt_function_replace_fail=:
  30182. +
  30183. +
  30184. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  30185. +func_append_quoted ()\
  30186. +{\
  30187. +\ func_quote_for_eval "${2}"\
  30188. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  30189. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  30190. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30191. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30192. +test 0 -eq $? || _lt_function_replace_fail=:
  30193. +
  30194. +
  30195. + # Save a `func_append' function call where possible by direct use of '+='
  30196. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  30197. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30198. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30199. + test 0 -eq $? || _lt_function_replace_fail=:
  30200. +else
  30201. + # Save a `func_append' function call even when '+=' is not available
  30202. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  30203. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  30204. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  30205. + test 0 -eq $? || _lt_function_replace_fail=:
  30206. +fi
  30207. +
  30208. +if test x"$_lt_function_replace_fail" = x":"; then
  30209. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  30210. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  30211. +fi
  30212. +
  30213. +
  30214. + mv -f "$cfgfile" "$ofile" ||
  30215. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  30216. chmod +x "$ofile"