0013-Use-libtool-2.4.patch 827 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584358535863587358835893590359135923593359435953596359735983599360036013602360336043605360636073608360936103611361236133614361536163617361836193620362136223623362436253626362736283629363036313632363336343635363636373638363936403641364236433644364536463647364836493650365136523653365436553656365736583659366036613662366336643665366636673668366936703671367236733674367536763677367836793680368136823683368436853686368736883689369036913692369336943695369636973698369937003701370237033704370537063707370837093710371137123713371437153716371737183719372037213722372337243725372637273728372937303731373237333734373537363737373837393740374137423743374437453746374737483749375037513752375337543755375637573758375937603761376237633764376537663767376837693770377137723773377437753776377737783779378037813782378337843785378637873788378937903791379237933794379537963797379837993800380138023803380438053806380738083809381038113812381338143815381638173818381938203821382238233824382538263827382838293830383138323833383438353836383738383839384038413842384338443845384638473848384938503851385238533854385538563857385838593860386138623863386438653866386738683869387038713872387338743875387638773878387938803881388238833884388538863887388838893890389138923893389438953896389738983899390039013902390339043905390639073908390939103911391239133914391539163917391839193920392139223923392439253926392739283929393039313932393339343935393639373938393939403941394239433944394539463947394839493950395139523953395439553956395739583959396039613962396339643965396639673968396939703971397239733974397539763977397839793980398139823983398439853986398739883989399039913992399339943995399639973998399940004001400240034004400540064007400840094010401140124013401440154016401740184019402040214022402340244025402640274028402940304031403240334034403540364037403840394040404140424043404440454046404740484049405040514052405340544055405640574058405940604061406240634064406540664067406840694070407140724073407440754076407740784079408040814082408340844085408640874088408940904091409240934094409540964097409840994100410141024103410441054106410741084109411041114112411341144115411641174118411941204121412241234124412541264127412841294130413141324133413441354136413741384139414041414142414341444145414641474148414941504151415241534154415541564157415841594160416141624163416441654166416741684169417041714172417341744175417641774178417941804181418241834184418541864187418841894190419141924193419441954196419741984199420042014202420342044205420642074208420942104211421242134214421542164217421842194220422142224223422442254226422742284229423042314232423342344235423642374238423942404241424242434244424542464247424842494250425142524253425442554256425742584259426042614262426342644265426642674268426942704271427242734274427542764277427842794280428142824283428442854286428742884289429042914292429342944295429642974298429943004301430243034304430543064307430843094310431143124313431443154316431743184319432043214322432343244325432643274328432943304331433243334334433543364337433843394340434143424343434443454346434743484349435043514352435343544355435643574358435943604361436243634364436543664367436843694370437143724373437443754376437743784379438043814382438343844385438643874388438943904391439243934394439543964397439843994400440144024403440444054406440744084409441044114412441344144415441644174418441944204421442244234424442544264427442844294430443144324433443444354436443744384439444044414442444344444445444644474448444944504451445244534454445544564457445844594460446144624463446444654466446744684469447044714472447344744475447644774478447944804481448244834484448544864487448844894490449144924493449444954496449744984499450045014502450345044505450645074508450945104511451245134514451545164517451845194520452145224523452445254526452745284529453045314532453345344535453645374538453945404541454245434544454545464547454845494550455145524553455445554556455745584559456045614562456345644565456645674568456945704571457245734574457545764577457845794580458145824583458445854586458745884589459045914592459345944595459645974598459946004601460246034604460546064607460846094610461146124613461446154616461746184619462046214622462346244625462646274628462946304631463246334634463546364637463846394640464146424643464446454646464746484649465046514652465346544655465646574658465946604661466246634664466546664667466846694670467146724673467446754676467746784679468046814682468346844685468646874688468946904691469246934694469546964697469846994700470147024703470447054706470747084709471047114712471347144715471647174718471947204721472247234724472547264727472847294730473147324733473447354736473747384739474047414742474347444745474647474748474947504751475247534754475547564757475847594760476147624763476447654766476747684769477047714772477347744775477647774778477947804781478247834784478547864787478847894790479147924793479447954796479747984799480048014802480348044805480648074808480948104811481248134814481548164817481848194820482148224823482448254826482748284829483048314832483348344835483648374838483948404841484248434844484548464847484848494850485148524853485448554856485748584859486048614862486348644865486648674868486948704871487248734874487548764877487848794880488148824883488448854886488748884889489048914892489348944895489648974898489949004901490249034904490549064907490849094910491149124913491449154916491749184919492049214922492349244925492649274928492949304931493249334934493549364937493849394940494149424943494449454946494749484949495049514952495349544955495649574958495949604961496249634964496549664967496849694970497149724973497449754976497749784979498049814982498349844985498649874988498949904991499249934994499549964997499849995000500150025003500450055006500750085009501050115012501350145015501650175018501950205021502250235024502550265027502850295030503150325033503450355036503750385039504050415042504350445045504650475048504950505051505250535054505550565057505850595060506150625063506450655066506750685069507050715072507350745075507650775078507950805081508250835084508550865087508850895090509150925093509450955096509750985099510051015102510351045105510651075108510951105111511251135114511551165117511851195120512151225123512451255126512751285129513051315132513351345135513651375138513951405141514251435144514551465147514851495150515151525153515451555156515751585159516051615162516351645165516651675168516951705171517251735174517551765177517851795180518151825183518451855186518751885189519051915192519351945195519651975198519952005201520252035204520552065207520852095210521152125213521452155216521752185219522052215222522352245225522652275228522952305231523252335234523552365237523852395240524152425243524452455246524752485249525052515252525352545255525652575258525952605261526252635264526552665267526852695270527152725273527452755276527752785279528052815282528352845285528652875288528952905291529252935294529552965297529852995300530153025303530453055306530753085309531053115312531353145315531653175318531953205321532253235324532553265327532853295330533153325333533453355336533753385339534053415342534353445345534653475348534953505351535253535354535553565357535853595360536153625363536453655366536753685369537053715372537353745375537653775378537953805381538253835384538553865387538853895390539153925393539453955396539753985399540054015402540354045405540654075408540954105411541254135414541554165417541854195420542154225423542454255426542754285429543054315432543354345435543654375438543954405441544254435444544554465447544854495450545154525453545454555456545754585459546054615462546354645465546654675468546954705471547254735474547554765477547854795480548154825483548454855486548754885489549054915492549354945495549654975498549955005501550255035504550555065507550855095510551155125513551455155516551755185519552055215522552355245525552655275528552955305531553255335534553555365537553855395540554155425543554455455546554755485549555055515552555355545555555655575558555955605561556255635564556555665567556855695570557155725573557455755576557755785579558055815582558355845585558655875588558955905591559255935594559555965597559855995600560156025603560456055606560756085609561056115612561356145615561656175618561956205621562256235624562556265627562856295630563156325633563456355636563756385639564056415642564356445645564656475648564956505651565256535654565556565657565856595660566156625663566456655666566756685669567056715672567356745675567656775678567956805681568256835684568556865687568856895690569156925693569456955696569756985699570057015702570357045705570657075708570957105711571257135714571557165717571857195720572157225723572457255726572757285729573057315732573357345735573657375738573957405741574257435744574557465747574857495750575157525753575457555756575757585759576057615762576357645765576657675768576957705771577257735774577557765777577857795780578157825783578457855786578757885789579057915792579357945795579657975798579958005801580258035804580558065807580858095810581158125813581458155816581758185819582058215822582358245825582658275828582958305831583258335834583558365837583858395840584158425843584458455846584758485849585058515852585358545855585658575858585958605861586258635864586558665867586858695870587158725873587458755876587758785879588058815882588358845885588658875888588958905891589258935894589558965897589858995900590159025903590459055906590759085909591059115912591359145915591659175918591959205921592259235924592559265927592859295930593159325933593459355936593759385939594059415942594359445945594659475948594959505951595259535954595559565957595859595960596159625963596459655966596759685969597059715972597359745975597659775978597959805981598259835984598559865987598859895990599159925993599459955996599759985999600060016002600360046005600660076008600960106011601260136014601560166017601860196020602160226023602460256026602760286029603060316032603360346035603660376038603960406041604260436044604560466047604860496050605160526053605460556056605760586059606060616062606360646065606660676068606960706071607260736074607560766077607860796080608160826083608460856086608760886089609060916092609360946095609660976098609961006101610261036104610561066107610861096110611161126113611461156116611761186119612061216122612361246125612661276128612961306131613261336134613561366137613861396140614161426143614461456146614761486149615061516152615361546155615661576158615961606161616261636164616561666167616861696170617161726173617461756176617761786179618061816182618361846185618661876188618961906191619261936194619561966197619861996200620162026203620462056206620762086209621062116212621362146215621662176218621962206221622262236224622562266227622862296230623162326233623462356236623762386239624062416242624362446245624662476248624962506251625262536254625562566257625862596260626162626263626462656266626762686269627062716272627362746275627662776278627962806281628262836284628562866287628862896290629162926293629462956296629762986299630063016302630363046305630663076308630963106311631263136314631563166317631863196320632163226323632463256326632763286329633063316332633363346335633663376338633963406341634263436344634563466347634863496350635163526353635463556356635763586359636063616362636363646365636663676368636963706371637263736374637563766377637863796380638163826383638463856386638763886389639063916392639363946395639663976398639964006401640264036404640564066407640864096410641164126413641464156416641764186419642064216422642364246425642664276428642964306431643264336434643564366437643864396440644164426443644464456446644764486449645064516452645364546455645664576458645964606461646264636464646564666467646864696470647164726473647464756476647764786479648064816482648364846485648664876488648964906491649264936494649564966497649864996500650165026503650465056506650765086509651065116512651365146515651665176518651965206521652265236524652565266527652865296530653165326533653465356536653765386539654065416542654365446545654665476548654965506551655265536554655565566557655865596560656165626563656465656566656765686569657065716572657365746575657665776578657965806581658265836584658565866587658865896590659165926593659465956596659765986599660066016602660366046605660666076608660966106611661266136614661566166617661866196620662166226623662466256626662766286629663066316632663366346635663666376638663966406641664266436644664566466647664866496650665166526653665466556656665766586659666066616662666366646665666666676668666966706671667266736674667566766677667866796680668166826683668466856686668766886689669066916692669366946695669666976698669967006701670267036704670567066707670867096710671167126713671467156716671767186719672067216722672367246725672667276728672967306731673267336734673567366737673867396740674167426743674467456746674767486749675067516752675367546755675667576758675967606761676267636764676567666767676867696770677167726773677467756776677767786779678067816782678367846785678667876788678967906791679267936794679567966797679867996800680168026803680468056806680768086809681068116812681368146815681668176818681968206821682268236824682568266827682868296830683168326833683468356836683768386839684068416842684368446845684668476848684968506851685268536854685568566857685868596860686168626863686468656866686768686869687068716872687368746875687668776878687968806881688268836884688568866887688868896890689168926893689468956896689768986899690069016902690369046905690669076908690969106911691269136914691569166917691869196920692169226923692469256926692769286929693069316932693369346935693669376938693969406941694269436944694569466947694869496950695169526953695469556956695769586959696069616962696369646965696669676968696969706971697269736974697569766977697869796980698169826983698469856986698769886989699069916992699369946995699669976998699970007001700270037004700570067007700870097010701170127013701470157016701770187019702070217022702370247025702670277028702970307031703270337034703570367037703870397040704170427043704470457046704770487049705070517052705370547055705670577058705970607061706270637064706570667067706870697070707170727073707470757076707770787079708070817082708370847085708670877088708970907091709270937094709570967097709870997100710171027103710471057106710771087109711071117112711371147115711671177118711971207121712271237124712571267127712871297130713171327133713471357136713771387139714071417142714371447145714671477148714971507151715271537154715571567157715871597160716171627163716471657166716771687169717071717172717371747175717671777178717971807181718271837184718571867187718871897190719171927193719471957196719771987199720072017202720372047205720672077208720972107211721272137214721572167217721872197220722172227223722472257226722772287229723072317232723372347235723672377238723972407241724272437244724572467247724872497250725172527253725472557256725772587259726072617262726372647265726672677268726972707271727272737274727572767277727872797280728172827283728472857286728772887289729072917292729372947295729672977298729973007301730273037304730573067307730873097310731173127313731473157316731773187319732073217322732373247325732673277328732973307331733273337334733573367337733873397340734173427343734473457346734773487349735073517352735373547355735673577358735973607361736273637364736573667367736873697370737173727373737473757376737773787379738073817382738373847385738673877388738973907391739273937394739573967397739873997400740174027403740474057406740774087409741074117412741374147415741674177418741974207421742274237424742574267427742874297430743174327433743474357436743774387439744074417442744374447445744674477448744974507451745274537454745574567457745874597460746174627463746474657466746774687469747074717472747374747475747674777478747974807481748274837484748574867487748874897490749174927493749474957496749774987499750075017502750375047505750675077508750975107511751275137514751575167517751875197520752175227523752475257526752775287529753075317532753375347535753675377538753975407541754275437544754575467547754875497550755175527553755475557556755775587559756075617562756375647565756675677568756975707571757275737574757575767577757875797580758175827583758475857586758775887589759075917592759375947595759675977598759976007601760276037604760576067607760876097610761176127613761476157616761776187619762076217622762376247625762676277628762976307631763276337634763576367637763876397640764176427643764476457646764776487649765076517652765376547655765676577658765976607661766276637664766576667667766876697670767176727673767476757676767776787679768076817682768376847685768676877688768976907691769276937694769576967697769876997700770177027703770477057706770777087709771077117712771377147715771677177718771977207721772277237724772577267727772877297730773177327733773477357736773777387739774077417742774377447745774677477748774977507751775277537754775577567757775877597760776177627763776477657766776777687769777077717772777377747775777677777778777977807781778277837784778577867787778877897790779177927793779477957796779777987799780078017802780378047805780678077808780978107811781278137814781578167817781878197820782178227823782478257826782778287829783078317832783378347835783678377838783978407841784278437844784578467847784878497850785178527853785478557856785778587859786078617862786378647865786678677868786978707871787278737874787578767877787878797880788178827883788478857886788778887889789078917892789378947895789678977898789979007901790279037904790579067907790879097910791179127913791479157916791779187919792079217922792379247925792679277928792979307931793279337934793579367937793879397940794179427943794479457946794779487949795079517952795379547955795679577958795979607961796279637964796579667967796879697970797179727973797479757976797779787979798079817982798379847985798679877988798979907991799279937994799579967997799879998000800180028003800480058006800780088009801080118012801380148015801680178018801980208021802280238024802580268027802880298030803180328033803480358036803780388039804080418042804380448045804680478048804980508051805280538054805580568057805880598060806180628063806480658066806780688069807080718072807380748075807680778078807980808081808280838084808580868087808880898090809180928093809480958096809780988099810081018102810381048105810681078108810981108111811281138114811581168117811881198120812181228123812481258126812781288129813081318132813381348135813681378138813981408141814281438144814581468147814881498150815181528153815481558156815781588159816081618162816381648165816681678168816981708171817281738174817581768177817881798180818181828183818481858186818781888189819081918192819381948195819681978198819982008201820282038204820582068207820882098210821182128213821482158216821782188219822082218222822382248225822682278228822982308231823282338234823582368237823882398240824182428243824482458246824782488249825082518252825382548255825682578258825982608261826282638264826582668267826882698270827182728273827482758276827782788279828082818282828382848285828682878288828982908291829282938294829582968297829882998300830183028303830483058306830783088309831083118312831383148315831683178318831983208321832283238324832583268327832883298330833183328333833483358336833783388339834083418342834383448345834683478348834983508351835283538354835583568357835883598360836183628363836483658366836783688369837083718372837383748375837683778378837983808381838283838384838583868387838883898390839183928393839483958396839783988399840084018402840384048405840684078408840984108411841284138414841584168417841884198420842184228423842484258426842784288429843084318432843384348435843684378438843984408441844284438444844584468447844884498450845184528453845484558456845784588459846084618462846384648465846684678468846984708471847284738474847584768477847884798480848184828483848484858486848784888489849084918492849384948495849684978498849985008501850285038504850585068507850885098510851185128513851485158516851785188519852085218522852385248525852685278528852985308531853285338534853585368537853885398540854185428543854485458546854785488549855085518552855385548555855685578558855985608561856285638564856585668567856885698570857185728573857485758576857785788579858085818582858385848585858685878588858985908591859285938594859585968597859885998600860186028603860486058606860786088609861086118612861386148615861686178618861986208621862286238624862586268627862886298630863186328633863486358636863786388639864086418642864386448645864686478648864986508651865286538654865586568657865886598660866186628663866486658666866786688669867086718672867386748675867686778678867986808681868286838684868586868687868886898690869186928693869486958696869786988699870087018702870387048705870687078708870987108711871287138714871587168717871887198720872187228723872487258726872787288729873087318732873387348735873687378738873987408741874287438744874587468747874887498750875187528753875487558756875787588759876087618762876387648765876687678768876987708771877287738774877587768777877887798780878187828783878487858786878787888789879087918792879387948795879687978798879988008801880288038804880588068807880888098810881188128813881488158816881788188819882088218822882388248825882688278828882988308831883288338834883588368837883888398840884188428843884488458846884788488849885088518852885388548855885688578858885988608861886288638864886588668867886888698870887188728873887488758876887788788879888088818882888388848885888688878888888988908891889288938894889588968897889888998900890189028903890489058906890789088909891089118912891389148915891689178918891989208921892289238924892589268927892889298930893189328933893489358936893789388939894089418942894389448945894689478948894989508951895289538954895589568957895889598960896189628963896489658966896789688969897089718972897389748975897689778978897989808981898289838984898589868987898889898990899189928993899489958996899789988999900090019002900390049005900690079008900990109011901290139014901590169017901890199020902190229023902490259026902790289029903090319032903390349035903690379038903990409041904290439044904590469047904890499050905190529053905490559056905790589059906090619062906390649065906690679068906990709071907290739074907590769077907890799080908190829083908490859086908790889089909090919092909390949095909690979098909991009101910291039104910591069107910891099110911191129113911491159116911791189119912091219122912391249125912691279128912991309131913291339134913591369137913891399140914191429143914491459146914791489149915091519152915391549155915691579158915991609161916291639164916591669167916891699170917191729173917491759176917791789179918091819182918391849185918691879188918991909191919291939194919591969197919891999200920192029203920492059206920792089209921092119212921392149215921692179218921992209221922292239224922592269227922892299230923192329233923492359236923792389239924092419242924392449245924692479248924992509251925292539254925592569257925892599260926192629263926492659266926792689269927092719272927392749275927692779278927992809281928292839284928592869287928892899290929192929293929492959296929792989299930093019302930393049305930693079308930993109311931293139314931593169317931893199320932193229323932493259326932793289329933093319332933393349335933693379338933993409341934293439344934593469347934893499350935193529353935493559356935793589359936093619362936393649365936693679368936993709371937293739374937593769377937893799380938193829383938493859386938793889389939093919392939393949395939693979398939994009401940294039404940594069407940894099410941194129413941494159416941794189419942094219422942394249425942694279428942994309431943294339434943594369437943894399440944194429443944494459446944794489449945094519452945394549455945694579458945994609461946294639464946594669467946894699470947194729473947494759476947794789479948094819482948394849485948694879488948994909491949294939494949594969497949894999500950195029503950495059506950795089509951095119512951395149515951695179518951995209521952295239524952595269527952895299530953195329533953495359536953795389539954095419542954395449545954695479548954995509551955295539554955595569557955895599560956195629563956495659566956795689569957095719572957395749575957695779578957995809581958295839584958595869587958895899590959195929593959495959596959795989599960096019602960396049605960696079608960996109611961296139614961596169617961896199620962196229623962496259626962796289629963096319632963396349635963696379638963996409641964296439644964596469647964896499650965196529653965496559656965796589659966096619662966396649665966696679668966996709671967296739674967596769677967896799680968196829683968496859686968796889689969096919692969396949695969696979698969997009701970297039704970597069707970897099710971197129713971497159716971797189719972097219722972397249725972697279728972997309731973297339734973597369737973897399740974197429743974497459746974797489749975097519752975397549755975697579758975997609761976297639764976597669767976897699770977197729773977497759776977797789779978097819782978397849785978697879788978997909791979297939794979597969797979897999800980198029803980498059806980798089809981098119812981398149815981698179818981998209821982298239824982598269827982898299830983198329833983498359836983798389839984098419842984398449845984698479848984998509851985298539854985598569857985898599860986198629863986498659866986798689869987098719872987398749875987698779878987998809881988298839884988598869887988898899890989198929893989498959896989798989899990099019902990399049905990699079908990999109911991299139914991599169917991899199920992199229923992499259926992799289929993099319932993399349935993699379938993999409941994299439944994599469947994899499950995199529953995499559956995799589959996099619962996399649965996699679968996999709971997299739974997599769977997899799980998199829983998499859986998799889989999099919992999399949995999699979998999910000100011000210003100041000510006100071000810009100101001110012100131001410015100161001710018100191002010021100221002310024100251002610027100281002910030100311003210033100341003510036100371003810039100401004110042100431004410045100461004710048100491005010051100521005310054100551005610057100581005910060100611006210063100641006510066100671006810069100701007110072100731007410075100761007710078100791008010081100821008310084100851008610087100881008910090100911009210093100941009510096100971009810099101001010110102101031010410105101061010710108101091011010111101121011310114101151011610117101181011910120101211012210123101241012510126101271012810129101301013110132101331013410135101361013710138101391014010141101421014310144101451014610147101481014910150101511015210153101541015510156101571015810159101601016110162101631016410165101661016710168101691017010171101721017310174101751017610177101781017910180101811018210183101841018510186101871018810189101901019110192101931019410195101961019710198101991020010201102021020310204102051020610207102081020910210102111021210213102141021510216102171021810219102201022110222102231022410225102261022710228102291023010231102321023310234102351023610237102381023910240102411024210243102441024510246102471024810249102501025110252102531025410255102561025710258102591026010261102621026310264102651026610267102681026910270102711027210273102741027510276102771027810279102801028110282102831028410285102861028710288102891029010291102921029310294102951029610297102981029910300103011030210303103041030510306103071030810309103101031110312103131031410315103161031710318103191032010321103221032310324103251032610327103281032910330103311033210333103341033510336103371033810339103401034110342103431034410345103461034710348103491035010351103521035310354103551035610357103581035910360103611036210363103641036510366103671036810369103701037110372103731037410375103761037710378103791038010381103821038310384103851038610387103881038910390103911039210393103941039510396103971039810399104001040110402104031040410405104061040710408104091041010411104121041310414104151041610417104181041910420104211042210423104241042510426104271042810429104301043110432104331043410435104361043710438104391044010441104421044310444104451044610447104481044910450104511045210453104541045510456104571045810459104601046110462104631046410465104661046710468104691047010471104721047310474104751047610477104781047910480104811048210483104841048510486104871048810489104901049110492104931049410495104961049710498104991050010501105021050310504105051050610507105081050910510105111051210513105141051510516105171051810519105201052110522105231052410525105261052710528105291053010531105321053310534105351053610537105381053910540105411054210543105441054510546105471054810549105501055110552105531055410555105561055710558105591056010561105621056310564105651056610567105681056910570105711057210573105741057510576105771057810579105801058110582105831058410585105861058710588105891059010591105921059310594105951059610597105981059910600106011060210603106041060510606106071060810609106101061110612106131061410615106161061710618106191062010621106221062310624106251062610627106281062910630106311063210633106341063510636106371063810639106401064110642106431064410645106461064710648106491065010651106521065310654106551065610657106581065910660106611066210663106641066510666106671066810669106701067110672106731067410675106761067710678106791068010681106821068310684106851068610687106881068910690106911069210693106941069510696106971069810699107001070110702107031070410705107061070710708107091071010711107121071310714107151071610717107181071910720107211072210723107241072510726107271072810729107301073110732107331073410735107361073710738107391074010741107421074310744107451074610747107481074910750107511075210753107541075510756107571075810759107601076110762107631076410765107661076710768107691077010771107721077310774107751077610777107781077910780107811078210783107841078510786107871078810789107901079110792107931079410795107961079710798107991080010801108021080310804108051080610807108081080910810108111081210813108141081510816108171081810819108201082110822108231082410825108261082710828108291083010831108321083310834108351083610837108381083910840108411084210843108441084510846108471084810849108501085110852108531085410855108561085710858108591086010861108621086310864108651086610867108681086910870108711087210873108741087510876108771087810879108801088110882108831088410885108861088710888108891089010891108921089310894108951089610897108981089910900109011090210903109041090510906109071090810909109101091110912109131091410915109161091710918109191092010921109221092310924109251092610927109281092910930109311093210933109341093510936109371093810939109401094110942109431094410945109461094710948109491095010951109521095310954109551095610957109581095910960109611096210963109641096510966109671096810969109701097110972109731097410975109761097710978109791098010981109821098310984109851098610987109881098910990109911099210993109941099510996109971099810999110001100111002110031100411005110061100711008110091101011011110121101311014110151101611017110181101911020110211102211023110241102511026110271102811029110301103111032110331103411035110361103711038110391104011041110421104311044110451104611047110481104911050110511105211053110541105511056110571105811059110601106111062110631106411065110661106711068110691107011071110721107311074110751107611077110781107911080110811108211083110841108511086110871108811089110901109111092110931109411095110961109711098110991110011101111021110311104111051110611107111081110911110111111111211113111141111511116111171111811119111201112111122111231112411125111261112711128111291113011131111321113311134111351113611137111381113911140111411114211143111441114511146111471114811149111501115111152111531115411155111561115711158111591116011161111621116311164111651116611167111681116911170111711117211173111741117511176111771117811179111801118111182111831118411185111861118711188111891119011191111921119311194111951119611197111981119911200112011120211203112041120511206112071120811209112101121111212112131121411215112161121711218112191122011221112221122311224112251122611227112281122911230112311123211233112341123511236112371123811239112401124111242112431124411245112461124711248112491125011251112521125311254112551125611257112581125911260112611126211263112641126511266112671126811269112701127111272112731127411275112761127711278112791128011281112821128311284112851128611287112881128911290112911129211293112941129511296112971129811299113001130111302113031130411305113061130711308113091131011311113121131311314113151131611317113181131911320113211132211323113241132511326113271132811329113301133111332113331133411335113361133711338113391134011341113421134311344113451134611347113481134911350113511135211353113541135511356113571135811359113601136111362113631136411365113661136711368113691137011371113721137311374113751137611377113781137911380113811138211383113841138511386113871138811389113901139111392113931139411395113961139711398113991140011401114021140311404114051140611407114081140911410114111141211413114141141511416114171141811419114201142111422114231142411425114261142711428114291143011431114321143311434114351143611437114381143911440114411144211443114441144511446114471144811449114501145111452114531145411455114561145711458114591146011461114621146311464114651146611467114681146911470114711147211473114741147511476114771147811479114801148111482114831148411485114861148711488114891149011491114921149311494114951149611497114981149911500115011150211503115041150511506115071150811509115101151111512115131151411515115161151711518115191152011521115221152311524115251152611527115281152911530115311153211533115341153511536115371153811539115401154111542115431154411545115461154711548115491155011551115521155311554115551155611557115581155911560115611156211563115641156511566115671156811569115701157111572115731157411575115761157711578115791158011581115821158311584115851158611587115881158911590115911159211593115941159511596115971159811599116001160111602116031160411605116061160711608116091161011611116121161311614116151161611617116181161911620116211162211623116241162511626116271162811629116301163111632116331163411635116361163711638116391164011641116421164311644116451164611647116481164911650116511165211653116541165511656116571165811659116601166111662116631166411665116661166711668116691167011671116721167311674116751167611677116781167911680116811168211683116841168511686116871168811689116901169111692116931169411695116961169711698116991170011701117021170311704117051170611707117081170911710117111171211713117141171511716117171171811719117201172111722117231172411725117261172711728117291173011731117321173311734117351173611737117381173911740117411174211743117441174511746117471174811749117501175111752117531175411755117561175711758117591176011761117621176311764117651176611767117681176911770117711177211773117741177511776117771177811779117801178111782117831178411785117861178711788117891179011791117921179311794117951179611797117981179911800118011180211803118041180511806118071180811809118101181111812118131181411815118161181711818118191182011821118221182311824118251182611827118281182911830118311183211833118341183511836118371183811839118401184111842118431184411845118461184711848118491185011851118521185311854118551185611857118581185911860118611186211863118641186511866118671186811869118701187111872118731187411875118761187711878118791188011881118821188311884118851188611887118881188911890118911189211893118941189511896118971189811899119001190111902119031190411905119061190711908119091191011911119121191311914119151191611917119181191911920119211192211923119241192511926119271192811929119301193111932119331193411935119361193711938119391194011941119421194311944119451194611947119481194911950119511195211953119541195511956119571195811959119601196111962119631196411965119661196711968119691197011971119721197311974119751197611977119781197911980119811198211983119841198511986119871198811989119901199111992119931199411995119961199711998119991200012001120021200312004120051200612007120081200912010120111201212013120141201512016120171201812019120201202112022120231202412025120261202712028120291203012031120321203312034120351203612037120381203912040120411204212043120441204512046120471204812049120501205112052120531205412055120561205712058120591206012061120621206312064120651206612067120681206912070120711207212073120741207512076120771207812079120801208112082120831208412085120861208712088120891209012091120921209312094120951209612097120981209912100121011210212103121041210512106121071210812109121101211112112121131211412115121161211712118121191212012121121221212312124121251212612127121281212912130121311213212133121341213512136121371213812139121401214112142121431214412145121461214712148121491215012151121521215312154121551215612157121581215912160121611216212163121641216512166121671216812169121701217112172121731217412175121761217712178121791218012181121821218312184121851218612187121881218912190121911219212193121941219512196121971219812199122001220112202122031220412205122061220712208122091221012211122121221312214122151221612217122181221912220122211222212223122241222512226122271222812229122301223112232122331223412235122361223712238122391224012241122421224312244122451224612247122481224912250122511225212253122541225512256122571225812259122601226112262122631226412265122661226712268122691227012271122721227312274122751227612277122781227912280122811228212283122841228512286122871228812289122901229112292122931229412295122961229712298122991230012301123021230312304123051230612307123081230912310123111231212313123141231512316123171231812319123201232112322123231232412325123261232712328123291233012331123321233312334123351233612337123381233912340123411234212343123441234512346123471234812349123501235112352123531235412355123561235712358123591236012361123621236312364123651236612367123681236912370123711237212373123741237512376123771237812379123801238112382123831238412385123861238712388123891239012391123921239312394123951239612397123981239912400124011240212403124041240512406124071240812409124101241112412124131241412415124161241712418124191242012421124221242312424124251242612427124281242912430124311243212433124341243512436124371243812439124401244112442124431244412445124461244712448124491245012451124521245312454124551245612457124581245912460124611246212463124641246512466124671246812469124701247112472124731247412475124761247712478124791248012481124821248312484124851248612487124881248912490124911249212493124941249512496124971249812499125001250112502125031250412505125061250712508125091251012511125121251312514125151251612517125181251912520125211252212523125241252512526125271252812529125301253112532125331253412535125361253712538125391254012541125421254312544125451254612547125481254912550125511255212553125541255512556125571255812559125601256112562125631256412565125661256712568125691257012571125721257312574125751257612577125781257912580125811258212583125841258512586125871258812589125901259112592125931259412595125961259712598125991260012601126021260312604126051260612607126081260912610126111261212613126141261512616126171261812619126201262112622126231262412625126261262712628126291263012631126321263312634126351263612637126381263912640126411264212643126441264512646126471264812649126501265112652126531265412655126561265712658126591266012661126621266312664126651266612667126681266912670126711267212673126741267512676126771267812679126801268112682126831268412685126861268712688126891269012691126921269312694126951269612697126981269912700127011270212703127041270512706127071270812709127101271112712127131271412715127161271712718127191272012721127221272312724127251272612727127281272912730127311273212733127341273512736127371273812739127401274112742127431274412745127461274712748127491275012751127521275312754127551275612757127581275912760127611276212763127641276512766127671276812769127701277112772127731277412775127761277712778127791278012781127821278312784127851278612787127881278912790127911279212793127941279512796127971279812799128001280112802128031280412805128061280712808128091281012811128121281312814128151281612817128181281912820128211282212823128241282512826128271282812829128301283112832128331283412835128361283712838128391284012841128421284312844128451284612847128481284912850128511285212853128541285512856128571285812859128601286112862128631286412865128661286712868128691287012871128721287312874128751287612877128781287912880128811288212883128841288512886128871288812889128901289112892128931289412895128961289712898128991290012901129021290312904129051290612907129081290912910129111291212913129141291512916129171291812919129201292112922129231292412925129261292712928129291293012931129321293312934129351293612937129381293912940129411294212943129441294512946129471294812949129501295112952129531295412955129561295712958129591296012961129621296312964129651296612967129681296912970129711297212973129741297512976129771297812979129801298112982129831298412985129861298712988129891299012991129921299312994129951299612997129981299913000130011300213003130041300513006130071300813009130101301113012130131301413015130161301713018130191302013021130221302313024130251302613027130281302913030130311303213033130341303513036130371303813039130401304113042130431304413045130461304713048130491305013051130521305313054130551305613057130581305913060130611306213063130641306513066130671306813069130701307113072130731307413075130761307713078130791308013081130821308313084130851308613087130881308913090130911309213093130941309513096130971309813099131001310113102131031310413105131061310713108131091311013111131121311313114131151311613117131181311913120131211312213123131241312513126131271312813129131301313113132131331313413135131361313713138131391314013141131421314313144131451314613147131481314913150131511315213153131541315513156131571315813159131601316113162131631316413165131661316713168131691317013171131721317313174131751317613177131781317913180131811318213183131841318513186131871318813189131901319113192131931319413195131961319713198131991320013201132021320313204132051320613207132081320913210132111321213213132141321513216132171321813219132201322113222132231322413225132261322713228132291323013231132321323313234132351323613237132381323913240132411324213243132441324513246132471324813249132501325113252132531325413255132561325713258132591326013261132621326313264132651326613267132681326913270132711327213273132741327513276132771327813279132801328113282132831328413285132861328713288132891329013291132921329313294132951329613297132981329913300133011330213303133041330513306133071330813309133101331113312133131331413315133161331713318133191332013321133221332313324133251332613327133281332913330133311333213333133341333513336133371333813339133401334113342133431334413345133461334713348133491335013351133521335313354133551335613357133581335913360133611336213363133641336513366133671336813369133701337113372133731337413375133761337713378133791338013381133821338313384133851338613387133881338913390133911339213393133941339513396133971339813399134001340113402134031340413405134061340713408134091341013411134121341313414134151341613417134181341913420134211342213423134241342513426134271342813429134301343113432134331343413435134361343713438134391344013441134421344313444134451344613447134481344913450134511345213453134541345513456134571345813459134601346113462134631346413465134661346713468134691347013471134721347313474134751347613477134781347913480134811348213483134841348513486134871348813489134901349113492134931349413495134961349713498134991350013501135021350313504135051350613507135081350913510135111351213513135141351513516135171351813519135201352113522135231352413525135261352713528135291353013531135321353313534135351353613537135381353913540135411354213543135441354513546135471354813549135501355113552135531355413555135561355713558135591356013561135621356313564135651356613567135681356913570135711357213573135741357513576135771357813579135801358113582135831358413585135861358713588135891359013591135921359313594135951359613597135981359913600136011360213603136041360513606136071360813609136101361113612136131361413615136161361713618136191362013621136221362313624136251362613627136281362913630136311363213633136341363513636136371363813639136401364113642136431364413645136461364713648136491365013651136521365313654136551365613657136581365913660136611366213663136641366513666136671366813669136701367113672136731367413675136761367713678136791368013681136821368313684136851368613687136881368913690136911369213693136941369513696136971369813699137001370113702137031370413705137061370713708137091371013711137121371313714137151371613717137181371913720137211372213723137241372513726137271372813729137301373113732137331373413735137361373713738137391374013741137421374313744137451374613747137481374913750137511375213753137541375513756137571375813759137601376113762137631376413765137661376713768137691377013771137721377313774137751377613777137781377913780137811378213783137841378513786137871378813789137901379113792137931379413795137961379713798137991380013801138021380313804138051380613807138081380913810138111381213813138141381513816138171381813819138201382113822138231382413825138261382713828138291383013831138321383313834138351383613837138381383913840138411384213843138441384513846138471384813849138501385113852138531385413855138561385713858138591386013861138621386313864138651386613867138681386913870138711387213873138741387513876138771387813879138801388113882138831388413885138861388713888138891389013891138921389313894138951389613897138981389913900139011390213903139041390513906139071390813909139101391113912139131391413915139161391713918139191392013921139221392313924139251392613927139281392913930139311393213933139341393513936139371393813939139401394113942139431394413945139461394713948139491395013951139521395313954139551395613957139581395913960139611396213963139641396513966139671396813969139701397113972139731397413975139761397713978139791398013981139821398313984139851398613987139881398913990139911399213993139941399513996139971399813999140001400114002140031400414005140061400714008140091401014011140121401314014140151401614017140181401914020140211402214023140241402514026140271402814029140301403114032140331403414035140361403714038140391404014041140421404314044140451404614047140481404914050140511405214053140541405514056140571405814059140601406114062140631406414065140661406714068140691407014071140721407314074140751407614077140781407914080140811408214083140841408514086140871408814089140901409114092140931409414095140961409714098140991410014101141021410314104141051410614107141081410914110141111411214113141141411514116141171411814119141201412114122141231412414125141261412714128141291413014131141321413314134141351413614137141381413914140141411414214143141441414514146141471414814149141501415114152141531415414155141561415714158141591416014161141621416314164141651416614167141681416914170141711417214173141741417514176141771417814179141801418114182141831418414185141861418714188141891419014191141921419314194141951419614197141981419914200142011420214203142041420514206142071420814209142101421114212142131421414215142161421714218142191422014221142221422314224142251422614227142281422914230142311423214233142341423514236142371423814239142401424114242142431424414245142461424714248142491425014251142521425314254142551425614257142581425914260142611426214263142641426514266142671426814269142701427114272142731427414275142761427714278142791428014281142821428314284142851428614287142881428914290142911429214293142941429514296142971429814299143001430114302143031430414305143061430714308143091431014311143121431314314143151431614317143181431914320143211432214323143241432514326143271432814329143301433114332143331433414335143361433714338143391434014341143421434314344143451434614347143481434914350143511435214353143541435514356143571435814359143601436114362143631436414365143661436714368143691437014371143721437314374143751437614377143781437914380143811438214383143841438514386143871438814389143901439114392143931439414395143961439714398143991440014401144021440314404144051440614407144081440914410144111441214413144141441514416144171441814419144201442114422144231442414425144261442714428144291443014431144321443314434144351443614437144381443914440144411444214443144441444514446144471444814449144501445114452144531445414455144561445714458144591446014461144621446314464144651446614467144681446914470144711447214473144741447514476144771447814479144801448114482144831448414485144861448714488144891449014491144921449314494144951449614497144981449914500145011450214503145041450514506145071450814509145101451114512145131451414515145161451714518145191452014521145221452314524145251452614527145281452914530145311453214533145341453514536145371453814539145401454114542145431454414545145461454714548145491455014551145521455314554145551455614557145581455914560145611456214563145641456514566145671456814569145701457114572145731457414575145761457714578145791458014581145821458314584145851458614587145881458914590145911459214593145941459514596145971459814599146001460114602146031460414605146061460714608146091461014611146121461314614146151461614617146181461914620146211462214623146241462514626146271462814629146301463114632146331463414635146361463714638146391464014641146421464314644146451464614647146481464914650146511465214653146541465514656146571465814659146601466114662146631466414665146661466714668146691467014671146721467314674146751467614677146781467914680146811468214683146841468514686146871468814689146901469114692146931469414695146961469714698146991470014701147021470314704147051470614707147081470914710147111471214713147141471514716147171471814719147201472114722147231472414725147261472714728147291473014731147321473314734147351473614737147381473914740147411474214743147441474514746147471474814749147501475114752147531475414755147561475714758147591476014761147621476314764147651476614767147681476914770147711477214773147741477514776147771477814779147801478114782147831478414785147861478714788147891479014791147921479314794147951479614797147981479914800148011480214803148041480514806148071480814809148101481114812148131481414815148161481714818148191482014821148221482314824148251482614827148281482914830148311483214833148341483514836148371483814839148401484114842148431484414845148461484714848148491485014851148521485314854148551485614857148581485914860148611486214863148641486514866148671486814869148701487114872148731487414875148761487714878148791488014881148821488314884148851488614887148881488914890148911489214893148941489514896148971489814899149001490114902149031490414905149061490714908149091491014911149121491314914149151491614917149181491914920149211492214923149241492514926149271492814929149301493114932149331493414935149361493714938149391494014941149421494314944149451494614947149481494914950149511495214953149541495514956149571495814959149601496114962149631496414965149661496714968149691497014971149721497314974149751497614977149781497914980149811498214983149841498514986149871498814989149901499114992149931499414995149961499714998149991500015001150021500315004150051500615007150081500915010150111501215013150141501515016150171501815019150201502115022150231502415025150261502715028150291503015031150321503315034150351503615037150381503915040150411504215043150441504515046150471504815049150501505115052150531505415055150561505715058150591506015061150621506315064150651506615067150681506915070150711507215073150741507515076150771507815079150801508115082150831508415085150861508715088150891509015091150921509315094150951509615097150981509915100151011510215103151041510515106151071510815109151101511115112151131511415115151161511715118151191512015121151221512315124151251512615127151281512915130151311513215133151341513515136151371513815139151401514115142151431514415145151461514715148151491515015151151521515315154151551515615157151581515915160151611516215163151641516515166151671516815169151701517115172151731517415175151761517715178151791518015181151821518315184151851518615187151881518915190151911519215193151941519515196151971519815199152001520115202152031520415205152061520715208152091521015211152121521315214152151521615217152181521915220152211522215223152241522515226152271522815229152301523115232152331523415235152361523715238152391524015241152421524315244152451524615247152481524915250152511525215253152541525515256152571525815259152601526115262152631526415265152661526715268152691527015271152721527315274152751527615277152781527915280152811528215283152841528515286152871528815289152901529115292152931529415295152961529715298152991530015301153021530315304153051530615307153081530915310153111531215313153141531515316153171531815319153201532115322153231532415325153261532715328153291533015331153321533315334153351533615337153381533915340153411534215343153441534515346153471534815349153501535115352153531535415355153561535715358153591536015361153621536315364153651536615367153681536915370153711537215373153741537515376153771537815379153801538115382153831538415385153861538715388153891539015391153921539315394153951539615397153981539915400154011540215403154041540515406154071540815409154101541115412154131541415415154161541715418154191542015421154221542315424154251542615427154281542915430154311543215433154341543515436154371543815439154401544115442154431544415445154461544715448154491545015451154521545315454154551545615457154581545915460154611546215463154641546515466154671546815469154701547115472154731547415475154761547715478154791548015481154821548315484154851548615487154881548915490154911549215493154941549515496154971549815499155001550115502155031550415505155061550715508155091551015511155121551315514155151551615517155181551915520155211552215523155241552515526155271552815529155301553115532155331553415535155361553715538155391554015541155421554315544155451554615547155481554915550155511555215553155541555515556155571555815559155601556115562155631556415565155661556715568155691557015571155721557315574155751557615577155781557915580155811558215583155841558515586155871558815589155901559115592155931559415595155961559715598155991560015601156021560315604156051560615607156081560915610156111561215613156141561515616156171561815619156201562115622156231562415625156261562715628156291563015631156321563315634156351563615637156381563915640156411564215643156441564515646156471564815649156501565115652156531565415655156561565715658156591566015661156621566315664156651566615667156681566915670156711567215673156741567515676156771567815679156801568115682156831568415685156861568715688156891569015691156921569315694156951569615697156981569915700157011570215703157041570515706157071570815709157101571115712157131571415715157161571715718157191572015721157221572315724157251572615727157281572915730157311573215733157341573515736157371573815739157401574115742157431574415745157461574715748157491575015751157521575315754157551575615757157581575915760157611576215763157641576515766157671576815769157701577115772157731577415775157761577715778157791578015781157821578315784157851578615787157881578915790157911579215793157941579515796157971579815799158001580115802158031580415805158061580715808158091581015811158121581315814158151581615817158181581915820158211582215823158241582515826158271582815829158301583115832158331583415835158361583715838158391584015841158421584315844158451584615847158481584915850158511585215853158541585515856158571585815859158601586115862158631586415865158661586715868158691587015871158721587315874158751587615877158781587915880158811588215883158841588515886158871588815889158901589115892158931589415895158961589715898158991590015901159021590315904159051590615907159081590915910159111591215913159141591515916159171591815919159201592115922159231592415925159261592715928159291593015931159321593315934159351593615937159381593915940159411594215943159441594515946159471594815949159501595115952159531595415955159561595715958159591596015961159621596315964159651596615967159681596915970159711597215973159741597515976159771597815979159801598115982159831598415985159861598715988159891599015991159921599315994159951599615997159981599916000160011600216003160041600516006160071600816009160101601116012160131601416015160161601716018160191602016021160221602316024160251602616027160281602916030160311603216033160341603516036160371603816039160401604116042160431604416045160461604716048160491605016051160521605316054160551605616057160581605916060160611606216063160641606516066160671606816069160701607116072160731607416075160761607716078160791608016081160821608316084160851608616087160881608916090160911609216093160941609516096160971609816099161001610116102161031610416105161061610716108161091611016111161121611316114161151611616117161181611916120161211612216123161241612516126161271612816129161301613116132161331613416135161361613716138161391614016141161421614316144161451614616147161481614916150161511615216153161541615516156161571615816159161601616116162161631616416165161661616716168161691617016171161721617316174161751617616177161781617916180161811618216183161841618516186161871618816189161901619116192161931619416195161961619716198161991620016201162021620316204162051620616207162081620916210162111621216213162141621516216162171621816219162201622116222162231622416225162261622716228162291623016231162321623316234162351623616237162381623916240162411624216243162441624516246162471624816249162501625116252162531625416255162561625716258162591626016261162621626316264162651626616267162681626916270162711627216273162741627516276162771627816279162801628116282162831628416285162861628716288162891629016291162921629316294162951629616297162981629916300163011630216303163041630516306163071630816309163101631116312163131631416315163161631716318163191632016321163221632316324163251632616327163281632916330163311633216333163341633516336163371633816339163401634116342163431634416345163461634716348163491635016351163521635316354163551635616357163581635916360163611636216363163641636516366163671636816369163701637116372163731637416375163761637716378163791638016381163821638316384163851638616387163881638916390163911639216393163941639516396163971639816399164001640116402164031640416405164061640716408164091641016411164121641316414164151641616417164181641916420164211642216423164241642516426164271642816429164301643116432164331643416435164361643716438164391644016441164421644316444164451644616447164481644916450164511645216453164541645516456164571645816459164601646116462164631646416465164661646716468164691647016471164721647316474164751647616477164781647916480164811648216483164841648516486164871648816489164901649116492164931649416495164961649716498164991650016501165021650316504165051650616507165081650916510165111651216513165141651516516165171651816519165201652116522165231652416525165261652716528165291653016531165321653316534165351653616537165381653916540165411654216543165441654516546165471654816549165501655116552165531655416555165561655716558165591656016561165621656316564165651656616567165681656916570165711657216573165741657516576165771657816579165801658116582165831658416585165861658716588165891659016591165921659316594165951659616597165981659916600166011660216603166041660516606166071660816609166101661116612166131661416615166161661716618166191662016621166221662316624166251662616627166281662916630166311663216633166341663516636166371663816639166401664116642166431664416645166461664716648166491665016651166521665316654166551665616657166581665916660166611666216663166641666516666166671666816669166701667116672166731667416675166761667716678166791668016681166821668316684166851668616687166881668916690166911669216693166941669516696166971669816699167001670116702167031670416705167061670716708167091671016711167121671316714167151671616717167181671916720167211672216723167241672516726167271672816729167301673116732167331673416735167361673716738167391674016741167421674316744167451674616747167481674916750167511675216753167541675516756167571675816759167601676116762167631676416765167661676716768167691677016771167721677316774167751677616777167781677916780167811678216783167841678516786167871678816789167901679116792167931679416795167961679716798167991680016801168021680316804168051680616807168081680916810168111681216813168141681516816168171681816819168201682116822168231682416825168261682716828168291683016831168321683316834168351683616837168381683916840168411684216843168441684516846168471684816849168501685116852168531685416855168561685716858168591686016861168621686316864168651686616867168681686916870168711687216873168741687516876168771687816879168801688116882168831688416885168861688716888168891689016891168921689316894168951689616897168981689916900169011690216903169041690516906169071690816909169101691116912169131691416915169161691716918169191692016921169221692316924169251692616927169281692916930169311693216933169341693516936169371693816939169401694116942169431694416945169461694716948169491695016951169521695316954169551695616957169581695916960169611696216963169641696516966169671696816969169701697116972169731697416975169761697716978169791698016981169821698316984169851698616987169881698916990169911699216993169941699516996169971699816999170001700117002170031700417005170061700717008170091701017011170121701317014170151701617017170181701917020170211702217023170241702517026170271702817029170301703117032170331703417035170361703717038170391704017041170421704317044170451704617047170481704917050170511705217053170541705517056170571705817059170601706117062170631706417065170661706717068170691707017071170721707317074170751707617077170781707917080170811708217083170841708517086170871708817089170901709117092170931709417095170961709717098170991710017101171021710317104171051710617107171081710917110171111711217113171141711517116171171711817119171201712117122171231712417125171261712717128171291713017131171321713317134171351713617137171381713917140171411714217143171441714517146171471714817149171501715117152171531715417155171561715717158171591716017161171621716317164171651716617167171681716917170171711717217173171741717517176171771717817179171801718117182171831718417185171861718717188171891719017191171921719317194171951719617197171981719917200172011720217203172041720517206172071720817209172101721117212172131721417215172161721717218172191722017221172221722317224172251722617227172281722917230172311723217233172341723517236172371723817239172401724117242172431724417245172461724717248172491725017251172521725317254172551725617257172581725917260172611726217263172641726517266172671726817269172701727117272172731727417275172761727717278172791728017281172821728317284172851728617287172881728917290172911729217293172941729517296172971729817299173001730117302173031730417305173061730717308173091731017311173121731317314173151731617317173181731917320173211732217323173241732517326173271732817329173301733117332173331733417335173361733717338173391734017341173421734317344173451734617347173481734917350173511735217353173541735517356173571735817359173601736117362173631736417365173661736717368173691737017371173721737317374173751737617377173781737917380173811738217383173841738517386173871738817389173901739117392173931739417395173961739717398173991740017401174021740317404174051740617407174081740917410174111741217413174141741517416174171741817419174201742117422174231742417425174261742717428174291743017431174321743317434174351743617437174381743917440174411744217443174441744517446174471744817449174501745117452174531745417455174561745717458174591746017461174621746317464174651746617467174681746917470174711747217473174741747517476174771747817479174801748117482174831748417485174861748717488174891749017491174921749317494174951749617497174981749917500175011750217503175041750517506175071750817509175101751117512175131751417515175161751717518175191752017521175221752317524175251752617527175281752917530175311753217533175341753517536175371753817539175401754117542175431754417545175461754717548175491755017551175521755317554175551755617557175581755917560175611756217563175641756517566175671756817569175701757117572175731757417575175761757717578175791758017581175821758317584175851758617587175881758917590175911759217593175941759517596175971759817599176001760117602176031760417605176061760717608176091761017611176121761317614176151761617617176181761917620176211762217623176241762517626176271762817629176301763117632176331763417635176361763717638176391764017641176421764317644176451764617647176481764917650176511765217653176541765517656176571765817659176601766117662176631766417665176661766717668176691767017671176721767317674176751767617677176781767917680176811768217683176841768517686176871768817689176901769117692176931769417695176961769717698176991770017701177021770317704177051770617707177081770917710177111771217713177141771517716177171771817719177201772117722177231772417725177261772717728177291773017731177321773317734177351773617737177381773917740177411774217743177441774517746177471774817749177501775117752177531775417755177561775717758177591776017761177621776317764177651776617767177681776917770177711777217773177741777517776177771777817779177801778117782177831778417785177861778717788177891779017791177921779317794177951779617797177981779917800178011780217803178041780517806178071780817809178101781117812178131781417815178161781717818178191782017821178221782317824178251782617827178281782917830178311783217833178341783517836178371783817839178401784117842178431784417845178461784717848178491785017851178521785317854178551785617857178581785917860178611786217863178641786517866178671786817869178701787117872178731787417875178761787717878178791788017881178821788317884178851788617887178881788917890178911789217893178941789517896178971789817899179001790117902179031790417905179061790717908179091791017911179121791317914179151791617917179181791917920179211792217923179241792517926179271792817929179301793117932179331793417935179361793717938179391794017941179421794317944179451794617947179481794917950179511795217953179541795517956179571795817959179601796117962179631796417965179661796717968179691797017971179721797317974179751797617977179781797917980179811798217983179841798517986179871798817989179901799117992179931799417995179961799717998179991800018001180021800318004180051800618007180081800918010180111801218013180141801518016180171801818019180201802118022180231802418025180261802718028180291803018031180321803318034180351803618037180381803918040180411804218043180441804518046180471804818049180501805118052180531805418055180561805718058180591806018061180621806318064180651806618067180681806918070180711807218073180741807518076180771807818079180801808118082180831808418085180861808718088180891809018091180921809318094180951809618097180981809918100181011810218103181041810518106181071810818109181101811118112181131811418115181161811718118181191812018121181221812318124181251812618127181281812918130181311813218133181341813518136181371813818139181401814118142181431814418145181461814718148181491815018151181521815318154181551815618157181581815918160181611816218163181641816518166181671816818169181701817118172181731817418175181761817718178181791818018181181821818318184181851818618187181881818918190181911819218193181941819518196181971819818199182001820118202182031820418205182061820718208182091821018211182121821318214182151821618217182181821918220182211822218223182241822518226182271822818229182301823118232182331823418235182361823718238182391824018241182421824318244182451824618247182481824918250182511825218253182541825518256182571825818259182601826118262182631826418265182661826718268182691827018271182721827318274182751827618277182781827918280182811828218283182841828518286182871828818289182901829118292182931829418295182961829718298182991830018301183021830318304183051830618307183081830918310183111831218313183141831518316183171831818319183201832118322183231832418325183261832718328183291833018331183321833318334183351833618337183381833918340183411834218343183441834518346183471834818349183501835118352183531835418355183561835718358183591836018361183621836318364183651836618367183681836918370183711837218373183741837518376183771837818379183801838118382183831838418385183861838718388183891839018391183921839318394183951839618397183981839918400184011840218403184041840518406184071840818409184101841118412184131841418415184161841718418184191842018421184221842318424184251842618427184281842918430184311843218433184341843518436184371843818439184401844118442184431844418445184461844718448184491845018451184521845318454184551845618457184581845918460184611846218463184641846518466184671846818469184701847118472184731847418475184761847718478184791848018481184821848318484184851848618487184881848918490184911849218493184941849518496184971849818499185001850118502185031850418505185061850718508185091851018511185121851318514185151851618517185181851918520185211852218523185241852518526185271852818529185301853118532185331853418535185361853718538185391854018541185421854318544185451854618547185481854918550185511855218553185541855518556185571855818559185601856118562185631856418565185661856718568185691857018571185721857318574185751857618577185781857918580185811858218583185841858518586185871858818589185901859118592185931859418595185961859718598185991860018601186021860318604186051860618607186081860918610186111861218613186141861518616186171861818619186201862118622186231862418625186261862718628186291863018631186321863318634186351863618637186381863918640186411864218643186441864518646186471864818649186501865118652186531865418655186561865718658186591866018661186621866318664186651866618667186681866918670186711867218673186741867518676186771867818679186801868118682186831868418685186861868718688186891869018691186921869318694186951869618697186981869918700187011870218703187041870518706187071870818709187101871118712187131871418715187161871718718187191872018721187221872318724187251872618727187281872918730187311873218733187341873518736187371873818739187401874118742187431874418745187461874718748187491875018751187521875318754187551875618757187581875918760187611876218763187641876518766187671876818769187701877118772187731877418775187761877718778187791878018781187821878318784187851878618787187881878918790187911879218793187941879518796187971879818799188001880118802188031880418805188061880718808188091881018811188121881318814188151881618817188181881918820188211882218823188241882518826188271882818829188301883118832188331883418835188361883718838188391884018841188421884318844188451884618847188481884918850188511885218853188541885518856188571885818859188601886118862188631886418865188661886718868188691887018871188721887318874188751887618877188781887918880188811888218883188841888518886188871888818889188901889118892188931889418895188961889718898188991890018901189021890318904189051890618907189081890918910189111891218913189141891518916189171891818919189201892118922189231892418925189261892718928189291893018931189321893318934189351893618937189381893918940189411894218943189441894518946189471894818949189501895118952189531895418955189561895718958189591896018961189621896318964189651896618967189681896918970189711897218973189741897518976189771897818979189801898118982189831898418985189861898718988189891899018991189921899318994189951899618997189981899919000190011900219003190041900519006190071900819009190101901119012190131901419015190161901719018190191902019021190221902319024190251902619027190281902919030190311903219033190341903519036190371903819039190401904119042190431904419045190461904719048190491905019051190521905319054190551905619057190581905919060190611906219063190641906519066190671906819069190701907119072190731907419075190761907719078190791908019081190821908319084190851908619087190881908919090190911909219093190941909519096190971909819099191001910119102191031910419105191061910719108191091911019111191121911319114191151911619117191181911919120191211912219123191241912519126191271912819129191301913119132191331913419135191361913719138191391914019141191421914319144191451914619147191481914919150191511915219153191541915519156191571915819159191601916119162191631916419165191661916719168191691917019171191721917319174191751917619177191781917919180191811918219183191841918519186191871918819189191901919119192191931919419195191961919719198191991920019201192021920319204192051920619207192081920919210192111921219213192141921519216192171921819219192201922119222192231922419225192261922719228192291923019231192321923319234192351923619237192381923919240192411924219243192441924519246192471924819249192501925119252192531925419255192561925719258192591926019261192621926319264192651926619267192681926919270192711927219273192741927519276192771927819279192801928119282192831928419285192861928719288192891929019291192921929319294192951929619297192981929919300193011930219303193041930519306193071930819309193101931119312193131931419315193161931719318193191932019321193221932319324193251932619327193281932919330193311933219333193341933519336193371933819339193401934119342193431934419345193461934719348193491935019351193521935319354193551935619357193581935919360193611936219363193641936519366193671936819369193701937119372193731937419375193761937719378193791938019381193821938319384193851938619387193881938919390193911939219393193941939519396193971939819399194001940119402194031940419405194061940719408194091941019411194121941319414194151941619417194181941919420194211942219423194241942519426194271942819429194301943119432194331943419435194361943719438194391944019441194421944319444194451944619447194481944919450194511945219453194541945519456194571945819459194601946119462194631946419465194661946719468194691947019471194721947319474194751947619477194781947919480194811948219483194841948519486194871948819489194901949119492194931949419495194961949719498194991950019501195021950319504195051950619507195081950919510195111951219513195141951519516195171951819519195201952119522195231952419525195261952719528195291953019531195321953319534195351953619537195381953919540195411954219543195441954519546195471954819549195501955119552195531955419555195561955719558195591956019561195621956319564195651956619567195681956919570195711957219573195741957519576195771957819579195801958119582195831958419585195861958719588195891959019591195921959319594195951959619597195981959919600196011960219603196041960519606196071960819609196101961119612196131961419615196161961719618196191962019621196221962319624196251962619627196281962919630196311963219633196341963519636196371963819639196401964119642196431964419645196461964719648196491965019651196521965319654196551965619657196581965919660196611966219663196641966519666196671966819669196701967119672196731967419675196761967719678196791968019681196821968319684196851968619687196881968919690196911969219693196941969519696196971969819699197001970119702197031970419705197061970719708197091971019711197121971319714197151971619717197181971919720197211972219723197241972519726197271972819729197301973119732197331973419735197361973719738197391974019741197421974319744197451974619747197481974919750197511975219753197541975519756197571975819759197601976119762197631976419765197661976719768197691977019771197721977319774197751977619777197781977919780197811978219783197841978519786197871978819789197901979119792197931979419795197961979719798197991980019801198021980319804198051980619807198081980919810198111981219813198141981519816198171981819819198201982119822198231982419825198261982719828198291983019831198321983319834198351983619837198381983919840198411984219843198441984519846198471984819849198501985119852198531985419855198561985719858198591986019861198621986319864198651986619867198681986919870198711987219873198741987519876198771987819879198801988119882198831988419885198861988719888198891989019891198921989319894198951989619897198981989919900199011990219903199041990519906199071990819909199101991119912199131991419915199161991719918199191992019921199221992319924199251992619927199281992919930199311993219933199341993519936199371993819939199401994119942199431994419945199461994719948199491995019951199521995319954199551995619957199581995919960199611996219963199641996519966199671996819969199701997119972199731997419975199761997719978199791998019981199821998319984199851998619987199881998919990199911999219993199941999519996199971999819999200002000120002200032000420005200062000720008200092001020011200122001320014200152001620017200182001920020200212002220023200242002520026200272002820029200302003120032200332003420035200362003720038200392004020041200422004320044200452004620047200482004920050200512005220053200542005520056200572005820059200602006120062200632006420065200662006720068200692007020071200722007320074200752007620077200782007920080200812008220083200842008520086200872008820089200902009120092200932009420095200962009720098200992010020101201022010320104201052010620107201082010920110201112011220113201142011520116201172011820119201202012120122201232012420125201262012720128201292013020131201322013320134201352013620137201382013920140201412014220143201442014520146201472014820149201502015120152201532015420155201562015720158201592016020161201622016320164201652016620167201682016920170201712017220173201742017520176201772017820179201802018120182201832018420185201862018720188201892019020191201922019320194201952019620197201982019920200202012020220203202042020520206202072020820209202102021120212202132021420215202162021720218202192022020221202222022320224202252022620227202282022920230202312023220233202342023520236202372023820239202402024120242202432024420245202462024720248202492025020251202522025320254202552025620257202582025920260202612026220263202642026520266202672026820269202702027120272202732027420275202762027720278202792028020281202822028320284202852028620287202882028920290202912029220293202942029520296202972029820299203002030120302203032030420305203062030720308203092031020311203122031320314203152031620317203182031920320203212032220323203242032520326203272032820329203302033120332203332033420335203362033720338203392034020341203422034320344203452034620347203482034920350203512035220353203542035520356203572035820359203602036120362203632036420365203662036720368203692037020371203722037320374203752037620377203782037920380203812038220383203842038520386203872038820389203902039120392203932039420395203962039720398203992040020401204022040320404204052040620407204082040920410204112041220413204142041520416204172041820419204202042120422204232042420425204262042720428204292043020431204322043320434204352043620437204382043920440204412044220443204442044520446204472044820449204502045120452204532045420455204562045720458204592046020461204622046320464204652046620467204682046920470204712047220473204742047520476204772047820479204802048120482204832048420485204862048720488204892049020491204922049320494204952049620497204982049920500205012050220503205042050520506205072050820509205102051120512205132051420515205162051720518205192052020521205222052320524205252052620527205282052920530205312053220533205342053520536205372053820539205402054120542205432054420545205462054720548205492055020551205522055320554205552055620557205582055920560205612056220563205642056520566205672056820569205702057120572205732057420575205762057720578205792058020581205822058320584205852058620587205882058920590205912059220593205942059520596205972059820599206002060120602206032060420605206062060720608206092061020611206122061320614206152061620617206182061920620206212062220623206242062520626206272062820629206302063120632206332063420635206362063720638206392064020641206422064320644206452064620647206482064920650206512065220653206542065520656206572065820659206602066120662206632066420665206662066720668206692067020671206722067320674206752067620677206782067920680206812068220683206842068520686206872068820689206902069120692206932069420695206962069720698206992070020701207022070320704207052070620707207082070920710207112071220713207142071520716207172071820719207202072120722207232072420725207262072720728207292073020731207322073320734207352073620737207382073920740207412074220743207442074520746207472074820749207502075120752207532075420755207562075720758207592076020761207622076320764207652076620767207682076920770207712077220773207742077520776207772077820779207802078120782207832078420785207862078720788207892079020791207922079320794207952079620797207982079920800208012080220803208042080520806208072080820809208102081120812208132081420815208162081720818208192082020821208222082320824208252082620827208282082920830208312083220833208342083520836208372083820839208402084120842208432084420845208462084720848208492085020851208522085320854208552085620857208582085920860208612086220863208642086520866208672086820869208702087120872208732087420875208762087720878208792088020881208822088320884208852088620887208882088920890208912089220893208942089520896208972089820899209002090120902209032090420905209062090720908209092091020911209122091320914209152091620917209182091920920209212092220923209242092520926209272092820929209302093120932209332093420935209362093720938209392094020941209422094320944209452094620947209482094920950209512095220953209542095520956209572095820959209602096120962209632096420965209662096720968209692097020971209722097320974209752097620977209782097920980209812098220983209842098520986209872098820989209902099120992209932099420995209962099720998209992100021001210022100321004210052100621007210082100921010210112101221013210142101521016210172101821019210202102121022210232102421025210262102721028210292103021031210322103321034210352103621037210382103921040210412104221043210442104521046210472104821049210502105121052210532105421055210562105721058210592106021061210622106321064210652106621067210682106921070210712107221073210742107521076210772107821079210802108121082210832108421085210862108721088210892109021091210922109321094210952109621097210982109921100211012110221103211042110521106211072110821109211102111121112211132111421115211162111721118211192112021121211222112321124211252112621127211282112921130211312113221133211342113521136211372113821139211402114121142211432114421145211462114721148211492115021151211522115321154211552115621157211582115921160211612116221163211642116521166211672116821169211702117121172211732117421175211762117721178211792118021181211822118321184211852118621187211882118921190211912119221193211942119521196211972119821199212002120121202212032120421205212062120721208212092121021211212122121321214212152121621217212182121921220212212122221223212242122521226212272122821229212302123121232212332123421235212362123721238212392124021241212422124321244212452124621247212482124921250212512125221253212542125521256212572125821259212602126121262212632126421265212662126721268212692127021271212722127321274212752127621277212782127921280212812128221283212842128521286212872128821289212902129121292212932129421295212962129721298212992130021301213022130321304213052130621307213082130921310213112131221313213142131521316213172131821319213202132121322213232132421325213262132721328213292133021331213322133321334213352133621337213382133921340213412134221343213442134521346213472134821349213502135121352213532135421355213562135721358213592136021361213622136321364213652136621367213682136921370213712137221373213742137521376213772137821379213802138121382213832138421385213862138721388213892139021391213922139321394213952139621397213982139921400214012140221403214042140521406214072140821409214102141121412214132141421415214162141721418214192142021421214222142321424214252142621427214282142921430214312143221433214342143521436214372143821439214402144121442214432144421445214462144721448214492145021451214522145321454214552145621457214582145921460214612146221463214642146521466214672146821469214702147121472214732147421475214762147721478214792148021481214822148321484214852148621487214882148921490214912149221493214942149521496214972149821499215002150121502215032150421505215062150721508215092151021511215122151321514215152151621517215182151921520215212152221523215242152521526215272152821529215302153121532215332153421535215362153721538215392154021541215422154321544215452154621547215482154921550215512155221553215542155521556215572155821559215602156121562215632156421565215662156721568215692157021571215722157321574215752157621577215782157921580215812158221583215842158521586215872158821589215902159121592215932159421595215962159721598215992160021601216022160321604216052160621607216082160921610216112161221613216142161521616216172161821619216202162121622216232162421625216262162721628216292163021631216322163321634216352163621637216382163921640216412164221643216442164521646216472164821649216502165121652216532165421655216562165721658216592166021661216622166321664216652166621667216682166921670216712167221673216742167521676216772167821679216802168121682216832168421685216862168721688216892169021691216922169321694216952169621697216982169921700217012170221703217042170521706217072170821709217102171121712217132171421715217162171721718217192172021721217222172321724217252172621727217282172921730217312173221733217342173521736217372173821739217402174121742217432174421745217462174721748217492175021751217522175321754217552175621757217582175921760217612176221763217642176521766217672176821769217702177121772217732177421775217762177721778217792178021781217822178321784217852178621787217882178921790217912179221793217942179521796217972179821799218002180121802218032180421805218062180721808218092181021811218122181321814218152181621817218182181921820218212182221823218242182521826218272182821829218302183121832218332183421835218362183721838218392184021841218422184321844218452184621847218482184921850218512185221853218542185521856218572185821859218602186121862218632186421865218662186721868218692187021871218722187321874218752187621877218782187921880218812188221883218842188521886218872188821889218902189121892218932189421895218962189721898218992190021901219022190321904219052190621907219082190921910219112191221913219142191521916219172191821919219202192121922219232192421925219262192721928219292193021931219322193321934219352193621937219382193921940219412194221943219442194521946219472194821949219502195121952219532195421955219562195721958219592196021961219622196321964219652196621967219682196921970219712197221973219742197521976219772197821979219802198121982219832198421985219862198721988219892199021991219922199321994219952199621997219982199922000220012200222003220042200522006220072200822009220102201122012220132201422015220162201722018220192202022021220222202322024220252202622027220282202922030220312203222033220342203522036220372203822039220402204122042220432204422045220462204722048220492205022051220522205322054220552205622057220582205922060220612206222063220642206522066220672206822069220702207122072220732207422075220762207722078220792208022081220822208322084220852208622087220882208922090220912209222093220942209522096220972209822099221002210122102221032210422105221062210722108221092211022111221122211322114221152211622117221182211922120221212212222123221242212522126221272212822129221302213122132221332213422135221362213722138221392214022141221422214322144221452214622147221482214922150221512215222153221542215522156221572215822159221602216122162221632216422165221662216722168221692217022171221722217322174221752217622177221782217922180221812218222183221842218522186221872218822189221902219122192221932219422195221962219722198221992220022201222022220322204222052220622207222082220922210222112221222213222142221522216222172221822219222202222122222222232222422225222262222722228222292223022231222322223322234222352223622237222382223922240222412224222243222442224522246222472224822249222502225122252222532225422255222562225722258222592226022261222622226322264222652226622267222682226922270222712227222273222742227522276222772227822279222802228122282222832228422285222862228722288222892229022291222922229322294222952229622297222982229922300223012230222303223042230522306223072230822309223102231122312223132231422315223162231722318223192232022321223222232322324223252232622327223282232922330223312233222333223342233522336223372233822339223402234122342223432234422345223462234722348223492235022351223522235322354223552235622357223582235922360223612236222363223642236522366223672236822369223702237122372223732237422375223762237722378223792238022381223822238322384223852238622387223882238922390223912239222393223942239522396223972239822399224002240122402224032240422405224062240722408224092241022411224122241322414224152241622417224182241922420224212242222423224242242522426224272242822429224302243122432224332243422435224362243722438224392244022441224422244322444224452244622447224482244922450224512245222453224542245522456224572245822459224602246122462224632246422465224662246722468224692247022471224722247322474224752247622477224782247922480224812248222483224842248522486224872248822489224902249122492224932249422495224962249722498224992250022501225022250322504225052250622507225082250922510225112251222513225142251522516225172251822519225202252122522225232252422525225262252722528225292253022531225322253322534225352253622537225382253922540225412254222543225442254522546225472254822549225502255122552225532255422555225562255722558225592256022561225622256322564225652256622567225682256922570225712257222573225742257522576225772257822579225802258122582225832258422585225862258722588225892259022591225922259322594225952259622597225982259922600226012260222603226042260522606226072260822609226102261122612226132261422615226162261722618226192262022621226222262322624226252262622627226282262922630226312263222633226342263522636226372263822639226402264122642226432264422645226462264722648226492265022651226522265322654226552265622657226582265922660226612266222663226642266522666226672266822669226702267122672226732267422675226762267722678226792268022681226822268322684226852268622687226882268922690226912269222693226942269522696226972269822699227002270122702227032270422705227062270722708227092271022711227122271322714227152271622717227182271922720227212272222723227242272522726227272272822729227302273122732227332273422735227362273722738227392274022741227422274322744227452274622747227482274922750227512275222753227542275522756227572275822759227602276122762227632276422765227662276722768227692277022771227722277322774227752277622777227782277922780227812278222783227842278522786227872278822789227902279122792227932279422795227962279722798227992280022801228022280322804228052280622807228082280922810228112281222813228142281522816228172281822819228202282122822228232282422825228262282722828228292283022831228322283322834228352283622837228382283922840228412284222843228442284522846228472284822849228502285122852228532285422855228562285722858228592286022861228622286322864228652286622867228682286922870228712287222873228742287522876228772287822879228802288122882228832288422885228862288722888228892289022891228922289322894228952289622897228982289922900229012290222903229042290522906229072290822909229102291122912229132291422915229162291722918229192292022921229222292322924229252292622927229282292922930229312293222933229342293522936229372293822939229402294122942229432294422945229462294722948229492295022951229522295322954229552295622957229582295922960229612296222963229642296522966229672296822969229702297122972229732297422975229762297722978229792298022981229822298322984229852298622987229882298922990229912299222993229942299522996229972299822999230002300123002230032300423005230062300723008230092301023011230122301323014230152301623017230182301923020230212302223023230242302523026230272302823029230302303123032230332303423035230362303723038230392304023041230422304323044230452304623047230482304923050230512305223053230542305523056230572305823059230602306123062230632306423065230662306723068230692307023071230722307323074230752307623077230782307923080230812308223083230842308523086230872308823089230902309123092230932309423095230962309723098230992310023101231022310323104231052310623107231082310923110231112311223113231142311523116231172311823119231202312123122231232312423125231262312723128231292313023131231322313323134231352313623137231382313923140231412314223143231442314523146231472314823149231502315123152231532315423155231562315723158231592316023161231622316323164231652316623167231682316923170231712317223173231742317523176231772317823179231802318123182231832318423185231862318723188231892319023191231922319323194231952319623197231982319923200232012320223203232042320523206232072320823209232102321123212232132321423215232162321723218232192322023221232222322323224232252322623227232282322923230232312323223233232342323523236232372323823239232402324123242232432324423245232462324723248232492325023251232522325323254232552325623257232582325923260232612326223263232642326523266232672326823269232702327123272232732327423275232762327723278232792328023281232822328323284232852328623287232882328923290232912329223293232942329523296232972329823299233002330123302233032330423305233062330723308233092331023311233122331323314233152331623317233182331923320233212332223323233242332523326233272332823329233302333123332233332333423335233362333723338233392334023341233422334323344233452334623347233482334923350233512335223353233542335523356233572335823359233602336123362233632336423365233662336723368233692337023371233722337323374233752337623377233782337923380233812338223383
  1. From fd34d57c9e2a0bff1283a6707062ed4a42476b10 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/configure | 1340 +++++++++++++++-----
  10. bfd/configure.ac | 2 +-
  11. binutils/configure | 1338 +++++++++++++++-----
  12. gas/configure | 1338 +++++++++++++++-----
  13. gprof/configure | 1338 +++++++++++++++-----
  14. ld/configure | 1713 +++++++++++++++++++-------
  15. libctf/configure | 1337 +++++++++++++++-----
  16. libtool.m4 | 1100 +++++++++++------
  17. ltmain.sh | 2925 +++++++++++++++++++++++++++++---------------
  18. ltoptions.m4 | 2 +-
  19. ltversion.m4 | 12 +-
  20. lt~obsolete.m4 | 2 +-
  21. opcodes/configure | 1338 +++++++++++++++-----
  22. zlib/configure | 1338 +++++++++++++++-----
  23. 14 files changed, 10995 insertions(+), 4128 deletions(-)
  24. diff --git a/bfd/configure b/bfd/configure
  25. index daa51244369..79d0c4b4623 100755
  26. --- a/bfd/configure
  27. +++ b/bfd/configure
  28. @@ -705,6 +705,9 @@ OTOOL
  29. LIPO
  30. NMEDIT
  31. DSYMUTIL
  32. +MANIFEST_TOOL
  33. +ac_ct_AR
  34. +DLLTOOL
  35. OBJDUMP
  36. LN_S
  37. NM
  38. @@ -823,6 +826,7 @@ enable_static
  39. with_pic
  40. enable_fast_install
  41. with_gnu_ld
  42. +with_libtool_sysroot
  43. enable_libtool_lock
  44. enable_plugins
  45. enable_largefile
  46. @@ -1507,6 +1511,8 @@ Optional Packages:
  47. --with-pic try to use only PIC/non-PIC objects [default=use
  48. both]
  49. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  50. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  51. + (or the compiler's sysroot if not specified).
  52. --with-mmap try using mmap for BFD input files if available
  53. --with-separate-debug-dir=DIR
  54. Look for global separate debug info in DIR
  55. @@ -4988,8 +4994,8 @@ esac
  56. -macro_version='2.2.7a'
  57. -macro_revision='1.3134'
  58. +macro_version='2.4'
  59. +macro_revision='1.3293'
  60. @@ -5029,7 +5035,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  61. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  62. $as_echo_n "checking how to print strings... " >&6; }
  63. # Test print first, because it will be a builtin if present.
  64. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  65. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  66. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  67. ECHO='print -r --'
  68. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  69. @@ -5715,8 +5721,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  70. # Try some XSI features
  71. xsi_shell=no
  72. ( _lt_dummy="a/b/c"
  73. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  74. - = c,a/b,, \
  75. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  76. + = c,a/b,b/c, \
  77. && eval 'test $(( 1 + 1 )) -eq 2 \
  78. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  79. && xsi_shell=yes
  80. @@ -5765,6 +5771,80 @@ esac
  81. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  82. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  83. +if ${lt_cv_to_host_file_cmd+:} false; then :
  84. + $as_echo_n "(cached) " >&6
  85. +else
  86. + case $host in
  87. + *-*-mingw* )
  88. + case $build in
  89. + *-*-mingw* ) # actually msys
  90. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  91. + ;;
  92. + *-*-cygwin* )
  93. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  94. + ;;
  95. + * ) # otherwise, assume *nix
  96. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  97. + ;;
  98. + esac
  99. + ;;
  100. + *-*-cygwin* )
  101. + case $build in
  102. + *-*-mingw* ) # actually msys
  103. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  104. + ;;
  105. + *-*-cygwin* )
  106. + lt_cv_to_host_file_cmd=func_convert_file_noop
  107. + ;;
  108. + * ) # otherwise, assume *nix
  109. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  110. + ;;
  111. + esac
  112. + ;;
  113. + * ) # unhandled hosts (and "normal" native builds)
  114. + lt_cv_to_host_file_cmd=func_convert_file_noop
  115. + ;;
  116. +esac
  117. +
  118. +fi
  119. +
  120. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  121. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  122. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  123. +
  124. +
  125. +
  126. +
  127. +
  128. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  129. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  130. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  131. + $as_echo_n "(cached) " >&6
  132. +else
  133. + #assume ordinary cross tools, or native build.
  134. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  135. +case $host in
  136. + *-*-mingw* )
  137. + case $build in
  138. + *-*-mingw* ) # actually msys
  139. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  140. + ;;
  141. + esac
  142. + ;;
  143. +esac
  144. +
  145. +fi
  146. +
  147. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  148. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  149. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  150. +
  151. +
  152. +
  153. +
  154. +
  155. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  156. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  157. if ${lt_cv_ld_reload_flag+:} false; then :
  158. @@ -5781,6 +5861,11 @@ case $reload_flag in
  159. esac
  160. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  161. case $host_os in
  162. + cygwin* | mingw* | pw32* | cegcc*)
  163. + if test "$GCC" != yes; then
  164. + reload_cmds=false
  165. + fi
  166. + ;;
  167. darwin*)
  168. if test "$GCC" = yes; then
  169. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  170. @@ -5949,7 +6034,8 @@ mingw* | pw32*)
  171. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  172. lt_cv_file_magic_cmd='func_win32_libid'
  173. else
  174. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  175. + # Keep this pattern in sync with the one in func_win32_libid.
  176. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  177. lt_cv_file_magic_cmd='$OBJDUMP -f'
  178. fi
  179. ;;
  180. @@ -6103,6 +6189,21 @@ esac
  181. fi
  182. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  183. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  184. +
  185. +file_magic_glob=
  186. +want_nocaseglob=no
  187. +if test "$build" = "$host"; then
  188. + case $host_os in
  189. + mingw* | pw32*)
  190. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  191. + want_nocaseglob=yes
  192. + else
  193. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  194. + fi
  195. + ;;
  196. + esac
  197. +fi
  198. +
  199. file_magic_cmd=$lt_cv_file_magic_cmd
  200. deplibs_check_method=$lt_cv_deplibs_check_method
  201. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  202. @@ -6118,6 +6219,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  203. +
  204. +
  205. +
  206. +
  207. +
  208. +
  209. +
  210. +
  211. +
  212. +
  213. +if test -n "$ac_tool_prefix"; then
  214. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  215. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  216. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  217. +$as_echo_n "checking for $ac_word... " >&6; }
  218. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  219. + $as_echo_n "(cached) " >&6
  220. +else
  221. + if test -n "$DLLTOOL"; then
  222. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  223. +else
  224. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  225. +for as_dir in $PATH
  226. +do
  227. + IFS=$as_save_IFS
  228. + test -z "$as_dir" && as_dir=.
  229. + for ac_exec_ext in '' $ac_executable_extensions; do
  230. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  231. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  232. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  233. + break 2
  234. + fi
  235. +done
  236. + done
  237. +IFS=$as_save_IFS
  238. +
  239. +fi
  240. +fi
  241. +DLLTOOL=$ac_cv_prog_DLLTOOL
  242. +if test -n "$DLLTOOL"; then
  243. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  244. +$as_echo "$DLLTOOL" >&6; }
  245. +else
  246. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  247. +$as_echo "no" >&6; }
  248. +fi
  249. +
  250. +
  251. +fi
  252. +if test -z "$ac_cv_prog_DLLTOOL"; then
  253. + ac_ct_DLLTOOL=$DLLTOOL
  254. + # Extract the first word of "dlltool", so it can be a program name with args.
  255. +set dummy dlltool; ac_word=$2
  256. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  257. +$as_echo_n "checking for $ac_word... " >&6; }
  258. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  259. + $as_echo_n "(cached) " >&6
  260. +else
  261. + if test -n "$ac_ct_DLLTOOL"; then
  262. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  263. +else
  264. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  265. +for as_dir in $PATH
  266. +do
  267. + IFS=$as_save_IFS
  268. + test -z "$as_dir" && as_dir=.
  269. + for ac_exec_ext in '' $ac_executable_extensions; do
  270. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  271. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  272. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  273. + break 2
  274. + fi
  275. +done
  276. + done
  277. +IFS=$as_save_IFS
  278. +
  279. +fi
  280. +fi
  281. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  282. +if test -n "$ac_ct_DLLTOOL"; then
  283. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  284. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  285. +else
  286. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  287. +$as_echo "no" >&6; }
  288. +fi
  289. +
  290. + if test "x$ac_ct_DLLTOOL" = x; then
  291. + DLLTOOL="false"
  292. + else
  293. + case $cross_compiling:$ac_tool_warned in
  294. +yes:)
  295. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  296. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  297. +ac_tool_warned=yes ;;
  298. +esac
  299. + DLLTOOL=$ac_ct_DLLTOOL
  300. + fi
  301. +else
  302. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  303. +fi
  304. +
  305. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  306. +
  307. +
  308. +
  309. +
  310. +
  311. +
  312. +
  313. +
  314. +
  315. +
  316. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  317. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  318. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  319. + $as_echo_n "(cached) " >&6
  320. +else
  321. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  322. +
  323. +case $host_os in
  324. +cygwin* | mingw* | pw32* | cegcc*)
  325. + # two different shell functions defined in ltmain.sh
  326. + # decide which to use based on capabilities of $DLLTOOL
  327. + case `$DLLTOOL --help 2>&1` in
  328. + *--identify-strict*)
  329. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  330. + ;;
  331. + *)
  332. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  333. + ;;
  334. + esac
  335. + ;;
  336. +*)
  337. + # fallback: assume linklib IS sharedlib
  338. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  339. + ;;
  340. +esac
  341. +
  342. +fi
  343. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  344. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  345. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  346. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  347. +
  348. +
  349. +
  350. +
  351. +
  352. +
  353. +
  354. plugin_option=
  355. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  356. for plugin in $plugin_names; do
  357. @@ -6132,8 +6384,10 @@ for plugin in $plugin_names; do
  358. done
  359. if test -n "$ac_tool_prefix"; then
  360. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  361. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  362. + for ac_prog in ar
  363. + do
  364. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  365. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  366. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  367. $as_echo_n "checking for $ac_word... " >&6; }
  368. if ${ac_cv_prog_AR+:} false; then :
  369. @@ -6149,7 +6403,7 @@ do
  370. test -z "$as_dir" && as_dir=.
  371. for ac_exec_ext in '' $ac_executable_extensions; do
  372. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  373. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  374. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  375. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  376. break 2
  377. fi
  378. @@ -6169,11 +6423,15 @@ $as_echo "no" >&6; }
  379. fi
  380. + test -n "$AR" && break
  381. + done
  382. fi
  383. -if test -z "$ac_cv_prog_AR"; then
  384. +if test -z "$AR"; then
  385. ac_ct_AR=$AR
  386. - # Extract the first word of "ar", so it can be a program name with args.
  387. -set dummy ar; ac_word=$2
  388. + for ac_prog in ar
  389. +do
  390. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  391. +set dummy $ac_prog; ac_word=$2
  392. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  393. $as_echo_n "checking for $ac_word... " >&6; }
  394. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  395. @@ -6189,7 +6447,7 @@ do
  396. test -z "$as_dir" && as_dir=.
  397. for ac_exec_ext in '' $ac_executable_extensions; do
  398. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  399. - ac_cv_prog_ac_ct_AR="ar"
  400. + ac_cv_prog_ac_ct_AR="$ac_prog"
  401. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  402. break 2
  403. fi
  404. @@ -6208,6 +6466,10 @@ else
  405. $as_echo "no" >&6; }
  406. fi
  407. +
  408. + test -n "$ac_ct_AR" && break
  409. +done
  410. +
  411. if test "x$ac_ct_AR" = x; then
  412. AR="false"
  413. else
  414. @@ -6219,25 +6481,20 @@ ac_tool_warned=yes ;;
  415. esac
  416. AR=$ac_ct_AR
  417. fi
  418. -else
  419. - AR="$ac_cv_prog_AR"
  420. fi
  421. -test -z "$AR" && AR=ar
  422. -if test -n "$plugin_option"; then
  423. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  424. - touch conftest.c
  425. - $AR $plugin_option rc conftest.a conftest.c
  426. - if test "$?" != 0; then
  427. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  428. + touch conftest.c
  429. + $AR $plugin_option rc conftest.a conftest.c
  430. + if test "$?" != 0; then
  431. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  432. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  433. - else
  434. - AR="$AR $plugin_option"
  435. - fi
  436. - rm -f conftest.*
  437. + else
  438. + AR="$AR $plugin_option"
  439. fi
  440. -fi
  441. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  442. + rm -f conftest.*
  443. +: ${AR=ar}
  444. +: ${AR_FLAGS=cru}
  445. +
  446. @@ -6248,6 +6505,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  447. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  448. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  449. +if ${lt_cv_ar_at_file+:} false; then :
  450. + $as_echo_n "(cached) " >&6
  451. +else
  452. + lt_cv_ar_at_file=no
  453. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  454. +/* end confdefs.h. */
  455. +
  456. +int
  457. +main ()
  458. +{
  459. +
  460. + ;
  461. + return 0;
  462. +}
  463. +_ACEOF
  464. +if ac_fn_c_try_compile "$LINENO"; then :
  465. + echo conftest.$ac_objext > conftest.lst
  466. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  467. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  468. + (eval $lt_ar_try) 2>&5
  469. + ac_status=$?
  470. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  471. + test $ac_status = 0; }
  472. + if test "$ac_status" -eq 0; then
  473. + # Ensure the archiver fails upon bogus file names.
  474. + rm -f conftest.$ac_objext libconftest.a
  475. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  476. + (eval $lt_ar_try) 2>&5
  477. + ac_status=$?
  478. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  479. + test $ac_status = 0; }
  480. + if test "$ac_status" -ne 0; then
  481. + lt_cv_ar_at_file=@
  482. + fi
  483. + fi
  484. + rm -f conftest.* libconftest.a
  485. +
  486. +fi
  487. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  488. +
  489. +fi
  490. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  491. +$as_echo "$lt_cv_ar_at_file" >&6; }
  492. +
  493. +if test "x$lt_cv_ar_at_file" = xno; then
  494. + archiver_list_spec=
  495. +else
  496. + archiver_list_spec=$lt_cv_ar_at_file
  497. +fi
  498. +
  499. +
  500. +
  501. +
  502. +
  503. +
  504. if test -n "$ac_tool_prefix"; then
  505. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  506. @@ -6588,8 +6902,8 @@ esac
  507. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  508. # Transform an extracted symbol line into symbol name and symbol address
  509. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  510. -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'"
  511. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  512. +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'"
  513. # Handle CRLF in mingw tool chain
  514. opt_cr=
  515. @@ -6625,6 +6939,7 @@ for ac_symprfx in "" "_"; do
  516. else
  517. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  518. fi
  519. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  520. # Check to see that the pipe works correctly.
  521. pipe_works=no
  522. @@ -6666,6 +6981,18 @@ _LT_EOF
  523. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  524. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  525. cat <<_LT_EOF > conftest.$ac_ext
  526. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  527. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  528. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  529. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  530. +# define LT_DLSYM_CONST
  531. +#elif defined(__osf__)
  532. +/* This system does not cope well with relocations in const data. */
  533. +# define LT_DLSYM_CONST
  534. +#else
  535. +# define LT_DLSYM_CONST const
  536. +#endif
  537. +
  538. #ifdef __cplusplus
  539. extern "C" {
  540. #endif
  541. @@ -6677,7 +7004,7 @@ _LT_EOF
  542. cat <<_LT_EOF >> conftest.$ac_ext
  543. /* The mapping between symbol names and symbols. */
  544. -const struct {
  545. +LT_DLSYM_CONST struct {
  546. const char *name;
  547. void *address;
  548. }
  549. @@ -6703,8 +7030,8 @@ static const void *lt_preloaded_setup() {
  550. _LT_EOF
  551. # Now try linking the two files.
  552. mv conftest.$ac_objext conftstm.$ac_objext
  553. - lt_save_LIBS="$LIBS"
  554. - lt_save_CFLAGS="$CFLAGS"
  555. + lt_globsym_save_LIBS=$LIBS
  556. + lt_globsym_save_CFLAGS=$CFLAGS
  557. LIBS="conftstm.$ac_objext"
  558. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  559. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  560. @@ -6714,8 +7041,8 @@ _LT_EOF
  561. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  562. pipe_works=yes
  563. fi
  564. - LIBS="$lt_save_LIBS"
  565. - CFLAGS="$lt_save_CFLAGS"
  566. + LIBS=$lt_globsym_save_LIBS
  567. + CFLAGS=$lt_globsym_save_CFLAGS
  568. else
  569. echo "cannot find nm_test_func in $nlist" >&5
  570. fi
  571. @@ -6752,6 +7079,14 @@ else
  572. $as_echo "ok" >&6; }
  573. fi
  574. +# Response file support.
  575. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  576. + nm_file_list_spec='@'
  577. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  578. + nm_file_list_spec='@'
  579. +fi
  580. +
  581. +
  582. @@ -6770,6 +7105,47 @@ fi
  583. +
  584. +
  585. +
  586. +
  587. +
  588. +
  589. +
  590. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  591. +$as_echo_n "checking for sysroot... " >&6; }
  592. +
  593. +# Check whether --with-libtool-sysroot was given.
  594. +if test "${with_libtool_sysroot+set}" = set; then :
  595. + withval=$with_libtool_sysroot;
  596. +else
  597. + with_libtool_sysroot=no
  598. +fi
  599. +
  600. +
  601. +lt_sysroot=
  602. +case ${with_libtool_sysroot} in #(
  603. + yes)
  604. + if test "$GCC" = yes; then
  605. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  606. + fi
  607. + ;; #(
  608. + /*)
  609. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  610. + ;; #(
  611. + no|'')
  612. + ;; #(
  613. + *)
  614. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  615. +$as_echo "${with_libtool_sysroot}" >&6; }
  616. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  617. + ;;
  618. +esac
  619. +
  620. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  621. +$as_echo "${lt_sysroot:-no}" >&6; }
  622. +
  623. +
  624. @@ -6979,6 +7355,123 @@ esac
  625. need_locks="$enable_libtool_lock"
  626. +if test -n "$ac_tool_prefix"; then
  627. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  628. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  629. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  630. +$as_echo_n "checking for $ac_word... " >&6; }
  631. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  632. + $as_echo_n "(cached) " >&6
  633. +else
  634. + if test -n "$MANIFEST_TOOL"; then
  635. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  636. +else
  637. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  638. +for as_dir in $PATH
  639. +do
  640. + IFS=$as_save_IFS
  641. + test -z "$as_dir" && as_dir=.
  642. + for ac_exec_ext in '' $ac_executable_extensions; do
  643. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  644. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  645. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  646. + break 2
  647. + fi
  648. +done
  649. + done
  650. +IFS=$as_save_IFS
  651. +
  652. +fi
  653. +fi
  654. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  655. +if test -n "$MANIFEST_TOOL"; then
  656. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  657. +$as_echo "$MANIFEST_TOOL" >&6; }
  658. +else
  659. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  660. +$as_echo "no" >&6; }
  661. +fi
  662. +
  663. +
  664. +fi
  665. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  666. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  667. + # Extract the first word of "mt", so it can be a program name with args.
  668. +set dummy mt; ac_word=$2
  669. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  670. +$as_echo_n "checking for $ac_word... " >&6; }
  671. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  672. + $as_echo_n "(cached) " >&6
  673. +else
  674. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  675. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  676. +else
  677. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  678. +for as_dir in $PATH
  679. +do
  680. + IFS=$as_save_IFS
  681. + test -z "$as_dir" && as_dir=.
  682. + for ac_exec_ext in '' $ac_executable_extensions; do
  683. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  684. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  685. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  686. + break 2
  687. + fi
  688. +done
  689. + done
  690. +IFS=$as_save_IFS
  691. +
  692. +fi
  693. +fi
  694. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  695. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  696. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  697. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  698. +else
  699. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  700. +$as_echo "no" >&6; }
  701. +fi
  702. +
  703. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  704. + MANIFEST_TOOL=":"
  705. + else
  706. + case $cross_compiling:$ac_tool_warned in
  707. +yes:)
  708. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  709. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  710. +ac_tool_warned=yes ;;
  711. +esac
  712. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  713. + fi
  714. +else
  715. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  716. +fi
  717. +
  718. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  719. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  720. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  721. +if ${lt_cv_path_mainfest_tool+:} false; then :
  722. + $as_echo_n "(cached) " >&6
  723. +else
  724. + lt_cv_path_mainfest_tool=no
  725. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  726. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  727. + cat conftest.err >&5
  728. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  729. + lt_cv_path_mainfest_tool=yes
  730. + fi
  731. + rm -f conftest*
  732. +fi
  733. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  734. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  735. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  736. + MANIFEST_TOOL=:
  737. +fi
  738. +
  739. +
  740. +
  741. +
  742. +
  743. case $host_os in
  744. rhapsody* | darwin*)
  745. @@ -7542,6 +8035,8 @@ _LT_EOF
  746. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  747. echo "$AR cru libconftest.a conftest.o" >&5
  748. $AR cru libconftest.a conftest.o 2>&5
  749. + echo "$RANLIB libconftest.a" >&5
  750. + $RANLIB libconftest.a 2>&5
  751. cat > conftest.c << _LT_EOF
  752. int main() { return 0;}
  753. _LT_EOF
  754. @@ -7706,7 +8201,8 @@ fi
  755. LIBTOOL_DEPS="$ltmain"
  756. # Always use our own libtool.
  757. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  758. +LIBTOOL='$(SHELL) $(top_builddir)'
  759. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  760. @@ -7795,7 +8291,7 @@ aix3*)
  761. esac
  762. # Global variables:
  763. -ofile=libtool
  764. +ofile=${host_alias}-libtool
  765. can_build_shared=yes
  766. # All known linkers require a `.a' archive for static linking (except MSVC,
  767. @@ -8093,8 +8589,6 @@ fi
  768. lt_prog_compiler_pic=
  769. lt_prog_compiler_static=
  770. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  771. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  772. if test "$GCC" = yes; then
  773. lt_prog_compiler_wl='-Wl,'
  774. @@ -8260,6 +8754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  775. lt_prog_compiler_pic='--shared'
  776. lt_prog_compiler_static='--static'
  777. ;;
  778. + nagfor*)
  779. + # NAG Fortran compiler
  780. + lt_prog_compiler_wl='-Wl,-Wl,,'
  781. + lt_prog_compiler_pic='-PIC'
  782. + lt_prog_compiler_static='-Bstatic'
  783. + ;;
  784. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  785. # Portland Group compilers (*not* the Pentium gcc compiler,
  786. # which looks to be a dead project)
  787. @@ -8322,7 +8822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  788. lt_prog_compiler_pic='-KPIC'
  789. lt_prog_compiler_static='-Bstatic'
  790. case $cc_basename in
  791. - f77* | f90* | f95*)
  792. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  793. lt_prog_compiler_wl='-Qoption ld ';;
  794. *)
  795. lt_prog_compiler_wl='-Wl,';;
  796. @@ -8379,13 +8879,17 @@ case $host_os in
  797. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  798. ;;
  799. esac
  800. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  801. -$as_echo "$lt_prog_compiler_pic" >&6; }
  802. -
  803. -
  804. -
  805. -
  806. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  807. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  808. +if ${lt_cv_prog_compiler_pic+:} false; then :
  809. + $as_echo_n "(cached) " >&6
  810. +else
  811. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  812. +fi
  813. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  814. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  815. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  816. #
  817. # Check to make sure the PIC flag actually works.
  818. @@ -8446,6 +8950,11 @@ fi
  819. +
  820. +
  821. +
  822. +
  823. +
  824. #
  825. # Check to make sure the static flag actually works.
  826. #
  827. @@ -8796,7 +9305,8 @@ _LT_EOF
  828. allow_undefined_flag=unsupported
  829. always_export_symbols=no
  830. enable_shared_with_static_runtimes=yes
  831. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  832. + 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'
  833. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  834. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  835. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  836. @@ -8895,12 +9405,12 @@ _LT_EOF
  837. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  838. hardcode_libdir_flag_spec=
  839. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  840. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  841. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  842. if test "x$supports_anon_versioning" = xyes; then
  843. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  844. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  845. echo "local: *; };" >> $output_objdir/$libname.ver~
  846. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  847. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  848. fi
  849. ;;
  850. esac
  851. @@ -8914,8 +9424,8 @@ _LT_EOF
  852. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  853. wlarc=
  854. else
  855. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  856. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  857. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  858. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  859. fi
  860. ;;
  861. @@ -8933,8 +9443,8 @@ _LT_EOF
  862. _LT_EOF
  863. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  864. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  865. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  866. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  867. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  868. else
  869. ld_shlibs=no
  870. fi
  871. @@ -8980,8 +9490,8 @@ _LT_EOF
  872. *)
  873. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  874. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  875. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  876. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  877. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  878. else
  879. ld_shlibs=no
  880. fi
  881. @@ -9111,7 +9621,13 @@ _LT_EOF
  882. allow_undefined_flag='-berok'
  883. # Determine the default libpath from the value encoded in an
  884. # empty executable.
  885. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  886. + if test "${lt_cv_aix_libpath+set}" = set; then
  887. + aix_libpath=$lt_cv_aix_libpath
  888. +else
  889. + if ${lt_cv_aix_libpath_+:} false; then :
  890. + $as_echo_n "(cached) " >&6
  891. +else
  892. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  893. /* end confdefs.h. */
  894. int
  895. @@ -9124,22 +9640,29 @@ main ()
  896. _ACEOF
  897. if ac_fn_c_try_link "$LINENO"; then :
  898. -lt_aix_libpath_sed='
  899. - /Import File Strings/,/^$/ {
  900. - /^0/ {
  901. - s/^0 *\(.*\)$/\1/
  902. - p
  903. - }
  904. - }'
  905. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  906. -# Check for a 64-bit object if we didn't find anything.
  907. -if test -z "$aix_libpath"; then
  908. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  909. -fi
  910. + lt_aix_libpath_sed='
  911. + /Import File Strings/,/^$/ {
  912. + /^0/ {
  913. + s/^0 *\([^ ]*\) *$/\1/
  914. + p
  915. + }
  916. + }'
  917. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  918. + # Check for a 64-bit object if we didn't find anything.
  919. + if test -z "$lt_cv_aix_libpath_"; then
  920. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  921. + fi
  922. fi
  923. rm -f core conftest.err conftest.$ac_objext \
  924. conftest$ac_exeext conftest.$ac_ext
  925. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  926. + if test -z "$lt_cv_aix_libpath_"; then
  927. + lt_cv_aix_libpath_="/usr/lib:/lib"
  928. + fi
  929. +
  930. +fi
  931. +
  932. + aix_libpath=$lt_cv_aix_libpath_
  933. +fi
  934. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  935. 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"
  936. @@ -9151,7 +9674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  937. else
  938. # Determine the default libpath from the value encoded in an
  939. # empty executable.
  940. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  941. + if test "${lt_cv_aix_libpath+set}" = set; then
  942. + aix_libpath=$lt_cv_aix_libpath
  943. +else
  944. + if ${lt_cv_aix_libpath_+:} false; then :
  945. + $as_echo_n "(cached) " >&6
  946. +else
  947. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  948. /* end confdefs.h. */
  949. int
  950. @@ -9164,22 +9693,29 @@ main ()
  951. _ACEOF
  952. if ac_fn_c_try_link "$LINENO"; then :
  953. -lt_aix_libpath_sed='
  954. - /Import File Strings/,/^$/ {
  955. - /^0/ {
  956. - s/^0 *\(.*\)$/\1/
  957. - p
  958. - }
  959. - }'
  960. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  961. -# Check for a 64-bit object if we didn't find anything.
  962. -if test -z "$aix_libpath"; then
  963. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  964. -fi
  965. + lt_aix_libpath_sed='
  966. + /Import File Strings/,/^$/ {
  967. + /^0/ {
  968. + s/^0 *\([^ ]*\) *$/\1/
  969. + p
  970. + }
  971. + }'
  972. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  973. + # Check for a 64-bit object if we didn't find anything.
  974. + if test -z "$lt_cv_aix_libpath_"; then
  975. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  976. + fi
  977. fi
  978. rm -f core conftest.err conftest.$ac_objext \
  979. conftest$ac_exeext conftest.$ac_ext
  980. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  981. + if test -z "$lt_cv_aix_libpath_"; then
  982. + lt_cv_aix_libpath_="/usr/lib:/lib"
  983. + fi
  984. +
  985. +fi
  986. +
  987. + aix_libpath=$lt_cv_aix_libpath_
  988. +fi
  989. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  990. # Warning - without using the other run time loading flags,
  991. @@ -9224,20 +9760,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  992. # Microsoft Visual C++.
  993. # hardcode_libdir_flag_spec is actually meaningless, as there is
  994. # no search path for DLLs.
  995. - hardcode_libdir_flag_spec=' '
  996. - allow_undefined_flag=unsupported
  997. - # Tell ltmain to make .lib files, not .a files.
  998. - libext=lib
  999. - # Tell ltmain to make .dll files, not .so files.
  1000. - shrext_cmds=".dll"
  1001. - # FIXME: Setting linknames here is a bad hack.
  1002. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  1003. - # The linker will automatically build a .lib file if we build a DLL.
  1004. - old_archive_from_new_cmds='true'
  1005. - # FIXME: Should let the user specify the lib program.
  1006. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  1007. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  1008. - enable_shared_with_static_runtimes=yes
  1009. + case $cc_basename in
  1010. + cl*)
  1011. + # Native MSVC
  1012. + hardcode_libdir_flag_spec=' '
  1013. + allow_undefined_flag=unsupported
  1014. + always_export_symbols=yes
  1015. + file_list_spec='@'
  1016. + # Tell ltmain to make .lib files, not .a files.
  1017. + libext=lib
  1018. + # Tell ltmain to make .dll files, not .so files.
  1019. + shrext_cmds=".dll"
  1020. + # FIXME: Setting linknames here is a bad hack.
  1021. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  1022. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  1023. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  1024. + else
  1025. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  1026. + fi~
  1027. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  1028. + linknames='
  1029. + # The linker will not automatically build a static lib if we build a DLL.
  1030. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  1031. + enable_shared_with_static_runtimes=yes
  1032. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  1033. + # Don't use ranlib
  1034. + old_postinstall_cmds='chmod 644 $oldlib'
  1035. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  1036. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  1037. + case $lt_outputfile in
  1038. + *.exe|*.EXE) ;;
  1039. + *)
  1040. + lt_outputfile="$lt_outputfile.exe"
  1041. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  1042. + ;;
  1043. + esac~
  1044. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  1045. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  1046. + $RM "$lt_outputfile.manifest";
  1047. + fi'
  1048. + ;;
  1049. + *)
  1050. + # Assume MSVC wrapper
  1051. + hardcode_libdir_flag_spec=' '
  1052. + allow_undefined_flag=unsupported
  1053. + # Tell ltmain to make .lib files, not .a files.
  1054. + libext=lib
  1055. + # Tell ltmain to make .dll files, not .so files.
  1056. + shrext_cmds=".dll"
  1057. + # FIXME: Setting linknames here is a bad hack.
  1058. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  1059. + # The linker will automatically build a .lib file if we build a DLL.
  1060. + old_archive_from_new_cmds='true'
  1061. + # FIXME: Should let the user specify the lib program.
  1062. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  1063. + enable_shared_with_static_runtimes=yes
  1064. + ;;
  1065. + esac
  1066. ;;
  1067. darwin* | rhapsody*)
  1068. @@ -9298,7 +9877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1069. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  1070. freebsd* | dragonfly*)
  1071. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  1072. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  1073. hardcode_libdir_flag_spec='-R$libdir'
  1074. hardcode_direct=yes
  1075. hardcode_shlibpath_var=no
  1076. @@ -9306,7 +9885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1077. hpux9*)
  1078. if test "$GCC" = yes; then
  1079. - 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'
  1080. + 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'
  1081. else
  1082. 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'
  1083. fi
  1084. @@ -9322,7 +9901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1085. hpux10*)
  1086. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  1087. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1088. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1089. else
  1090. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  1091. fi
  1092. @@ -9346,10 +9925,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  1093. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  1094. ;;
  1095. ia64*)
  1096. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  1097. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  1098. ;;
  1099. *)
  1100. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1101. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  1102. ;;
  1103. esac
  1104. else
  1105. @@ -9428,23 +10007,36 @@ fi
  1106. irix5* | irix6* | nonstopux*)
  1107. if test "$GCC" = yes; then
  1108. - 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'
  1109. + 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'
  1110. # Try to use the -exported_symbol ld option, if it does not
  1111. # work, assume that -exports_file does not work either and
  1112. # implicitly export all symbols.
  1113. - save_LDFLAGS="$LDFLAGS"
  1114. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  1115. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1116. + # This should be the same for all languages, so no per-tag cache variable.
  1117. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  1118. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  1119. +if ${lt_cv_irix_exported_symbol+:} false; then :
  1120. + $as_echo_n "(cached) " >&6
  1121. +else
  1122. + save_LDFLAGS="$LDFLAGS"
  1123. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  1124. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  1125. /* end confdefs.h. */
  1126. -int foo(void) {}
  1127. +int foo (void) { return 0; }
  1128. _ACEOF
  1129. if ac_fn_c_try_link "$LINENO"; then :
  1130. - 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'
  1131. -
  1132. + lt_cv_irix_exported_symbol=yes
  1133. +else
  1134. + lt_cv_irix_exported_symbol=no
  1135. fi
  1136. rm -f core conftest.err conftest.$ac_objext \
  1137. conftest$ac_exeext conftest.$ac_ext
  1138. - LDFLAGS="$save_LDFLAGS"
  1139. + LDFLAGS="$save_LDFLAGS"
  1140. +fi
  1141. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  1142. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  1143. + if test "$lt_cv_irix_exported_symbol" = yes; then
  1144. + 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'
  1145. + fi
  1146. else
  1147. 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'
  1148. 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'
  1149. @@ -9529,7 +10121,7 @@ rm -f core conftest.err conftest.$ac_objext \
  1150. osf4* | osf5*) # as osf3* with the addition of -msym flag
  1151. if test "$GCC" = yes; then
  1152. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  1153. - 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'
  1154. + 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'
  1155. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  1156. else
  1157. allow_undefined_flag=' -expect_unresolved \*'
  1158. @@ -9548,9 +10140,9 @@ rm -f core conftest.err conftest.$ac_objext \
  1159. no_undefined_flag=' -z defs'
  1160. if test "$GCC" = yes; then
  1161. wlarc='${wl}'
  1162. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  1163. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  1164. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  1165. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  1166. + $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'
  1167. else
  1168. case `$CC -V 2>&1` in
  1169. *"Compilers 5.0"*)
  1170. @@ -10126,8 +10718,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  1171. need_version=no
  1172. need_lib_prefix=no
  1173. - case $GCC,$host_os in
  1174. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  1175. + case $GCC,$cc_basename in
  1176. + yes,*)
  1177. + # gcc
  1178. library_names_spec='$libname.dll.a'
  1179. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  1180. postinstall_cmds='base_file=`basename \${file}`~
  1181. @@ -10160,13 +10753,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  1182. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  1183. ;;
  1184. esac
  1185. + dynamic_linker='Win32 ld.exe'
  1186. + ;;
  1187. +
  1188. + *,cl*)
  1189. + # Native MSVC
  1190. + libname_spec='$name'
  1191. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  1192. + library_names_spec='${libname}.dll.lib'
  1193. +
  1194. + case $build_os in
  1195. + mingw*)
  1196. + sys_lib_search_path_spec=
  1197. + lt_save_ifs=$IFS
  1198. + IFS=';'
  1199. + for lt_path in $LIB
  1200. + do
  1201. + IFS=$lt_save_ifs
  1202. + # Let DOS variable expansion print the short 8.3 style file name.
  1203. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  1204. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  1205. + done
  1206. + IFS=$lt_save_ifs
  1207. + # Convert to MSYS style.
  1208. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  1209. + ;;
  1210. + cygwin*)
  1211. + # Convert to unix form, then to dos form, then back to unix form
  1212. + # but this time dos style (no spaces!) so that the unix form looks
  1213. + # like /cygdrive/c/PROGRA~1:/cygdr...
  1214. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  1215. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  1216. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  1217. + ;;
  1218. + *)
  1219. + sys_lib_search_path_spec="$LIB"
  1220. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  1221. + # It is most probably a Windows format PATH.
  1222. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  1223. + else
  1224. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  1225. + fi
  1226. + # FIXME: find the short name or the path components, as spaces are
  1227. + # common. (e.g. "Program Files" -> "PROGRA~1")
  1228. + ;;
  1229. + esac
  1230. +
  1231. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  1232. + postinstall_cmds='base_file=`basename \${file}`~
  1233. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  1234. + dldir=$destdir/`dirname \$dlpath`~
  1235. + test -d \$dldir || mkdir -p \$dldir~
  1236. + $install_prog $dir/$dlname \$dldir/$dlname'
  1237. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  1238. + dlpath=$dir/\$dldll~
  1239. + $RM \$dlpath'
  1240. + shlibpath_overrides_runpath=yes
  1241. + dynamic_linker='Win32 link.exe'
  1242. ;;
  1243. *)
  1244. + # Assume MSVC wrapper
  1245. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  1246. + dynamic_linker='Win32 ld.exe'
  1247. ;;
  1248. esac
  1249. - dynamic_linker='Win32 ld.exe'
  1250. # FIXME: first we should search . and the directory the executable is in
  1251. shlibpath_var=PATH
  1252. ;;
  1253. @@ -10248,7 +10899,7 @@ haiku*)
  1254. soname_spec='${libname}${release}${shared_ext}$major'
  1255. shlibpath_var=LIBRARY_PATH
  1256. shlibpath_overrides_runpath=yes
  1257. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  1258. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  1259. hardcode_into_libs=yes
  1260. ;;
  1261. @@ -11044,7 +11695,7 @@ else
  1262. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  1263. lt_status=$lt_dlunknown
  1264. cat > conftest.$ac_ext <<_LT_EOF
  1265. -#line 11047 "configure"
  1266. +#line $LINENO "configure"
  1267. #include "confdefs.h"
  1268. #if HAVE_DLFCN_H
  1269. @@ -11088,10 +11739,10 @@ else
  1270. /* When -fvisbility=hidden is used, assume the code has been annotated
  1271. correspondingly for the symbols needed. */
  1272. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  1273. -void fnord () __attribute__((visibility("default")));
  1274. +int fnord () __attribute__((visibility("default")));
  1275. #endif
  1276. -void fnord () { int i=42; }
  1277. +int fnord () { return 42; }
  1278. int main ()
  1279. {
  1280. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  1281. @@ -11150,7 +11801,7 @@ else
  1282. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  1283. lt_status=$lt_dlunknown
  1284. cat > conftest.$ac_ext <<_LT_EOF
  1285. -#line 11153 "configure"
  1286. +#line $LINENO "configure"
  1287. #include "confdefs.h"
  1288. #if HAVE_DLFCN_H
  1289. @@ -11194,10 +11845,10 @@ else
  1290. /* When -fvisbility=hidden is used, assume the code has been annotated
  1291. correspondingly for the symbols needed. */
  1292. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  1293. -void fnord () __attribute__((visibility("default")));
  1294. +int fnord () __attribute__((visibility("default")));
  1295. #endif
  1296. -void fnord () { int i=42; }
  1297. +int fnord () { return 42; }
  1298. int main ()
  1299. {
  1300. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  1301. @@ -13114,7 +13765,7 @@ SHARED_LDFLAGS=
  1302. if test "$enable_shared" = "yes"; then
  1303. x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
  1304. if test -n "$x"; then
  1305. - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
  1306. + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
  1307. fi
  1308. fi
  1309. @@ -15762,13 +16413,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  1310. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  1311. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  1312. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  1313. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  1314. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  1315. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  1316. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  1317. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  1318. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  1319. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  1320. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  1321. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  1322. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  1323. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  1324. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  1325. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  1326. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  1327. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  1328. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  1329. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  1330. @@ -15783,14 +16441,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  1331. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  1332. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  1333. 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"`'
  1334. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  1335. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  1336. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  1337. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  1338. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  1339. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  1340. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  1341. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  1342. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  1343. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  1344. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  1345. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  1346. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  1347. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  1348. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  1349. @@ -15823,12 +16484,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  1350. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  1351. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  1352. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  1353. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  1354. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  1355. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  1356. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  1357. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  1358. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  1359. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  1360. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  1361. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  1362. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  1363. @@ -15883,8 +16544,13 @@ reload_flag \
  1364. OBJDUMP \
  1365. deplibs_check_method \
  1366. file_magic_cmd \
  1367. +file_magic_glob \
  1368. +want_nocaseglob \
  1369. +DLLTOOL \
  1370. +sharedlib_from_linklib_cmd \
  1371. AR \
  1372. AR_FLAGS \
  1373. +archiver_list_spec \
  1374. STRIP \
  1375. RANLIB \
  1376. CC \
  1377. @@ -15894,12 +16560,14 @@ lt_cv_sys_global_symbol_pipe \
  1378. lt_cv_sys_global_symbol_to_cdecl \
  1379. lt_cv_sys_global_symbol_to_c_name_address \
  1380. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  1381. +nm_file_list_spec \
  1382. lt_prog_compiler_no_builtin_flag \
  1383. -lt_prog_compiler_wl \
  1384. lt_prog_compiler_pic \
  1385. +lt_prog_compiler_wl \
  1386. lt_prog_compiler_static \
  1387. lt_cv_prog_compiler_c_o \
  1388. need_locks \
  1389. +MANIFEST_TOOL \
  1390. DSYMUTIL \
  1391. NMEDIT \
  1392. LIPO \
  1393. @@ -15915,7 +16583,6 @@ no_undefined_flag \
  1394. hardcode_libdir_flag_spec \
  1395. hardcode_libdir_flag_spec_ld \
  1396. hardcode_libdir_separator \
  1397. -fix_srcfile_path \
  1398. exclude_expsyms \
  1399. include_expsyms \
  1400. file_list_spec \
  1401. @@ -15951,6 +16618,7 @@ module_cmds \
  1402. module_expsym_cmds \
  1403. export_symbols_cmds \
  1404. prelink_cmds \
  1405. +postlink_cmds \
  1406. postinstall_cmds \
  1407. postuninstall_cmds \
  1408. finish_cmds \
  1409. @@ -16720,7 +17388,8 @@ $as_echo X"$file" |
  1410. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  1411. #
  1412. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  1413. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  1414. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  1415. +# Inc.
  1416. # Written by Gordon Matzigkeit, 1996
  1417. #
  1418. # This file is part of GNU Libtool.
  1419. @@ -16823,19 +17492,42 @@ SP2NL=$lt_lt_SP2NL
  1420. # turn newlines into spaces.
  1421. NL2SP=$lt_lt_NL2SP
  1422. +# convert \$build file names to \$host format.
  1423. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  1424. +
  1425. +# convert \$build files to toolchain format.
  1426. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  1427. +
  1428. # An object symbol dumper.
  1429. OBJDUMP=$lt_OBJDUMP
  1430. # Method to check whether dependent libraries are shared objects.
  1431. deplibs_check_method=$lt_deplibs_check_method
  1432. -# Command to use when deplibs_check_method == "file_magic".
  1433. +# Command to use when deplibs_check_method = "file_magic".
  1434. file_magic_cmd=$lt_file_magic_cmd
  1435. +# How to find potential files when deplibs_check_method = "file_magic".
  1436. +file_magic_glob=$lt_file_magic_glob
  1437. +
  1438. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  1439. +want_nocaseglob=$lt_want_nocaseglob
  1440. +
  1441. +# DLL creation program.
  1442. +DLLTOOL=$lt_DLLTOOL
  1443. +
  1444. +# Command to associate shared and link libraries.
  1445. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  1446. +
  1447. # The archiver.
  1448. AR=$lt_AR
  1449. +
  1450. +# Flags to create an archive.
  1451. AR_FLAGS=$lt_AR_FLAGS
  1452. +# How to feed a file listing to the archiver.
  1453. +archiver_list_spec=$lt_archiver_list_spec
  1454. +
  1455. # A symbol stripping program.
  1456. STRIP=$lt_STRIP
  1457. @@ -16865,6 +17557,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  1458. # Transform the output of nm in a C name address pair when lib prefix is needed.
  1459. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  1460. +# Specify filename containing input files for \$NM.
  1461. +nm_file_list_spec=$lt_nm_file_list_spec
  1462. +
  1463. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  1464. +lt_sysroot=$lt_sysroot
  1465. +
  1466. # The name of the directory that contains temporary libtool files.
  1467. objdir=$objdir
  1468. @@ -16874,6 +17572,9 @@ MAGIC_CMD=$MAGIC_CMD
  1469. # Must we lock files when doing compilation?
  1470. need_locks=$lt_need_locks
  1471. +# Manifest tool.
  1472. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  1473. +
  1474. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  1475. DSYMUTIL=$lt_DSYMUTIL
  1476. @@ -16988,12 +17689,12 @@ with_gcc=$GCC
  1477. # Compiler flag to turn off builtin functions.
  1478. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  1479. -# How to pass a linker flag through the compiler.
  1480. -wl=$lt_lt_prog_compiler_wl
  1481. -
  1482. # Additional compiler flags for building library objects.
  1483. pic_flag=$lt_lt_prog_compiler_pic
  1484. +# How to pass a linker flag through the compiler.
  1485. +wl=$lt_lt_prog_compiler_wl
  1486. +
  1487. # Compiler flag to prevent dynamic linking.
  1488. link_static_flag=$lt_lt_prog_compiler_static
  1489. @@ -17080,9 +17781,6 @@ inherit_rpath=$inherit_rpath
  1490. # Whether libtool must link a program against all its dependency libraries.
  1491. link_all_deplibs=$link_all_deplibs
  1492. -# Fix the shell variable \$srcfile for the compiler.
  1493. -fix_srcfile_path=$lt_fix_srcfile_path
  1494. -
  1495. # Set to "yes" if exported symbols are required.
  1496. always_export_symbols=$always_export_symbols
  1497. @@ -17098,6 +17796,9 @@ include_expsyms=$lt_include_expsyms
  1498. # Commands necessary for linking programs (against libraries) with templates.
  1499. prelink_cmds=$lt_prelink_cmds
  1500. +# Commands necessary for finishing linking programs.
  1501. +postlink_cmds=$lt_postlink_cmds
  1502. +
  1503. # Specify filename containing input files.
  1504. file_list_spec=$lt_file_list_spec
  1505. @@ -17130,210 +17831,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  1506. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  1507. # text mode, it properly converts lines to CR/LF. This bash problem
  1508. # is reportedly fixed, but why not run on old versions too?
  1509. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  1510. - || (rm -f "$cfgfile"; exit 1)
  1511. -
  1512. - case $xsi_shell in
  1513. - yes)
  1514. - cat << \_LT_EOF >> "$cfgfile"
  1515. -
  1516. -# func_dirname file append nondir_replacement
  1517. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  1518. -# otherwise set result to NONDIR_REPLACEMENT.
  1519. -func_dirname ()
  1520. -{
  1521. - case ${1} in
  1522. - */*) func_dirname_result="${1%/*}${2}" ;;
  1523. - * ) func_dirname_result="${3}" ;;
  1524. - esac
  1525. -}
  1526. -
  1527. -# func_basename file
  1528. -func_basename ()
  1529. -{
  1530. - func_basename_result="${1##*/}"
  1531. -}
  1532. -
  1533. -# func_dirname_and_basename file append nondir_replacement
  1534. -# perform func_basename and func_dirname in a single function
  1535. -# call:
  1536. -# dirname: Compute the dirname of FILE. If nonempty,
  1537. -# add APPEND to the result, otherwise set result
  1538. -# to NONDIR_REPLACEMENT.
  1539. -# value returned in "$func_dirname_result"
  1540. -# basename: Compute filename of FILE.
  1541. -# value retuned in "$func_basename_result"
  1542. -# Implementation must be kept synchronized with func_dirname
  1543. -# and func_basename. For efficiency, we do not delegate to
  1544. -# those functions but instead duplicate the functionality here.
  1545. -func_dirname_and_basename ()
  1546. -{
  1547. - case ${1} in
  1548. - */*) func_dirname_result="${1%/*}${2}" ;;
  1549. - * ) func_dirname_result="${3}" ;;
  1550. - esac
  1551. - func_basename_result="${1##*/}"
  1552. -}
  1553. -
  1554. -# func_stripname prefix suffix name
  1555. -# strip PREFIX and SUFFIX off of NAME.
  1556. -# PREFIX and SUFFIX must not contain globbing or regex special
  1557. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  1558. -# dot (in which case that matches only a dot).
  1559. -func_stripname ()
  1560. -{
  1561. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  1562. - # positional parameters, so assign one to ordinary parameter first.
  1563. - func_stripname_result=${3}
  1564. - func_stripname_result=${func_stripname_result#"${1}"}
  1565. - func_stripname_result=${func_stripname_result%"${2}"}
  1566. -}
  1567. -
  1568. -# func_opt_split
  1569. -func_opt_split ()
  1570. -{
  1571. - func_opt_split_opt=${1%%=*}
  1572. - func_opt_split_arg=${1#*=}
  1573. -}
  1574. -
  1575. -# func_lo2o object
  1576. -func_lo2o ()
  1577. -{
  1578. - case ${1} in
  1579. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  1580. - *) func_lo2o_result=${1} ;;
  1581. - esac
  1582. -}
  1583. -
  1584. -# func_xform libobj-or-source
  1585. -func_xform ()
  1586. -{
  1587. - func_xform_result=${1%.*}.lo
  1588. -}
  1589. -
  1590. -# func_arith arithmetic-term...
  1591. -func_arith ()
  1592. -{
  1593. - func_arith_result=$(( $* ))
  1594. -}
  1595. -
  1596. -# func_len string
  1597. -# STRING may not start with a hyphen.
  1598. -func_len ()
  1599. -{
  1600. - func_len_result=${#1}
  1601. -}
  1602. -
  1603. -_LT_EOF
  1604. - ;;
  1605. - *) # Bourne compatible functions.
  1606. - cat << \_LT_EOF >> "$cfgfile"
  1607. -
  1608. -# func_dirname file append nondir_replacement
  1609. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  1610. -# otherwise set result to NONDIR_REPLACEMENT.
  1611. -func_dirname ()
  1612. -{
  1613. - # Extract subdirectory from the argument.
  1614. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  1615. - if test "X$func_dirname_result" = "X${1}"; then
  1616. - func_dirname_result="${3}"
  1617. - else
  1618. - func_dirname_result="$func_dirname_result${2}"
  1619. - fi
  1620. -}
  1621. -
  1622. -# func_basename file
  1623. -func_basename ()
  1624. -{
  1625. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  1626. -}
  1627. -
  1628. -
  1629. -# func_stripname prefix suffix name
  1630. -# strip PREFIX and SUFFIX off of NAME.
  1631. -# PREFIX and SUFFIX must not contain globbing or regex special
  1632. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  1633. -# dot (in which case that matches only a dot).
  1634. -# func_strip_suffix prefix name
  1635. -func_stripname ()
  1636. -{
  1637. - case ${2} in
  1638. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  1639. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  1640. - esac
  1641. -}
  1642. -
  1643. -# sed scripts:
  1644. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  1645. -my_sed_long_arg='1s/^-[^=]*=//'
  1646. -
  1647. -# func_opt_split
  1648. -func_opt_split ()
  1649. -{
  1650. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  1651. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  1652. -}
  1653. -
  1654. -# func_lo2o object
  1655. -func_lo2o ()
  1656. -{
  1657. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  1658. -}
  1659. -
  1660. -# func_xform libobj-or-source
  1661. -func_xform ()
  1662. -{
  1663. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  1664. -}
  1665. -
  1666. -# func_arith arithmetic-term...
  1667. -func_arith ()
  1668. -{
  1669. - func_arith_result=`expr "$@"`
  1670. -}
  1671. -
  1672. -# func_len string
  1673. -# STRING may not start with a hyphen.
  1674. -func_len ()
  1675. -{
  1676. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  1677. -}
  1678. -
  1679. -_LT_EOF
  1680. -esac
  1681. -
  1682. -case $lt_shell_append in
  1683. - yes)
  1684. - cat << \_LT_EOF >> "$cfgfile"
  1685. -
  1686. -# func_append var value
  1687. -# Append VALUE to the end of shell variable VAR.
  1688. -func_append ()
  1689. -{
  1690. - eval "$1+=\$2"
  1691. -}
  1692. -_LT_EOF
  1693. - ;;
  1694. - *)
  1695. - cat << \_LT_EOF >> "$cfgfile"
  1696. -
  1697. -# func_append var value
  1698. -# Append VALUE to the end of shell variable VAR.
  1699. -func_append ()
  1700. -{
  1701. - eval "$1=\$$1\$2"
  1702. -}
  1703. -
  1704. -_LT_EOF
  1705. - ;;
  1706. - esac
  1707. -
  1708. -
  1709. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  1710. - || (rm -f "$cfgfile"; exit 1)
  1711. -
  1712. - mv -f "$cfgfile" "$ofile" ||
  1713. + sed '$q' "$ltmain" >> "$cfgfile" \
  1714. + || (rm -f "$cfgfile"; exit 1)
  1715. +
  1716. + if test x"$xsi_shell" = xyes; then
  1717. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  1718. +func_dirname ()\
  1719. +{\
  1720. +\ case ${1} in\
  1721. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  1722. +\ * ) func_dirname_result="${3}" ;;\
  1723. +\ esac\
  1724. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  1725. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1726. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1727. +test 0 -eq $? || _lt_function_replace_fail=:
  1728. +
  1729. +
  1730. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  1731. +func_basename ()\
  1732. +{\
  1733. +\ func_basename_result="${1##*/}"\
  1734. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  1735. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1736. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1737. +test 0 -eq $? || _lt_function_replace_fail=:
  1738. +
  1739. +
  1740. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  1741. +func_dirname_and_basename ()\
  1742. +{\
  1743. +\ case ${1} in\
  1744. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  1745. +\ * ) func_dirname_result="${3}" ;;\
  1746. +\ esac\
  1747. +\ func_basename_result="${1##*/}"\
  1748. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  1749. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1750. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1751. +test 0 -eq $? || _lt_function_replace_fail=:
  1752. +
  1753. +
  1754. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  1755. +func_stripname ()\
  1756. +{\
  1757. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  1758. +\ # positional parameters, so assign one to ordinary parameter first.\
  1759. +\ func_stripname_result=${3}\
  1760. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  1761. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  1762. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  1763. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1764. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1765. +test 0 -eq $? || _lt_function_replace_fail=:
  1766. +
  1767. +
  1768. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  1769. +func_split_long_opt ()\
  1770. +{\
  1771. +\ func_split_long_opt_name=${1%%=*}\
  1772. +\ func_split_long_opt_arg=${1#*=}\
  1773. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  1774. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1775. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1776. +test 0 -eq $? || _lt_function_replace_fail=:
  1777. +
  1778. +
  1779. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  1780. +func_split_short_opt ()\
  1781. +{\
  1782. +\ func_split_short_opt_arg=${1#??}\
  1783. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  1784. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  1785. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1786. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1787. +test 0 -eq $? || _lt_function_replace_fail=:
  1788. +
  1789. +
  1790. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  1791. +func_lo2o ()\
  1792. +{\
  1793. +\ case ${1} in\
  1794. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  1795. +\ *) func_lo2o_result=${1} ;;\
  1796. +\ esac\
  1797. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  1798. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1799. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1800. +test 0 -eq $? || _lt_function_replace_fail=:
  1801. +
  1802. +
  1803. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  1804. +func_xform ()\
  1805. +{\
  1806. + func_xform_result=${1%.*}.lo\
  1807. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  1808. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1809. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1810. +test 0 -eq $? || _lt_function_replace_fail=:
  1811. +
  1812. +
  1813. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  1814. +func_arith ()\
  1815. +{\
  1816. + func_arith_result=$(( $* ))\
  1817. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  1818. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1819. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1820. +test 0 -eq $? || _lt_function_replace_fail=:
  1821. +
  1822. +
  1823. + sed -e '/^func_len ()$/,/^} # func_len /c\
  1824. +func_len ()\
  1825. +{\
  1826. + func_len_result=${#1}\
  1827. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  1828. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1829. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1830. +test 0 -eq $? || _lt_function_replace_fail=:
  1831. +
  1832. +fi
  1833. +
  1834. +if test x"$lt_shell_append" = xyes; then
  1835. + sed -e '/^func_append ()$/,/^} # func_append /c\
  1836. +func_append ()\
  1837. +{\
  1838. + eval "${1}+=\\${2}"\
  1839. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  1840. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1841. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1842. +test 0 -eq $? || _lt_function_replace_fail=:
  1843. +
  1844. +
  1845. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  1846. +func_append_quoted ()\
  1847. +{\
  1848. +\ func_quote_for_eval "${2}"\
  1849. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  1850. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  1851. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1852. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1853. +test 0 -eq $? || _lt_function_replace_fail=:
  1854. +
  1855. +
  1856. + # Save a `func_append' function call where possible by direct use of '+='
  1857. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  1858. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1859. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1860. + test 0 -eq $? || _lt_function_replace_fail=:
  1861. +else
  1862. + # Save a `func_append' function call even when '+=' is not available
  1863. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  1864. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  1865. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  1866. + test 0 -eq $? || _lt_function_replace_fail=:
  1867. +fi
  1868. +
  1869. +if test x"$_lt_function_replace_fail" = x":"; then
  1870. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  1871. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  1872. +fi
  1873. +
  1874. +
  1875. + mv -f "$cfgfile" "$ofile" ||
  1876. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  1877. chmod +x "$ofile"
  1878. diff --git a/bfd/configure.ac b/bfd/configure.ac
  1879. index 07a75ed1626..288374c504c 100644
  1880. --- a/bfd/configure.ac
  1881. +++ b/bfd/configure.ac
  1882. @@ -304,7 +304,7 @@ changequote(,)dnl
  1883. x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
  1884. changequote([,])dnl
  1885. if test -n "$x"; then
  1886. - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
  1887. + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
  1888. fi
  1889. fi
  1890. diff --git a/binutils/configure b/binutils/configure
  1891. index bf6461dab1e..8e6f6d30b4d 100755
  1892. --- a/binutils/configure
  1893. +++ b/binutils/configure
  1894. @@ -696,8 +696,11 @@ OTOOL
  1895. LIPO
  1896. NMEDIT
  1897. DSYMUTIL
  1898. +MANIFEST_TOOL
  1899. RANLIB
  1900. +ac_ct_AR
  1901. AR
  1902. +DLLTOOL
  1903. OBJDUMP
  1904. LN_S
  1905. NM
  1906. @@ -814,6 +817,7 @@ enable_static
  1907. with_pic
  1908. enable_fast_install
  1909. with_gnu_ld
  1910. +with_libtool_sysroot
  1911. enable_libtool_lock
  1912. enable_plugins
  1913. enable_largefile
  1914. @@ -1509,6 +1513,8 @@ Optional Packages:
  1915. --with-pic try to use only PIC/non-PIC objects [default=use
  1916. both]
  1917. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  1918. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  1919. + (or the compiler's sysroot if not specified).
  1920. --with-debuginfod Enable debuginfo lookups with debuginfod
  1921. (auto/yes/no)
  1922. --with-system-zlib use installed libz
  1923. @@ -4844,8 +4850,8 @@ esac
  1924. -macro_version='2.2.7a'
  1925. -macro_revision='1.3134'
  1926. +macro_version='2.4'
  1927. +macro_revision='1.3293'
  1928. @@ -4885,7 +4891,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  1929. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  1930. $as_echo_n "checking how to print strings... " >&6; }
  1931. # Test print first, because it will be a builtin if present.
  1932. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  1933. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  1934. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  1935. ECHO='print -r --'
  1936. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  1937. @@ -5571,8 +5577,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  1938. # Try some XSI features
  1939. xsi_shell=no
  1940. ( _lt_dummy="a/b/c"
  1941. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  1942. - = c,a/b,, \
  1943. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  1944. + = c,a/b,b/c, \
  1945. && eval 'test $(( 1 + 1 )) -eq 2 \
  1946. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  1947. && xsi_shell=yes
  1948. @@ -5621,6 +5627,80 @@ esac
  1949. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  1950. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  1951. +if ${lt_cv_to_host_file_cmd+:} false; then :
  1952. + $as_echo_n "(cached) " >&6
  1953. +else
  1954. + case $host in
  1955. + *-*-mingw* )
  1956. + case $build in
  1957. + *-*-mingw* ) # actually msys
  1958. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  1959. + ;;
  1960. + *-*-cygwin* )
  1961. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  1962. + ;;
  1963. + * ) # otherwise, assume *nix
  1964. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  1965. + ;;
  1966. + esac
  1967. + ;;
  1968. + *-*-cygwin* )
  1969. + case $build in
  1970. + *-*-mingw* ) # actually msys
  1971. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  1972. + ;;
  1973. + *-*-cygwin* )
  1974. + lt_cv_to_host_file_cmd=func_convert_file_noop
  1975. + ;;
  1976. + * ) # otherwise, assume *nix
  1977. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  1978. + ;;
  1979. + esac
  1980. + ;;
  1981. + * ) # unhandled hosts (and "normal" native builds)
  1982. + lt_cv_to_host_file_cmd=func_convert_file_noop
  1983. + ;;
  1984. +esac
  1985. +
  1986. +fi
  1987. +
  1988. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  1989. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  1990. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  1991. +
  1992. +
  1993. +
  1994. +
  1995. +
  1996. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  1997. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  1998. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  1999. + $as_echo_n "(cached) " >&6
  2000. +else
  2001. + #assume ordinary cross tools, or native build.
  2002. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  2003. +case $host in
  2004. + *-*-mingw* )
  2005. + case $build in
  2006. + *-*-mingw* ) # actually msys
  2007. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  2008. + ;;
  2009. + esac
  2010. + ;;
  2011. +esac
  2012. +
  2013. +fi
  2014. +
  2015. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  2016. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  2017. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  2018. +
  2019. +
  2020. +
  2021. +
  2022. +
  2023. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  2024. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  2025. if ${lt_cv_ld_reload_flag+:} false; then :
  2026. @@ -5637,6 +5717,11 @@ case $reload_flag in
  2027. esac
  2028. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  2029. case $host_os in
  2030. + cygwin* | mingw* | pw32* | cegcc*)
  2031. + if test "$GCC" != yes; then
  2032. + reload_cmds=false
  2033. + fi
  2034. + ;;
  2035. darwin*)
  2036. if test "$GCC" = yes; then
  2037. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  2038. @@ -5805,7 +5890,8 @@ mingw* | pw32*)
  2039. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  2040. lt_cv_file_magic_cmd='func_win32_libid'
  2041. else
  2042. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  2043. + # Keep this pattern in sync with the one in func_win32_libid.
  2044. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  2045. lt_cv_file_magic_cmd='$OBJDUMP -f'
  2046. fi
  2047. ;;
  2048. @@ -5959,6 +6045,21 @@ esac
  2049. fi
  2050. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  2051. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  2052. +
  2053. +file_magic_glob=
  2054. +want_nocaseglob=no
  2055. +if test "$build" = "$host"; then
  2056. + case $host_os in
  2057. + mingw* | pw32*)
  2058. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  2059. + want_nocaseglob=yes
  2060. + else
  2061. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  2062. + fi
  2063. + ;;
  2064. + esac
  2065. +fi
  2066. +
  2067. file_magic_cmd=$lt_cv_file_magic_cmd
  2068. deplibs_check_method=$lt_cv_deplibs_check_method
  2069. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  2070. @@ -5974,6 +6075,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  2071. +
  2072. +
  2073. +
  2074. +
  2075. +
  2076. +
  2077. +
  2078. +
  2079. +
  2080. +
  2081. +if test -n "$ac_tool_prefix"; then
  2082. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  2083. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  2084. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2085. +$as_echo_n "checking for $ac_word... " >&6; }
  2086. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  2087. + $as_echo_n "(cached) " >&6
  2088. +else
  2089. + if test -n "$DLLTOOL"; then
  2090. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  2091. +else
  2092. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2093. +for as_dir in $PATH
  2094. +do
  2095. + IFS=$as_save_IFS
  2096. + test -z "$as_dir" && as_dir=.
  2097. + for ac_exec_ext in '' $ac_executable_extensions; do
  2098. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2099. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  2100. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2101. + break 2
  2102. + fi
  2103. +done
  2104. + done
  2105. +IFS=$as_save_IFS
  2106. +
  2107. +fi
  2108. +fi
  2109. +DLLTOOL=$ac_cv_prog_DLLTOOL
  2110. +if test -n "$DLLTOOL"; then
  2111. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  2112. +$as_echo "$DLLTOOL" >&6; }
  2113. +else
  2114. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2115. +$as_echo "no" >&6; }
  2116. +fi
  2117. +
  2118. +
  2119. +fi
  2120. +if test -z "$ac_cv_prog_DLLTOOL"; then
  2121. + ac_ct_DLLTOOL=$DLLTOOL
  2122. + # Extract the first word of "dlltool", so it can be a program name with args.
  2123. +set dummy dlltool; ac_word=$2
  2124. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2125. +$as_echo_n "checking for $ac_word... " >&6; }
  2126. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  2127. + $as_echo_n "(cached) " >&6
  2128. +else
  2129. + if test -n "$ac_ct_DLLTOOL"; then
  2130. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  2131. +else
  2132. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2133. +for as_dir in $PATH
  2134. +do
  2135. + IFS=$as_save_IFS
  2136. + test -z "$as_dir" && as_dir=.
  2137. + for ac_exec_ext in '' $ac_executable_extensions; do
  2138. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2139. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  2140. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2141. + break 2
  2142. + fi
  2143. +done
  2144. + done
  2145. +IFS=$as_save_IFS
  2146. +
  2147. +fi
  2148. +fi
  2149. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  2150. +if test -n "$ac_ct_DLLTOOL"; then
  2151. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  2152. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  2153. +else
  2154. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2155. +$as_echo "no" >&6; }
  2156. +fi
  2157. +
  2158. + if test "x$ac_ct_DLLTOOL" = x; then
  2159. + DLLTOOL="false"
  2160. + else
  2161. + case $cross_compiling:$ac_tool_warned in
  2162. +yes:)
  2163. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  2164. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  2165. +ac_tool_warned=yes ;;
  2166. +esac
  2167. + DLLTOOL=$ac_ct_DLLTOOL
  2168. + fi
  2169. +else
  2170. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  2171. +fi
  2172. +
  2173. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  2174. +
  2175. +
  2176. +
  2177. +
  2178. +
  2179. +
  2180. +
  2181. +
  2182. +
  2183. +
  2184. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  2185. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  2186. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  2187. + $as_echo_n "(cached) " >&6
  2188. +else
  2189. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  2190. +
  2191. +case $host_os in
  2192. +cygwin* | mingw* | pw32* | cegcc*)
  2193. + # two different shell functions defined in ltmain.sh
  2194. + # decide which to use based on capabilities of $DLLTOOL
  2195. + case `$DLLTOOL --help 2>&1` in
  2196. + *--identify-strict*)
  2197. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  2198. + ;;
  2199. + *)
  2200. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  2201. + ;;
  2202. + esac
  2203. + ;;
  2204. +*)
  2205. + # fallback: assume linklib IS sharedlib
  2206. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  2207. + ;;
  2208. +esac
  2209. +
  2210. +fi
  2211. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  2212. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  2213. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  2214. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  2215. +
  2216. +
  2217. +
  2218. +
  2219. +
  2220. +
  2221. +
  2222. plugin_option=
  2223. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  2224. for plugin in $plugin_names; do
  2225. @@ -5988,8 +6240,10 @@ for plugin in $plugin_names; do
  2226. done
  2227. if test -n "$ac_tool_prefix"; then
  2228. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  2229. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  2230. + for ac_prog in ar
  2231. + do
  2232. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  2233. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  2234. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2235. $as_echo_n "checking for $ac_word... " >&6; }
  2236. if ${ac_cv_prog_AR+:} false; then :
  2237. @@ -6005,7 +6259,7 @@ do
  2238. test -z "$as_dir" && as_dir=.
  2239. for ac_exec_ext in '' $ac_executable_extensions; do
  2240. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2241. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  2242. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  2243. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2244. break 2
  2245. fi
  2246. @@ -6025,11 +6279,15 @@ $as_echo "no" >&6; }
  2247. fi
  2248. + test -n "$AR" && break
  2249. + done
  2250. fi
  2251. -if test -z "$ac_cv_prog_AR"; then
  2252. +if test -z "$AR"; then
  2253. ac_ct_AR=$AR
  2254. - # Extract the first word of "ar", so it can be a program name with args.
  2255. -set dummy ar; ac_word=$2
  2256. + for ac_prog in ar
  2257. +do
  2258. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  2259. +set dummy $ac_prog; ac_word=$2
  2260. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2261. $as_echo_n "checking for $ac_word... " >&6; }
  2262. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  2263. @@ -6045,7 +6303,7 @@ do
  2264. test -z "$as_dir" && as_dir=.
  2265. for ac_exec_ext in '' $ac_executable_extensions; do
  2266. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2267. - ac_cv_prog_ac_ct_AR="ar"
  2268. + ac_cv_prog_ac_ct_AR="$ac_prog"
  2269. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2270. break 2
  2271. fi
  2272. @@ -6064,6 +6322,10 @@ else
  2273. $as_echo "no" >&6; }
  2274. fi
  2275. +
  2276. + test -n "$ac_ct_AR" && break
  2277. +done
  2278. +
  2279. if test "x$ac_ct_AR" = x; then
  2280. AR="false"
  2281. else
  2282. @@ -6075,29 +6337,81 @@ ac_tool_warned=yes ;;
  2283. esac
  2284. AR=$ac_ct_AR
  2285. fi
  2286. -else
  2287. - AR="$ac_cv_prog_AR"
  2288. fi
  2289. -test -z "$AR" && AR=ar
  2290. -if test -n "$plugin_option"; then
  2291. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  2292. - touch conftest.c
  2293. - $AR $plugin_option rc conftest.a conftest.c
  2294. - if test "$?" != 0; then
  2295. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  2296. + touch conftest.c
  2297. + $AR $plugin_option rc conftest.a conftest.c
  2298. + if test "$?" != 0; then
  2299. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  2300. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  2301. - else
  2302. - AR="$AR $plugin_option"
  2303. - fi
  2304. - rm -f conftest.*
  2305. + else
  2306. + AR="$AR $plugin_option"
  2307. fi
  2308. -fi
  2309. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  2310. + rm -f conftest.*
  2311. +: ${AR=ar}
  2312. +: ${AR_FLAGS=cru}
  2313. +
  2314. +
  2315. +
  2316. +
  2317. +
  2318. +
  2319. +
  2320. +
  2321. +
  2322. +
  2323. +
  2324. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  2325. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  2326. +if ${lt_cv_ar_at_file+:} false; then :
  2327. + $as_echo_n "(cached) " >&6
  2328. +else
  2329. + lt_cv_ar_at_file=no
  2330. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2331. +/* end confdefs.h. */
  2332. +
  2333. +int
  2334. +main ()
  2335. +{
  2336. + ;
  2337. + return 0;
  2338. +}
  2339. +_ACEOF
  2340. +if ac_fn_c_try_compile "$LINENO"; then :
  2341. + echo conftest.$ac_objext > conftest.lst
  2342. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  2343. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  2344. + (eval $lt_ar_try) 2>&5
  2345. + ac_status=$?
  2346. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  2347. + test $ac_status = 0; }
  2348. + if test "$ac_status" -eq 0; then
  2349. + # Ensure the archiver fails upon bogus file names.
  2350. + rm -f conftest.$ac_objext libconftest.a
  2351. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  2352. + (eval $lt_ar_try) 2>&5
  2353. + ac_status=$?
  2354. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  2355. + test $ac_status = 0; }
  2356. + if test "$ac_status" -ne 0; then
  2357. + lt_cv_ar_at_file=@
  2358. + fi
  2359. + fi
  2360. + rm -f conftest.* libconftest.a
  2361. +fi
  2362. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  2363. +fi
  2364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  2365. +$as_echo "$lt_cv_ar_at_file" >&6; }
  2366. +if test "x$lt_cv_ar_at_file" = xno; then
  2367. + archiver_list_spec=
  2368. +else
  2369. + archiver_list_spec=$lt_cv_ar_at_file
  2370. +fi
  2371. @@ -6444,8 +6758,8 @@ esac
  2372. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  2373. # Transform an extracted symbol line into symbol name and symbol address
  2374. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  2375. -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'"
  2376. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  2377. +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'"
  2378. # Handle CRLF in mingw tool chain
  2379. opt_cr=
  2380. @@ -6481,6 +6795,7 @@ for ac_symprfx in "" "_"; do
  2381. else
  2382. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  2383. fi
  2384. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  2385. # Check to see that the pipe works correctly.
  2386. pipe_works=no
  2387. @@ -6522,6 +6837,18 @@ _LT_EOF
  2388. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  2389. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  2390. cat <<_LT_EOF > conftest.$ac_ext
  2391. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  2392. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  2393. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  2394. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  2395. +# define LT_DLSYM_CONST
  2396. +#elif defined(__osf__)
  2397. +/* This system does not cope well with relocations in const data. */
  2398. +# define LT_DLSYM_CONST
  2399. +#else
  2400. +# define LT_DLSYM_CONST const
  2401. +#endif
  2402. +
  2403. #ifdef __cplusplus
  2404. extern "C" {
  2405. #endif
  2406. @@ -6533,7 +6860,7 @@ _LT_EOF
  2407. cat <<_LT_EOF >> conftest.$ac_ext
  2408. /* The mapping between symbol names and symbols. */
  2409. -const struct {
  2410. +LT_DLSYM_CONST struct {
  2411. const char *name;
  2412. void *address;
  2413. }
  2414. @@ -6559,8 +6886,8 @@ static const void *lt_preloaded_setup() {
  2415. _LT_EOF
  2416. # Now try linking the two files.
  2417. mv conftest.$ac_objext conftstm.$ac_objext
  2418. - lt_save_LIBS="$LIBS"
  2419. - lt_save_CFLAGS="$CFLAGS"
  2420. + lt_globsym_save_LIBS=$LIBS
  2421. + lt_globsym_save_CFLAGS=$CFLAGS
  2422. LIBS="conftstm.$ac_objext"
  2423. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  2424. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  2425. @@ -6570,8 +6897,8 @@ _LT_EOF
  2426. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  2427. pipe_works=yes
  2428. fi
  2429. - LIBS="$lt_save_LIBS"
  2430. - CFLAGS="$lt_save_CFLAGS"
  2431. + LIBS=$lt_globsym_save_LIBS
  2432. + CFLAGS=$lt_globsym_save_CFLAGS
  2433. else
  2434. echo "cannot find nm_test_func in $nlist" >&5
  2435. fi
  2436. @@ -6608,6 +6935,19 @@ else
  2437. $as_echo "ok" >&6; }
  2438. fi
  2439. +# Response file support.
  2440. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  2441. + nm_file_list_spec='@'
  2442. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  2443. + nm_file_list_spec='@'
  2444. +fi
  2445. +
  2446. +
  2447. +
  2448. +
  2449. +
  2450. +
  2451. +
  2452. @@ -6624,6 +6964,42 @@ fi
  2453. +
  2454. +
  2455. +
  2456. +
  2457. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  2458. +$as_echo_n "checking for sysroot... " >&6; }
  2459. +
  2460. +# Check whether --with-libtool-sysroot was given.
  2461. +if test "${with_libtool_sysroot+set}" = set; then :
  2462. + withval=$with_libtool_sysroot;
  2463. +else
  2464. + with_libtool_sysroot=no
  2465. +fi
  2466. +
  2467. +
  2468. +lt_sysroot=
  2469. +case ${with_libtool_sysroot} in #(
  2470. + yes)
  2471. + if test "$GCC" = yes; then
  2472. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  2473. + fi
  2474. + ;; #(
  2475. + /*)
  2476. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  2477. + ;; #(
  2478. + no|'')
  2479. + ;; #(
  2480. + *)
  2481. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  2482. +$as_echo "${with_libtool_sysroot}" >&6; }
  2483. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  2484. + ;;
  2485. +esac
  2486. +
  2487. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  2488. +$as_echo "${lt_sysroot:-no}" >&6; }
  2489. @@ -6835,6 +7211,123 @@ esac
  2490. need_locks="$enable_libtool_lock"
  2491. +if test -n "$ac_tool_prefix"; then
  2492. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  2493. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  2494. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2495. +$as_echo_n "checking for $ac_word... " >&6; }
  2496. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  2497. + $as_echo_n "(cached) " >&6
  2498. +else
  2499. + if test -n "$MANIFEST_TOOL"; then
  2500. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  2501. +else
  2502. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2503. +for as_dir in $PATH
  2504. +do
  2505. + IFS=$as_save_IFS
  2506. + test -z "$as_dir" && as_dir=.
  2507. + for ac_exec_ext in '' $ac_executable_extensions; do
  2508. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2509. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  2510. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2511. + break 2
  2512. + fi
  2513. +done
  2514. + done
  2515. +IFS=$as_save_IFS
  2516. +
  2517. +fi
  2518. +fi
  2519. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  2520. +if test -n "$MANIFEST_TOOL"; then
  2521. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  2522. +$as_echo "$MANIFEST_TOOL" >&6; }
  2523. +else
  2524. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2525. +$as_echo "no" >&6; }
  2526. +fi
  2527. +
  2528. +
  2529. +fi
  2530. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  2531. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  2532. + # Extract the first word of "mt", so it can be a program name with args.
  2533. +set dummy mt; ac_word=$2
  2534. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  2535. +$as_echo_n "checking for $ac_word... " >&6; }
  2536. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  2537. + $as_echo_n "(cached) " >&6
  2538. +else
  2539. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  2540. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  2541. +else
  2542. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  2543. +for as_dir in $PATH
  2544. +do
  2545. + IFS=$as_save_IFS
  2546. + test -z "$as_dir" && as_dir=.
  2547. + for ac_exec_ext in '' $ac_executable_extensions; do
  2548. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  2549. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  2550. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  2551. + break 2
  2552. + fi
  2553. +done
  2554. + done
  2555. +IFS=$as_save_IFS
  2556. +
  2557. +fi
  2558. +fi
  2559. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  2560. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  2561. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  2562. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  2563. +else
  2564. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  2565. +$as_echo "no" >&6; }
  2566. +fi
  2567. +
  2568. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  2569. + MANIFEST_TOOL=":"
  2570. + else
  2571. + case $cross_compiling:$ac_tool_warned in
  2572. +yes:)
  2573. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  2574. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  2575. +ac_tool_warned=yes ;;
  2576. +esac
  2577. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  2578. + fi
  2579. +else
  2580. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  2581. +fi
  2582. +
  2583. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  2584. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  2585. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  2586. +if ${lt_cv_path_mainfest_tool+:} false; then :
  2587. + $as_echo_n "(cached) " >&6
  2588. +else
  2589. + lt_cv_path_mainfest_tool=no
  2590. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  2591. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  2592. + cat conftest.err >&5
  2593. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  2594. + lt_cv_path_mainfest_tool=yes
  2595. + fi
  2596. + rm -f conftest*
  2597. +fi
  2598. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  2599. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  2600. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  2601. + MANIFEST_TOOL=:
  2602. +fi
  2603. +
  2604. +
  2605. +
  2606. +
  2607. +
  2608. case $host_os in
  2609. rhapsody* | darwin*)
  2610. @@ -7398,6 +7891,8 @@ _LT_EOF
  2611. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  2612. echo "$AR cru libconftest.a conftest.o" >&5
  2613. $AR cru libconftest.a conftest.o 2>&5
  2614. + echo "$RANLIB libconftest.a" >&5
  2615. + $RANLIB libconftest.a 2>&5
  2616. cat > conftest.c << _LT_EOF
  2617. int main() { return 0;}
  2618. _LT_EOF
  2619. @@ -7593,7 +8088,8 @@ fi
  2620. LIBTOOL_DEPS="$ltmain"
  2621. # Always use our own libtool.
  2622. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  2623. +LIBTOOL='$(SHELL) $(top_builddir)'
  2624. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  2625. @@ -7682,7 +8178,7 @@ aix3*)
  2626. esac
  2627. # Global variables:
  2628. -ofile=libtool
  2629. +ofile=${host_alias}-libtool
  2630. can_build_shared=yes
  2631. # All known linkers require a `.a' archive for static linking (except MSVC,
  2632. @@ -7980,8 +8476,6 @@ fi
  2633. lt_prog_compiler_pic=
  2634. lt_prog_compiler_static=
  2635. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  2636. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2637. if test "$GCC" = yes; then
  2638. lt_prog_compiler_wl='-Wl,'
  2639. @@ -8147,6 +8641,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2640. lt_prog_compiler_pic='--shared'
  2641. lt_prog_compiler_static='--static'
  2642. ;;
  2643. + nagfor*)
  2644. + # NAG Fortran compiler
  2645. + lt_prog_compiler_wl='-Wl,-Wl,,'
  2646. + lt_prog_compiler_pic='-PIC'
  2647. + lt_prog_compiler_static='-Bstatic'
  2648. + ;;
  2649. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  2650. # Portland Group compilers (*not* the Pentium gcc compiler,
  2651. # which looks to be a dead project)
  2652. @@ -8209,7 +8709,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2653. lt_prog_compiler_pic='-KPIC'
  2654. lt_prog_compiler_static='-Bstatic'
  2655. case $cc_basename in
  2656. - f77* | f90* | f95*)
  2657. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  2658. lt_prog_compiler_wl='-Qoption ld ';;
  2659. *)
  2660. lt_prog_compiler_wl='-Wl,';;
  2661. @@ -8266,13 +8766,17 @@ case $host_os in
  2662. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  2663. ;;
  2664. esac
  2665. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  2666. -$as_echo "$lt_prog_compiler_pic" >&6; }
  2667. -
  2668. -
  2669. -
  2670. -
  2671. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  2672. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  2673. +if ${lt_cv_prog_compiler_pic+:} false; then :
  2674. + $as_echo_n "(cached) " >&6
  2675. +else
  2676. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  2677. +fi
  2678. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  2679. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  2680. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  2681. #
  2682. # Check to make sure the PIC flag actually works.
  2683. @@ -8333,6 +8837,11 @@ fi
  2684. +
  2685. +
  2686. +
  2687. +
  2688. +
  2689. #
  2690. # Check to make sure the static flag actually works.
  2691. #
  2692. @@ -8683,7 +9192,8 @@ _LT_EOF
  2693. allow_undefined_flag=unsupported
  2694. always_export_symbols=no
  2695. enable_shared_with_static_runtimes=yes
  2696. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  2697. + 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'
  2698. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  2699. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  2700. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  2701. @@ -8782,12 +9292,12 @@ _LT_EOF
  2702. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  2703. hardcode_libdir_flag_spec=
  2704. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  2705. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  2706. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  2707. if test "x$supports_anon_versioning" = xyes; then
  2708. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  2709. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  2710. echo "local: *; };" >> $output_objdir/$libname.ver~
  2711. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  2712. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  2713. fi
  2714. ;;
  2715. esac
  2716. @@ -8801,8 +9311,8 @@ _LT_EOF
  2717. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  2718. wlarc=
  2719. else
  2720. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2721. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2722. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2723. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2724. fi
  2725. ;;
  2726. @@ -8820,8 +9330,8 @@ _LT_EOF
  2727. _LT_EOF
  2728. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  2729. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2730. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2731. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2732. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2733. else
  2734. ld_shlibs=no
  2735. fi
  2736. @@ -8867,8 +9377,8 @@ _LT_EOF
  2737. *)
  2738. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  2739. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2740. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2741. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  2742. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  2743. else
  2744. ld_shlibs=no
  2745. fi
  2746. @@ -8998,7 +9508,13 @@ _LT_EOF
  2747. allow_undefined_flag='-berok'
  2748. # Determine the default libpath from the value encoded in an
  2749. # empty executable.
  2750. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2751. + if test "${lt_cv_aix_libpath+set}" = set; then
  2752. + aix_libpath=$lt_cv_aix_libpath
  2753. +else
  2754. + if ${lt_cv_aix_libpath_+:} false; then :
  2755. + $as_echo_n "(cached) " >&6
  2756. +else
  2757. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2758. /* end confdefs.h. */
  2759. int
  2760. @@ -9011,22 +9527,29 @@ main ()
  2761. _ACEOF
  2762. if ac_fn_c_try_link "$LINENO"; then :
  2763. -lt_aix_libpath_sed='
  2764. - /Import File Strings/,/^$/ {
  2765. - /^0/ {
  2766. - s/^0 *\(.*\)$/\1/
  2767. - p
  2768. - }
  2769. - }'
  2770. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2771. -# Check for a 64-bit object if we didn't find anything.
  2772. -if test -z "$aix_libpath"; then
  2773. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2774. -fi
  2775. + lt_aix_libpath_sed='
  2776. + /Import File Strings/,/^$/ {
  2777. + /^0/ {
  2778. + s/^0 *\([^ ]*\) *$/\1/
  2779. + p
  2780. + }
  2781. + }'
  2782. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2783. + # Check for a 64-bit object if we didn't find anything.
  2784. + if test -z "$lt_cv_aix_libpath_"; then
  2785. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2786. + fi
  2787. fi
  2788. rm -f core conftest.err conftest.$ac_objext \
  2789. conftest$ac_exeext conftest.$ac_ext
  2790. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2791. + if test -z "$lt_cv_aix_libpath_"; then
  2792. + lt_cv_aix_libpath_="/usr/lib:/lib"
  2793. + fi
  2794. +
  2795. +fi
  2796. +
  2797. + aix_libpath=$lt_cv_aix_libpath_
  2798. +fi
  2799. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  2800. 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"
  2801. @@ -9038,7 +9561,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2802. else
  2803. # Determine the default libpath from the value encoded in an
  2804. # empty executable.
  2805. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2806. + if test "${lt_cv_aix_libpath+set}" = set; then
  2807. + aix_libpath=$lt_cv_aix_libpath
  2808. +else
  2809. + if ${lt_cv_aix_libpath_+:} false; then :
  2810. + $as_echo_n "(cached) " >&6
  2811. +else
  2812. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2813. /* end confdefs.h. */
  2814. int
  2815. @@ -9051,22 +9580,29 @@ main ()
  2816. _ACEOF
  2817. if ac_fn_c_try_link "$LINENO"; then :
  2818. -lt_aix_libpath_sed='
  2819. - /Import File Strings/,/^$/ {
  2820. - /^0/ {
  2821. - s/^0 *\(.*\)$/\1/
  2822. - p
  2823. - }
  2824. - }'
  2825. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2826. -# Check for a 64-bit object if we didn't find anything.
  2827. -if test -z "$aix_libpath"; then
  2828. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2829. -fi
  2830. + lt_aix_libpath_sed='
  2831. + /Import File Strings/,/^$/ {
  2832. + /^0/ {
  2833. + s/^0 *\([^ ]*\) *$/\1/
  2834. + p
  2835. + }
  2836. + }'
  2837. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2838. + # Check for a 64-bit object if we didn't find anything.
  2839. + if test -z "$lt_cv_aix_libpath_"; then
  2840. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  2841. + fi
  2842. fi
  2843. rm -f core conftest.err conftest.$ac_objext \
  2844. conftest$ac_exeext conftest.$ac_ext
  2845. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2846. + if test -z "$lt_cv_aix_libpath_"; then
  2847. + lt_cv_aix_libpath_="/usr/lib:/lib"
  2848. + fi
  2849. +
  2850. +fi
  2851. +
  2852. + aix_libpath=$lt_cv_aix_libpath_
  2853. +fi
  2854. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  2855. # Warning - without using the other run time loading flags,
  2856. @@ -9111,20 +9647,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2857. # Microsoft Visual C++.
  2858. # hardcode_libdir_flag_spec is actually meaningless, as there is
  2859. # no search path for DLLs.
  2860. - hardcode_libdir_flag_spec=' '
  2861. - allow_undefined_flag=unsupported
  2862. - # Tell ltmain to make .lib files, not .a files.
  2863. - libext=lib
  2864. - # Tell ltmain to make .dll files, not .so files.
  2865. - shrext_cmds=".dll"
  2866. - # FIXME: Setting linknames here is a bad hack.
  2867. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  2868. - # The linker will automatically build a .lib file if we build a DLL.
  2869. - old_archive_from_new_cmds='true'
  2870. - # FIXME: Should let the user specify the lib program.
  2871. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  2872. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  2873. - enable_shared_with_static_runtimes=yes
  2874. + case $cc_basename in
  2875. + cl*)
  2876. + # Native MSVC
  2877. + hardcode_libdir_flag_spec=' '
  2878. + allow_undefined_flag=unsupported
  2879. + always_export_symbols=yes
  2880. + file_list_spec='@'
  2881. + # Tell ltmain to make .lib files, not .a files.
  2882. + libext=lib
  2883. + # Tell ltmain to make .dll files, not .so files.
  2884. + shrext_cmds=".dll"
  2885. + # FIXME: Setting linknames here is a bad hack.
  2886. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  2887. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  2888. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  2889. + else
  2890. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  2891. + fi~
  2892. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  2893. + linknames='
  2894. + # The linker will not automatically build a static lib if we build a DLL.
  2895. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  2896. + enable_shared_with_static_runtimes=yes
  2897. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  2898. + # Don't use ranlib
  2899. + old_postinstall_cmds='chmod 644 $oldlib'
  2900. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  2901. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  2902. + case $lt_outputfile in
  2903. + *.exe|*.EXE) ;;
  2904. + *)
  2905. + lt_outputfile="$lt_outputfile.exe"
  2906. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  2907. + ;;
  2908. + esac~
  2909. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  2910. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  2911. + $RM "$lt_outputfile.manifest";
  2912. + fi'
  2913. + ;;
  2914. + *)
  2915. + # Assume MSVC wrapper
  2916. + hardcode_libdir_flag_spec=' '
  2917. + allow_undefined_flag=unsupported
  2918. + # Tell ltmain to make .lib files, not .a files.
  2919. + libext=lib
  2920. + # Tell ltmain to make .dll files, not .so files.
  2921. + shrext_cmds=".dll"
  2922. + # FIXME: Setting linknames here is a bad hack.
  2923. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  2924. + # The linker will automatically build a .lib file if we build a DLL.
  2925. + old_archive_from_new_cmds='true'
  2926. + # FIXME: Should let the user specify the lib program.
  2927. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  2928. + enable_shared_with_static_runtimes=yes
  2929. + ;;
  2930. + esac
  2931. ;;
  2932. darwin* | rhapsody*)
  2933. @@ -9185,7 +9764,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2934. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  2935. freebsd* | dragonfly*)
  2936. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  2937. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  2938. hardcode_libdir_flag_spec='-R$libdir'
  2939. hardcode_direct=yes
  2940. hardcode_shlibpath_var=no
  2941. @@ -9193,7 +9772,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2942. hpux9*)
  2943. if test "$GCC" = yes; then
  2944. - 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'
  2945. + 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'
  2946. else
  2947. 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'
  2948. fi
  2949. @@ -9209,7 +9788,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2950. hpux10*)
  2951. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  2952. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  2953. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  2954. else
  2955. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  2956. fi
  2957. @@ -9233,10 +9812,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  2958. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  2959. ;;
  2960. ia64*)
  2961. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  2962. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  2963. ;;
  2964. *)
  2965. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  2966. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  2967. ;;
  2968. esac
  2969. else
  2970. @@ -9315,23 +9894,36 @@ fi
  2971. irix5* | irix6* | nonstopux*)
  2972. if test "$GCC" = yes; then
  2973. - 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'
  2974. + 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'
  2975. # Try to use the -exported_symbol ld option, if it does not
  2976. # work, assume that -exports_file does not work either and
  2977. # implicitly export all symbols.
  2978. - save_LDFLAGS="$LDFLAGS"
  2979. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  2980. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2981. + # This should be the same for all languages, so no per-tag cache variable.
  2982. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  2983. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  2984. +if ${lt_cv_irix_exported_symbol+:} false; then :
  2985. + $as_echo_n "(cached) " >&6
  2986. +else
  2987. + save_LDFLAGS="$LDFLAGS"
  2988. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  2989. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  2990. /* end confdefs.h. */
  2991. -int foo(void) {}
  2992. +int foo (void) { return 0; }
  2993. _ACEOF
  2994. if ac_fn_c_try_link "$LINENO"; then :
  2995. - 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'
  2996. -
  2997. + lt_cv_irix_exported_symbol=yes
  2998. +else
  2999. + lt_cv_irix_exported_symbol=no
  3000. fi
  3001. rm -f core conftest.err conftest.$ac_objext \
  3002. conftest$ac_exeext conftest.$ac_ext
  3003. - LDFLAGS="$save_LDFLAGS"
  3004. + LDFLAGS="$save_LDFLAGS"
  3005. +fi
  3006. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  3007. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  3008. + if test "$lt_cv_irix_exported_symbol" = yes; then
  3009. + 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'
  3010. + fi
  3011. else
  3012. 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'
  3013. 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'
  3014. @@ -9416,7 +10008,7 @@ rm -f core conftest.err conftest.$ac_objext \
  3015. osf4* | osf5*) # as osf3* with the addition of -msym flag
  3016. if test "$GCC" = yes; then
  3017. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  3018. - 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'
  3019. + 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'
  3020. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  3021. else
  3022. allow_undefined_flag=' -expect_unresolved \*'
  3023. @@ -9435,9 +10027,9 @@ rm -f core conftest.err conftest.$ac_objext \
  3024. no_undefined_flag=' -z defs'
  3025. if test "$GCC" = yes; then
  3026. wlarc='${wl}'
  3027. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  3028. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  3029. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  3030. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  3031. + $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'
  3032. else
  3033. case `$CC -V 2>&1` in
  3034. *"Compilers 5.0"*)
  3035. @@ -10013,8 +10605,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  3036. need_version=no
  3037. need_lib_prefix=no
  3038. - case $GCC,$host_os in
  3039. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  3040. + case $GCC,$cc_basename in
  3041. + yes,*)
  3042. + # gcc
  3043. library_names_spec='$libname.dll.a'
  3044. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  3045. postinstall_cmds='base_file=`basename \${file}`~
  3046. @@ -10047,13 +10640,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  3047. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  3048. ;;
  3049. esac
  3050. + dynamic_linker='Win32 ld.exe'
  3051. + ;;
  3052. +
  3053. + *,cl*)
  3054. + # Native MSVC
  3055. + libname_spec='$name'
  3056. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  3057. + library_names_spec='${libname}.dll.lib'
  3058. +
  3059. + case $build_os in
  3060. + mingw*)
  3061. + sys_lib_search_path_spec=
  3062. + lt_save_ifs=$IFS
  3063. + IFS=';'
  3064. + for lt_path in $LIB
  3065. + do
  3066. + IFS=$lt_save_ifs
  3067. + # Let DOS variable expansion print the short 8.3 style file name.
  3068. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  3069. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  3070. + done
  3071. + IFS=$lt_save_ifs
  3072. + # Convert to MSYS style.
  3073. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  3074. + ;;
  3075. + cygwin*)
  3076. + # Convert to unix form, then to dos form, then back to unix form
  3077. + # but this time dos style (no spaces!) so that the unix form looks
  3078. + # like /cygdrive/c/PROGRA~1:/cygdr...
  3079. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  3080. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  3081. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  3082. + ;;
  3083. + *)
  3084. + sys_lib_search_path_spec="$LIB"
  3085. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  3086. + # It is most probably a Windows format PATH.
  3087. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  3088. + else
  3089. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  3090. + fi
  3091. + # FIXME: find the short name or the path components, as spaces are
  3092. + # common. (e.g. "Program Files" -> "PROGRA~1")
  3093. + ;;
  3094. + esac
  3095. +
  3096. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  3097. + postinstall_cmds='base_file=`basename \${file}`~
  3098. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  3099. + dldir=$destdir/`dirname \$dlpath`~
  3100. + test -d \$dldir || mkdir -p \$dldir~
  3101. + $install_prog $dir/$dlname \$dldir/$dlname'
  3102. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  3103. + dlpath=$dir/\$dldll~
  3104. + $RM \$dlpath'
  3105. + shlibpath_overrides_runpath=yes
  3106. + dynamic_linker='Win32 link.exe'
  3107. ;;
  3108. *)
  3109. + # Assume MSVC wrapper
  3110. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  3111. + dynamic_linker='Win32 ld.exe'
  3112. ;;
  3113. esac
  3114. - dynamic_linker='Win32 ld.exe'
  3115. # FIXME: first we should search . and the directory the executable is in
  3116. shlibpath_var=PATH
  3117. ;;
  3118. @@ -10135,7 +10786,7 @@ haiku*)
  3119. soname_spec='${libname}${release}${shared_ext}$major'
  3120. shlibpath_var=LIBRARY_PATH
  3121. shlibpath_overrides_runpath=yes
  3122. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  3123. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  3124. hardcode_into_libs=yes
  3125. ;;
  3126. @@ -10931,7 +11582,7 @@ else
  3127. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  3128. lt_status=$lt_dlunknown
  3129. cat > conftest.$ac_ext <<_LT_EOF
  3130. -#line 10934 "configure"
  3131. +#line $LINENO "configure"
  3132. #include "confdefs.h"
  3133. #if HAVE_DLFCN_H
  3134. @@ -10975,10 +11626,10 @@ else
  3135. /* When -fvisbility=hidden is used, assume the code has been annotated
  3136. correspondingly for the symbols needed. */
  3137. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  3138. -void fnord () __attribute__((visibility("default")));
  3139. +int fnord () __attribute__((visibility("default")));
  3140. #endif
  3141. -void fnord () { int i=42; }
  3142. +int fnord () { return 42; }
  3143. int main ()
  3144. {
  3145. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  3146. @@ -11037,7 +11688,7 @@ else
  3147. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  3148. lt_status=$lt_dlunknown
  3149. cat > conftest.$ac_ext <<_LT_EOF
  3150. -#line 11040 "configure"
  3151. +#line $LINENO "configure"
  3152. #include "confdefs.h"
  3153. #if HAVE_DLFCN_H
  3154. @@ -11081,10 +11732,10 @@ else
  3155. /* When -fvisbility=hidden is used, assume the code has been annotated
  3156. correspondingly for the symbols needed. */
  3157. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  3158. -void fnord () __attribute__((visibility("default")));
  3159. +int fnord () __attribute__((visibility("default")));
  3160. #endif
  3161. -void fnord () { int i=42; }
  3162. +int fnord () { return 42; }
  3163. int main ()
  3164. {
  3165. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  3166. @@ -15455,13 +16106,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  3167. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  3168. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  3169. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  3170. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  3171. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  3172. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  3173. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  3174. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  3175. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  3176. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  3177. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  3178. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  3179. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  3180. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  3181. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  3182. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  3183. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  3184. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  3185. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  3186. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  3187. @@ -15476,14 +16134,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  3188. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  3189. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  3190. 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"`'
  3191. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  3192. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  3193. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  3194. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  3195. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  3196. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  3197. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  3198. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  3199. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  3200. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  3201. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  3202. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  3203. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  3204. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  3205. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  3206. @@ -15516,12 +16177,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  3207. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  3208. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  3209. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  3210. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  3211. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  3212. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  3213. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  3214. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  3215. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  3216. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  3217. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  3218. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  3219. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  3220. @@ -15576,8 +16237,13 @@ reload_flag \
  3221. OBJDUMP \
  3222. deplibs_check_method \
  3223. file_magic_cmd \
  3224. +file_magic_glob \
  3225. +want_nocaseglob \
  3226. +DLLTOOL \
  3227. +sharedlib_from_linklib_cmd \
  3228. AR \
  3229. AR_FLAGS \
  3230. +archiver_list_spec \
  3231. STRIP \
  3232. RANLIB \
  3233. CC \
  3234. @@ -15587,12 +16253,14 @@ lt_cv_sys_global_symbol_pipe \
  3235. lt_cv_sys_global_symbol_to_cdecl \
  3236. lt_cv_sys_global_symbol_to_c_name_address \
  3237. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  3238. +nm_file_list_spec \
  3239. lt_prog_compiler_no_builtin_flag \
  3240. -lt_prog_compiler_wl \
  3241. lt_prog_compiler_pic \
  3242. +lt_prog_compiler_wl \
  3243. lt_prog_compiler_static \
  3244. lt_cv_prog_compiler_c_o \
  3245. need_locks \
  3246. +MANIFEST_TOOL \
  3247. DSYMUTIL \
  3248. NMEDIT \
  3249. LIPO \
  3250. @@ -15608,7 +16276,6 @@ no_undefined_flag \
  3251. hardcode_libdir_flag_spec \
  3252. hardcode_libdir_flag_spec_ld \
  3253. hardcode_libdir_separator \
  3254. -fix_srcfile_path \
  3255. exclude_expsyms \
  3256. include_expsyms \
  3257. file_list_spec \
  3258. @@ -15644,6 +16311,7 @@ module_cmds \
  3259. module_expsym_cmds \
  3260. export_symbols_cmds \
  3261. prelink_cmds \
  3262. +postlink_cmds \
  3263. postinstall_cmds \
  3264. postuninstall_cmds \
  3265. finish_cmds \
  3266. @@ -16410,7 +17078,8 @@ $as_echo X"$file" |
  3267. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  3268. #
  3269. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  3270. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  3271. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  3272. +# Inc.
  3273. # Written by Gordon Matzigkeit, 1996
  3274. #
  3275. # This file is part of GNU Libtool.
  3276. @@ -16513,19 +17182,42 @@ SP2NL=$lt_lt_SP2NL
  3277. # turn newlines into spaces.
  3278. NL2SP=$lt_lt_NL2SP
  3279. +# convert \$build file names to \$host format.
  3280. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  3281. +
  3282. +# convert \$build files to toolchain format.
  3283. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  3284. +
  3285. # An object symbol dumper.
  3286. OBJDUMP=$lt_OBJDUMP
  3287. # Method to check whether dependent libraries are shared objects.
  3288. deplibs_check_method=$lt_deplibs_check_method
  3289. -# Command to use when deplibs_check_method == "file_magic".
  3290. +# Command to use when deplibs_check_method = "file_magic".
  3291. file_magic_cmd=$lt_file_magic_cmd
  3292. +# How to find potential files when deplibs_check_method = "file_magic".
  3293. +file_magic_glob=$lt_file_magic_glob
  3294. +
  3295. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  3296. +want_nocaseglob=$lt_want_nocaseglob
  3297. +
  3298. +# DLL creation program.
  3299. +DLLTOOL=$lt_DLLTOOL
  3300. +
  3301. +# Command to associate shared and link libraries.
  3302. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  3303. +
  3304. # The archiver.
  3305. AR=$lt_AR
  3306. +
  3307. +# Flags to create an archive.
  3308. AR_FLAGS=$lt_AR_FLAGS
  3309. +# How to feed a file listing to the archiver.
  3310. +archiver_list_spec=$lt_archiver_list_spec
  3311. +
  3312. # A symbol stripping program.
  3313. STRIP=$lt_STRIP
  3314. @@ -16555,6 +17247,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  3315. # Transform the output of nm in a C name address pair when lib prefix is needed.
  3316. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  3317. +# Specify filename containing input files for \$NM.
  3318. +nm_file_list_spec=$lt_nm_file_list_spec
  3319. +
  3320. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  3321. +lt_sysroot=$lt_sysroot
  3322. +
  3323. # The name of the directory that contains temporary libtool files.
  3324. objdir=$objdir
  3325. @@ -16564,6 +17262,9 @@ MAGIC_CMD=$MAGIC_CMD
  3326. # Must we lock files when doing compilation?
  3327. need_locks=$lt_need_locks
  3328. +# Manifest tool.
  3329. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  3330. +
  3331. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  3332. DSYMUTIL=$lt_DSYMUTIL
  3333. @@ -16678,12 +17379,12 @@ with_gcc=$GCC
  3334. # Compiler flag to turn off builtin functions.
  3335. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  3336. -# How to pass a linker flag through the compiler.
  3337. -wl=$lt_lt_prog_compiler_wl
  3338. -
  3339. # Additional compiler flags for building library objects.
  3340. pic_flag=$lt_lt_prog_compiler_pic
  3341. +# How to pass a linker flag through the compiler.
  3342. +wl=$lt_lt_prog_compiler_wl
  3343. +
  3344. # Compiler flag to prevent dynamic linking.
  3345. link_static_flag=$lt_lt_prog_compiler_static
  3346. @@ -16770,9 +17471,6 @@ inherit_rpath=$inherit_rpath
  3347. # Whether libtool must link a program against all its dependency libraries.
  3348. link_all_deplibs=$link_all_deplibs
  3349. -# Fix the shell variable \$srcfile for the compiler.
  3350. -fix_srcfile_path=$lt_fix_srcfile_path
  3351. -
  3352. # Set to "yes" if exported symbols are required.
  3353. always_export_symbols=$always_export_symbols
  3354. @@ -16788,6 +17486,9 @@ include_expsyms=$lt_include_expsyms
  3355. # Commands necessary for linking programs (against libraries) with templates.
  3356. prelink_cmds=$lt_prelink_cmds
  3357. +# Commands necessary for finishing linking programs.
  3358. +postlink_cmds=$lt_postlink_cmds
  3359. +
  3360. # Specify filename containing input files.
  3361. file_list_spec=$lt_file_list_spec
  3362. @@ -16820,210 +17521,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  3363. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  3364. # text mode, it properly converts lines to CR/LF. This bash problem
  3365. # is reportedly fixed, but why not run on old versions too?
  3366. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  3367. - || (rm -f "$cfgfile"; exit 1)
  3368. -
  3369. - case $xsi_shell in
  3370. - yes)
  3371. - cat << \_LT_EOF >> "$cfgfile"
  3372. -
  3373. -# func_dirname file append nondir_replacement
  3374. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  3375. -# otherwise set result to NONDIR_REPLACEMENT.
  3376. -func_dirname ()
  3377. -{
  3378. - case ${1} in
  3379. - */*) func_dirname_result="${1%/*}${2}" ;;
  3380. - * ) func_dirname_result="${3}" ;;
  3381. - esac
  3382. -}
  3383. -
  3384. -# func_basename file
  3385. -func_basename ()
  3386. -{
  3387. - func_basename_result="${1##*/}"
  3388. -}
  3389. -
  3390. -# func_dirname_and_basename file append nondir_replacement
  3391. -# perform func_basename and func_dirname in a single function
  3392. -# call:
  3393. -# dirname: Compute the dirname of FILE. If nonempty,
  3394. -# add APPEND to the result, otherwise set result
  3395. -# to NONDIR_REPLACEMENT.
  3396. -# value returned in "$func_dirname_result"
  3397. -# basename: Compute filename of FILE.
  3398. -# value retuned in "$func_basename_result"
  3399. -# Implementation must be kept synchronized with func_dirname
  3400. -# and func_basename. For efficiency, we do not delegate to
  3401. -# those functions but instead duplicate the functionality here.
  3402. -func_dirname_and_basename ()
  3403. -{
  3404. - case ${1} in
  3405. - */*) func_dirname_result="${1%/*}${2}" ;;
  3406. - * ) func_dirname_result="${3}" ;;
  3407. - esac
  3408. - func_basename_result="${1##*/}"
  3409. -}
  3410. -
  3411. -# func_stripname prefix suffix name
  3412. -# strip PREFIX and SUFFIX off of NAME.
  3413. -# PREFIX and SUFFIX must not contain globbing or regex special
  3414. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  3415. -# dot (in which case that matches only a dot).
  3416. -func_stripname ()
  3417. -{
  3418. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  3419. - # positional parameters, so assign one to ordinary parameter first.
  3420. - func_stripname_result=${3}
  3421. - func_stripname_result=${func_stripname_result#"${1}"}
  3422. - func_stripname_result=${func_stripname_result%"${2}"}
  3423. -}
  3424. -
  3425. -# func_opt_split
  3426. -func_opt_split ()
  3427. -{
  3428. - func_opt_split_opt=${1%%=*}
  3429. - func_opt_split_arg=${1#*=}
  3430. -}
  3431. -
  3432. -# func_lo2o object
  3433. -func_lo2o ()
  3434. -{
  3435. - case ${1} in
  3436. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  3437. - *) func_lo2o_result=${1} ;;
  3438. - esac
  3439. -}
  3440. -
  3441. -# func_xform libobj-or-source
  3442. -func_xform ()
  3443. -{
  3444. - func_xform_result=${1%.*}.lo
  3445. -}
  3446. -
  3447. -# func_arith arithmetic-term...
  3448. -func_arith ()
  3449. -{
  3450. - func_arith_result=$(( $* ))
  3451. -}
  3452. -
  3453. -# func_len string
  3454. -# STRING may not start with a hyphen.
  3455. -func_len ()
  3456. -{
  3457. - func_len_result=${#1}
  3458. -}
  3459. -
  3460. -_LT_EOF
  3461. - ;;
  3462. - *) # Bourne compatible functions.
  3463. - cat << \_LT_EOF >> "$cfgfile"
  3464. -
  3465. -# func_dirname file append nondir_replacement
  3466. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  3467. -# otherwise set result to NONDIR_REPLACEMENT.
  3468. -func_dirname ()
  3469. -{
  3470. - # Extract subdirectory from the argument.
  3471. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  3472. - if test "X$func_dirname_result" = "X${1}"; then
  3473. - func_dirname_result="${3}"
  3474. - else
  3475. - func_dirname_result="$func_dirname_result${2}"
  3476. - fi
  3477. -}
  3478. -
  3479. -# func_basename file
  3480. -func_basename ()
  3481. -{
  3482. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  3483. -}
  3484. -
  3485. -
  3486. -# func_stripname prefix suffix name
  3487. -# strip PREFIX and SUFFIX off of NAME.
  3488. -# PREFIX and SUFFIX must not contain globbing or regex special
  3489. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  3490. -# dot (in which case that matches only a dot).
  3491. -# func_strip_suffix prefix name
  3492. -func_stripname ()
  3493. -{
  3494. - case ${2} in
  3495. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  3496. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  3497. - esac
  3498. -}
  3499. -
  3500. -# sed scripts:
  3501. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  3502. -my_sed_long_arg='1s/^-[^=]*=//'
  3503. -
  3504. -# func_opt_split
  3505. -func_opt_split ()
  3506. -{
  3507. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  3508. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  3509. -}
  3510. -
  3511. -# func_lo2o object
  3512. -func_lo2o ()
  3513. -{
  3514. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  3515. -}
  3516. -
  3517. -# func_xform libobj-or-source
  3518. -func_xform ()
  3519. -{
  3520. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  3521. -}
  3522. -
  3523. -# func_arith arithmetic-term...
  3524. -func_arith ()
  3525. -{
  3526. - func_arith_result=`expr "$@"`
  3527. -}
  3528. -
  3529. -# func_len string
  3530. -# STRING may not start with a hyphen.
  3531. -func_len ()
  3532. -{
  3533. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  3534. -}
  3535. -
  3536. -_LT_EOF
  3537. -esac
  3538. -
  3539. -case $lt_shell_append in
  3540. - yes)
  3541. - cat << \_LT_EOF >> "$cfgfile"
  3542. -
  3543. -# func_append var value
  3544. -# Append VALUE to the end of shell variable VAR.
  3545. -func_append ()
  3546. -{
  3547. - eval "$1+=\$2"
  3548. -}
  3549. -_LT_EOF
  3550. - ;;
  3551. - *)
  3552. - cat << \_LT_EOF >> "$cfgfile"
  3553. -
  3554. -# func_append var value
  3555. -# Append VALUE to the end of shell variable VAR.
  3556. -func_append ()
  3557. -{
  3558. - eval "$1=\$$1\$2"
  3559. -}
  3560. -
  3561. -_LT_EOF
  3562. - ;;
  3563. - esac
  3564. -
  3565. -
  3566. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  3567. - || (rm -f "$cfgfile"; exit 1)
  3568. -
  3569. - mv -f "$cfgfile" "$ofile" ||
  3570. + sed '$q' "$ltmain" >> "$cfgfile" \
  3571. + || (rm -f "$cfgfile"; exit 1)
  3572. +
  3573. + if test x"$xsi_shell" = xyes; then
  3574. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  3575. +func_dirname ()\
  3576. +{\
  3577. +\ case ${1} in\
  3578. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  3579. +\ * ) func_dirname_result="${3}" ;;\
  3580. +\ esac\
  3581. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  3582. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3583. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3584. +test 0 -eq $? || _lt_function_replace_fail=:
  3585. +
  3586. +
  3587. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  3588. +func_basename ()\
  3589. +{\
  3590. +\ func_basename_result="${1##*/}"\
  3591. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  3592. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3593. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3594. +test 0 -eq $? || _lt_function_replace_fail=:
  3595. +
  3596. +
  3597. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  3598. +func_dirname_and_basename ()\
  3599. +{\
  3600. +\ case ${1} in\
  3601. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  3602. +\ * ) func_dirname_result="${3}" ;;\
  3603. +\ esac\
  3604. +\ func_basename_result="${1##*/}"\
  3605. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  3606. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3607. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3608. +test 0 -eq $? || _lt_function_replace_fail=:
  3609. +
  3610. +
  3611. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  3612. +func_stripname ()\
  3613. +{\
  3614. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  3615. +\ # positional parameters, so assign one to ordinary parameter first.\
  3616. +\ func_stripname_result=${3}\
  3617. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  3618. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  3619. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  3620. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3621. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3622. +test 0 -eq $? || _lt_function_replace_fail=:
  3623. +
  3624. +
  3625. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  3626. +func_split_long_opt ()\
  3627. +{\
  3628. +\ func_split_long_opt_name=${1%%=*}\
  3629. +\ func_split_long_opt_arg=${1#*=}\
  3630. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  3631. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3632. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3633. +test 0 -eq $? || _lt_function_replace_fail=:
  3634. +
  3635. +
  3636. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  3637. +func_split_short_opt ()\
  3638. +{\
  3639. +\ func_split_short_opt_arg=${1#??}\
  3640. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  3641. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  3642. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3643. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3644. +test 0 -eq $? || _lt_function_replace_fail=:
  3645. +
  3646. +
  3647. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  3648. +func_lo2o ()\
  3649. +{\
  3650. +\ case ${1} in\
  3651. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  3652. +\ *) func_lo2o_result=${1} ;;\
  3653. +\ esac\
  3654. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  3655. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3656. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3657. +test 0 -eq $? || _lt_function_replace_fail=:
  3658. +
  3659. +
  3660. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  3661. +func_xform ()\
  3662. +{\
  3663. + func_xform_result=${1%.*}.lo\
  3664. +} # Extended-shell func_xform 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_arith ()$/,/^} # func_arith /c\
  3671. +func_arith ()\
  3672. +{\
  3673. + func_arith_result=$(( $* ))\
  3674. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  3675. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3676. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3677. +test 0 -eq $? || _lt_function_replace_fail=:
  3678. +
  3679. +
  3680. + sed -e '/^func_len ()$/,/^} # func_len /c\
  3681. +func_len ()\
  3682. +{\
  3683. + func_len_result=${#1}\
  3684. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  3685. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3686. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3687. +test 0 -eq $? || _lt_function_replace_fail=:
  3688. +
  3689. +fi
  3690. +
  3691. +if test x"$lt_shell_append" = xyes; then
  3692. + sed -e '/^func_append ()$/,/^} # func_append /c\
  3693. +func_append ()\
  3694. +{\
  3695. + eval "${1}+=\\${2}"\
  3696. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  3697. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3698. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3699. +test 0 -eq $? || _lt_function_replace_fail=:
  3700. +
  3701. +
  3702. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  3703. +func_append_quoted ()\
  3704. +{\
  3705. +\ func_quote_for_eval "${2}"\
  3706. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  3707. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  3708. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3709. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3710. +test 0 -eq $? || _lt_function_replace_fail=:
  3711. +
  3712. +
  3713. + # Save a `func_append' function call where possible by direct use of '+='
  3714. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  3715. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3716. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3717. + test 0 -eq $? || _lt_function_replace_fail=:
  3718. +else
  3719. + # Save a `func_append' function call even when '+=' is not available
  3720. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  3721. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  3722. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  3723. + test 0 -eq $? || _lt_function_replace_fail=:
  3724. +fi
  3725. +
  3726. +if test x"$_lt_function_replace_fail" = x":"; then
  3727. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  3728. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  3729. +fi
  3730. +
  3731. +
  3732. + mv -f "$cfgfile" "$ofile" ||
  3733. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  3734. chmod +x "$ofile"
  3735. diff --git a/gas/configure b/gas/configure
  3736. index 789d1b38b33..7ac563a13ad 100755
  3737. --- a/gas/configure
  3738. +++ b/gas/configure
  3739. @@ -681,8 +681,11 @@ OTOOL
  3740. LIPO
  3741. NMEDIT
  3742. DSYMUTIL
  3743. +MANIFEST_TOOL
  3744. RANLIB
  3745. +ac_ct_AR
  3746. AR
  3747. +DLLTOOL
  3748. OBJDUMP
  3749. LN_S
  3750. NM
  3751. @@ -799,6 +802,7 @@ enable_static
  3752. with_pic
  3753. enable_fast_install
  3754. with_gnu_ld
  3755. +with_libtool_sysroot
  3756. enable_libtool_lock
  3757. enable_plugins
  3758. enable_largefile
  3759. @@ -1490,6 +1494,8 @@ Optional Packages:
  3760. --with-pic try to use only PIC/non-PIC objects [default=use
  3761. both]
  3762. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  3763. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  3764. + (or the compiler's sysroot if not specified).
  3765. --with-cpu=CPU default cpu variant is CPU (currently only supported
  3766. on ARC)
  3767. --with-system-zlib use installed libz
  3768. @@ -4569,8 +4575,8 @@ esac
  3769. -macro_version='2.2.7a'
  3770. -macro_revision='1.3134'
  3771. +macro_version='2.4'
  3772. +macro_revision='1.3293'
  3773. @@ -4610,7 +4616,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  3774. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  3775. $as_echo_n "checking how to print strings... " >&6; }
  3776. # Test print first, because it will be a builtin if present.
  3777. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  3778. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  3779. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  3780. ECHO='print -r --'
  3781. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  3782. @@ -5296,8 +5302,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  3783. # Try some XSI features
  3784. xsi_shell=no
  3785. ( _lt_dummy="a/b/c"
  3786. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  3787. - = c,a/b,, \
  3788. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  3789. + = c,a/b,b/c, \
  3790. && eval 'test $(( 1 + 1 )) -eq 2 \
  3791. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  3792. && xsi_shell=yes
  3793. @@ -5346,6 +5352,80 @@ esac
  3794. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  3795. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  3796. +if ${lt_cv_to_host_file_cmd+:} false; then :
  3797. + $as_echo_n "(cached) " >&6
  3798. +else
  3799. + case $host in
  3800. + *-*-mingw* )
  3801. + case $build in
  3802. + *-*-mingw* ) # actually msys
  3803. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  3804. + ;;
  3805. + *-*-cygwin* )
  3806. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  3807. + ;;
  3808. + * ) # otherwise, assume *nix
  3809. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  3810. + ;;
  3811. + esac
  3812. + ;;
  3813. + *-*-cygwin* )
  3814. + case $build in
  3815. + *-*-mingw* ) # actually msys
  3816. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  3817. + ;;
  3818. + *-*-cygwin* )
  3819. + lt_cv_to_host_file_cmd=func_convert_file_noop
  3820. + ;;
  3821. + * ) # otherwise, assume *nix
  3822. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  3823. + ;;
  3824. + esac
  3825. + ;;
  3826. + * ) # unhandled hosts (and "normal" native builds)
  3827. + lt_cv_to_host_file_cmd=func_convert_file_noop
  3828. + ;;
  3829. +esac
  3830. +
  3831. +fi
  3832. +
  3833. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  3834. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  3835. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  3836. +
  3837. +
  3838. +
  3839. +
  3840. +
  3841. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  3842. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  3843. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  3844. + $as_echo_n "(cached) " >&6
  3845. +else
  3846. + #assume ordinary cross tools, or native build.
  3847. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  3848. +case $host in
  3849. + *-*-mingw* )
  3850. + case $build in
  3851. + *-*-mingw* ) # actually msys
  3852. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  3853. + ;;
  3854. + esac
  3855. + ;;
  3856. +esac
  3857. +
  3858. +fi
  3859. +
  3860. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  3861. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  3862. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  3863. +
  3864. +
  3865. +
  3866. +
  3867. +
  3868. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  3869. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  3870. if ${lt_cv_ld_reload_flag+:} false; then :
  3871. @@ -5362,6 +5442,11 @@ case $reload_flag in
  3872. esac
  3873. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  3874. case $host_os in
  3875. + cygwin* | mingw* | pw32* | cegcc*)
  3876. + if test "$GCC" != yes; then
  3877. + reload_cmds=false
  3878. + fi
  3879. + ;;
  3880. darwin*)
  3881. if test "$GCC" = yes; then
  3882. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  3883. @@ -5530,7 +5615,8 @@ mingw* | pw32*)
  3884. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  3885. lt_cv_file_magic_cmd='func_win32_libid'
  3886. else
  3887. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  3888. + # Keep this pattern in sync with the one in func_win32_libid.
  3889. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  3890. lt_cv_file_magic_cmd='$OBJDUMP -f'
  3891. fi
  3892. ;;
  3893. @@ -5684,6 +5770,21 @@ esac
  3894. fi
  3895. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  3896. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  3897. +
  3898. +file_magic_glob=
  3899. +want_nocaseglob=no
  3900. +if test "$build" = "$host"; then
  3901. + case $host_os in
  3902. + mingw* | pw32*)
  3903. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  3904. + want_nocaseglob=yes
  3905. + else
  3906. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  3907. + fi
  3908. + ;;
  3909. + esac
  3910. +fi
  3911. +
  3912. file_magic_cmd=$lt_cv_file_magic_cmd
  3913. deplibs_check_method=$lt_cv_deplibs_check_method
  3914. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  3915. @@ -5699,6 +5800,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  3916. +
  3917. +
  3918. +
  3919. +
  3920. +
  3921. +
  3922. +
  3923. +
  3924. +
  3925. +
  3926. +if test -n "$ac_tool_prefix"; then
  3927. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  3928. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  3929. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3930. +$as_echo_n "checking for $ac_word... " >&6; }
  3931. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  3932. + $as_echo_n "(cached) " >&6
  3933. +else
  3934. + if test -n "$DLLTOOL"; then
  3935. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  3936. +else
  3937. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3938. +for as_dir in $PATH
  3939. +do
  3940. + IFS=$as_save_IFS
  3941. + test -z "$as_dir" && as_dir=.
  3942. + for ac_exec_ext in '' $ac_executable_extensions; do
  3943. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  3944. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  3945. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  3946. + break 2
  3947. + fi
  3948. +done
  3949. + done
  3950. +IFS=$as_save_IFS
  3951. +
  3952. +fi
  3953. +fi
  3954. +DLLTOOL=$ac_cv_prog_DLLTOOL
  3955. +if test -n "$DLLTOOL"; then
  3956. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  3957. +$as_echo "$DLLTOOL" >&6; }
  3958. +else
  3959. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  3960. +$as_echo "no" >&6; }
  3961. +fi
  3962. +
  3963. +
  3964. +fi
  3965. +if test -z "$ac_cv_prog_DLLTOOL"; then
  3966. + ac_ct_DLLTOOL=$DLLTOOL
  3967. + # Extract the first word of "dlltool", so it can be a program name with args.
  3968. +set dummy dlltool; ac_word=$2
  3969. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  3970. +$as_echo_n "checking for $ac_word... " >&6; }
  3971. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  3972. + $as_echo_n "(cached) " >&6
  3973. +else
  3974. + if test -n "$ac_ct_DLLTOOL"; then
  3975. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  3976. +else
  3977. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  3978. +for as_dir in $PATH
  3979. +do
  3980. + IFS=$as_save_IFS
  3981. + test -z "$as_dir" && as_dir=.
  3982. + for ac_exec_ext in '' $ac_executable_extensions; do
  3983. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  3984. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  3985. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  3986. + break 2
  3987. + fi
  3988. +done
  3989. + done
  3990. +IFS=$as_save_IFS
  3991. +
  3992. +fi
  3993. +fi
  3994. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  3995. +if test -n "$ac_ct_DLLTOOL"; then
  3996. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  3997. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  3998. +else
  3999. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4000. +$as_echo "no" >&6; }
  4001. +fi
  4002. +
  4003. + if test "x$ac_ct_DLLTOOL" = x; then
  4004. + DLLTOOL="false"
  4005. + else
  4006. + case $cross_compiling:$ac_tool_warned in
  4007. +yes:)
  4008. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  4009. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  4010. +ac_tool_warned=yes ;;
  4011. +esac
  4012. + DLLTOOL=$ac_ct_DLLTOOL
  4013. + fi
  4014. +else
  4015. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  4016. +fi
  4017. +
  4018. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  4019. +
  4020. +
  4021. +
  4022. +
  4023. +
  4024. +
  4025. +
  4026. +
  4027. +
  4028. +
  4029. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  4030. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  4031. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  4032. + $as_echo_n "(cached) " >&6
  4033. +else
  4034. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  4035. +
  4036. +case $host_os in
  4037. +cygwin* | mingw* | pw32* | cegcc*)
  4038. + # two different shell functions defined in ltmain.sh
  4039. + # decide which to use based on capabilities of $DLLTOOL
  4040. + case `$DLLTOOL --help 2>&1` in
  4041. + *--identify-strict*)
  4042. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  4043. + ;;
  4044. + *)
  4045. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  4046. + ;;
  4047. + esac
  4048. + ;;
  4049. +*)
  4050. + # fallback: assume linklib IS sharedlib
  4051. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  4052. + ;;
  4053. +esac
  4054. +
  4055. +fi
  4056. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  4057. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  4058. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  4059. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  4060. +
  4061. +
  4062. +
  4063. +
  4064. +
  4065. +
  4066. +
  4067. plugin_option=
  4068. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  4069. for plugin in $plugin_names; do
  4070. @@ -5713,8 +5965,10 @@ for plugin in $plugin_names; do
  4071. done
  4072. if test -n "$ac_tool_prefix"; then
  4073. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  4074. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  4075. + for ac_prog in ar
  4076. + do
  4077. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  4078. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  4079. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4080. $as_echo_n "checking for $ac_word... " >&6; }
  4081. if ${ac_cv_prog_AR+:} false; then :
  4082. @@ -5730,7 +5984,7 @@ do
  4083. test -z "$as_dir" && as_dir=.
  4084. for ac_exec_ext in '' $ac_executable_extensions; do
  4085. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4086. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  4087. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  4088. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4089. break 2
  4090. fi
  4091. @@ -5750,11 +6004,15 @@ $as_echo "no" >&6; }
  4092. fi
  4093. + test -n "$AR" && break
  4094. + done
  4095. fi
  4096. -if test -z "$ac_cv_prog_AR"; then
  4097. +if test -z "$AR"; then
  4098. ac_ct_AR=$AR
  4099. - # Extract the first word of "ar", so it can be a program name with args.
  4100. -set dummy ar; ac_word=$2
  4101. + for ac_prog in ar
  4102. +do
  4103. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  4104. +set dummy $ac_prog; ac_word=$2
  4105. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4106. $as_echo_n "checking for $ac_word... " >&6; }
  4107. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  4108. @@ -5770,7 +6028,7 @@ do
  4109. test -z "$as_dir" && as_dir=.
  4110. for ac_exec_ext in '' $ac_executable_extensions; do
  4111. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4112. - ac_cv_prog_ac_ct_AR="ar"
  4113. + ac_cv_prog_ac_ct_AR="$ac_prog"
  4114. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4115. break 2
  4116. fi
  4117. @@ -5789,6 +6047,10 @@ else
  4118. $as_echo "no" >&6; }
  4119. fi
  4120. +
  4121. + test -n "$ac_ct_AR" && break
  4122. +done
  4123. +
  4124. if test "x$ac_ct_AR" = x; then
  4125. AR="false"
  4126. else
  4127. @@ -5800,29 +6062,81 @@ ac_tool_warned=yes ;;
  4128. esac
  4129. AR=$ac_ct_AR
  4130. fi
  4131. -else
  4132. - AR="$ac_cv_prog_AR"
  4133. fi
  4134. -test -z "$AR" && AR=ar
  4135. -if test -n "$plugin_option"; then
  4136. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  4137. - touch conftest.c
  4138. - $AR $plugin_option rc conftest.a conftest.c
  4139. - if test "$?" != 0; then
  4140. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  4141. + touch conftest.c
  4142. + $AR $plugin_option rc conftest.a conftest.c
  4143. + if test "$?" != 0; then
  4144. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  4145. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  4146. - else
  4147. - AR="$AR $plugin_option"
  4148. - fi
  4149. - rm -f conftest.*
  4150. + else
  4151. + AR="$AR $plugin_option"
  4152. fi
  4153. -fi
  4154. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  4155. + rm -f conftest.*
  4156. +: ${AR=ar}
  4157. +: ${AR_FLAGS=cru}
  4158. +
  4159. +
  4160. +
  4161. +
  4162. +
  4163. +
  4164. +
  4165. +
  4166. +
  4167. +
  4168. +
  4169. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  4170. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  4171. +if ${lt_cv_ar_at_file+:} false; then :
  4172. + $as_echo_n "(cached) " >&6
  4173. +else
  4174. + lt_cv_ar_at_file=no
  4175. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4176. +/* end confdefs.h. */
  4177. +
  4178. +int
  4179. +main ()
  4180. +{
  4181. + ;
  4182. + return 0;
  4183. +}
  4184. +_ACEOF
  4185. +if ac_fn_c_try_compile "$LINENO"; then :
  4186. + echo conftest.$ac_objext > conftest.lst
  4187. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  4188. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  4189. + (eval $lt_ar_try) 2>&5
  4190. + ac_status=$?
  4191. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  4192. + test $ac_status = 0; }
  4193. + if test "$ac_status" -eq 0; then
  4194. + # Ensure the archiver fails upon bogus file names.
  4195. + rm -f conftest.$ac_objext libconftest.a
  4196. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  4197. + (eval $lt_ar_try) 2>&5
  4198. + ac_status=$?
  4199. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  4200. + test $ac_status = 0; }
  4201. + if test "$ac_status" -ne 0; then
  4202. + lt_cv_ar_at_file=@
  4203. + fi
  4204. + fi
  4205. + rm -f conftest.* libconftest.a
  4206. +fi
  4207. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  4208. +fi
  4209. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  4210. +$as_echo "$lt_cv_ar_at_file" >&6; }
  4211. +if test "x$lt_cv_ar_at_file" = xno; then
  4212. + archiver_list_spec=
  4213. +else
  4214. + archiver_list_spec=$lt_cv_ar_at_file
  4215. +fi
  4216. @@ -6169,8 +6483,8 @@ esac
  4217. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  4218. # Transform an extracted symbol line into symbol name and symbol address
  4219. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  4220. -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'"
  4221. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  4222. +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'"
  4223. # Handle CRLF in mingw tool chain
  4224. opt_cr=
  4225. @@ -6206,6 +6520,7 @@ for ac_symprfx in "" "_"; do
  4226. else
  4227. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  4228. fi
  4229. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  4230. # Check to see that the pipe works correctly.
  4231. pipe_works=no
  4232. @@ -6247,6 +6562,18 @@ _LT_EOF
  4233. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  4234. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  4235. cat <<_LT_EOF > conftest.$ac_ext
  4236. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  4237. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  4238. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  4239. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  4240. +# define LT_DLSYM_CONST
  4241. +#elif defined(__osf__)
  4242. +/* This system does not cope well with relocations in const data. */
  4243. +# define LT_DLSYM_CONST
  4244. +#else
  4245. +# define LT_DLSYM_CONST const
  4246. +#endif
  4247. +
  4248. #ifdef __cplusplus
  4249. extern "C" {
  4250. #endif
  4251. @@ -6258,7 +6585,7 @@ _LT_EOF
  4252. cat <<_LT_EOF >> conftest.$ac_ext
  4253. /* The mapping between symbol names and symbols. */
  4254. -const struct {
  4255. +LT_DLSYM_CONST struct {
  4256. const char *name;
  4257. void *address;
  4258. }
  4259. @@ -6284,8 +6611,8 @@ static const void *lt_preloaded_setup() {
  4260. _LT_EOF
  4261. # Now try linking the two files.
  4262. mv conftest.$ac_objext conftstm.$ac_objext
  4263. - lt_save_LIBS="$LIBS"
  4264. - lt_save_CFLAGS="$CFLAGS"
  4265. + lt_globsym_save_LIBS=$LIBS
  4266. + lt_globsym_save_CFLAGS=$CFLAGS
  4267. LIBS="conftstm.$ac_objext"
  4268. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  4269. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  4270. @@ -6295,8 +6622,8 @@ _LT_EOF
  4271. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  4272. pipe_works=yes
  4273. fi
  4274. - LIBS="$lt_save_LIBS"
  4275. - CFLAGS="$lt_save_CFLAGS"
  4276. + LIBS=$lt_globsym_save_LIBS
  4277. + CFLAGS=$lt_globsym_save_CFLAGS
  4278. else
  4279. echo "cannot find nm_test_func in $nlist" >&5
  4280. fi
  4281. @@ -6333,6 +6660,19 @@ else
  4282. $as_echo "ok" >&6; }
  4283. fi
  4284. +# Response file support.
  4285. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  4286. + nm_file_list_spec='@'
  4287. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  4288. + nm_file_list_spec='@'
  4289. +fi
  4290. +
  4291. +
  4292. +
  4293. +
  4294. +
  4295. +
  4296. +
  4297. @@ -6349,6 +6689,42 @@ fi
  4298. +
  4299. +
  4300. +
  4301. +
  4302. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  4303. +$as_echo_n "checking for sysroot... " >&6; }
  4304. +
  4305. +# Check whether --with-libtool-sysroot was given.
  4306. +if test "${with_libtool_sysroot+set}" = set; then :
  4307. + withval=$with_libtool_sysroot;
  4308. +else
  4309. + with_libtool_sysroot=no
  4310. +fi
  4311. +
  4312. +
  4313. +lt_sysroot=
  4314. +case ${with_libtool_sysroot} in #(
  4315. + yes)
  4316. + if test "$GCC" = yes; then
  4317. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  4318. + fi
  4319. + ;; #(
  4320. + /*)
  4321. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  4322. + ;; #(
  4323. + no|'')
  4324. + ;; #(
  4325. + *)
  4326. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  4327. +$as_echo "${with_libtool_sysroot}" >&6; }
  4328. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  4329. + ;;
  4330. +esac
  4331. +
  4332. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  4333. +$as_echo "${lt_sysroot:-no}" >&6; }
  4334. @@ -6560,6 +6936,123 @@ esac
  4335. need_locks="$enable_libtool_lock"
  4336. +if test -n "$ac_tool_prefix"; then
  4337. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  4338. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  4339. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4340. +$as_echo_n "checking for $ac_word... " >&6; }
  4341. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  4342. + $as_echo_n "(cached) " >&6
  4343. +else
  4344. + if test -n "$MANIFEST_TOOL"; then
  4345. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  4346. +else
  4347. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4348. +for as_dir in $PATH
  4349. +do
  4350. + IFS=$as_save_IFS
  4351. + test -z "$as_dir" && as_dir=.
  4352. + for ac_exec_ext in '' $ac_executable_extensions; do
  4353. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4354. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  4355. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4356. + break 2
  4357. + fi
  4358. +done
  4359. + done
  4360. +IFS=$as_save_IFS
  4361. +
  4362. +fi
  4363. +fi
  4364. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  4365. +if test -n "$MANIFEST_TOOL"; then
  4366. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  4367. +$as_echo "$MANIFEST_TOOL" >&6; }
  4368. +else
  4369. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4370. +$as_echo "no" >&6; }
  4371. +fi
  4372. +
  4373. +
  4374. +fi
  4375. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  4376. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  4377. + # Extract the first word of "mt", so it can be a program name with args.
  4378. +set dummy mt; ac_word=$2
  4379. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4380. +$as_echo_n "checking for $ac_word... " >&6; }
  4381. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  4382. + $as_echo_n "(cached) " >&6
  4383. +else
  4384. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  4385. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  4386. +else
  4387. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4388. +for as_dir in $PATH
  4389. +do
  4390. + IFS=$as_save_IFS
  4391. + test -z "$as_dir" && as_dir=.
  4392. + for ac_exec_ext in '' $ac_executable_extensions; do
  4393. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4394. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  4395. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4396. + break 2
  4397. + fi
  4398. +done
  4399. + done
  4400. +IFS=$as_save_IFS
  4401. +
  4402. +fi
  4403. +fi
  4404. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  4405. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  4406. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  4407. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  4408. +else
  4409. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4410. +$as_echo "no" >&6; }
  4411. +fi
  4412. +
  4413. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  4414. + MANIFEST_TOOL=":"
  4415. + else
  4416. + case $cross_compiling:$ac_tool_warned in
  4417. +yes:)
  4418. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  4419. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  4420. +ac_tool_warned=yes ;;
  4421. +esac
  4422. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  4423. + fi
  4424. +else
  4425. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  4426. +fi
  4427. +
  4428. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  4429. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  4430. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  4431. +if ${lt_cv_path_mainfest_tool+:} false; then :
  4432. + $as_echo_n "(cached) " >&6
  4433. +else
  4434. + lt_cv_path_mainfest_tool=no
  4435. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  4436. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  4437. + cat conftest.err >&5
  4438. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  4439. + lt_cv_path_mainfest_tool=yes
  4440. + fi
  4441. + rm -f conftest*
  4442. +fi
  4443. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  4444. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  4445. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  4446. + MANIFEST_TOOL=:
  4447. +fi
  4448. +
  4449. +
  4450. +
  4451. +
  4452. +
  4453. case $host_os in
  4454. rhapsody* | darwin*)
  4455. @@ -7123,6 +7616,8 @@ _LT_EOF
  4456. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  4457. echo "$AR cru libconftest.a conftest.o" >&5
  4458. $AR cru libconftest.a conftest.o 2>&5
  4459. + echo "$RANLIB libconftest.a" >&5
  4460. + $RANLIB libconftest.a 2>&5
  4461. cat > conftest.c << _LT_EOF
  4462. int main() { return 0;}
  4463. _LT_EOF
  4464. @@ -7318,7 +7813,8 @@ fi
  4465. LIBTOOL_DEPS="$ltmain"
  4466. # Always use our own libtool.
  4467. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  4468. +LIBTOOL='$(SHELL) $(top_builddir)'
  4469. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  4470. @@ -7407,7 +7903,7 @@ aix3*)
  4471. esac
  4472. # Global variables:
  4473. -ofile=libtool
  4474. +ofile=${host_alias}-libtool
  4475. can_build_shared=yes
  4476. # All known linkers require a `.a' archive for static linking (except MSVC,
  4477. @@ -7705,8 +8201,6 @@ fi
  4478. lt_prog_compiler_pic=
  4479. lt_prog_compiler_static=
  4480. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  4481. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4482. if test "$GCC" = yes; then
  4483. lt_prog_compiler_wl='-Wl,'
  4484. @@ -7872,6 +8366,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4485. lt_prog_compiler_pic='--shared'
  4486. lt_prog_compiler_static='--static'
  4487. ;;
  4488. + nagfor*)
  4489. + # NAG Fortran compiler
  4490. + lt_prog_compiler_wl='-Wl,-Wl,,'
  4491. + lt_prog_compiler_pic='-PIC'
  4492. + lt_prog_compiler_static='-Bstatic'
  4493. + ;;
  4494. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  4495. # Portland Group compilers (*not* the Pentium gcc compiler,
  4496. # which looks to be a dead project)
  4497. @@ -7934,7 +8434,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4498. lt_prog_compiler_pic='-KPIC'
  4499. lt_prog_compiler_static='-Bstatic'
  4500. case $cc_basename in
  4501. - f77* | f90* | f95*)
  4502. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  4503. lt_prog_compiler_wl='-Qoption ld ';;
  4504. *)
  4505. lt_prog_compiler_wl='-Wl,';;
  4506. @@ -7991,13 +8491,17 @@ case $host_os in
  4507. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  4508. ;;
  4509. esac
  4510. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  4511. -$as_echo "$lt_prog_compiler_pic" >&6; }
  4512. -
  4513. -
  4514. -
  4515. -
  4516. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  4517. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  4518. +if ${lt_cv_prog_compiler_pic+:} false; then :
  4519. + $as_echo_n "(cached) " >&6
  4520. +else
  4521. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  4522. +fi
  4523. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  4524. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  4525. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  4526. #
  4527. # Check to make sure the PIC flag actually works.
  4528. @@ -8058,6 +8562,11 @@ fi
  4529. +
  4530. +
  4531. +
  4532. +
  4533. +
  4534. #
  4535. # Check to make sure the static flag actually works.
  4536. #
  4537. @@ -8408,7 +8917,8 @@ _LT_EOF
  4538. allow_undefined_flag=unsupported
  4539. always_export_symbols=no
  4540. enable_shared_with_static_runtimes=yes
  4541. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  4542. + 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'
  4543. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  4544. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  4545. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  4546. @@ -8507,12 +9017,12 @@ _LT_EOF
  4547. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  4548. hardcode_libdir_flag_spec=
  4549. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  4550. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  4551. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  4552. if test "x$supports_anon_versioning" = xyes; then
  4553. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  4554. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  4555. echo "local: *; };" >> $output_objdir/$libname.ver~
  4556. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  4557. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  4558. fi
  4559. ;;
  4560. esac
  4561. @@ -8526,8 +9036,8 @@ _LT_EOF
  4562. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  4563. wlarc=
  4564. else
  4565. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4566. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4567. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4568. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4569. fi
  4570. ;;
  4571. @@ -8545,8 +9055,8 @@ _LT_EOF
  4572. _LT_EOF
  4573. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  4574. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4575. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4576. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4577. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4578. else
  4579. ld_shlibs=no
  4580. fi
  4581. @@ -8592,8 +9102,8 @@ _LT_EOF
  4582. *)
  4583. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  4584. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4585. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4586. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  4587. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  4588. else
  4589. ld_shlibs=no
  4590. fi
  4591. @@ -8723,7 +9233,13 @@ _LT_EOF
  4592. allow_undefined_flag='-berok'
  4593. # Determine the default libpath from the value encoded in an
  4594. # empty executable.
  4595. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4596. + if test "${lt_cv_aix_libpath+set}" = set; then
  4597. + aix_libpath=$lt_cv_aix_libpath
  4598. +else
  4599. + if ${lt_cv_aix_libpath_+:} false; then :
  4600. + $as_echo_n "(cached) " >&6
  4601. +else
  4602. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4603. /* end confdefs.h. */
  4604. int
  4605. @@ -8736,22 +9252,29 @@ main ()
  4606. _ACEOF
  4607. if ac_fn_c_try_link "$LINENO"; then :
  4608. -lt_aix_libpath_sed='
  4609. - /Import File Strings/,/^$/ {
  4610. - /^0/ {
  4611. - s/^0 *\(.*\)$/\1/
  4612. - p
  4613. - }
  4614. - }'
  4615. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4616. -# Check for a 64-bit object if we didn't find anything.
  4617. -if test -z "$aix_libpath"; then
  4618. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4619. -fi
  4620. + lt_aix_libpath_sed='
  4621. + /Import File Strings/,/^$/ {
  4622. + /^0/ {
  4623. + s/^0 *\([^ ]*\) *$/\1/
  4624. + p
  4625. + }
  4626. + }'
  4627. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4628. + # Check for a 64-bit object if we didn't find anything.
  4629. + if test -z "$lt_cv_aix_libpath_"; then
  4630. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4631. + fi
  4632. fi
  4633. rm -f core conftest.err conftest.$ac_objext \
  4634. conftest$ac_exeext conftest.$ac_ext
  4635. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4636. + if test -z "$lt_cv_aix_libpath_"; then
  4637. + lt_cv_aix_libpath_="/usr/lib:/lib"
  4638. + fi
  4639. +
  4640. +fi
  4641. +
  4642. + aix_libpath=$lt_cv_aix_libpath_
  4643. +fi
  4644. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  4645. 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"
  4646. @@ -8763,7 +9286,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4647. else
  4648. # Determine the default libpath from the value encoded in an
  4649. # empty executable.
  4650. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4651. + if test "${lt_cv_aix_libpath+set}" = set; then
  4652. + aix_libpath=$lt_cv_aix_libpath
  4653. +else
  4654. + if ${lt_cv_aix_libpath_+:} false; then :
  4655. + $as_echo_n "(cached) " >&6
  4656. +else
  4657. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4658. /* end confdefs.h. */
  4659. int
  4660. @@ -8776,22 +9305,29 @@ main ()
  4661. _ACEOF
  4662. if ac_fn_c_try_link "$LINENO"; then :
  4663. -lt_aix_libpath_sed='
  4664. - /Import File Strings/,/^$/ {
  4665. - /^0/ {
  4666. - s/^0 *\(.*\)$/\1/
  4667. - p
  4668. - }
  4669. - }'
  4670. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4671. -# Check for a 64-bit object if we didn't find anything.
  4672. -if test -z "$aix_libpath"; then
  4673. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4674. -fi
  4675. + lt_aix_libpath_sed='
  4676. + /Import File Strings/,/^$/ {
  4677. + /^0/ {
  4678. + s/^0 *\([^ ]*\) *$/\1/
  4679. + p
  4680. + }
  4681. + }'
  4682. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4683. + # Check for a 64-bit object if we didn't find anything.
  4684. + if test -z "$lt_cv_aix_libpath_"; then
  4685. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  4686. + fi
  4687. fi
  4688. rm -f core conftest.err conftest.$ac_objext \
  4689. conftest$ac_exeext conftest.$ac_ext
  4690. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4691. + if test -z "$lt_cv_aix_libpath_"; then
  4692. + lt_cv_aix_libpath_="/usr/lib:/lib"
  4693. + fi
  4694. +
  4695. +fi
  4696. +
  4697. + aix_libpath=$lt_cv_aix_libpath_
  4698. +fi
  4699. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  4700. # Warning - without using the other run time loading flags,
  4701. @@ -8836,20 +9372,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4702. # Microsoft Visual C++.
  4703. # hardcode_libdir_flag_spec is actually meaningless, as there is
  4704. # no search path for DLLs.
  4705. - hardcode_libdir_flag_spec=' '
  4706. - allow_undefined_flag=unsupported
  4707. - # Tell ltmain to make .lib files, not .a files.
  4708. - libext=lib
  4709. - # Tell ltmain to make .dll files, not .so files.
  4710. - shrext_cmds=".dll"
  4711. - # FIXME: Setting linknames here is a bad hack.
  4712. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  4713. - # The linker will automatically build a .lib file if we build a DLL.
  4714. - old_archive_from_new_cmds='true'
  4715. - # FIXME: Should let the user specify the lib program.
  4716. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  4717. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  4718. - enable_shared_with_static_runtimes=yes
  4719. + case $cc_basename in
  4720. + cl*)
  4721. + # Native MSVC
  4722. + hardcode_libdir_flag_spec=' '
  4723. + allow_undefined_flag=unsupported
  4724. + always_export_symbols=yes
  4725. + file_list_spec='@'
  4726. + # Tell ltmain to make .lib files, not .a files.
  4727. + libext=lib
  4728. + # Tell ltmain to make .dll files, not .so files.
  4729. + shrext_cmds=".dll"
  4730. + # FIXME: Setting linknames here is a bad hack.
  4731. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  4732. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  4733. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  4734. + else
  4735. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  4736. + fi~
  4737. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  4738. + linknames='
  4739. + # The linker will not automatically build a static lib if we build a DLL.
  4740. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  4741. + enable_shared_with_static_runtimes=yes
  4742. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  4743. + # Don't use ranlib
  4744. + old_postinstall_cmds='chmod 644 $oldlib'
  4745. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  4746. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  4747. + case $lt_outputfile in
  4748. + *.exe|*.EXE) ;;
  4749. + *)
  4750. + lt_outputfile="$lt_outputfile.exe"
  4751. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  4752. + ;;
  4753. + esac~
  4754. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  4755. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  4756. + $RM "$lt_outputfile.manifest";
  4757. + fi'
  4758. + ;;
  4759. + *)
  4760. + # Assume MSVC wrapper
  4761. + hardcode_libdir_flag_spec=' '
  4762. + allow_undefined_flag=unsupported
  4763. + # Tell ltmain to make .lib files, not .a files.
  4764. + libext=lib
  4765. + # Tell ltmain to make .dll files, not .so files.
  4766. + shrext_cmds=".dll"
  4767. + # FIXME: Setting linknames here is a bad hack.
  4768. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  4769. + # The linker will automatically build a .lib file if we build a DLL.
  4770. + old_archive_from_new_cmds='true'
  4771. + # FIXME: Should let the user specify the lib program.
  4772. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  4773. + enable_shared_with_static_runtimes=yes
  4774. + ;;
  4775. + esac
  4776. ;;
  4777. darwin* | rhapsody*)
  4778. @@ -8910,7 +9489,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4779. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  4780. freebsd* | dragonfly*)
  4781. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  4782. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  4783. hardcode_libdir_flag_spec='-R$libdir'
  4784. hardcode_direct=yes
  4785. hardcode_shlibpath_var=no
  4786. @@ -8918,7 +9497,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4787. hpux9*)
  4788. if test "$GCC" = yes; then
  4789. - 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'
  4790. + 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'
  4791. else
  4792. 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'
  4793. fi
  4794. @@ -8934,7 +9513,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4795. hpux10*)
  4796. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  4797. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4798. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4799. else
  4800. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  4801. fi
  4802. @@ -8958,10 +9537,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  4803. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  4804. ;;
  4805. ia64*)
  4806. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  4807. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  4808. ;;
  4809. *)
  4810. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4811. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  4812. ;;
  4813. esac
  4814. else
  4815. @@ -9040,23 +9619,36 @@ fi
  4816. irix5* | irix6* | nonstopux*)
  4817. if test "$GCC" = yes; then
  4818. - 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'
  4819. + 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'
  4820. # Try to use the -exported_symbol ld option, if it does not
  4821. # work, assume that -exports_file does not work either and
  4822. # implicitly export all symbols.
  4823. - save_LDFLAGS="$LDFLAGS"
  4824. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  4825. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4826. + # This should be the same for all languages, so no per-tag cache variable.
  4827. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  4828. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  4829. +if ${lt_cv_irix_exported_symbol+:} false; then :
  4830. + $as_echo_n "(cached) " >&6
  4831. +else
  4832. + save_LDFLAGS="$LDFLAGS"
  4833. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  4834. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  4835. /* end confdefs.h. */
  4836. -int foo(void) {}
  4837. +int foo (void) { return 0; }
  4838. _ACEOF
  4839. if ac_fn_c_try_link "$LINENO"; then :
  4840. - 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'
  4841. -
  4842. + lt_cv_irix_exported_symbol=yes
  4843. +else
  4844. + lt_cv_irix_exported_symbol=no
  4845. fi
  4846. rm -f core conftest.err conftest.$ac_objext \
  4847. conftest$ac_exeext conftest.$ac_ext
  4848. - LDFLAGS="$save_LDFLAGS"
  4849. + LDFLAGS="$save_LDFLAGS"
  4850. +fi
  4851. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  4852. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  4853. + if test "$lt_cv_irix_exported_symbol" = yes; then
  4854. + 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'
  4855. + fi
  4856. else
  4857. 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'
  4858. 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'
  4859. @@ -9141,7 +9733,7 @@ rm -f core conftest.err conftest.$ac_objext \
  4860. osf4* | osf5*) # as osf3* with the addition of -msym flag
  4861. if test "$GCC" = yes; then
  4862. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  4863. - 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'
  4864. + 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'
  4865. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  4866. else
  4867. allow_undefined_flag=' -expect_unresolved \*'
  4868. @@ -9160,9 +9752,9 @@ rm -f core conftest.err conftest.$ac_objext \
  4869. no_undefined_flag=' -z defs'
  4870. if test "$GCC" = yes; then
  4871. wlarc='${wl}'
  4872. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  4873. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  4874. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  4875. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  4876. + $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'
  4877. else
  4878. case `$CC -V 2>&1` in
  4879. *"Compilers 5.0"*)
  4880. @@ -9738,8 +10330,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  4881. need_version=no
  4882. need_lib_prefix=no
  4883. - case $GCC,$host_os in
  4884. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  4885. + case $GCC,$cc_basename in
  4886. + yes,*)
  4887. + # gcc
  4888. library_names_spec='$libname.dll.a'
  4889. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  4890. postinstall_cmds='base_file=`basename \${file}`~
  4891. @@ -9772,13 +10365,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  4892. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  4893. ;;
  4894. esac
  4895. + dynamic_linker='Win32 ld.exe'
  4896. + ;;
  4897. +
  4898. + *,cl*)
  4899. + # Native MSVC
  4900. + libname_spec='$name'
  4901. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  4902. + library_names_spec='${libname}.dll.lib'
  4903. +
  4904. + case $build_os in
  4905. + mingw*)
  4906. + sys_lib_search_path_spec=
  4907. + lt_save_ifs=$IFS
  4908. + IFS=';'
  4909. + for lt_path in $LIB
  4910. + do
  4911. + IFS=$lt_save_ifs
  4912. + # Let DOS variable expansion print the short 8.3 style file name.
  4913. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  4914. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  4915. + done
  4916. + IFS=$lt_save_ifs
  4917. + # Convert to MSYS style.
  4918. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  4919. + ;;
  4920. + cygwin*)
  4921. + # Convert to unix form, then to dos form, then back to unix form
  4922. + # but this time dos style (no spaces!) so that the unix form looks
  4923. + # like /cygdrive/c/PROGRA~1:/cygdr...
  4924. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  4925. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  4926. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  4927. + ;;
  4928. + *)
  4929. + sys_lib_search_path_spec="$LIB"
  4930. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  4931. + # It is most probably a Windows format PATH.
  4932. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  4933. + else
  4934. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  4935. + fi
  4936. + # FIXME: find the short name or the path components, as spaces are
  4937. + # common. (e.g. "Program Files" -> "PROGRA~1")
  4938. + ;;
  4939. + esac
  4940. +
  4941. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  4942. + postinstall_cmds='base_file=`basename \${file}`~
  4943. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  4944. + dldir=$destdir/`dirname \$dlpath`~
  4945. + test -d \$dldir || mkdir -p \$dldir~
  4946. + $install_prog $dir/$dlname \$dldir/$dlname'
  4947. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  4948. + dlpath=$dir/\$dldll~
  4949. + $RM \$dlpath'
  4950. + shlibpath_overrides_runpath=yes
  4951. + dynamic_linker='Win32 link.exe'
  4952. ;;
  4953. *)
  4954. + # Assume MSVC wrapper
  4955. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  4956. + dynamic_linker='Win32 ld.exe'
  4957. ;;
  4958. esac
  4959. - dynamic_linker='Win32 ld.exe'
  4960. # FIXME: first we should search . and the directory the executable is in
  4961. shlibpath_var=PATH
  4962. ;;
  4963. @@ -9860,7 +10511,7 @@ haiku*)
  4964. soname_spec='${libname}${release}${shared_ext}$major'
  4965. shlibpath_var=LIBRARY_PATH
  4966. shlibpath_overrides_runpath=yes
  4967. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  4968. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  4969. hardcode_into_libs=yes
  4970. ;;
  4971. @@ -10656,7 +11307,7 @@ else
  4972. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  4973. lt_status=$lt_dlunknown
  4974. cat > conftest.$ac_ext <<_LT_EOF
  4975. -#line 10659 "configure"
  4976. +#line $LINENO "configure"
  4977. #include "confdefs.h"
  4978. #if HAVE_DLFCN_H
  4979. @@ -10700,10 +11351,10 @@ else
  4980. /* When -fvisbility=hidden is used, assume the code has been annotated
  4981. correspondingly for the symbols needed. */
  4982. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  4983. -void fnord () __attribute__((visibility("default")));
  4984. +int fnord () __attribute__((visibility("default")));
  4985. #endif
  4986. -void fnord () { int i=42; }
  4987. +int fnord () { return 42; }
  4988. int main ()
  4989. {
  4990. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  4991. @@ -10762,7 +11413,7 @@ else
  4992. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  4993. lt_status=$lt_dlunknown
  4994. cat > conftest.$ac_ext <<_LT_EOF
  4995. -#line 10765 "configure"
  4996. +#line $LINENO "configure"
  4997. #include "confdefs.h"
  4998. #if HAVE_DLFCN_H
  4999. @@ -10806,10 +11457,10 @@ else
  5000. /* When -fvisbility=hidden is used, assume the code has been annotated
  5001. correspondingly for the symbols needed. */
  5002. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  5003. -void fnord () __attribute__((visibility("default")));
  5004. +int fnord () __attribute__((visibility("default")));
  5005. #endif
  5006. -void fnord () { int i=42; }
  5007. +int fnord () { return 42; }
  5008. int main ()
  5009. {
  5010. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  5011. @@ -14785,13 +15436,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  5012. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  5013. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  5014. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  5015. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  5016. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  5017. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  5018. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  5019. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  5020. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  5021. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  5022. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  5023. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  5024. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  5025. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  5026. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  5027. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  5028. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  5029. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  5030. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  5031. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  5032. @@ -14806,14 +15464,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  5033. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  5034. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  5035. 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"`'
  5036. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  5037. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  5038. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  5039. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  5040. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  5041. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  5042. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  5043. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  5044. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  5045. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  5046. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  5047. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  5048. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  5049. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  5050. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  5051. @@ -14846,12 +15507,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  5052. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  5053. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  5054. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  5055. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  5056. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  5057. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  5058. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  5059. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  5060. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  5061. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  5062. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  5063. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  5064. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  5065. @@ -14906,8 +15567,13 @@ reload_flag \
  5066. OBJDUMP \
  5067. deplibs_check_method \
  5068. file_magic_cmd \
  5069. +file_magic_glob \
  5070. +want_nocaseglob \
  5071. +DLLTOOL \
  5072. +sharedlib_from_linklib_cmd \
  5073. AR \
  5074. AR_FLAGS \
  5075. +archiver_list_spec \
  5076. STRIP \
  5077. RANLIB \
  5078. CC \
  5079. @@ -14917,12 +15583,14 @@ lt_cv_sys_global_symbol_pipe \
  5080. lt_cv_sys_global_symbol_to_cdecl \
  5081. lt_cv_sys_global_symbol_to_c_name_address \
  5082. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  5083. +nm_file_list_spec \
  5084. lt_prog_compiler_no_builtin_flag \
  5085. -lt_prog_compiler_wl \
  5086. lt_prog_compiler_pic \
  5087. +lt_prog_compiler_wl \
  5088. lt_prog_compiler_static \
  5089. lt_cv_prog_compiler_c_o \
  5090. need_locks \
  5091. +MANIFEST_TOOL \
  5092. DSYMUTIL \
  5093. NMEDIT \
  5094. LIPO \
  5095. @@ -14938,7 +15606,6 @@ no_undefined_flag \
  5096. hardcode_libdir_flag_spec \
  5097. hardcode_libdir_flag_spec_ld \
  5098. hardcode_libdir_separator \
  5099. -fix_srcfile_path \
  5100. exclude_expsyms \
  5101. include_expsyms \
  5102. file_list_spec \
  5103. @@ -14974,6 +15641,7 @@ module_cmds \
  5104. module_expsym_cmds \
  5105. export_symbols_cmds \
  5106. prelink_cmds \
  5107. +postlink_cmds \
  5108. postinstall_cmds \
  5109. postuninstall_cmds \
  5110. finish_cmds \
  5111. @@ -15747,7 +16415,8 @@ $as_echo X"$file" |
  5112. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  5113. #
  5114. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  5115. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  5116. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  5117. +# Inc.
  5118. # Written by Gordon Matzigkeit, 1996
  5119. #
  5120. # This file is part of GNU Libtool.
  5121. @@ -15850,19 +16519,42 @@ SP2NL=$lt_lt_SP2NL
  5122. # turn newlines into spaces.
  5123. NL2SP=$lt_lt_NL2SP
  5124. +# convert \$build file names to \$host format.
  5125. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  5126. +
  5127. +# convert \$build files to toolchain format.
  5128. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  5129. +
  5130. # An object symbol dumper.
  5131. OBJDUMP=$lt_OBJDUMP
  5132. # Method to check whether dependent libraries are shared objects.
  5133. deplibs_check_method=$lt_deplibs_check_method
  5134. -# Command to use when deplibs_check_method == "file_magic".
  5135. +# Command to use when deplibs_check_method = "file_magic".
  5136. file_magic_cmd=$lt_file_magic_cmd
  5137. +# How to find potential files when deplibs_check_method = "file_magic".
  5138. +file_magic_glob=$lt_file_magic_glob
  5139. +
  5140. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  5141. +want_nocaseglob=$lt_want_nocaseglob
  5142. +
  5143. +# DLL creation program.
  5144. +DLLTOOL=$lt_DLLTOOL
  5145. +
  5146. +# Command to associate shared and link libraries.
  5147. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  5148. +
  5149. # The archiver.
  5150. AR=$lt_AR
  5151. +
  5152. +# Flags to create an archive.
  5153. AR_FLAGS=$lt_AR_FLAGS
  5154. +# How to feed a file listing to the archiver.
  5155. +archiver_list_spec=$lt_archiver_list_spec
  5156. +
  5157. # A symbol stripping program.
  5158. STRIP=$lt_STRIP
  5159. @@ -15892,6 +16584,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  5160. # Transform the output of nm in a C name address pair when lib prefix is needed.
  5161. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  5162. +# Specify filename containing input files for \$NM.
  5163. +nm_file_list_spec=$lt_nm_file_list_spec
  5164. +
  5165. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  5166. +lt_sysroot=$lt_sysroot
  5167. +
  5168. # The name of the directory that contains temporary libtool files.
  5169. objdir=$objdir
  5170. @@ -15901,6 +16599,9 @@ MAGIC_CMD=$MAGIC_CMD
  5171. # Must we lock files when doing compilation?
  5172. need_locks=$lt_need_locks
  5173. +# Manifest tool.
  5174. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  5175. +
  5176. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  5177. DSYMUTIL=$lt_DSYMUTIL
  5178. @@ -16015,12 +16716,12 @@ with_gcc=$GCC
  5179. # Compiler flag to turn off builtin functions.
  5180. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  5181. -# How to pass a linker flag through the compiler.
  5182. -wl=$lt_lt_prog_compiler_wl
  5183. -
  5184. # Additional compiler flags for building library objects.
  5185. pic_flag=$lt_lt_prog_compiler_pic
  5186. +# How to pass a linker flag through the compiler.
  5187. +wl=$lt_lt_prog_compiler_wl
  5188. +
  5189. # Compiler flag to prevent dynamic linking.
  5190. link_static_flag=$lt_lt_prog_compiler_static
  5191. @@ -16107,9 +16808,6 @@ inherit_rpath=$inherit_rpath
  5192. # Whether libtool must link a program against all its dependency libraries.
  5193. link_all_deplibs=$link_all_deplibs
  5194. -# Fix the shell variable \$srcfile for the compiler.
  5195. -fix_srcfile_path=$lt_fix_srcfile_path
  5196. -
  5197. # Set to "yes" if exported symbols are required.
  5198. always_export_symbols=$always_export_symbols
  5199. @@ -16125,6 +16823,9 @@ include_expsyms=$lt_include_expsyms
  5200. # Commands necessary for linking programs (against libraries) with templates.
  5201. prelink_cmds=$lt_prelink_cmds
  5202. +# Commands necessary for finishing linking programs.
  5203. +postlink_cmds=$lt_postlink_cmds
  5204. +
  5205. # Specify filename containing input files.
  5206. file_list_spec=$lt_file_list_spec
  5207. @@ -16157,210 +16858,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  5208. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  5209. # text mode, it properly converts lines to CR/LF. This bash problem
  5210. # is reportedly fixed, but why not run on old versions too?
  5211. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  5212. - || (rm -f "$cfgfile"; exit 1)
  5213. -
  5214. - case $xsi_shell in
  5215. - yes)
  5216. - cat << \_LT_EOF >> "$cfgfile"
  5217. -
  5218. -# func_dirname file append nondir_replacement
  5219. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  5220. -# otherwise set result to NONDIR_REPLACEMENT.
  5221. -func_dirname ()
  5222. -{
  5223. - case ${1} in
  5224. - */*) func_dirname_result="${1%/*}${2}" ;;
  5225. - * ) func_dirname_result="${3}" ;;
  5226. - esac
  5227. -}
  5228. -
  5229. -# func_basename file
  5230. -func_basename ()
  5231. -{
  5232. - func_basename_result="${1##*/}"
  5233. -}
  5234. -
  5235. -# func_dirname_and_basename file append nondir_replacement
  5236. -# perform func_basename and func_dirname in a single function
  5237. -# call:
  5238. -# dirname: Compute the dirname of FILE. If nonempty,
  5239. -# add APPEND to the result, otherwise set result
  5240. -# to NONDIR_REPLACEMENT.
  5241. -# value returned in "$func_dirname_result"
  5242. -# basename: Compute filename of FILE.
  5243. -# value retuned in "$func_basename_result"
  5244. -# Implementation must be kept synchronized with func_dirname
  5245. -# and func_basename. For efficiency, we do not delegate to
  5246. -# those functions but instead duplicate the functionality here.
  5247. -func_dirname_and_basename ()
  5248. -{
  5249. - case ${1} in
  5250. - */*) func_dirname_result="${1%/*}${2}" ;;
  5251. - * ) func_dirname_result="${3}" ;;
  5252. - esac
  5253. - func_basename_result="${1##*/}"
  5254. -}
  5255. -
  5256. -# func_stripname prefix suffix name
  5257. -# strip PREFIX and SUFFIX off of NAME.
  5258. -# PREFIX and SUFFIX must not contain globbing or regex special
  5259. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  5260. -# dot (in which case that matches only a dot).
  5261. -func_stripname ()
  5262. -{
  5263. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  5264. - # positional parameters, so assign one to ordinary parameter first.
  5265. - func_stripname_result=${3}
  5266. - func_stripname_result=${func_stripname_result#"${1}"}
  5267. - func_stripname_result=${func_stripname_result%"${2}"}
  5268. -}
  5269. -
  5270. -# func_opt_split
  5271. -func_opt_split ()
  5272. -{
  5273. - func_opt_split_opt=${1%%=*}
  5274. - func_opt_split_arg=${1#*=}
  5275. -}
  5276. -
  5277. -# func_lo2o object
  5278. -func_lo2o ()
  5279. -{
  5280. - case ${1} in
  5281. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  5282. - *) func_lo2o_result=${1} ;;
  5283. - esac
  5284. -}
  5285. -
  5286. -# func_xform libobj-or-source
  5287. -func_xform ()
  5288. -{
  5289. - func_xform_result=${1%.*}.lo
  5290. -}
  5291. -
  5292. -# func_arith arithmetic-term...
  5293. -func_arith ()
  5294. -{
  5295. - func_arith_result=$(( $* ))
  5296. -}
  5297. -
  5298. -# func_len string
  5299. -# STRING may not start with a hyphen.
  5300. -func_len ()
  5301. -{
  5302. - func_len_result=${#1}
  5303. -}
  5304. -
  5305. -_LT_EOF
  5306. - ;;
  5307. - *) # Bourne compatible functions.
  5308. - cat << \_LT_EOF >> "$cfgfile"
  5309. -
  5310. -# func_dirname file append nondir_replacement
  5311. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  5312. -# otherwise set result to NONDIR_REPLACEMENT.
  5313. -func_dirname ()
  5314. -{
  5315. - # Extract subdirectory from the argument.
  5316. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  5317. - if test "X$func_dirname_result" = "X${1}"; then
  5318. - func_dirname_result="${3}"
  5319. - else
  5320. - func_dirname_result="$func_dirname_result${2}"
  5321. - fi
  5322. -}
  5323. -
  5324. -# func_basename file
  5325. -func_basename ()
  5326. -{
  5327. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  5328. -}
  5329. -
  5330. -
  5331. -# func_stripname prefix suffix name
  5332. -# strip PREFIX and SUFFIX off of NAME.
  5333. -# PREFIX and SUFFIX must not contain globbing or regex special
  5334. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  5335. -# dot (in which case that matches only a dot).
  5336. -# func_strip_suffix prefix name
  5337. -func_stripname ()
  5338. -{
  5339. - case ${2} in
  5340. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  5341. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  5342. - esac
  5343. -}
  5344. -
  5345. -# sed scripts:
  5346. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  5347. -my_sed_long_arg='1s/^-[^=]*=//'
  5348. -
  5349. -# func_opt_split
  5350. -func_opt_split ()
  5351. -{
  5352. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  5353. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  5354. -}
  5355. -
  5356. -# func_lo2o object
  5357. -func_lo2o ()
  5358. -{
  5359. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  5360. -}
  5361. -
  5362. -# func_xform libobj-or-source
  5363. -func_xform ()
  5364. -{
  5365. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  5366. -}
  5367. -
  5368. -# func_arith arithmetic-term...
  5369. -func_arith ()
  5370. -{
  5371. - func_arith_result=`expr "$@"`
  5372. -}
  5373. -
  5374. -# func_len string
  5375. -# STRING may not start with a hyphen.
  5376. -func_len ()
  5377. -{
  5378. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  5379. -}
  5380. -
  5381. -_LT_EOF
  5382. -esac
  5383. -
  5384. -case $lt_shell_append in
  5385. - yes)
  5386. - cat << \_LT_EOF >> "$cfgfile"
  5387. -
  5388. -# func_append var value
  5389. -# Append VALUE to the end of shell variable VAR.
  5390. -func_append ()
  5391. -{
  5392. - eval "$1+=\$2"
  5393. -}
  5394. -_LT_EOF
  5395. - ;;
  5396. - *)
  5397. - cat << \_LT_EOF >> "$cfgfile"
  5398. -
  5399. -# func_append var value
  5400. -# Append VALUE to the end of shell variable VAR.
  5401. -func_append ()
  5402. -{
  5403. - eval "$1=\$$1\$2"
  5404. -}
  5405. -
  5406. -_LT_EOF
  5407. - ;;
  5408. - esac
  5409. -
  5410. -
  5411. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  5412. - || (rm -f "$cfgfile"; exit 1)
  5413. -
  5414. - mv -f "$cfgfile" "$ofile" ||
  5415. + sed '$q' "$ltmain" >> "$cfgfile" \
  5416. + || (rm -f "$cfgfile"; exit 1)
  5417. +
  5418. + if test x"$xsi_shell" = xyes; then
  5419. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  5420. +func_dirname ()\
  5421. +{\
  5422. +\ case ${1} in\
  5423. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  5424. +\ * ) func_dirname_result="${3}" ;;\
  5425. +\ esac\
  5426. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  5427. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5428. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5429. +test 0 -eq $? || _lt_function_replace_fail=:
  5430. +
  5431. +
  5432. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  5433. +func_basename ()\
  5434. +{\
  5435. +\ func_basename_result="${1##*/}"\
  5436. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  5437. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5438. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5439. +test 0 -eq $? || _lt_function_replace_fail=:
  5440. +
  5441. +
  5442. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  5443. +func_dirname_and_basename ()\
  5444. +{\
  5445. +\ case ${1} in\
  5446. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  5447. +\ * ) func_dirname_result="${3}" ;;\
  5448. +\ esac\
  5449. +\ func_basename_result="${1##*/}"\
  5450. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  5451. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5452. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5453. +test 0 -eq $? || _lt_function_replace_fail=:
  5454. +
  5455. +
  5456. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  5457. +func_stripname ()\
  5458. +{\
  5459. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  5460. +\ # positional parameters, so assign one to ordinary parameter first.\
  5461. +\ func_stripname_result=${3}\
  5462. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  5463. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  5464. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  5465. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5466. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5467. +test 0 -eq $? || _lt_function_replace_fail=:
  5468. +
  5469. +
  5470. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  5471. +func_split_long_opt ()\
  5472. +{\
  5473. +\ func_split_long_opt_name=${1%%=*}\
  5474. +\ func_split_long_opt_arg=${1#*=}\
  5475. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  5476. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5477. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5478. +test 0 -eq $? || _lt_function_replace_fail=:
  5479. +
  5480. +
  5481. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  5482. +func_split_short_opt ()\
  5483. +{\
  5484. +\ func_split_short_opt_arg=${1#??}\
  5485. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  5486. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  5487. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5488. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5489. +test 0 -eq $? || _lt_function_replace_fail=:
  5490. +
  5491. +
  5492. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  5493. +func_lo2o ()\
  5494. +{\
  5495. +\ case ${1} in\
  5496. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  5497. +\ *) func_lo2o_result=${1} ;;\
  5498. +\ esac\
  5499. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  5500. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5501. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5502. +test 0 -eq $? || _lt_function_replace_fail=:
  5503. +
  5504. +
  5505. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  5506. +func_xform ()\
  5507. +{\
  5508. + func_xform_result=${1%.*}.lo\
  5509. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  5510. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5511. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5512. +test 0 -eq $? || _lt_function_replace_fail=:
  5513. +
  5514. +
  5515. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  5516. +func_arith ()\
  5517. +{\
  5518. + func_arith_result=$(( $* ))\
  5519. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  5520. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5521. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5522. +test 0 -eq $? || _lt_function_replace_fail=:
  5523. +
  5524. +
  5525. + sed -e '/^func_len ()$/,/^} # func_len /c\
  5526. +func_len ()\
  5527. +{\
  5528. + func_len_result=${#1}\
  5529. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  5530. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5531. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5532. +test 0 -eq $? || _lt_function_replace_fail=:
  5533. +
  5534. +fi
  5535. +
  5536. +if test x"$lt_shell_append" = xyes; then
  5537. + sed -e '/^func_append ()$/,/^} # func_append /c\
  5538. +func_append ()\
  5539. +{\
  5540. + eval "${1}+=\\${2}"\
  5541. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  5542. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5543. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5544. +test 0 -eq $? || _lt_function_replace_fail=:
  5545. +
  5546. +
  5547. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  5548. +func_append_quoted ()\
  5549. +{\
  5550. +\ func_quote_for_eval "${2}"\
  5551. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  5552. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  5553. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5554. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5555. +test 0 -eq $? || _lt_function_replace_fail=:
  5556. +
  5557. +
  5558. + # Save a `func_append' function call where possible by direct use of '+='
  5559. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  5560. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5561. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5562. + test 0 -eq $? || _lt_function_replace_fail=:
  5563. +else
  5564. + # Save a `func_append' function call even when '+=' is not available
  5565. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  5566. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  5567. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  5568. + test 0 -eq $? || _lt_function_replace_fail=:
  5569. +fi
  5570. +
  5571. +if test x"$_lt_function_replace_fail" = x":"; then
  5572. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  5573. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  5574. +fi
  5575. +
  5576. +
  5577. + mv -f "$cfgfile" "$ofile" ||
  5578. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  5579. chmod +x "$ofile"
  5580. diff --git a/gprof/configure b/gprof/configure
  5581. index 5703bba4462..e1ac86ec797 100755
  5582. --- a/gprof/configure
  5583. +++ b/gprof/configure
  5584. @@ -663,8 +663,11 @@ OTOOL
  5585. LIPO
  5586. NMEDIT
  5587. DSYMUTIL
  5588. +MANIFEST_TOOL
  5589. RANLIB
  5590. +ac_ct_AR
  5591. AR
  5592. +DLLTOOL
  5593. OBJDUMP
  5594. LN_S
  5595. NM
  5596. @@ -781,6 +784,7 @@ enable_static
  5597. with_pic
  5598. enable_fast_install
  5599. with_gnu_ld
  5600. +with_libtool_sysroot
  5601. enable_libtool_lock
  5602. enable_plugins
  5603. enable_largefile
  5604. @@ -1443,6 +1447,8 @@ Optional Packages:
  5605. --with-pic try to use only PIC/non-PIC objects [default=use
  5606. both]
  5607. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  5608. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  5609. + (or the compiler's sysroot if not specified).
  5610. Some influential environment variables:
  5611. CC C compiler command
  5612. @@ -4471,8 +4477,8 @@ esac
  5613. -macro_version='2.2.7a'
  5614. -macro_revision='1.3134'
  5615. +macro_version='2.4'
  5616. +macro_revision='1.3293'
  5617. @@ -4512,7 +4518,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  5618. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  5619. $as_echo_n "checking how to print strings... " >&6; }
  5620. # Test print first, because it will be a builtin if present.
  5621. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  5622. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  5623. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  5624. ECHO='print -r --'
  5625. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  5626. @@ -5198,8 +5204,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  5627. # Try some XSI features
  5628. xsi_shell=no
  5629. ( _lt_dummy="a/b/c"
  5630. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  5631. - = c,a/b,, \
  5632. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  5633. + = c,a/b,b/c, \
  5634. && eval 'test $(( 1 + 1 )) -eq 2 \
  5635. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  5636. && xsi_shell=yes
  5637. @@ -5248,6 +5254,80 @@ esac
  5638. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  5639. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  5640. +if ${lt_cv_to_host_file_cmd+:} false; then :
  5641. + $as_echo_n "(cached) " >&6
  5642. +else
  5643. + case $host in
  5644. + *-*-mingw* )
  5645. + case $build in
  5646. + *-*-mingw* ) # actually msys
  5647. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  5648. + ;;
  5649. + *-*-cygwin* )
  5650. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  5651. + ;;
  5652. + * ) # otherwise, assume *nix
  5653. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  5654. + ;;
  5655. + esac
  5656. + ;;
  5657. + *-*-cygwin* )
  5658. + case $build in
  5659. + *-*-mingw* ) # actually msys
  5660. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  5661. + ;;
  5662. + *-*-cygwin* )
  5663. + lt_cv_to_host_file_cmd=func_convert_file_noop
  5664. + ;;
  5665. + * ) # otherwise, assume *nix
  5666. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  5667. + ;;
  5668. + esac
  5669. + ;;
  5670. + * ) # unhandled hosts (and "normal" native builds)
  5671. + lt_cv_to_host_file_cmd=func_convert_file_noop
  5672. + ;;
  5673. +esac
  5674. +
  5675. +fi
  5676. +
  5677. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  5678. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  5679. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  5680. +
  5681. +
  5682. +
  5683. +
  5684. +
  5685. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  5686. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  5687. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  5688. + $as_echo_n "(cached) " >&6
  5689. +else
  5690. + #assume ordinary cross tools, or native build.
  5691. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  5692. +case $host in
  5693. + *-*-mingw* )
  5694. + case $build in
  5695. + *-*-mingw* ) # actually msys
  5696. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  5697. + ;;
  5698. + esac
  5699. + ;;
  5700. +esac
  5701. +
  5702. +fi
  5703. +
  5704. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  5705. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  5706. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  5707. +
  5708. +
  5709. +
  5710. +
  5711. +
  5712. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  5713. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  5714. if ${lt_cv_ld_reload_flag+:} false; then :
  5715. @@ -5264,6 +5344,11 @@ case $reload_flag in
  5716. esac
  5717. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  5718. case $host_os in
  5719. + cygwin* | mingw* | pw32* | cegcc*)
  5720. + if test "$GCC" != yes; then
  5721. + reload_cmds=false
  5722. + fi
  5723. + ;;
  5724. darwin*)
  5725. if test "$GCC" = yes; then
  5726. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  5727. @@ -5432,7 +5517,8 @@ mingw* | pw32*)
  5728. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  5729. lt_cv_file_magic_cmd='func_win32_libid'
  5730. else
  5731. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  5732. + # Keep this pattern in sync with the one in func_win32_libid.
  5733. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  5734. lt_cv_file_magic_cmd='$OBJDUMP -f'
  5735. fi
  5736. ;;
  5737. @@ -5586,6 +5672,21 @@ esac
  5738. fi
  5739. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  5740. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  5741. +
  5742. +file_magic_glob=
  5743. +want_nocaseglob=no
  5744. +if test "$build" = "$host"; then
  5745. + case $host_os in
  5746. + mingw* | pw32*)
  5747. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  5748. + want_nocaseglob=yes
  5749. + else
  5750. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  5751. + fi
  5752. + ;;
  5753. + esac
  5754. +fi
  5755. +
  5756. file_magic_cmd=$lt_cv_file_magic_cmd
  5757. deplibs_check_method=$lt_cv_deplibs_check_method
  5758. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  5759. @@ -5601,6 +5702,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  5760. +
  5761. +
  5762. +
  5763. +
  5764. +
  5765. +
  5766. +
  5767. +
  5768. +
  5769. +
  5770. +if test -n "$ac_tool_prefix"; then
  5771. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  5772. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  5773. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5774. +$as_echo_n "checking for $ac_word... " >&6; }
  5775. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  5776. + $as_echo_n "(cached) " >&6
  5777. +else
  5778. + if test -n "$DLLTOOL"; then
  5779. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  5780. +else
  5781. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  5782. +for as_dir in $PATH
  5783. +do
  5784. + IFS=$as_save_IFS
  5785. + test -z "$as_dir" && as_dir=.
  5786. + for ac_exec_ext in '' $ac_executable_extensions; do
  5787. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  5788. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  5789. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5790. + break 2
  5791. + fi
  5792. +done
  5793. + done
  5794. +IFS=$as_save_IFS
  5795. +
  5796. +fi
  5797. +fi
  5798. +DLLTOOL=$ac_cv_prog_DLLTOOL
  5799. +if test -n "$DLLTOOL"; then
  5800. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  5801. +$as_echo "$DLLTOOL" >&6; }
  5802. +else
  5803. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5804. +$as_echo "no" >&6; }
  5805. +fi
  5806. +
  5807. +
  5808. +fi
  5809. +if test -z "$ac_cv_prog_DLLTOOL"; then
  5810. + ac_ct_DLLTOOL=$DLLTOOL
  5811. + # Extract the first word of "dlltool", so it can be a program name with args.
  5812. +set dummy dlltool; ac_word=$2
  5813. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5814. +$as_echo_n "checking for $ac_word... " >&6; }
  5815. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  5816. + $as_echo_n "(cached) " >&6
  5817. +else
  5818. + if test -n "$ac_ct_DLLTOOL"; then
  5819. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  5820. +else
  5821. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  5822. +for as_dir in $PATH
  5823. +do
  5824. + IFS=$as_save_IFS
  5825. + test -z "$as_dir" && as_dir=.
  5826. + for ac_exec_ext in '' $ac_executable_extensions; do
  5827. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  5828. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  5829. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5830. + break 2
  5831. + fi
  5832. +done
  5833. + done
  5834. +IFS=$as_save_IFS
  5835. +
  5836. +fi
  5837. +fi
  5838. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  5839. +if test -n "$ac_ct_DLLTOOL"; then
  5840. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  5841. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  5842. +else
  5843. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5844. +$as_echo "no" >&6; }
  5845. +fi
  5846. +
  5847. + if test "x$ac_ct_DLLTOOL" = x; then
  5848. + DLLTOOL="false"
  5849. + else
  5850. + case $cross_compiling:$ac_tool_warned in
  5851. +yes:)
  5852. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  5853. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  5854. +ac_tool_warned=yes ;;
  5855. +esac
  5856. + DLLTOOL=$ac_ct_DLLTOOL
  5857. + fi
  5858. +else
  5859. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  5860. +fi
  5861. +
  5862. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  5863. +
  5864. +
  5865. +
  5866. +
  5867. +
  5868. +
  5869. +
  5870. +
  5871. +
  5872. +
  5873. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  5874. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  5875. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  5876. + $as_echo_n "(cached) " >&6
  5877. +else
  5878. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  5879. +
  5880. +case $host_os in
  5881. +cygwin* | mingw* | pw32* | cegcc*)
  5882. + # two different shell functions defined in ltmain.sh
  5883. + # decide which to use based on capabilities of $DLLTOOL
  5884. + case `$DLLTOOL --help 2>&1` in
  5885. + *--identify-strict*)
  5886. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  5887. + ;;
  5888. + *)
  5889. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  5890. + ;;
  5891. + esac
  5892. + ;;
  5893. +*)
  5894. + # fallback: assume linklib IS sharedlib
  5895. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  5896. + ;;
  5897. +esac
  5898. +
  5899. +fi
  5900. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  5901. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  5902. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  5903. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  5904. +
  5905. +
  5906. +
  5907. +
  5908. +
  5909. +
  5910. +
  5911. plugin_option=
  5912. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  5913. for plugin in $plugin_names; do
  5914. @@ -5615,8 +5867,10 @@ for plugin in $plugin_names; do
  5915. done
  5916. if test -n "$ac_tool_prefix"; then
  5917. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  5918. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  5919. + for ac_prog in ar
  5920. + do
  5921. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  5922. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  5923. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5924. $as_echo_n "checking for $ac_word... " >&6; }
  5925. if ${ac_cv_prog_AR+:} false; then :
  5926. @@ -5632,7 +5886,7 @@ do
  5927. test -z "$as_dir" && as_dir=.
  5928. for ac_exec_ext in '' $ac_executable_extensions; do
  5929. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  5930. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  5931. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  5932. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5933. break 2
  5934. fi
  5935. @@ -5652,11 +5906,15 @@ $as_echo "no" >&6; }
  5936. fi
  5937. + test -n "$AR" && break
  5938. + done
  5939. fi
  5940. -if test -z "$ac_cv_prog_AR"; then
  5941. +if test -z "$AR"; then
  5942. ac_ct_AR=$AR
  5943. - # Extract the first word of "ar", so it can be a program name with args.
  5944. -set dummy ar; ac_word=$2
  5945. + for ac_prog in ar
  5946. +do
  5947. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  5948. +set dummy $ac_prog; ac_word=$2
  5949. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  5950. $as_echo_n "checking for $ac_word... " >&6; }
  5951. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  5952. @@ -5672,7 +5930,7 @@ do
  5953. test -z "$as_dir" && as_dir=.
  5954. for ac_exec_ext in '' $ac_executable_extensions; do
  5955. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  5956. - ac_cv_prog_ac_ct_AR="ar"
  5957. + ac_cv_prog_ac_ct_AR="$ac_prog"
  5958. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  5959. break 2
  5960. fi
  5961. @@ -5691,6 +5949,10 @@ else
  5962. $as_echo "no" >&6; }
  5963. fi
  5964. +
  5965. + test -n "$ac_ct_AR" && break
  5966. +done
  5967. +
  5968. if test "x$ac_ct_AR" = x; then
  5969. AR="false"
  5970. else
  5971. @@ -5702,25 +5964,19 @@ ac_tool_warned=yes ;;
  5972. esac
  5973. AR=$ac_ct_AR
  5974. fi
  5975. -else
  5976. - AR="$ac_cv_prog_AR"
  5977. fi
  5978. -test -z "$AR" && AR=ar
  5979. -if test -n "$plugin_option"; then
  5980. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  5981. - touch conftest.c
  5982. - $AR $plugin_option rc conftest.a conftest.c
  5983. - if test "$?" != 0; then
  5984. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  5985. + touch conftest.c
  5986. + $AR $plugin_option rc conftest.a conftest.c
  5987. + if test "$?" != 0; then
  5988. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  5989. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  5990. - else
  5991. - AR="$AR $plugin_option"
  5992. - fi
  5993. - rm -f conftest.*
  5994. + else
  5995. + AR="$AR $plugin_option"
  5996. fi
  5997. -fi
  5998. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  5999. + rm -f conftest.*
  6000. +: ${AR=ar}
  6001. +: ${AR_FLAGS=cru}
  6002. @@ -5732,6 +5988,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  6003. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  6004. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  6005. +if ${lt_cv_ar_at_file+:} false; then :
  6006. + $as_echo_n "(cached) " >&6
  6007. +else
  6008. + lt_cv_ar_at_file=no
  6009. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6010. +/* end confdefs.h. */
  6011. +
  6012. +int
  6013. +main ()
  6014. +{
  6015. +
  6016. + ;
  6017. + return 0;
  6018. +}
  6019. +_ACEOF
  6020. +if ac_fn_c_try_compile "$LINENO"; then :
  6021. + echo conftest.$ac_objext > conftest.lst
  6022. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  6023. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  6024. + (eval $lt_ar_try) 2>&5
  6025. + ac_status=$?
  6026. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  6027. + test $ac_status = 0; }
  6028. + if test "$ac_status" -eq 0; then
  6029. + # Ensure the archiver fails upon bogus file names.
  6030. + rm -f conftest.$ac_objext libconftest.a
  6031. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  6032. + (eval $lt_ar_try) 2>&5
  6033. + ac_status=$?
  6034. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  6035. + test $ac_status = 0; }
  6036. + if test "$ac_status" -ne 0; then
  6037. + lt_cv_ar_at_file=@
  6038. + fi
  6039. + fi
  6040. + rm -f conftest.* libconftest.a
  6041. +
  6042. +fi
  6043. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  6044. +
  6045. +fi
  6046. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  6047. +$as_echo "$lt_cv_ar_at_file" >&6; }
  6048. +
  6049. +if test "x$lt_cv_ar_at_file" = xno; then
  6050. + archiver_list_spec=
  6051. +else
  6052. + archiver_list_spec=$lt_cv_ar_at_file
  6053. +fi
  6054. +
  6055. +
  6056. +
  6057. +
  6058. +
  6059. +
  6060. +
  6061. if test -n "$ac_tool_prefix"; then
  6062. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  6063. set dummy ${ac_tool_prefix}strip; ac_word=$2
  6064. @@ -6071,8 +6385,8 @@ esac
  6065. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  6066. # Transform an extracted symbol line into symbol name and symbol address
  6067. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  6068. -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'"
  6069. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  6070. +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'"
  6071. # Handle CRLF in mingw tool chain
  6072. opt_cr=
  6073. @@ -6108,6 +6422,7 @@ for ac_symprfx in "" "_"; do
  6074. else
  6075. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  6076. fi
  6077. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  6078. # Check to see that the pipe works correctly.
  6079. pipe_works=no
  6080. @@ -6149,6 +6464,18 @@ _LT_EOF
  6081. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  6082. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  6083. cat <<_LT_EOF > conftest.$ac_ext
  6084. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  6085. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  6086. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  6087. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  6088. +# define LT_DLSYM_CONST
  6089. +#elif defined(__osf__)
  6090. +/* This system does not cope well with relocations in const data. */
  6091. +# define LT_DLSYM_CONST
  6092. +#else
  6093. +# define LT_DLSYM_CONST const
  6094. +#endif
  6095. +
  6096. #ifdef __cplusplus
  6097. extern "C" {
  6098. #endif
  6099. @@ -6160,7 +6487,7 @@ _LT_EOF
  6100. cat <<_LT_EOF >> conftest.$ac_ext
  6101. /* The mapping between symbol names and symbols. */
  6102. -const struct {
  6103. +LT_DLSYM_CONST struct {
  6104. const char *name;
  6105. void *address;
  6106. }
  6107. @@ -6186,8 +6513,8 @@ static const void *lt_preloaded_setup() {
  6108. _LT_EOF
  6109. # Now try linking the two files.
  6110. mv conftest.$ac_objext conftstm.$ac_objext
  6111. - lt_save_LIBS="$LIBS"
  6112. - lt_save_CFLAGS="$CFLAGS"
  6113. + lt_globsym_save_LIBS=$LIBS
  6114. + lt_globsym_save_CFLAGS=$CFLAGS
  6115. LIBS="conftstm.$ac_objext"
  6116. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  6117. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  6118. @@ -6197,8 +6524,8 @@ _LT_EOF
  6119. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  6120. pipe_works=yes
  6121. fi
  6122. - LIBS="$lt_save_LIBS"
  6123. - CFLAGS="$lt_save_CFLAGS"
  6124. + LIBS=$lt_globsym_save_LIBS
  6125. + CFLAGS=$lt_globsym_save_CFLAGS
  6126. else
  6127. echo "cannot find nm_test_func in $nlist" >&5
  6128. fi
  6129. @@ -6235,6 +6562,18 @@ else
  6130. $as_echo "ok" >&6; }
  6131. fi
  6132. +# Response file support.
  6133. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  6134. + nm_file_list_spec='@'
  6135. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  6136. + nm_file_list_spec='@'
  6137. +fi
  6138. +
  6139. +
  6140. +
  6141. +
  6142. +
  6143. +
  6144. @@ -6251,6 +6590,43 @@ fi
  6145. +
  6146. +
  6147. +
  6148. +
  6149. +
  6150. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  6151. +$as_echo_n "checking for sysroot... " >&6; }
  6152. +
  6153. +# Check whether --with-libtool-sysroot was given.
  6154. +if test "${with_libtool_sysroot+set}" = set; then :
  6155. + withval=$with_libtool_sysroot;
  6156. +else
  6157. + with_libtool_sysroot=no
  6158. +fi
  6159. +
  6160. +
  6161. +lt_sysroot=
  6162. +case ${with_libtool_sysroot} in #(
  6163. + yes)
  6164. + if test "$GCC" = yes; then
  6165. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  6166. + fi
  6167. + ;; #(
  6168. + /*)
  6169. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  6170. + ;; #(
  6171. + no|'')
  6172. + ;; #(
  6173. + *)
  6174. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  6175. +$as_echo "${with_libtool_sysroot}" >&6; }
  6176. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  6177. + ;;
  6178. +esac
  6179. +
  6180. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  6181. +$as_echo "${lt_sysroot:-no}" >&6; }
  6182. @@ -6462,6 +6838,123 @@ esac
  6183. need_locks="$enable_libtool_lock"
  6184. +if test -n "$ac_tool_prefix"; then
  6185. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  6186. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  6187. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6188. +$as_echo_n "checking for $ac_word... " >&6; }
  6189. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  6190. + $as_echo_n "(cached) " >&6
  6191. +else
  6192. + if test -n "$MANIFEST_TOOL"; then
  6193. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  6194. +else
  6195. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6196. +for as_dir in $PATH
  6197. +do
  6198. + IFS=$as_save_IFS
  6199. + test -z "$as_dir" && as_dir=.
  6200. + for ac_exec_ext in '' $ac_executable_extensions; do
  6201. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6202. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  6203. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6204. + break 2
  6205. + fi
  6206. +done
  6207. + done
  6208. +IFS=$as_save_IFS
  6209. +
  6210. +fi
  6211. +fi
  6212. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  6213. +if test -n "$MANIFEST_TOOL"; then
  6214. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  6215. +$as_echo "$MANIFEST_TOOL" >&6; }
  6216. +else
  6217. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  6218. +$as_echo "no" >&6; }
  6219. +fi
  6220. +
  6221. +
  6222. +fi
  6223. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  6224. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  6225. + # Extract the first word of "mt", so it can be a program name with args.
  6226. +set dummy mt; ac_word=$2
  6227. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  6228. +$as_echo_n "checking for $ac_word... " >&6; }
  6229. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  6230. + $as_echo_n "(cached) " >&6
  6231. +else
  6232. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  6233. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  6234. +else
  6235. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6236. +for as_dir in $PATH
  6237. +do
  6238. + IFS=$as_save_IFS
  6239. + test -z "$as_dir" && as_dir=.
  6240. + for ac_exec_ext in '' $ac_executable_extensions; do
  6241. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  6242. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  6243. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  6244. + break 2
  6245. + fi
  6246. +done
  6247. + done
  6248. +IFS=$as_save_IFS
  6249. +
  6250. +fi
  6251. +fi
  6252. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  6253. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  6254. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  6255. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  6256. +else
  6257. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  6258. +$as_echo "no" >&6; }
  6259. +fi
  6260. +
  6261. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  6262. + MANIFEST_TOOL=":"
  6263. + else
  6264. + case $cross_compiling:$ac_tool_warned in
  6265. +yes:)
  6266. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  6267. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6268. +ac_tool_warned=yes ;;
  6269. +esac
  6270. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  6271. + fi
  6272. +else
  6273. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  6274. +fi
  6275. +
  6276. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  6277. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  6278. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  6279. +if ${lt_cv_path_mainfest_tool+:} false; then :
  6280. + $as_echo_n "(cached) " >&6
  6281. +else
  6282. + lt_cv_path_mainfest_tool=no
  6283. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  6284. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  6285. + cat conftest.err >&5
  6286. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  6287. + lt_cv_path_mainfest_tool=yes
  6288. + fi
  6289. + rm -f conftest*
  6290. +fi
  6291. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  6292. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  6293. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  6294. + MANIFEST_TOOL=:
  6295. +fi
  6296. +
  6297. +
  6298. +
  6299. +
  6300. +
  6301. case $host_os in
  6302. rhapsody* | darwin*)
  6303. @@ -7025,6 +7518,8 @@ _LT_EOF
  6304. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  6305. echo "$AR cru libconftest.a conftest.o" >&5
  6306. $AR cru libconftest.a conftest.o 2>&5
  6307. + echo "$RANLIB libconftest.a" >&5
  6308. + $RANLIB libconftest.a 2>&5
  6309. cat > conftest.c << _LT_EOF
  6310. int main() { return 0;}
  6311. _LT_EOF
  6312. @@ -7220,7 +7715,8 @@ fi
  6313. LIBTOOL_DEPS="$ltmain"
  6314. # Always use our own libtool.
  6315. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  6316. +LIBTOOL='$(SHELL) $(top_builddir)'
  6317. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  6318. @@ -7309,7 +7805,7 @@ aix3*)
  6319. esac
  6320. # Global variables:
  6321. -ofile=libtool
  6322. +ofile=${host_alias}-libtool
  6323. can_build_shared=yes
  6324. # All known linkers require a `.a' archive for static linking (except MSVC,
  6325. @@ -7607,8 +8103,6 @@ fi
  6326. lt_prog_compiler_pic=
  6327. lt_prog_compiler_static=
  6328. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  6329. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6330. if test "$GCC" = yes; then
  6331. lt_prog_compiler_wl='-Wl,'
  6332. @@ -7774,6 +8268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6333. lt_prog_compiler_pic='--shared'
  6334. lt_prog_compiler_static='--static'
  6335. ;;
  6336. + nagfor*)
  6337. + # NAG Fortran compiler
  6338. + lt_prog_compiler_wl='-Wl,-Wl,,'
  6339. + lt_prog_compiler_pic='-PIC'
  6340. + lt_prog_compiler_static='-Bstatic'
  6341. + ;;
  6342. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  6343. # Portland Group compilers (*not* the Pentium gcc compiler,
  6344. # which looks to be a dead project)
  6345. @@ -7836,7 +8336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6346. lt_prog_compiler_pic='-KPIC'
  6347. lt_prog_compiler_static='-Bstatic'
  6348. case $cc_basename in
  6349. - f77* | f90* | f95*)
  6350. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  6351. lt_prog_compiler_wl='-Qoption ld ';;
  6352. *)
  6353. lt_prog_compiler_wl='-Wl,';;
  6354. @@ -7893,13 +8393,17 @@ case $host_os in
  6355. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  6356. ;;
  6357. esac
  6358. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  6359. -$as_echo "$lt_prog_compiler_pic" >&6; }
  6360. -
  6361. -
  6362. -
  6363. -
  6364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  6365. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6366. +if ${lt_cv_prog_compiler_pic+:} false; then :
  6367. + $as_echo_n "(cached) " >&6
  6368. +else
  6369. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  6370. +fi
  6371. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  6372. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  6373. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  6374. #
  6375. # Check to make sure the PIC flag actually works.
  6376. @@ -7960,6 +8464,11 @@ fi
  6377. +
  6378. +
  6379. +
  6380. +
  6381. +
  6382. #
  6383. # Check to make sure the static flag actually works.
  6384. #
  6385. @@ -8310,7 +8819,8 @@ _LT_EOF
  6386. allow_undefined_flag=unsupported
  6387. always_export_symbols=no
  6388. enable_shared_with_static_runtimes=yes
  6389. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  6390. + 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'
  6391. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  6392. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  6393. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  6394. @@ -8409,12 +8919,12 @@ _LT_EOF
  6395. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  6396. hardcode_libdir_flag_spec=
  6397. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  6398. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  6399. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  6400. if test "x$supports_anon_versioning" = xyes; then
  6401. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  6402. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  6403. echo "local: *; };" >> $output_objdir/$libname.ver~
  6404. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  6405. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  6406. fi
  6407. ;;
  6408. esac
  6409. @@ -8428,8 +8938,8 @@ _LT_EOF
  6410. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  6411. wlarc=
  6412. else
  6413. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6414. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6415. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6416. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6417. fi
  6418. ;;
  6419. @@ -8447,8 +8957,8 @@ _LT_EOF
  6420. _LT_EOF
  6421. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  6422. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6423. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6424. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6425. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6426. else
  6427. ld_shlibs=no
  6428. fi
  6429. @@ -8494,8 +9004,8 @@ _LT_EOF
  6430. *)
  6431. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  6432. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6433. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6434. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  6435. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  6436. else
  6437. ld_shlibs=no
  6438. fi
  6439. @@ -8625,7 +9135,13 @@ _LT_EOF
  6440. allow_undefined_flag='-berok'
  6441. # Determine the default libpath from the value encoded in an
  6442. # empty executable.
  6443. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6444. + if test "${lt_cv_aix_libpath+set}" = set; then
  6445. + aix_libpath=$lt_cv_aix_libpath
  6446. +else
  6447. + if ${lt_cv_aix_libpath_+:} false; then :
  6448. + $as_echo_n "(cached) " >&6
  6449. +else
  6450. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6451. /* end confdefs.h. */
  6452. int
  6453. @@ -8638,22 +9154,29 @@ main ()
  6454. _ACEOF
  6455. if ac_fn_c_try_link "$LINENO"; then :
  6456. -lt_aix_libpath_sed='
  6457. - /Import File Strings/,/^$/ {
  6458. - /^0/ {
  6459. - s/^0 *\(.*\)$/\1/
  6460. - p
  6461. - }
  6462. - }'
  6463. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6464. -# Check for a 64-bit object if we didn't find anything.
  6465. -if test -z "$aix_libpath"; then
  6466. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6467. -fi
  6468. + lt_aix_libpath_sed='
  6469. + /Import File Strings/,/^$/ {
  6470. + /^0/ {
  6471. + s/^0 *\([^ ]*\) *$/\1/
  6472. + p
  6473. + }
  6474. + }'
  6475. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6476. + # Check for a 64-bit object if we didn't find anything.
  6477. + if test -z "$lt_cv_aix_libpath_"; then
  6478. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6479. + fi
  6480. fi
  6481. rm -f core conftest.err conftest.$ac_objext \
  6482. conftest$ac_exeext conftest.$ac_ext
  6483. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6484. + if test -z "$lt_cv_aix_libpath_"; then
  6485. + lt_cv_aix_libpath_="/usr/lib:/lib"
  6486. + fi
  6487. +
  6488. +fi
  6489. +
  6490. + aix_libpath=$lt_cv_aix_libpath_
  6491. +fi
  6492. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  6493. 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"
  6494. @@ -8665,7 +9188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6495. else
  6496. # Determine the default libpath from the value encoded in an
  6497. # empty executable.
  6498. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6499. + if test "${lt_cv_aix_libpath+set}" = set; then
  6500. + aix_libpath=$lt_cv_aix_libpath
  6501. +else
  6502. + if ${lt_cv_aix_libpath_+:} false; then :
  6503. + $as_echo_n "(cached) " >&6
  6504. +else
  6505. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6506. /* end confdefs.h. */
  6507. int
  6508. @@ -8678,22 +9207,29 @@ main ()
  6509. _ACEOF
  6510. if ac_fn_c_try_link "$LINENO"; then :
  6511. -lt_aix_libpath_sed='
  6512. - /Import File Strings/,/^$/ {
  6513. - /^0/ {
  6514. - s/^0 *\(.*\)$/\1/
  6515. - p
  6516. - }
  6517. - }'
  6518. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6519. -# Check for a 64-bit object if we didn't find anything.
  6520. -if test -z "$aix_libpath"; then
  6521. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6522. -fi
  6523. + lt_aix_libpath_sed='
  6524. + /Import File Strings/,/^$/ {
  6525. + /^0/ {
  6526. + s/^0 *\([^ ]*\) *$/\1/
  6527. + p
  6528. + }
  6529. + }'
  6530. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6531. + # Check for a 64-bit object if we didn't find anything.
  6532. + if test -z "$lt_cv_aix_libpath_"; then
  6533. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6534. + fi
  6535. fi
  6536. rm -f core conftest.err conftest.$ac_objext \
  6537. conftest$ac_exeext conftest.$ac_ext
  6538. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6539. + if test -z "$lt_cv_aix_libpath_"; then
  6540. + lt_cv_aix_libpath_="/usr/lib:/lib"
  6541. + fi
  6542. +
  6543. +fi
  6544. +
  6545. + aix_libpath=$lt_cv_aix_libpath_
  6546. +fi
  6547. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  6548. # Warning - without using the other run time loading flags,
  6549. @@ -8738,20 +9274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6550. # Microsoft Visual C++.
  6551. # hardcode_libdir_flag_spec is actually meaningless, as there is
  6552. # no search path for DLLs.
  6553. - hardcode_libdir_flag_spec=' '
  6554. - allow_undefined_flag=unsupported
  6555. - # Tell ltmain to make .lib files, not .a files.
  6556. - libext=lib
  6557. - # Tell ltmain to make .dll files, not .so files.
  6558. - shrext_cmds=".dll"
  6559. - # FIXME: Setting linknames here is a bad hack.
  6560. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  6561. - # The linker will automatically build a .lib file if we build a DLL.
  6562. - old_archive_from_new_cmds='true'
  6563. - # FIXME: Should let the user specify the lib program.
  6564. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  6565. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  6566. - enable_shared_with_static_runtimes=yes
  6567. + case $cc_basename in
  6568. + cl*)
  6569. + # Native MSVC
  6570. + hardcode_libdir_flag_spec=' '
  6571. + allow_undefined_flag=unsupported
  6572. + always_export_symbols=yes
  6573. + file_list_spec='@'
  6574. + # Tell ltmain to make .lib files, not .a files.
  6575. + libext=lib
  6576. + # Tell ltmain to make .dll files, not .so files.
  6577. + shrext_cmds=".dll"
  6578. + # FIXME: Setting linknames here is a bad hack.
  6579. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  6580. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  6581. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  6582. + else
  6583. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  6584. + fi~
  6585. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  6586. + linknames='
  6587. + # The linker will not automatically build a static lib if we build a DLL.
  6588. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  6589. + enable_shared_with_static_runtimes=yes
  6590. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  6591. + # Don't use ranlib
  6592. + old_postinstall_cmds='chmod 644 $oldlib'
  6593. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  6594. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  6595. + case $lt_outputfile in
  6596. + *.exe|*.EXE) ;;
  6597. + *)
  6598. + lt_outputfile="$lt_outputfile.exe"
  6599. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  6600. + ;;
  6601. + esac~
  6602. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  6603. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  6604. + $RM "$lt_outputfile.manifest";
  6605. + fi'
  6606. + ;;
  6607. + *)
  6608. + # Assume MSVC wrapper
  6609. + hardcode_libdir_flag_spec=' '
  6610. + allow_undefined_flag=unsupported
  6611. + # Tell ltmain to make .lib files, not .a files.
  6612. + libext=lib
  6613. + # Tell ltmain to make .dll files, not .so files.
  6614. + shrext_cmds=".dll"
  6615. + # FIXME: Setting linknames here is a bad hack.
  6616. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  6617. + # The linker will automatically build a .lib file if we build a DLL.
  6618. + old_archive_from_new_cmds='true'
  6619. + # FIXME: Should let the user specify the lib program.
  6620. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  6621. + enable_shared_with_static_runtimes=yes
  6622. + ;;
  6623. + esac
  6624. ;;
  6625. darwin* | rhapsody*)
  6626. @@ -8812,7 +9391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6627. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  6628. freebsd* | dragonfly*)
  6629. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  6630. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  6631. hardcode_libdir_flag_spec='-R$libdir'
  6632. hardcode_direct=yes
  6633. hardcode_shlibpath_var=no
  6634. @@ -8820,7 +9399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6635. hpux9*)
  6636. if test "$GCC" = yes; then
  6637. - 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'
  6638. + 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'
  6639. else
  6640. 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'
  6641. fi
  6642. @@ -8836,7 +9415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6643. hpux10*)
  6644. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  6645. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6646. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6647. else
  6648. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  6649. fi
  6650. @@ -8860,10 +9439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6651. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  6652. ;;
  6653. ia64*)
  6654. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  6655. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  6656. ;;
  6657. *)
  6658. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6659. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  6660. ;;
  6661. esac
  6662. else
  6663. @@ -8942,23 +9521,36 @@ fi
  6664. irix5* | irix6* | nonstopux*)
  6665. if test "$GCC" = yes; then
  6666. - 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'
  6667. + 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'
  6668. # Try to use the -exported_symbol ld option, if it does not
  6669. # work, assume that -exports_file does not work either and
  6670. # implicitly export all symbols.
  6671. - save_LDFLAGS="$LDFLAGS"
  6672. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  6673. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6674. + # This should be the same for all languages, so no per-tag cache variable.
  6675. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  6676. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  6677. +if ${lt_cv_irix_exported_symbol+:} false; then :
  6678. + $as_echo_n "(cached) " >&6
  6679. +else
  6680. + save_LDFLAGS="$LDFLAGS"
  6681. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  6682. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  6683. /* end confdefs.h. */
  6684. -int foo(void) {}
  6685. +int foo (void) { return 0; }
  6686. _ACEOF
  6687. if ac_fn_c_try_link "$LINENO"; then :
  6688. - 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'
  6689. -
  6690. + lt_cv_irix_exported_symbol=yes
  6691. +else
  6692. + lt_cv_irix_exported_symbol=no
  6693. fi
  6694. rm -f core conftest.err conftest.$ac_objext \
  6695. conftest$ac_exeext conftest.$ac_ext
  6696. - LDFLAGS="$save_LDFLAGS"
  6697. + LDFLAGS="$save_LDFLAGS"
  6698. +fi
  6699. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  6700. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  6701. + if test "$lt_cv_irix_exported_symbol" = yes; then
  6702. + 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'
  6703. + fi
  6704. else
  6705. 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'
  6706. 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'
  6707. @@ -9043,7 +9635,7 @@ rm -f core conftest.err conftest.$ac_objext \
  6708. osf4* | osf5*) # as osf3* with the addition of -msym flag
  6709. if test "$GCC" = yes; then
  6710. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  6711. - 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'
  6712. + 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'
  6713. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  6714. else
  6715. allow_undefined_flag=' -expect_unresolved \*'
  6716. @@ -9062,9 +9654,9 @@ rm -f core conftest.err conftest.$ac_objext \
  6717. no_undefined_flag=' -z defs'
  6718. if test "$GCC" = yes; then
  6719. wlarc='${wl}'
  6720. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  6721. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  6722. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  6723. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  6724. + $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'
  6725. else
  6726. case `$CC -V 2>&1` in
  6727. *"Compilers 5.0"*)
  6728. @@ -9640,8 +10232,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  6729. need_version=no
  6730. need_lib_prefix=no
  6731. - case $GCC,$host_os in
  6732. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  6733. + case $GCC,$cc_basename in
  6734. + yes,*)
  6735. + # gcc
  6736. library_names_spec='$libname.dll.a'
  6737. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  6738. postinstall_cmds='base_file=`basename \${file}`~
  6739. @@ -9674,13 +10267,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  6740. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  6741. ;;
  6742. esac
  6743. + dynamic_linker='Win32 ld.exe'
  6744. + ;;
  6745. +
  6746. + *,cl*)
  6747. + # Native MSVC
  6748. + libname_spec='$name'
  6749. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  6750. + library_names_spec='${libname}.dll.lib'
  6751. +
  6752. + case $build_os in
  6753. + mingw*)
  6754. + sys_lib_search_path_spec=
  6755. + lt_save_ifs=$IFS
  6756. + IFS=';'
  6757. + for lt_path in $LIB
  6758. + do
  6759. + IFS=$lt_save_ifs
  6760. + # Let DOS variable expansion print the short 8.3 style file name.
  6761. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  6762. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  6763. + done
  6764. + IFS=$lt_save_ifs
  6765. + # Convert to MSYS style.
  6766. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  6767. + ;;
  6768. + cygwin*)
  6769. + # Convert to unix form, then to dos form, then back to unix form
  6770. + # but this time dos style (no spaces!) so that the unix form looks
  6771. + # like /cygdrive/c/PROGRA~1:/cygdr...
  6772. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  6773. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  6774. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  6775. + ;;
  6776. + *)
  6777. + sys_lib_search_path_spec="$LIB"
  6778. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  6779. + # It is most probably a Windows format PATH.
  6780. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  6781. + else
  6782. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  6783. + fi
  6784. + # FIXME: find the short name or the path components, as spaces are
  6785. + # common. (e.g. "Program Files" -> "PROGRA~1")
  6786. + ;;
  6787. + esac
  6788. +
  6789. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  6790. + postinstall_cmds='base_file=`basename \${file}`~
  6791. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  6792. + dldir=$destdir/`dirname \$dlpath`~
  6793. + test -d \$dldir || mkdir -p \$dldir~
  6794. + $install_prog $dir/$dlname \$dldir/$dlname'
  6795. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  6796. + dlpath=$dir/\$dldll~
  6797. + $RM \$dlpath'
  6798. + shlibpath_overrides_runpath=yes
  6799. + dynamic_linker='Win32 link.exe'
  6800. ;;
  6801. *)
  6802. + # Assume MSVC wrapper
  6803. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  6804. + dynamic_linker='Win32 ld.exe'
  6805. ;;
  6806. esac
  6807. - dynamic_linker='Win32 ld.exe'
  6808. # FIXME: first we should search . and the directory the executable is in
  6809. shlibpath_var=PATH
  6810. ;;
  6811. @@ -9762,7 +10413,7 @@ haiku*)
  6812. soname_spec='${libname}${release}${shared_ext}$major'
  6813. shlibpath_var=LIBRARY_PATH
  6814. shlibpath_overrides_runpath=yes
  6815. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  6816. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  6817. hardcode_into_libs=yes
  6818. ;;
  6819. @@ -10558,7 +11209,7 @@ else
  6820. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  6821. lt_status=$lt_dlunknown
  6822. cat > conftest.$ac_ext <<_LT_EOF
  6823. -#line 10561 "configure"
  6824. +#line $LINENO "configure"
  6825. #include "confdefs.h"
  6826. #if HAVE_DLFCN_H
  6827. @@ -10602,10 +11253,10 @@ else
  6828. /* When -fvisbility=hidden is used, assume the code has been annotated
  6829. correspondingly for the symbols needed. */
  6830. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  6831. -void fnord () __attribute__((visibility("default")));
  6832. +int fnord () __attribute__((visibility("default")));
  6833. #endif
  6834. -void fnord () { int i=42; }
  6835. +int fnord () { return 42; }
  6836. int main ()
  6837. {
  6838. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  6839. @@ -10664,7 +11315,7 @@ else
  6840. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  6841. lt_status=$lt_dlunknown
  6842. cat > conftest.$ac_ext <<_LT_EOF
  6843. -#line 10667 "configure"
  6844. +#line $LINENO "configure"
  6845. #include "confdefs.h"
  6846. #if HAVE_DLFCN_H
  6847. @@ -10708,10 +11359,10 @@ else
  6848. /* When -fvisbility=hidden is used, assume the code has been annotated
  6849. correspondingly for the symbols needed. */
  6850. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  6851. -void fnord () __attribute__((visibility("default")));
  6852. +int fnord () __attribute__((visibility("default")));
  6853. #endif
  6854. -void fnord () { int i=42; }
  6855. +int fnord () { return 42; }
  6856. int main ()
  6857. {
  6858. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  6859. @@ -12731,13 +13382,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  6860. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  6861. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  6862. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  6863. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  6864. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  6865. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  6866. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  6867. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  6868. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  6869. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  6870. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  6871. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  6872. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  6873. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  6874. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  6875. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  6876. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  6877. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  6878. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  6879. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  6880. @@ -12752,14 +13410,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  6881. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  6882. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  6883. 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"`'
  6884. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  6885. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  6886. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  6887. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  6888. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  6889. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  6890. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  6891. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  6892. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  6893. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  6894. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  6895. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  6896. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  6897. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  6898. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  6899. @@ -12792,12 +13453,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  6900. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  6901. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  6902. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  6903. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  6904. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  6905. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  6906. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  6907. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  6908. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  6909. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  6910. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  6911. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  6912. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  6913. @@ -12852,8 +13513,13 @@ reload_flag \
  6914. OBJDUMP \
  6915. deplibs_check_method \
  6916. file_magic_cmd \
  6917. +file_magic_glob \
  6918. +want_nocaseglob \
  6919. +DLLTOOL \
  6920. +sharedlib_from_linklib_cmd \
  6921. AR \
  6922. AR_FLAGS \
  6923. +archiver_list_spec \
  6924. STRIP \
  6925. RANLIB \
  6926. CC \
  6927. @@ -12863,12 +13529,14 @@ lt_cv_sys_global_symbol_pipe \
  6928. lt_cv_sys_global_symbol_to_cdecl \
  6929. lt_cv_sys_global_symbol_to_c_name_address \
  6930. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  6931. +nm_file_list_spec \
  6932. lt_prog_compiler_no_builtin_flag \
  6933. -lt_prog_compiler_wl \
  6934. lt_prog_compiler_pic \
  6935. +lt_prog_compiler_wl \
  6936. lt_prog_compiler_static \
  6937. lt_cv_prog_compiler_c_o \
  6938. need_locks \
  6939. +MANIFEST_TOOL \
  6940. DSYMUTIL \
  6941. NMEDIT \
  6942. LIPO \
  6943. @@ -12884,7 +13552,6 @@ no_undefined_flag \
  6944. hardcode_libdir_flag_spec \
  6945. hardcode_libdir_flag_spec_ld \
  6946. hardcode_libdir_separator \
  6947. -fix_srcfile_path \
  6948. exclude_expsyms \
  6949. include_expsyms \
  6950. file_list_spec \
  6951. @@ -12920,6 +13587,7 @@ module_cmds \
  6952. module_expsym_cmds \
  6953. export_symbols_cmds \
  6954. prelink_cmds \
  6955. +postlink_cmds \
  6956. postinstall_cmds \
  6957. postuninstall_cmds \
  6958. finish_cmds \
  6959. @@ -13685,7 +14353,8 @@ $as_echo X"$file" |
  6960. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  6961. #
  6962. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  6963. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  6964. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  6965. +# Inc.
  6966. # Written by Gordon Matzigkeit, 1996
  6967. #
  6968. # This file is part of GNU Libtool.
  6969. @@ -13788,19 +14457,42 @@ SP2NL=$lt_lt_SP2NL
  6970. # turn newlines into spaces.
  6971. NL2SP=$lt_lt_NL2SP
  6972. +# convert \$build file names to \$host format.
  6973. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  6974. +
  6975. +# convert \$build files to toolchain format.
  6976. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  6977. +
  6978. # An object symbol dumper.
  6979. OBJDUMP=$lt_OBJDUMP
  6980. # Method to check whether dependent libraries are shared objects.
  6981. deplibs_check_method=$lt_deplibs_check_method
  6982. -# Command to use when deplibs_check_method == "file_magic".
  6983. +# Command to use when deplibs_check_method = "file_magic".
  6984. file_magic_cmd=$lt_file_magic_cmd
  6985. +# How to find potential files when deplibs_check_method = "file_magic".
  6986. +file_magic_glob=$lt_file_magic_glob
  6987. +
  6988. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  6989. +want_nocaseglob=$lt_want_nocaseglob
  6990. +
  6991. +# DLL creation program.
  6992. +DLLTOOL=$lt_DLLTOOL
  6993. +
  6994. +# Command to associate shared and link libraries.
  6995. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  6996. +
  6997. # The archiver.
  6998. AR=$lt_AR
  6999. +
  7000. +# Flags to create an archive.
  7001. AR_FLAGS=$lt_AR_FLAGS
  7002. +# How to feed a file listing to the archiver.
  7003. +archiver_list_spec=$lt_archiver_list_spec
  7004. +
  7005. # A symbol stripping program.
  7006. STRIP=$lt_STRIP
  7007. @@ -13830,6 +14522,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  7008. # Transform the output of nm in a C name address pair when lib prefix is needed.
  7009. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  7010. +# Specify filename containing input files for \$NM.
  7011. +nm_file_list_spec=$lt_nm_file_list_spec
  7012. +
  7013. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  7014. +lt_sysroot=$lt_sysroot
  7015. +
  7016. # The name of the directory that contains temporary libtool files.
  7017. objdir=$objdir
  7018. @@ -13839,6 +14537,9 @@ MAGIC_CMD=$MAGIC_CMD
  7019. # Must we lock files when doing compilation?
  7020. need_locks=$lt_need_locks
  7021. +# Manifest tool.
  7022. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  7023. +
  7024. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  7025. DSYMUTIL=$lt_DSYMUTIL
  7026. @@ -13953,12 +14654,12 @@ with_gcc=$GCC
  7027. # Compiler flag to turn off builtin functions.
  7028. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  7029. -# How to pass a linker flag through the compiler.
  7030. -wl=$lt_lt_prog_compiler_wl
  7031. -
  7032. # Additional compiler flags for building library objects.
  7033. pic_flag=$lt_lt_prog_compiler_pic
  7034. +# How to pass a linker flag through the compiler.
  7035. +wl=$lt_lt_prog_compiler_wl
  7036. +
  7037. # Compiler flag to prevent dynamic linking.
  7038. link_static_flag=$lt_lt_prog_compiler_static
  7039. @@ -14045,9 +14746,6 @@ inherit_rpath=$inherit_rpath
  7040. # Whether libtool must link a program against all its dependency libraries.
  7041. link_all_deplibs=$link_all_deplibs
  7042. -# Fix the shell variable \$srcfile for the compiler.
  7043. -fix_srcfile_path=$lt_fix_srcfile_path
  7044. -
  7045. # Set to "yes" if exported symbols are required.
  7046. always_export_symbols=$always_export_symbols
  7047. @@ -14063,6 +14761,9 @@ include_expsyms=$lt_include_expsyms
  7048. # Commands necessary for linking programs (against libraries) with templates.
  7049. prelink_cmds=$lt_prelink_cmds
  7050. +# Commands necessary for finishing linking programs.
  7051. +postlink_cmds=$lt_postlink_cmds
  7052. +
  7053. # Specify filename containing input files.
  7054. file_list_spec=$lt_file_list_spec
  7055. @@ -14095,210 +14796,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  7056. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  7057. # text mode, it properly converts lines to CR/LF. This bash problem
  7058. # is reportedly fixed, but why not run on old versions too?
  7059. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  7060. - || (rm -f "$cfgfile"; exit 1)
  7061. -
  7062. - case $xsi_shell in
  7063. - yes)
  7064. - cat << \_LT_EOF >> "$cfgfile"
  7065. -
  7066. -# func_dirname file append nondir_replacement
  7067. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  7068. -# otherwise set result to NONDIR_REPLACEMENT.
  7069. -func_dirname ()
  7070. -{
  7071. - case ${1} in
  7072. - */*) func_dirname_result="${1%/*}${2}" ;;
  7073. - * ) func_dirname_result="${3}" ;;
  7074. - esac
  7075. -}
  7076. -
  7077. -# func_basename file
  7078. -func_basename ()
  7079. -{
  7080. - func_basename_result="${1##*/}"
  7081. -}
  7082. -
  7083. -# func_dirname_and_basename file append nondir_replacement
  7084. -# perform func_basename and func_dirname in a single function
  7085. -# call:
  7086. -# dirname: Compute the dirname of FILE. If nonempty,
  7087. -# add APPEND to the result, otherwise set result
  7088. -# to NONDIR_REPLACEMENT.
  7089. -# value returned in "$func_dirname_result"
  7090. -# basename: Compute filename of FILE.
  7091. -# value retuned in "$func_basename_result"
  7092. -# Implementation must be kept synchronized with func_dirname
  7093. -# and func_basename. For efficiency, we do not delegate to
  7094. -# those functions but instead duplicate the functionality here.
  7095. -func_dirname_and_basename ()
  7096. -{
  7097. - case ${1} in
  7098. - */*) func_dirname_result="${1%/*}${2}" ;;
  7099. - * ) func_dirname_result="${3}" ;;
  7100. - esac
  7101. - func_basename_result="${1##*/}"
  7102. -}
  7103. -
  7104. -# func_stripname prefix suffix name
  7105. -# strip PREFIX and SUFFIX off of NAME.
  7106. -# PREFIX and SUFFIX must not contain globbing or regex special
  7107. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  7108. -# dot (in which case that matches only a dot).
  7109. -func_stripname ()
  7110. -{
  7111. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  7112. - # positional parameters, so assign one to ordinary parameter first.
  7113. - func_stripname_result=${3}
  7114. - func_stripname_result=${func_stripname_result#"${1}"}
  7115. - func_stripname_result=${func_stripname_result%"${2}"}
  7116. -}
  7117. -
  7118. -# func_opt_split
  7119. -func_opt_split ()
  7120. -{
  7121. - func_opt_split_opt=${1%%=*}
  7122. - func_opt_split_arg=${1#*=}
  7123. -}
  7124. -
  7125. -# func_lo2o object
  7126. -func_lo2o ()
  7127. -{
  7128. - case ${1} in
  7129. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  7130. - *) func_lo2o_result=${1} ;;
  7131. - esac
  7132. -}
  7133. -
  7134. -# func_xform libobj-or-source
  7135. -func_xform ()
  7136. -{
  7137. - func_xform_result=${1%.*}.lo
  7138. -}
  7139. -
  7140. -# func_arith arithmetic-term...
  7141. -func_arith ()
  7142. -{
  7143. - func_arith_result=$(( $* ))
  7144. -}
  7145. -
  7146. -# func_len string
  7147. -# STRING may not start with a hyphen.
  7148. -func_len ()
  7149. -{
  7150. - func_len_result=${#1}
  7151. -}
  7152. -
  7153. -_LT_EOF
  7154. - ;;
  7155. - *) # Bourne compatible functions.
  7156. - cat << \_LT_EOF >> "$cfgfile"
  7157. -
  7158. -# func_dirname file append nondir_replacement
  7159. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  7160. -# otherwise set result to NONDIR_REPLACEMENT.
  7161. -func_dirname ()
  7162. -{
  7163. - # Extract subdirectory from the argument.
  7164. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  7165. - if test "X$func_dirname_result" = "X${1}"; then
  7166. - func_dirname_result="${3}"
  7167. - else
  7168. - func_dirname_result="$func_dirname_result${2}"
  7169. - fi
  7170. -}
  7171. -
  7172. -# func_basename file
  7173. -func_basename ()
  7174. -{
  7175. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  7176. -}
  7177. -
  7178. -
  7179. -# func_stripname prefix suffix name
  7180. -# strip PREFIX and SUFFIX off of NAME.
  7181. -# PREFIX and SUFFIX must not contain globbing or regex special
  7182. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  7183. -# dot (in which case that matches only a dot).
  7184. -# func_strip_suffix prefix name
  7185. -func_stripname ()
  7186. -{
  7187. - case ${2} in
  7188. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  7189. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  7190. - esac
  7191. -}
  7192. -
  7193. -# sed scripts:
  7194. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  7195. -my_sed_long_arg='1s/^-[^=]*=//'
  7196. -
  7197. -# func_opt_split
  7198. -func_opt_split ()
  7199. -{
  7200. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  7201. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  7202. -}
  7203. -
  7204. -# func_lo2o object
  7205. -func_lo2o ()
  7206. -{
  7207. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  7208. -}
  7209. -
  7210. -# func_xform libobj-or-source
  7211. -func_xform ()
  7212. -{
  7213. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  7214. -}
  7215. -
  7216. -# func_arith arithmetic-term...
  7217. -func_arith ()
  7218. -{
  7219. - func_arith_result=`expr "$@"`
  7220. -}
  7221. -
  7222. -# func_len string
  7223. -# STRING may not start with a hyphen.
  7224. -func_len ()
  7225. -{
  7226. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  7227. -}
  7228. -
  7229. -_LT_EOF
  7230. -esac
  7231. -
  7232. -case $lt_shell_append in
  7233. - yes)
  7234. - cat << \_LT_EOF >> "$cfgfile"
  7235. -
  7236. -# func_append var value
  7237. -# Append VALUE to the end of shell variable VAR.
  7238. -func_append ()
  7239. -{
  7240. - eval "$1+=\$2"
  7241. -}
  7242. -_LT_EOF
  7243. - ;;
  7244. - *)
  7245. - cat << \_LT_EOF >> "$cfgfile"
  7246. -
  7247. -# func_append var value
  7248. -# Append VALUE to the end of shell variable VAR.
  7249. -func_append ()
  7250. -{
  7251. - eval "$1=\$$1\$2"
  7252. -}
  7253. -
  7254. -_LT_EOF
  7255. - ;;
  7256. - esac
  7257. -
  7258. -
  7259. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  7260. - || (rm -f "$cfgfile"; exit 1)
  7261. -
  7262. - mv -f "$cfgfile" "$ofile" ||
  7263. + sed '$q' "$ltmain" >> "$cfgfile" \
  7264. + || (rm -f "$cfgfile"; exit 1)
  7265. +
  7266. + if test x"$xsi_shell" = xyes; then
  7267. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  7268. +func_dirname ()\
  7269. +{\
  7270. +\ case ${1} in\
  7271. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  7272. +\ * ) func_dirname_result="${3}" ;;\
  7273. +\ esac\
  7274. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  7275. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7276. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7277. +test 0 -eq $? || _lt_function_replace_fail=:
  7278. +
  7279. +
  7280. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  7281. +func_basename ()\
  7282. +{\
  7283. +\ func_basename_result="${1##*/}"\
  7284. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  7285. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7286. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7287. +test 0 -eq $? || _lt_function_replace_fail=:
  7288. +
  7289. +
  7290. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  7291. +func_dirname_and_basename ()\
  7292. +{\
  7293. +\ case ${1} in\
  7294. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  7295. +\ * ) func_dirname_result="${3}" ;;\
  7296. +\ esac\
  7297. +\ func_basename_result="${1##*/}"\
  7298. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  7299. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7300. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7301. +test 0 -eq $? || _lt_function_replace_fail=:
  7302. +
  7303. +
  7304. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  7305. +func_stripname ()\
  7306. +{\
  7307. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  7308. +\ # positional parameters, so assign one to ordinary parameter first.\
  7309. +\ func_stripname_result=${3}\
  7310. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  7311. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  7312. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  7313. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7314. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7315. +test 0 -eq $? || _lt_function_replace_fail=:
  7316. +
  7317. +
  7318. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  7319. +func_split_long_opt ()\
  7320. +{\
  7321. +\ func_split_long_opt_name=${1%%=*}\
  7322. +\ func_split_long_opt_arg=${1#*=}\
  7323. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  7324. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7325. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7326. +test 0 -eq $? || _lt_function_replace_fail=:
  7327. +
  7328. +
  7329. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  7330. +func_split_short_opt ()\
  7331. +{\
  7332. +\ func_split_short_opt_arg=${1#??}\
  7333. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  7334. +} # Extended-shell func_split_short_opt 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_lo2o ()$/,/^} # func_lo2o /c\
  7341. +func_lo2o ()\
  7342. +{\
  7343. +\ case ${1} in\
  7344. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  7345. +\ *) func_lo2o_result=${1} ;;\
  7346. +\ esac\
  7347. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  7348. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7349. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7350. +test 0 -eq $? || _lt_function_replace_fail=:
  7351. +
  7352. +
  7353. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  7354. +func_xform ()\
  7355. +{\
  7356. + func_xform_result=${1%.*}.lo\
  7357. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  7358. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7359. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7360. +test 0 -eq $? || _lt_function_replace_fail=:
  7361. +
  7362. +
  7363. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  7364. +func_arith ()\
  7365. +{\
  7366. + func_arith_result=$(( $* ))\
  7367. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  7368. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7369. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7370. +test 0 -eq $? || _lt_function_replace_fail=:
  7371. +
  7372. +
  7373. + sed -e '/^func_len ()$/,/^} # func_len /c\
  7374. +func_len ()\
  7375. +{\
  7376. + func_len_result=${#1}\
  7377. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  7378. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7379. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7380. +test 0 -eq $? || _lt_function_replace_fail=:
  7381. +
  7382. +fi
  7383. +
  7384. +if test x"$lt_shell_append" = xyes; then
  7385. + sed -e '/^func_append ()$/,/^} # func_append /c\
  7386. +func_append ()\
  7387. +{\
  7388. + eval "${1}+=\\${2}"\
  7389. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  7390. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7391. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7392. +test 0 -eq $? || _lt_function_replace_fail=:
  7393. +
  7394. +
  7395. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  7396. +func_append_quoted ()\
  7397. +{\
  7398. +\ func_quote_for_eval "${2}"\
  7399. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  7400. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  7401. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7402. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7403. +test 0 -eq $? || _lt_function_replace_fail=:
  7404. +
  7405. +
  7406. + # Save a `func_append' function call where possible by direct use of '+='
  7407. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $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. +else
  7412. + # Save a `func_append' function call even when '+=' is not available
  7413. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  7414. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  7415. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  7416. + test 0 -eq $? || _lt_function_replace_fail=:
  7417. +fi
  7418. +
  7419. +if test x"$_lt_function_replace_fail" = x":"; then
  7420. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  7421. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  7422. +fi
  7423. +
  7424. +
  7425. + mv -f "$cfgfile" "$ofile" ||
  7426. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  7427. chmod +x "$ofile"
  7428. diff --git a/ld/configure b/ld/configure
  7429. index 2aeb3317b65..5ef46d31558 100755
  7430. --- a/ld/configure
  7431. +++ b/ld/configure
  7432. @@ -693,8 +693,11 @@ OTOOL
  7433. LIPO
  7434. NMEDIT
  7435. DSYMUTIL
  7436. +MANIFEST_TOOL
  7437. RANLIB
  7438. +ac_ct_AR
  7439. AR
  7440. +DLLTOOL
  7441. OBJDUMP
  7442. LN_S
  7443. NM
  7444. @@ -821,6 +824,7 @@ enable_static
  7445. with_pic
  7446. enable_fast_install
  7447. with_gnu_ld
  7448. +with_libtool_sysroot
  7449. enable_libtool_lock
  7450. enable_plugins
  7451. enable_largefile
  7452. @@ -1528,6 +1532,8 @@ Optional Packages:
  7453. --with-pic try to use only PIC/non-PIC objects [default=use
  7454. both]
  7455. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  7456. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  7457. + (or the compiler's sysroot if not specified).
  7458. --with-lib-path=dir1:dir2... set default LIB_PATH
  7459. --with-sysroot=DIR Search for usr/lib et al within DIR.
  7460. --with-system-zlib use installed libz
  7461. @@ -5327,8 +5333,8 @@ esac
  7462. -macro_version='2.2.7a'
  7463. -macro_revision='1.3134'
  7464. +macro_version='2.4'
  7465. +macro_revision='1.3293'
  7466. @@ -5368,7 +5374,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  7467. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  7468. $as_echo_n "checking how to print strings... " >&6; }
  7469. # Test print first, because it will be a builtin if present.
  7470. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  7471. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  7472. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  7473. ECHO='print -r --'
  7474. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  7475. @@ -6054,8 +6060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  7476. # Try some XSI features
  7477. xsi_shell=no
  7478. ( _lt_dummy="a/b/c"
  7479. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  7480. - = c,a/b,, \
  7481. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  7482. + = c,a/b,b/c, \
  7483. && eval 'test $(( 1 + 1 )) -eq 2 \
  7484. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  7485. && xsi_shell=yes
  7486. @@ -6104,6 +6110,80 @@ esac
  7487. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  7488. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  7489. +if ${lt_cv_to_host_file_cmd+:} false; then :
  7490. + $as_echo_n "(cached) " >&6
  7491. +else
  7492. + case $host in
  7493. + *-*-mingw* )
  7494. + case $build in
  7495. + *-*-mingw* ) # actually msys
  7496. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  7497. + ;;
  7498. + *-*-cygwin* )
  7499. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  7500. + ;;
  7501. + * ) # otherwise, assume *nix
  7502. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  7503. + ;;
  7504. + esac
  7505. + ;;
  7506. + *-*-cygwin* )
  7507. + case $build in
  7508. + *-*-mingw* ) # actually msys
  7509. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  7510. + ;;
  7511. + *-*-cygwin* )
  7512. + lt_cv_to_host_file_cmd=func_convert_file_noop
  7513. + ;;
  7514. + * ) # otherwise, assume *nix
  7515. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  7516. + ;;
  7517. + esac
  7518. + ;;
  7519. + * ) # unhandled hosts (and "normal" native builds)
  7520. + lt_cv_to_host_file_cmd=func_convert_file_noop
  7521. + ;;
  7522. +esac
  7523. +
  7524. +fi
  7525. +
  7526. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  7527. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  7528. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  7529. +
  7530. +
  7531. +
  7532. +
  7533. +
  7534. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  7535. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  7536. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  7537. + $as_echo_n "(cached) " >&6
  7538. +else
  7539. + #assume ordinary cross tools, or native build.
  7540. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  7541. +case $host in
  7542. + *-*-mingw* )
  7543. + case $build in
  7544. + *-*-mingw* ) # actually msys
  7545. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  7546. + ;;
  7547. + esac
  7548. + ;;
  7549. +esac
  7550. +
  7551. +fi
  7552. +
  7553. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  7554. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  7555. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  7556. +
  7557. +
  7558. +
  7559. +
  7560. +
  7561. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  7562. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  7563. if ${lt_cv_ld_reload_flag+:} false; then :
  7564. @@ -6120,6 +6200,11 @@ case $reload_flag in
  7565. esac
  7566. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  7567. case $host_os in
  7568. + cygwin* | mingw* | pw32* | cegcc*)
  7569. + if test "$GCC" != yes; then
  7570. + reload_cmds=false
  7571. + fi
  7572. + ;;
  7573. darwin*)
  7574. if test "$GCC" = yes; then
  7575. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  7576. @@ -6288,7 +6373,8 @@ mingw* | pw32*)
  7577. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  7578. lt_cv_file_magic_cmd='func_win32_libid'
  7579. else
  7580. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  7581. + # Keep this pattern in sync with the one in func_win32_libid.
  7582. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  7583. lt_cv_file_magic_cmd='$OBJDUMP -f'
  7584. fi
  7585. ;;
  7586. @@ -6442,6 +6528,21 @@ esac
  7587. fi
  7588. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  7589. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  7590. +
  7591. +file_magic_glob=
  7592. +want_nocaseglob=no
  7593. +if test "$build" = "$host"; then
  7594. + case $host_os in
  7595. + mingw* | pw32*)
  7596. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  7597. + want_nocaseglob=yes
  7598. + else
  7599. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  7600. + fi
  7601. + ;;
  7602. + esac
  7603. +fi
  7604. +
  7605. file_magic_cmd=$lt_cv_file_magic_cmd
  7606. deplibs_check_method=$lt_cv_deplibs_check_method
  7607. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  7608. @@ -6457,6 +6558,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  7609. +
  7610. +
  7611. +
  7612. +
  7613. +
  7614. +
  7615. +
  7616. +
  7617. +
  7618. +
  7619. +if test -n "$ac_tool_prefix"; then
  7620. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  7621. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  7622. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7623. +$as_echo_n "checking for $ac_word... " >&6; }
  7624. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  7625. + $as_echo_n "(cached) " >&6
  7626. +else
  7627. + if test -n "$DLLTOOL"; then
  7628. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  7629. +else
  7630. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  7631. +for as_dir in $PATH
  7632. +do
  7633. + IFS=$as_save_IFS
  7634. + test -z "$as_dir" && as_dir=.
  7635. + for ac_exec_ext in '' $ac_executable_extensions; do
  7636. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7637. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  7638. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7639. + break 2
  7640. + fi
  7641. +done
  7642. + done
  7643. +IFS=$as_save_IFS
  7644. +
  7645. +fi
  7646. +fi
  7647. +DLLTOOL=$ac_cv_prog_DLLTOOL
  7648. +if test -n "$DLLTOOL"; then
  7649. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  7650. +$as_echo "$DLLTOOL" >&6; }
  7651. +else
  7652. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  7653. +$as_echo "no" >&6; }
  7654. +fi
  7655. +
  7656. +
  7657. +fi
  7658. +if test -z "$ac_cv_prog_DLLTOOL"; then
  7659. + ac_ct_DLLTOOL=$DLLTOOL
  7660. + # Extract the first word of "dlltool", so it can be a program name with args.
  7661. +set dummy dlltool; ac_word=$2
  7662. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7663. +$as_echo_n "checking for $ac_word... " >&6; }
  7664. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  7665. + $as_echo_n "(cached) " >&6
  7666. +else
  7667. + if test -n "$ac_ct_DLLTOOL"; then
  7668. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  7669. +else
  7670. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  7671. +for as_dir in $PATH
  7672. +do
  7673. + IFS=$as_save_IFS
  7674. + test -z "$as_dir" && as_dir=.
  7675. + for ac_exec_ext in '' $ac_executable_extensions; do
  7676. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7677. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  7678. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7679. + break 2
  7680. + fi
  7681. +done
  7682. + done
  7683. +IFS=$as_save_IFS
  7684. +
  7685. +fi
  7686. +fi
  7687. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  7688. +if test -n "$ac_ct_DLLTOOL"; then
  7689. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  7690. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  7691. +else
  7692. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  7693. +$as_echo "no" >&6; }
  7694. +fi
  7695. +
  7696. + if test "x$ac_ct_DLLTOOL" = x; then
  7697. + DLLTOOL="false"
  7698. + else
  7699. + case $cross_compiling:$ac_tool_warned in
  7700. +yes:)
  7701. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  7702. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  7703. +ac_tool_warned=yes ;;
  7704. +esac
  7705. + DLLTOOL=$ac_ct_DLLTOOL
  7706. + fi
  7707. +else
  7708. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  7709. +fi
  7710. +
  7711. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  7712. +
  7713. +
  7714. +
  7715. +
  7716. +
  7717. +
  7718. +
  7719. +
  7720. +
  7721. +
  7722. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  7723. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  7724. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  7725. + $as_echo_n "(cached) " >&6
  7726. +else
  7727. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  7728. +
  7729. +case $host_os in
  7730. +cygwin* | mingw* | pw32* | cegcc*)
  7731. + # two different shell functions defined in ltmain.sh
  7732. + # decide which to use based on capabilities of $DLLTOOL
  7733. + case `$DLLTOOL --help 2>&1` in
  7734. + *--identify-strict*)
  7735. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  7736. + ;;
  7737. + *)
  7738. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  7739. + ;;
  7740. + esac
  7741. + ;;
  7742. +*)
  7743. + # fallback: assume linklib IS sharedlib
  7744. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  7745. + ;;
  7746. +esac
  7747. +
  7748. +fi
  7749. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  7750. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  7751. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  7752. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  7753. +
  7754. +
  7755. +
  7756. +
  7757. +
  7758. +
  7759. +
  7760. plugin_option=
  7761. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  7762. for plugin in $plugin_names; do
  7763. @@ -6471,8 +6723,10 @@ for plugin in $plugin_names; do
  7764. done
  7765. if test -n "$ac_tool_prefix"; then
  7766. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  7767. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  7768. + for ac_prog in ar
  7769. + do
  7770. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  7771. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  7772. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7773. $as_echo_n "checking for $ac_word... " >&6; }
  7774. if ${ac_cv_prog_AR+:} false; then :
  7775. @@ -6488,7 +6742,7 @@ do
  7776. test -z "$as_dir" && as_dir=.
  7777. for ac_exec_ext in '' $ac_executable_extensions; do
  7778. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7779. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  7780. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  7781. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7782. break 2
  7783. fi
  7784. @@ -6508,11 +6762,15 @@ $as_echo "no" >&6; }
  7785. fi
  7786. + test -n "$AR" && break
  7787. + done
  7788. fi
  7789. -if test -z "$ac_cv_prog_AR"; then
  7790. +if test -z "$AR"; then
  7791. ac_ct_AR=$AR
  7792. - # Extract the first word of "ar", so it can be a program name with args.
  7793. -set dummy ar; ac_word=$2
  7794. + for ac_prog in ar
  7795. +do
  7796. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  7797. +set dummy $ac_prog; ac_word=$2
  7798. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  7799. $as_echo_n "checking for $ac_word... " >&6; }
  7800. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  7801. @@ -6528,7 +6786,7 @@ do
  7802. test -z "$as_dir" && as_dir=.
  7803. for ac_exec_ext in '' $ac_executable_extensions; do
  7804. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  7805. - ac_cv_prog_ac_ct_AR="ar"
  7806. + ac_cv_prog_ac_ct_AR="$ac_prog"
  7807. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  7808. break 2
  7809. fi
  7810. @@ -6547,6 +6805,10 @@ else
  7811. $as_echo "no" >&6; }
  7812. fi
  7813. +
  7814. + test -n "$ac_ct_AR" && break
  7815. +done
  7816. +
  7817. if test "x$ac_ct_AR" = x; then
  7818. AR="false"
  7819. else
  7820. @@ -6558,25 +6820,19 @@ ac_tool_warned=yes ;;
  7821. esac
  7822. AR=$ac_ct_AR
  7823. fi
  7824. -else
  7825. - AR="$ac_cv_prog_AR"
  7826. fi
  7827. -test -z "$AR" && AR=ar
  7828. -if test -n "$plugin_option"; then
  7829. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  7830. - touch conftest.c
  7831. - $AR $plugin_option rc conftest.a conftest.c
  7832. - if test "$?" != 0; then
  7833. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  7834. + touch conftest.c
  7835. + $AR $plugin_option rc conftest.a conftest.c
  7836. + if test "$?" != 0; then
  7837. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  7838. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  7839. - else
  7840. - AR="$AR $plugin_option"
  7841. - fi
  7842. - rm -f conftest.*
  7843. + else
  7844. + AR="$AR $plugin_option"
  7845. fi
  7846. -fi
  7847. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  7848. + rm -f conftest.*
  7849. +: ${AR=ar}
  7850. +: ${AR_FLAGS=cru}
  7851. @@ -6588,6 +6844,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  7852. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  7853. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  7854. +if ${lt_cv_ar_at_file+:} false; then :
  7855. + $as_echo_n "(cached) " >&6
  7856. +else
  7857. + lt_cv_ar_at_file=no
  7858. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  7859. +/* end confdefs.h. */
  7860. +
  7861. +int
  7862. +main ()
  7863. +{
  7864. +
  7865. + ;
  7866. + return 0;
  7867. +}
  7868. +_ACEOF
  7869. +if ac_fn_c_try_compile "$LINENO"; then :
  7870. + echo conftest.$ac_objext > conftest.lst
  7871. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  7872. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  7873. + (eval $lt_ar_try) 2>&5
  7874. + ac_status=$?
  7875. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  7876. + test $ac_status = 0; }
  7877. + if test "$ac_status" -eq 0; then
  7878. + # Ensure the archiver fails upon bogus file names.
  7879. + rm -f conftest.$ac_objext libconftest.a
  7880. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  7881. + (eval $lt_ar_try) 2>&5
  7882. + ac_status=$?
  7883. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  7884. + test $ac_status = 0; }
  7885. + if test "$ac_status" -ne 0; then
  7886. + lt_cv_ar_at_file=@
  7887. + fi
  7888. + fi
  7889. + rm -f conftest.* libconftest.a
  7890. +
  7891. +fi
  7892. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  7893. +
  7894. +fi
  7895. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  7896. +$as_echo "$lt_cv_ar_at_file" >&6; }
  7897. +
  7898. +if test "x$lt_cv_ar_at_file" = xno; then
  7899. + archiver_list_spec=
  7900. +else
  7901. + archiver_list_spec=$lt_cv_ar_at_file
  7902. +fi
  7903. +
  7904. +
  7905. +
  7906. +
  7907. +
  7908. +
  7909. +
  7910. if test -n "$ac_tool_prefix"; then
  7911. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  7912. set dummy ${ac_tool_prefix}strip; ac_word=$2
  7913. @@ -6927,8 +7241,8 @@ esac
  7914. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  7915. # Transform an extracted symbol line into symbol name and symbol address
  7916. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  7917. -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'"
  7918. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  7919. +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'"
  7920. # Handle CRLF in mingw tool chain
  7921. opt_cr=
  7922. @@ -6964,6 +7278,7 @@ for ac_symprfx in "" "_"; do
  7923. else
  7924. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  7925. fi
  7926. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  7927. # Check to see that the pipe works correctly.
  7928. pipe_works=no
  7929. @@ -7005,6 +7320,18 @@ _LT_EOF
  7930. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  7931. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  7932. cat <<_LT_EOF > conftest.$ac_ext
  7933. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  7934. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  7935. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  7936. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  7937. +# define LT_DLSYM_CONST
  7938. +#elif defined(__osf__)
  7939. +/* This system does not cope well with relocations in const data. */
  7940. +# define LT_DLSYM_CONST
  7941. +#else
  7942. +# define LT_DLSYM_CONST const
  7943. +#endif
  7944. +
  7945. #ifdef __cplusplus
  7946. extern "C" {
  7947. #endif
  7948. @@ -7016,7 +7343,7 @@ _LT_EOF
  7949. cat <<_LT_EOF >> conftest.$ac_ext
  7950. /* The mapping between symbol names and symbols. */
  7951. -const struct {
  7952. +LT_DLSYM_CONST struct {
  7953. const char *name;
  7954. void *address;
  7955. }
  7956. @@ -7042,8 +7369,8 @@ static const void *lt_preloaded_setup() {
  7957. _LT_EOF
  7958. # Now try linking the two files.
  7959. mv conftest.$ac_objext conftstm.$ac_objext
  7960. - lt_save_LIBS="$LIBS"
  7961. - lt_save_CFLAGS="$CFLAGS"
  7962. + lt_globsym_save_LIBS=$LIBS
  7963. + lt_globsym_save_CFLAGS=$CFLAGS
  7964. LIBS="conftstm.$ac_objext"
  7965. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  7966. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  7967. @@ -7053,8 +7380,8 @@ _LT_EOF
  7968. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  7969. pipe_works=yes
  7970. fi
  7971. - LIBS="$lt_save_LIBS"
  7972. - CFLAGS="$lt_save_CFLAGS"
  7973. + LIBS=$lt_globsym_save_LIBS
  7974. + CFLAGS=$lt_globsym_save_CFLAGS
  7975. else
  7976. echo "cannot find nm_test_func in $nlist" >&5
  7977. fi
  7978. @@ -7091,6 +7418,17 @@ else
  7979. $as_echo "ok" >&6; }
  7980. fi
  7981. +# Response file support.
  7982. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  7983. + nm_file_list_spec='@'
  7984. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  7985. + nm_file_list_spec='@'
  7986. +fi
  7987. +
  7988. +
  7989. +
  7990. +
  7991. +
  7992. @@ -7107,6 +7445,44 @@ fi
  7993. +
  7994. +
  7995. +
  7996. +
  7997. +
  7998. +
  7999. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  8000. +$as_echo_n "checking for sysroot... " >&6; }
  8001. +
  8002. +# Check whether --with-libtool-sysroot was given.
  8003. +if test "${with_libtool_sysroot+set}" = set; then :
  8004. + withval=$with_libtool_sysroot;
  8005. +else
  8006. + with_libtool_sysroot=no
  8007. +fi
  8008. +
  8009. +
  8010. +lt_sysroot=
  8011. +case ${with_libtool_sysroot} in #(
  8012. + yes)
  8013. + if test "$GCC" = yes; then
  8014. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  8015. + fi
  8016. + ;; #(
  8017. + /*)
  8018. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  8019. + ;; #(
  8020. + no|'')
  8021. + ;; #(
  8022. + *)
  8023. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  8024. +$as_echo "${with_libtool_sysroot}" >&6; }
  8025. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  8026. + ;;
  8027. +esac
  8028. +
  8029. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  8030. +$as_echo "${lt_sysroot:-no}" >&6; }
  8031. @@ -7318,6 +7694,123 @@ esac
  8032. need_locks="$enable_libtool_lock"
  8033. +if test -n "$ac_tool_prefix"; then
  8034. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  8035. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  8036. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  8037. +$as_echo_n "checking for $ac_word... " >&6; }
  8038. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  8039. + $as_echo_n "(cached) " >&6
  8040. +else
  8041. + if test -n "$MANIFEST_TOOL"; then
  8042. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  8043. +else
  8044. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  8045. +for as_dir in $PATH
  8046. +do
  8047. + IFS=$as_save_IFS
  8048. + test -z "$as_dir" && as_dir=.
  8049. + for ac_exec_ext in '' $ac_executable_extensions; do
  8050. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  8051. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  8052. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  8053. + break 2
  8054. + fi
  8055. +done
  8056. + done
  8057. +IFS=$as_save_IFS
  8058. +
  8059. +fi
  8060. +fi
  8061. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  8062. +if test -n "$MANIFEST_TOOL"; then
  8063. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  8064. +$as_echo "$MANIFEST_TOOL" >&6; }
  8065. +else
  8066. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  8067. +$as_echo "no" >&6; }
  8068. +fi
  8069. +
  8070. +
  8071. +fi
  8072. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  8073. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  8074. + # Extract the first word of "mt", so it can be a program name with args.
  8075. +set dummy mt; ac_word=$2
  8076. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  8077. +$as_echo_n "checking for $ac_word... " >&6; }
  8078. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  8079. + $as_echo_n "(cached) " >&6
  8080. +else
  8081. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  8082. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  8083. +else
  8084. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  8085. +for as_dir in $PATH
  8086. +do
  8087. + IFS=$as_save_IFS
  8088. + test -z "$as_dir" && as_dir=.
  8089. + for ac_exec_ext in '' $ac_executable_extensions; do
  8090. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  8091. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  8092. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  8093. + break 2
  8094. + fi
  8095. +done
  8096. + done
  8097. +IFS=$as_save_IFS
  8098. +
  8099. +fi
  8100. +fi
  8101. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  8102. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  8103. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  8104. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  8105. +else
  8106. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  8107. +$as_echo "no" >&6; }
  8108. +fi
  8109. +
  8110. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  8111. + MANIFEST_TOOL=":"
  8112. + else
  8113. + case $cross_compiling:$ac_tool_warned in
  8114. +yes:)
  8115. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  8116. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  8117. +ac_tool_warned=yes ;;
  8118. +esac
  8119. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  8120. + fi
  8121. +else
  8122. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  8123. +fi
  8124. +
  8125. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  8126. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  8127. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  8128. +if ${lt_cv_path_mainfest_tool+:} false; then :
  8129. + $as_echo_n "(cached) " >&6
  8130. +else
  8131. + lt_cv_path_mainfest_tool=no
  8132. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  8133. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  8134. + cat conftest.err >&5
  8135. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  8136. + lt_cv_path_mainfest_tool=yes
  8137. + fi
  8138. + rm -f conftest*
  8139. +fi
  8140. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  8141. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  8142. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  8143. + MANIFEST_TOOL=:
  8144. +fi
  8145. +
  8146. +
  8147. +
  8148. +
  8149. +
  8150. case $host_os in
  8151. rhapsody* | darwin*)
  8152. @@ -7881,6 +8374,8 @@ _LT_EOF
  8153. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  8154. echo "$AR cru libconftest.a conftest.o" >&5
  8155. $AR cru libconftest.a conftest.o 2>&5
  8156. + echo "$RANLIB libconftest.a" >&5
  8157. + $RANLIB libconftest.a 2>&5
  8158. cat > conftest.c << _LT_EOF
  8159. int main() { return 0;}
  8160. _LT_EOF
  8161. @@ -7949,6 +8444,16 @@ done
  8162. +func_stripname_cnf ()
  8163. +{
  8164. + case ${2} in
  8165. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  8166. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  8167. + esac
  8168. +} # func_stripname_cnf
  8169. +
  8170. +
  8171. +
  8172. # Set options
  8173. @@ -8077,7 +8582,8 @@ fi
  8174. LIBTOOL_DEPS="$ltmain"
  8175. # Always use our own libtool.
  8176. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  8177. +LIBTOOL='$(SHELL) $(top_builddir)'
  8178. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  8179. @@ -8166,7 +8672,7 @@ aix3*)
  8180. esac
  8181. # Global variables:
  8182. -ofile=libtool
  8183. +ofile=${host_alias}-libtool
  8184. can_build_shared=yes
  8185. # All known linkers require a `.a' archive for static linking (except MSVC,
  8186. @@ -8464,8 +8970,6 @@ fi
  8187. lt_prog_compiler_pic=
  8188. lt_prog_compiler_static=
  8189. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  8190. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8191. if test "$GCC" = yes; then
  8192. lt_prog_compiler_wl='-Wl,'
  8193. @@ -8631,6 +9135,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8194. lt_prog_compiler_pic='--shared'
  8195. lt_prog_compiler_static='--static'
  8196. ;;
  8197. + nagfor*)
  8198. + # NAG Fortran compiler
  8199. + lt_prog_compiler_wl='-Wl,-Wl,,'
  8200. + lt_prog_compiler_pic='-PIC'
  8201. + lt_prog_compiler_static='-Bstatic'
  8202. + ;;
  8203. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  8204. # Portland Group compilers (*not* the Pentium gcc compiler,
  8205. # which looks to be a dead project)
  8206. @@ -8693,7 +9203,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8207. lt_prog_compiler_pic='-KPIC'
  8208. lt_prog_compiler_static='-Bstatic'
  8209. case $cc_basename in
  8210. - f77* | f90* | f95*)
  8211. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  8212. lt_prog_compiler_wl='-Qoption ld ';;
  8213. *)
  8214. lt_prog_compiler_wl='-Wl,';;
  8215. @@ -8750,13 +9260,17 @@ case $host_os in
  8216. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  8217. ;;
  8218. esac
  8219. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  8220. -$as_echo "$lt_prog_compiler_pic" >&6; }
  8221. -
  8222. -
  8223. -
  8224. -
  8225. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  8226. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  8227. +if ${lt_cv_prog_compiler_pic+:} false; then :
  8228. + $as_echo_n "(cached) " >&6
  8229. +else
  8230. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  8231. +fi
  8232. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  8233. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  8234. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  8235. #
  8236. # Check to make sure the PIC flag actually works.
  8237. @@ -8817,6 +9331,11 @@ fi
  8238. +
  8239. +
  8240. +
  8241. +
  8242. +
  8243. #
  8244. # Check to make sure the static flag actually works.
  8245. #
  8246. @@ -9167,7 +9686,8 @@ _LT_EOF
  8247. allow_undefined_flag=unsupported
  8248. always_export_symbols=no
  8249. enable_shared_with_static_runtimes=yes
  8250. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  8251. + 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'
  8252. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  8253. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  8254. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  8255. @@ -9266,12 +9786,12 @@ _LT_EOF
  8256. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  8257. hardcode_libdir_flag_spec=
  8258. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  8259. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  8260. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  8261. if test "x$supports_anon_versioning" = xyes; then
  8262. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  8263. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  8264. echo "local: *; };" >> $output_objdir/$libname.ver~
  8265. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  8266. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  8267. fi
  8268. ;;
  8269. esac
  8270. @@ -9285,8 +9805,8 @@ _LT_EOF
  8271. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  8272. wlarc=
  8273. else
  8274. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8275. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8276. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8277. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8278. fi
  8279. ;;
  8280. @@ -9304,8 +9824,8 @@ _LT_EOF
  8281. _LT_EOF
  8282. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  8283. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8284. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8285. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8286. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8287. else
  8288. ld_shlibs=no
  8289. fi
  8290. @@ -9351,8 +9871,8 @@ _LT_EOF
  8291. *)
  8292. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  8293. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8294. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8295. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  8296. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  8297. else
  8298. ld_shlibs=no
  8299. fi
  8300. @@ -9482,7 +10002,13 @@ _LT_EOF
  8301. allow_undefined_flag='-berok'
  8302. # Determine the default libpath from the value encoded in an
  8303. # empty executable.
  8304. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8305. + if test "${lt_cv_aix_libpath+set}" = set; then
  8306. + aix_libpath=$lt_cv_aix_libpath
  8307. +else
  8308. + if ${lt_cv_aix_libpath_+:} false; then :
  8309. + $as_echo_n "(cached) " >&6
  8310. +else
  8311. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8312. /* end confdefs.h. */
  8313. int
  8314. @@ -9495,22 +10021,29 @@ main ()
  8315. _ACEOF
  8316. if ac_fn_c_try_link "$LINENO"; then :
  8317. -lt_aix_libpath_sed='
  8318. - /Import File Strings/,/^$/ {
  8319. - /^0/ {
  8320. - s/^0 *\(.*\)$/\1/
  8321. - p
  8322. - }
  8323. - }'
  8324. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8325. -# Check for a 64-bit object if we didn't find anything.
  8326. -if test -z "$aix_libpath"; then
  8327. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8328. -fi
  8329. + lt_aix_libpath_sed='
  8330. + /Import File Strings/,/^$/ {
  8331. + /^0/ {
  8332. + s/^0 *\([^ ]*\) *$/\1/
  8333. + p
  8334. + }
  8335. + }'
  8336. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8337. + # Check for a 64-bit object if we didn't find anything.
  8338. + if test -z "$lt_cv_aix_libpath_"; then
  8339. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8340. + fi
  8341. fi
  8342. rm -f core conftest.err conftest.$ac_objext \
  8343. conftest$ac_exeext conftest.$ac_ext
  8344. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8345. + if test -z "$lt_cv_aix_libpath_"; then
  8346. + lt_cv_aix_libpath_="/usr/lib:/lib"
  8347. + fi
  8348. +
  8349. +fi
  8350. +
  8351. + aix_libpath=$lt_cv_aix_libpath_
  8352. +fi
  8353. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  8354. 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"
  8355. @@ -9522,7 +10055,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8356. else
  8357. # Determine the default libpath from the value encoded in an
  8358. # empty executable.
  8359. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8360. + if test "${lt_cv_aix_libpath+set}" = set; then
  8361. + aix_libpath=$lt_cv_aix_libpath
  8362. +else
  8363. + if ${lt_cv_aix_libpath_+:} false; then :
  8364. + $as_echo_n "(cached) " >&6
  8365. +else
  8366. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8367. /* end confdefs.h. */
  8368. int
  8369. @@ -9535,22 +10074,29 @@ main ()
  8370. _ACEOF
  8371. if ac_fn_c_try_link "$LINENO"; then :
  8372. -lt_aix_libpath_sed='
  8373. - /Import File Strings/,/^$/ {
  8374. - /^0/ {
  8375. - s/^0 *\(.*\)$/\1/
  8376. - p
  8377. - }
  8378. - }'
  8379. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8380. -# Check for a 64-bit object if we didn't find anything.
  8381. -if test -z "$aix_libpath"; then
  8382. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8383. -fi
  8384. + lt_aix_libpath_sed='
  8385. + /Import File Strings/,/^$/ {
  8386. + /^0/ {
  8387. + s/^0 *\([^ ]*\) *$/\1/
  8388. + p
  8389. + }
  8390. + }'
  8391. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8392. + # Check for a 64-bit object if we didn't find anything.
  8393. + if test -z "$lt_cv_aix_libpath_"; then
  8394. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8395. + fi
  8396. fi
  8397. rm -f core conftest.err conftest.$ac_objext \
  8398. conftest$ac_exeext conftest.$ac_ext
  8399. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8400. + if test -z "$lt_cv_aix_libpath_"; then
  8401. + lt_cv_aix_libpath_="/usr/lib:/lib"
  8402. + fi
  8403. +
  8404. +fi
  8405. +
  8406. + aix_libpath=$lt_cv_aix_libpath_
  8407. +fi
  8408. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  8409. # Warning - without using the other run time loading flags,
  8410. @@ -9594,21 +10140,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8411. # When not using gcc, we currently assume that we are using
  8412. # Microsoft Visual C++.
  8413. # hardcode_libdir_flag_spec is actually meaningless, as there is
  8414. - # no search path for DLLs.
  8415. - hardcode_libdir_flag_spec=' '
  8416. - allow_undefined_flag=unsupported
  8417. - # Tell ltmain to make .lib files, not .a files.
  8418. - libext=lib
  8419. - # Tell ltmain to make .dll files, not .so files.
  8420. - shrext_cmds=".dll"
  8421. - # FIXME: Setting linknames here is a bad hack.
  8422. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  8423. - # The linker will automatically build a .lib file if we build a DLL.
  8424. - old_archive_from_new_cmds='true'
  8425. - # FIXME: Should let the user specify the lib program.
  8426. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  8427. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  8428. - enable_shared_with_static_runtimes=yes
  8429. + # no search path for DLLs.
  8430. + case $cc_basename in
  8431. + cl*)
  8432. + # Native MSVC
  8433. + hardcode_libdir_flag_spec=' '
  8434. + allow_undefined_flag=unsupported
  8435. + always_export_symbols=yes
  8436. + file_list_spec='@'
  8437. + # Tell ltmain to make .lib files, not .a files.
  8438. + libext=lib
  8439. + # Tell ltmain to make .dll files, not .so files.
  8440. + shrext_cmds=".dll"
  8441. + # FIXME: Setting linknames here is a bad hack.
  8442. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  8443. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8444. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  8445. + else
  8446. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  8447. + fi~
  8448. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  8449. + linknames='
  8450. + # The linker will not automatically build a static lib if we build a DLL.
  8451. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  8452. + enable_shared_with_static_runtimes=yes
  8453. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  8454. + # Don't use ranlib
  8455. + old_postinstall_cmds='chmod 644 $oldlib'
  8456. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  8457. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  8458. + case $lt_outputfile in
  8459. + *.exe|*.EXE) ;;
  8460. + *)
  8461. + lt_outputfile="$lt_outputfile.exe"
  8462. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  8463. + ;;
  8464. + esac~
  8465. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  8466. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  8467. + $RM "$lt_outputfile.manifest";
  8468. + fi'
  8469. + ;;
  8470. + *)
  8471. + # Assume MSVC wrapper
  8472. + hardcode_libdir_flag_spec=' '
  8473. + allow_undefined_flag=unsupported
  8474. + # Tell ltmain to make .lib files, not .a files.
  8475. + libext=lib
  8476. + # Tell ltmain to make .dll files, not .so files.
  8477. + shrext_cmds=".dll"
  8478. + # FIXME: Setting linknames here is a bad hack.
  8479. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  8480. + # The linker will automatically build a .lib file if we build a DLL.
  8481. + old_archive_from_new_cmds='true'
  8482. + # FIXME: Should let the user specify the lib program.
  8483. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  8484. + enable_shared_with_static_runtimes=yes
  8485. + ;;
  8486. + esac
  8487. ;;
  8488. darwin* | rhapsody*)
  8489. @@ -9669,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8490. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  8491. freebsd* | dragonfly*)
  8492. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  8493. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  8494. hardcode_libdir_flag_spec='-R$libdir'
  8495. hardcode_direct=yes
  8496. hardcode_shlibpath_var=no
  8497. @@ -9677,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8498. hpux9*)
  8499. if test "$GCC" = yes; then
  8500. - 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'
  8501. + 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'
  8502. else
  8503. 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'
  8504. fi
  8505. @@ -9693,7 +10282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8506. hpux10*)
  8507. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  8508. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8509. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8510. else
  8511. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  8512. fi
  8513. @@ -9717,10 +10306,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8514. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  8515. ;;
  8516. ia64*)
  8517. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  8518. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  8519. ;;
  8520. *)
  8521. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8522. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  8523. ;;
  8524. esac
  8525. else
  8526. @@ -9799,23 +10388,36 @@ fi
  8527. irix5* | irix6* | nonstopux*)
  8528. if test "$GCC" = yes; then
  8529. - 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'
  8530. + 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'
  8531. # Try to use the -exported_symbol ld option, if it does not
  8532. # work, assume that -exports_file does not work either and
  8533. # implicitly export all symbols.
  8534. - save_LDFLAGS="$LDFLAGS"
  8535. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  8536. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8537. + # This should be the same for all languages, so no per-tag cache variable.
  8538. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  8539. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  8540. +if ${lt_cv_irix_exported_symbol+:} false; then :
  8541. + $as_echo_n "(cached) " >&6
  8542. +else
  8543. + save_LDFLAGS="$LDFLAGS"
  8544. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  8545. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8546. /* end confdefs.h. */
  8547. -int foo(void) {}
  8548. +int foo (void) { return 0; }
  8549. _ACEOF
  8550. if ac_fn_c_try_link "$LINENO"; then :
  8551. - 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'
  8552. -
  8553. + lt_cv_irix_exported_symbol=yes
  8554. +else
  8555. + lt_cv_irix_exported_symbol=no
  8556. fi
  8557. rm -f core conftest.err conftest.$ac_objext \
  8558. conftest$ac_exeext conftest.$ac_ext
  8559. - LDFLAGS="$save_LDFLAGS"
  8560. + LDFLAGS="$save_LDFLAGS"
  8561. +fi
  8562. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  8563. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  8564. + if test "$lt_cv_irix_exported_symbol" = yes; then
  8565. + 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'
  8566. + fi
  8567. else
  8568. 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'
  8569. 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'
  8570. @@ -9900,7 +10502,7 @@ rm -f core conftest.err conftest.$ac_objext \
  8571. osf4* | osf5*) # as osf3* with the addition of -msym flag
  8572. if test "$GCC" = yes; then
  8573. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  8574. - 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'
  8575. + 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'
  8576. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  8577. else
  8578. allow_undefined_flag=' -expect_unresolved \*'
  8579. @@ -9919,9 +10521,9 @@ rm -f core conftest.err conftest.$ac_objext \
  8580. no_undefined_flag=' -z defs'
  8581. if test "$GCC" = yes; then
  8582. wlarc='${wl}'
  8583. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  8584. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  8585. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  8586. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  8587. + $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'
  8588. else
  8589. case `$CC -V 2>&1` in
  8590. *"Compilers 5.0"*)
  8591. @@ -10497,8 +11099,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  8592. need_version=no
  8593. need_lib_prefix=no
  8594. - case $GCC,$host_os in
  8595. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  8596. + case $GCC,$cc_basename in
  8597. + yes,*)
  8598. + # gcc
  8599. library_names_spec='$libname.dll.a'
  8600. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  8601. postinstall_cmds='base_file=`basename \${file}`~
  8602. @@ -10531,13 +11134,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  8603. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  8604. ;;
  8605. esac
  8606. + dynamic_linker='Win32 ld.exe'
  8607. + ;;
  8608. +
  8609. + *,cl*)
  8610. + # Native MSVC
  8611. + libname_spec='$name'
  8612. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  8613. + library_names_spec='${libname}.dll.lib'
  8614. +
  8615. + case $build_os in
  8616. + mingw*)
  8617. + sys_lib_search_path_spec=
  8618. + lt_save_ifs=$IFS
  8619. + IFS=';'
  8620. + for lt_path in $LIB
  8621. + do
  8622. + IFS=$lt_save_ifs
  8623. + # Let DOS variable expansion print the short 8.3 style file name.
  8624. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  8625. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  8626. + done
  8627. + IFS=$lt_save_ifs
  8628. + # Convert to MSYS style.
  8629. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  8630. + ;;
  8631. + cygwin*)
  8632. + # Convert to unix form, then to dos form, then back to unix form
  8633. + # but this time dos style (no spaces!) so that the unix form looks
  8634. + # like /cygdrive/c/PROGRA~1:/cygdr...
  8635. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  8636. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  8637. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  8638. + ;;
  8639. + *)
  8640. + sys_lib_search_path_spec="$LIB"
  8641. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  8642. + # It is most probably a Windows format PATH.
  8643. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  8644. + else
  8645. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  8646. + fi
  8647. + # FIXME: find the short name or the path components, as spaces are
  8648. + # common. (e.g. "Program Files" -> "PROGRA~1")
  8649. + ;;
  8650. + esac
  8651. +
  8652. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  8653. + postinstall_cmds='base_file=`basename \${file}`~
  8654. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  8655. + dldir=$destdir/`dirname \$dlpath`~
  8656. + test -d \$dldir || mkdir -p \$dldir~
  8657. + $install_prog $dir/$dlname \$dldir/$dlname'
  8658. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  8659. + dlpath=$dir/\$dldll~
  8660. + $RM \$dlpath'
  8661. + shlibpath_overrides_runpath=yes
  8662. + dynamic_linker='Win32 link.exe'
  8663. ;;
  8664. *)
  8665. + # Assume MSVC wrapper
  8666. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  8667. + dynamic_linker='Win32 ld.exe'
  8668. ;;
  8669. esac
  8670. - dynamic_linker='Win32 ld.exe'
  8671. # FIXME: first we should search . and the directory the executable is in
  8672. shlibpath_var=PATH
  8673. ;;
  8674. @@ -10619,7 +11280,7 @@ haiku*)
  8675. soname_spec='${libname}${release}${shared_ext}$major'
  8676. shlibpath_var=LIBRARY_PATH
  8677. shlibpath_overrides_runpath=yes
  8678. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  8679. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  8680. hardcode_into_libs=yes
  8681. ;;
  8682. @@ -11415,7 +12076,7 @@ else
  8683. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  8684. lt_status=$lt_dlunknown
  8685. cat > conftest.$ac_ext <<_LT_EOF
  8686. -#line 11415 "configure"
  8687. +#line $LINENO "configure"
  8688. #include "confdefs.h"
  8689. #if HAVE_DLFCN_H
  8690. @@ -11459,10 +12120,10 @@ else
  8691. /* When -fvisbility=hidden is used, assume the code has been annotated
  8692. correspondingly for the symbols needed. */
  8693. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  8694. -void fnord () __attribute__((visibility("default")));
  8695. +int fnord () __attribute__((visibility("default")));
  8696. #endif
  8697. -void fnord () { int i=42; }
  8698. +int fnord () { return 42; }
  8699. int main ()
  8700. {
  8701. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  8702. @@ -11521,7 +12182,7 @@ else
  8703. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  8704. lt_status=$lt_dlunknown
  8705. cat > conftest.$ac_ext <<_LT_EOF
  8706. -#line 11521 "configure"
  8707. +#line $LINENO "configure"
  8708. #include "confdefs.h"
  8709. #if HAVE_DLFCN_H
  8710. @@ -11565,10 +12226,10 @@ else
  8711. /* When -fvisbility=hidden is used, assume the code has been annotated
  8712. correspondingly for the symbols needed. */
  8713. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  8714. -void fnord () __attribute__((visibility("default")));
  8715. +int fnord () __attribute__((visibility("default")));
  8716. #endif
  8717. -void fnord () { int i=42; }
  8718. +int fnord () { return 42; }
  8719. int main ()
  8720. {
  8721. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  8722. @@ -11960,6 +12621,7 @@ $RM -r conftest*
  8723. # Allow CC to be a program name with arguments.
  8724. lt_save_CC=$CC
  8725. + lt_save_CFLAGS=$CFLAGS
  8726. lt_save_LD=$LD
  8727. lt_save_GCC=$GCC
  8728. GCC=$GXX
  8729. @@ -11977,6 +12639,7 @@ $RM -r conftest*
  8730. fi
  8731. test -z "${LDCXX+set}" || LD=$LDCXX
  8732. CC=${CXX-"c++"}
  8733. + CFLAGS=$CXXFLAGS
  8734. compiler=$CC
  8735. compiler_CXX=$CC
  8736. for cc_temp in $compiler""; do
  8737. @@ -12259,7 +12922,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  8738. allow_undefined_flag_CXX='-berok'
  8739. # Determine the default libpath from the value encoded in an empty
  8740. # executable.
  8741. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8742. + if test "${lt_cv_aix_libpath+set}" = set; then
  8743. + aix_libpath=$lt_cv_aix_libpath
  8744. +else
  8745. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  8746. + $as_echo_n "(cached) " >&6
  8747. +else
  8748. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8749. /* end confdefs.h. */
  8750. int
  8751. @@ -12272,22 +12941,29 @@ main ()
  8752. _ACEOF
  8753. if ac_fn_cxx_try_link "$LINENO"; then :
  8754. -lt_aix_libpath_sed='
  8755. - /Import File Strings/,/^$/ {
  8756. - /^0/ {
  8757. - s/^0 *\(.*\)$/\1/
  8758. - p
  8759. - }
  8760. - }'
  8761. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8762. -# Check for a 64-bit object if we didn't find anything.
  8763. -if test -z "$aix_libpath"; then
  8764. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8765. -fi
  8766. + lt_aix_libpath_sed='
  8767. + /Import File Strings/,/^$/ {
  8768. + /^0/ {
  8769. + s/^0 *\([^ ]*\) *$/\1/
  8770. + p
  8771. + }
  8772. + }'
  8773. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8774. + # Check for a 64-bit object if we didn't find anything.
  8775. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8776. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8777. + fi
  8778. fi
  8779. rm -f core conftest.err conftest.$ac_objext \
  8780. conftest$ac_exeext conftest.$ac_ext
  8781. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8782. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8783. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  8784. + fi
  8785. +
  8786. +fi
  8787. +
  8788. + aix_libpath=$lt_cv_aix_libpath__CXX
  8789. +fi
  8790. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  8791. @@ -12300,7 +12976,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8792. else
  8793. # Determine the default libpath from the value encoded in an
  8794. # empty executable.
  8795. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8796. + if test "${lt_cv_aix_libpath+set}" = set; then
  8797. + aix_libpath=$lt_cv_aix_libpath
  8798. +else
  8799. + if ${lt_cv_aix_libpath__CXX+:} false; then :
  8800. + $as_echo_n "(cached) " >&6
  8801. +else
  8802. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  8803. /* end confdefs.h. */
  8804. int
  8805. @@ -12313,22 +12995,29 @@ main ()
  8806. _ACEOF
  8807. if ac_fn_cxx_try_link "$LINENO"; then :
  8808. -lt_aix_libpath_sed='
  8809. - /Import File Strings/,/^$/ {
  8810. - /^0/ {
  8811. - s/^0 *\(.*\)$/\1/
  8812. - p
  8813. - }
  8814. - }'
  8815. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8816. -# Check for a 64-bit object if we didn't find anything.
  8817. -if test -z "$aix_libpath"; then
  8818. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8819. -fi
  8820. + lt_aix_libpath_sed='
  8821. + /Import File Strings/,/^$/ {
  8822. + /^0/ {
  8823. + s/^0 *\([^ ]*\) *$/\1/
  8824. + p
  8825. + }
  8826. + }'
  8827. + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8828. + # Check for a 64-bit object if we didn't find anything.
  8829. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8830. + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  8831. + fi
  8832. fi
  8833. rm -f core conftest.err conftest.$ac_objext \
  8834. conftest$ac_exeext conftest.$ac_ext
  8835. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8836. + if test -z "$lt_cv_aix_libpath__CXX"; then
  8837. + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
  8838. + fi
  8839. +
  8840. +fi
  8841. +
  8842. + aix_libpath=$lt_cv_aix_libpath__CXX
  8843. +fi
  8844. hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  8845. # Warning - without using the other run time loading flags,
  8846. @@ -12371,29 +13060,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8847. ;;
  8848. cygwin* | mingw* | pw32* | cegcc*)
  8849. - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  8850. - # as there is no search path for DLLs.
  8851. - hardcode_libdir_flag_spec_CXX='-L$libdir'
  8852. - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  8853. - allow_undefined_flag_CXX=unsupported
  8854. - always_export_symbols_CXX=no
  8855. - enable_shared_with_static_runtimes_CXX=yes
  8856. -
  8857. - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  8858. - 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'
  8859. - # If the export-symbols file already is a .def file (1st line
  8860. - # is EXPORTS), use it as is; otherwise, prepend...
  8861. - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8862. - cp $export_symbols $output_objdir/$soname.def;
  8863. - else
  8864. - echo EXPORTS > $output_objdir/$soname.def;
  8865. - cat $export_symbols >> $output_objdir/$soname.def;
  8866. - fi~
  8867. - $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'
  8868. - else
  8869. - ld_shlibs_CXX=no
  8870. - fi
  8871. - ;;
  8872. + case $GXX,$cc_basename in
  8873. + ,cl* | no,cl*)
  8874. + # Native MSVC
  8875. + # hardcode_libdir_flag_spec is actually meaningless, as there is
  8876. + # no search path for DLLs.
  8877. + hardcode_libdir_flag_spec_CXX=' '
  8878. + allow_undefined_flag_CXX=unsupported
  8879. + always_export_symbols_CXX=yes
  8880. + file_list_spec_CXX='@'
  8881. + # Tell ltmain to make .lib files, not .a files.
  8882. + libext=lib
  8883. + # Tell ltmain to make .dll files, not .so files.
  8884. + shrext_cmds=".dll"
  8885. + # FIXME: Setting linknames here is a bad hack.
  8886. + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  8887. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8888. + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  8889. + else
  8890. + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  8891. + fi~
  8892. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  8893. + linknames='
  8894. + # The linker will not automatically build a static lib if we build a DLL.
  8895. + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
  8896. + enable_shared_with_static_runtimes_CXX=yes
  8897. + # Don't use ranlib
  8898. + old_postinstall_cmds_CXX='chmod 644 $oldlib'
  8899. + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
  8900. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  8901. + case $lt_outputfile in
  8902. + *.exe|*.EXE) ;;
  8903. + *)
  8904. + lt_outputfile="$lt_outputfile.exe"
  8905. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  8906. + ;;
  8907. + esac~
  8908. + func_to_tool_file "$lt_outputfile"~
  8909. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  8910. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  8911. + $RM "$lt_outputfile.manifest";
  8912. + fi'
  8913. + ;;
  8914. + *)
  8915. + # g++
  8916. + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
  8917. + # as there is no search path for DLLs.
  8918. + hardcode_libdir_flag_spec_CXX='-L$libdir'
  8919. + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
  8920. + allow_undefined_flag_CXX=unsupported
  8921. + always_export_symbols_CXX=no
  8922. + enable_shared_with_static_runtimes_CXX=yes
  8923. +
  8924. + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  8925. + 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'
  8926. + # If the export-symbols file already is a .def file (1st line
  8927. + # is EXPORTS), use it as is; otherwise, prepend...
  8928. + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  8929. + cp $export_symbols $output_objdir/$soname.def;
  8930. + else
  8931. + echo EXPORTS > $output_objdir/$soname.def;
  8932. + cat $export_symbols >> $output_objdir/$soname.def;
  8933. + fi~
  8934. + $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'
  8935. + else
  8936. + ld_shlibs_CXX=no
  8937. + fi
  8938. + ;;
  8939. + esac
  8940. + ;;
  8941. darwin* | rhapsody*)
  8942. @@ -12499,7 +13234,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8943. ;;
  8944. *)
  8945. if test "$GXX" = yes; then
  8946. - 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'
  8947. + 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'
  8948. else
  8949. # FIXME: insert proper C++ library support
  8950. ld_shlibs_CXX=no
  8951. @@ -12570,10 +13305,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8952. archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  8953. ;;
  8954. ia64*)
  8955. - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  8956. + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  8957. ;;
  8958. *)
  8959. - 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'
  8960. + 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'
  8961. ;;
  8962. esac
  8963. fi
  8964. @@ -12614,9 +13349,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8965. *)
  8966. if test "$GXX" = yes; then
  8967. if test "$with_gnu_ld" = no; then
  8968. - 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'
  8969. + 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'
  8970. else
  8971. - 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'
  8972. + 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'
  8973. fi
  8974. fi
  8975. link_all_deplibs_CXX=yes
  8976. @@ -12686,20 +13421,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  8977. prelink_cmds_CXX='tpldir=Template.dir~
  8978. rm -rf $tpldir~
  8979. $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  8980. - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
  8981. + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  8982. old_archive_cmds_CXX='tpldir=Template.dir~
  8983. rm -rf $tpldir~
  8984. $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  8985. - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
  8986. + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  8987. $RANLIB $oldlib'
  8988. archive_cmds_CXX='tpldir=Template.dir~
  8989. rm -rf $tpldir~
  8990. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  8991. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  8992. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  8993. archive_expsym_cmds_CXX='tpldir=Template.dir~
  8994. rm -rf $tpldir~
  8995. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  8996. - $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'
  8997. + $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'
  8998. ;;
  8999. *) # Version 6 and above use weak symbols
  9000. archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  9001. @@ -12894,7 +13629,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9002. 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'
  9003. ;;
  9004. *)
  9005. - 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'
  9006. + 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'
  9007. ;;
  9008. esac
  9009. @@ -12940,7 +13675,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9010. solaris*)
  9011. case $cc_basename in
  9012. - CC*)
  9013. + CC* | sunCC*)
  9014. # Sun C++ 4.2, 5.x and Centerline C++
  9015. archive_cmds_need_lc_CXX=yes
  9016. no_undefined_flag_CXX=' -zdefs'
  9017. @@ -12981,9 +13716,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  9018. if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  9019. no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  9020. if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  9021. - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  9022. + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  9023. archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  9024. - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  9025. + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  9026. # Commands to make compiler produce verbose output that lists
  9027. # what "hidden" libraries, object files and flags are used when
  9028. @@ -13118,6 +13853,13 @@ private:
  9029. };
  9030. _LT_EOF
  9031. +
  9032. +_lt_libdeps_save_CFLAGS=$CFLAGS
  9033. +case "$CC $CFLAGS " in #(
  9034. +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
  9035. +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
  9036. +esac
  9037. +
  9038. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9039. (eval $ac_compile) 2>&5
  9040. ac_status=$?
  9041. @@ -13131,7 +13873,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9042. pre_test_object_deps_done=no
  9043. for p in `eval "$output_verbose_link_cmd"`; do
  9044. - case $p in
  9045. + case ${prev}${p} in
  9046. -L* | -R* | -l*)
  9047. # Some compilers place space between "-{L,R}" and the path.
  9048. @@ -13140,13 +13882,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9049. test $p = "-R"; then
  9050. prev=$p
  9051. continue
  9052. - else
  9053. - prev=
  9054. fi
  9055. + # Expand the sysroot to ease extracting the directories later.
  9056. + if test -z "$prev"; then
  9057. + case $p in
  9058. + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
  9059. + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
  9060. + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
  9061. + esac
  9062. + fi
  9063. + case $p in
  9064. + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
  9065. + esac
  9066. if test "$pre_test_object_deps_done" = no; then
  9067. - case $p in
  9068. - -L* | -R*)
  9069. + case ${prev} in
  9070. + -L | -R)
  9071. # Internal compiler library paths should come after those
  9072. # provided the user. The postdeps already come after the
  9073. # user supplied libs so there is no need to process them.
  9074. @@ -13166,8 +13917,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  9075. postdeps_CXX="${postdeps_CXX} ${prev}${p}"
  9076. fi
  9077. fi
  9078. + prev=
  9079. ;;
  9080. + *.lto.$objext) ;; # Ignore GCC LTO objects
  9081. *.$objext)
  9082. # This assumes that the test object file only shows up
  9083. # once in the compiler output.
  9084. @@ -13203,6 +13956,7 @@ else
  9085. fi
  9086. $RM -f confest.$objext
  9087. +CFLAGS=$_lt_libdeps_save_CFLAGS
  9088. # PORTME: override above test on systems where it is broken
  9089. case $host_os in
  9090. @@ -13238,7 +13992,7 @@ linux*)
  9091. solaris*)
  9092. case $cc_basename in
  9093. - CC*)
  9094. + CC* | sunCC*)
  9095. # The more standards-conforming stlport4 library is
  9096. # incompatible with the Cstd library. Avoid specifying
  9097. # it if it's in CXXFLAGS. Ignore libCrun as
  9098. @@ -13303,8 +14057,6 @@ fi
  9099. lt_prog_compiler_pic_CXX=
  9100. lt_prog_compiler_static_CXX=
  9101. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  9102. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9103. # C++ specific cases for pic, static, wl, etc.
  9104. if test "$GXX" = yes; then
  9105. @@ -13409,6 +14161,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9106. ;;
  9107. esac
  9108. ;;
  9109. + mingw* | cygwin* | os2* | pw32* | cegcc*)
  9110. + # This hack is so that the source file can tell whether it is being
  9111. + # built for inclusion in a dll (and should export symbols for example).
  9112. + lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
  9113. + ;;
  9114. dgux*)
  9115. case $cc_basename in
  9116. ec++*)
  9117. @@ -13561,7 +14318,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9118. ;;
  9119. solaris*)
  9120. case $cc_basename in
  9121. - CC*)
  9122. + CC* | sunCC*)
  9123. # Sun C++ 4.2, 5.x and Centerline C++
  9124. lt_prog_compiler_pic_CXX='-KPIC'
  9125. lt_prog_compiler_static_CXX='-Bstatic'
  9126. @@ -13626,10 +14383,17 @@ case $host_os in
  9127. lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
  9128. ;;
  9129. esac
  9130. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
  9131. -$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  9132. -
  9133. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  9134. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  9135. +if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
  9136. + $as_echo_n "(cached) " >&6
  9137. +else
  9138. + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
  9139. +fi
  9140. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
  9141. +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
  9142. +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
  9143. #
  9144. # Check to make sure the PIC flag actually works.
  9145. @@ -13687,6 +14451,8 @@ fi
  9146. +
  9147. +
  9148. #
  9149. # Check to make sure the static flag actually works.
  9150. #
  9151. @@ -13864,6 +14630,7 @@ fi
  9152. $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  9153. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  9154. + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  9155. case $host_os in
  9156. aix[4-9]*)
  9157. # If we're using GNU nm, then we don't want the "-C" option.
  9158. @@ -13878,15 +14645,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  9159. ;;
  9160. pw32*)
  9161. export_symbols_cmds_CXX="$ltdll_cmds"
  9162. - ;;
  9163. + ;;
  9164. cygwin* | mingw* | cegcc*)
  9165. - 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'
  9166. - ;;
  9167. + case $cc_basename in
  9168. + cl*) ;;
  9169. + *)
  9170. + 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'
  9171. + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  9172. + ;;
  9173. + esac
  9174. + ;;
  9175. *)
  9176. export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  9177. - ;;
  9178. + ;;
  9179. esac
  9180. - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  9181. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
  9182. $as_echo "$ld_shlibs_CXX" >&6; }
  9183. @@ -14149,8 +14921,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  9184. need_version=no
  9185. need_lib_prefix=no
  9186. - case $GCC,$host_os in
  9187. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  9188. + case $GCC,$cc_basename in
  9189. + yes,*)
  9190. + # gcc
  9191. library_names_spec='$libname.dll.a'
  9192. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  9193. postinstall_cmds='base_file=`basename \${file}`~
  9194. @@ -14182,13 +14955,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  9195. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  9196. ;;
  9197. esac
  9198. + dynamic_linker='Win32 ld.exe'
  9199. + ;;
  9200. +
  9201. + *,cl*)
  9202. + # Native MSVC
  9203. + libname_spec='$name'
  9204. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  9205. + library_names_spec='${libname}.dll.lib'
  9206. +
  9207. + case $build_os in
  9208. + mingw*)
  9209. + sys_lib_search_path_spec=
  9210. + lt_save_ifs=$IFS
  9211. + IFS=';'
  9212. + for lt_path in $LIB
  9213. + do
  9214. + IFS=$lt_save_ifs
  9215. + # Let DOS variable expansion print the short 8.3 style file name.
  9216. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  9217. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  9218. + done
  9219. + IFS=$lt_save_ifs
  9220. + # Convert to MSYS style.
  9221. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  9222. + ;;
  9223. + cygwin*)
  9224. + # Convert to unix form, then to dos form, then back to unix form
  9225. + # but this time dos style (no spaces!) so that the unix form looks
  9226. + # like /cygdrive/c/PROGRA~1:/cygdr...
  9227. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  9228. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  9229. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  9230. + ;;
  9231. + *)
  9232. + sys_lib_search_path_spec="$LIB"
  9233. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  9234. + # It is most probably a Windows format PATH.
  9235. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  9236. + else
  9237. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  9238. + fi
  9239. + # FIXME: find the short name or the path components, as spaces are
  9240. + # common. (e.g. "Program Files" -> "PROGRA~1")
  9241. + ;;
  9242. + esac
  9243. +
  9244. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  9245. + postinstall_cmds='base_file=`basename \${file}`~
  9246. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  9247. + dldir=$destdir/`dirname \$dlpath`~
  9248. + test -d \$dldir || mkdir -p \$dldir~
  9249. + $install_prog $dir/$dlname \$dldir/$dlname'
  9250. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  9251. + dlpath=$dir/\$dldll~
  9252. + $RM \$dlpath'
  9253. + shlibpath_overrides_runpath=yes
  9254. + dynamic_linker='Win32 link.exe'
  9255. ;;
  9256. *)
  9257. + # Assume MSVC wrapper
  9258. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  9259. + dynamic_linker='Win32 ld.exe'
  9260. ;;
  9261. esac
  9262. - dynamic_linker='Win32 ld.exe'
  9263. # FIXME: first we should search . and the directory the executable is in
  9264. shlibpath_var=PATH
  9265. ;;
  9266. @@ -14269,7 +15100,7 @@ haiku*)
  9267. soname_spec='${libname}${release}${shared_ext}$major'
  9268. shlibpath_var=LIBRARY_PATH
  9269. shlibpath_overrides_runpath=yes
  9270. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  9271. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  9272. hardcode_into_libs=yes
  9273. ;;
  9274. @@ -14728,6 +15559,7 @@ fi
  9275. fi # test -n "$compiler"
  9276. CC=$lt_save_CC
  9277. + CFLAGS=$lt_save_CFLAGS
  9278. LDCXX=$LD
  9279. LD=$lt_save_LD
  9280. GCC=$lt_save_GCC
  9281. @@ -17770,13 +18602,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  9282. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  9283. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  9284. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  9285. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  9286. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  9287. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  9288. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  9289. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  9290. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  9291. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  9292. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  9293. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  9294. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  9295. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  9296. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  9297. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  9298. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  9299. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  9300. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  9301. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  9302. @@ -17791,14 +18630,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  9303. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  9304. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  9305. 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"`'
  9306. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  9307. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  9308. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  9309. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  9310. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  9311. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  9312. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  9313. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  9314. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  9315. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  9316. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  9317. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  9318. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  9319. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  9320. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  9321. @@ -17831,12 +18673,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  9322. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  9323. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  9324. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  9325. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  9326. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  9327. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  9328. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  9329. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  9330. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  9331. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  9332. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  9333. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  9334. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  9335. @@ -17875,8 +18717,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
  9336. compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
  9337. GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
  9338. lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
  9339. -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  9340. lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
  9341. +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
  9342. lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
  9343. lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
  9344. archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
  9345. @@ -17903,12 +18745,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
  9346. hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
  9347. inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
  9348. link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
  9349. -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
  9350. always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
  9351. export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  9352. exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  9353. include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
  9354. prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  9355. +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
  9356. file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
  9357. hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
  9358. compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
  9359. @@ -17946,8 +18788,13 @@ reload_flag \
  9360. OBJDUMP \
  9361. deplibs_check_method \
  9362. file_magic_cmd \
  9363. +file_magic_glob \
  9364. +want_nocaseglob \
  9365. +DLLTOOL \
  9366. +sharedlib_from_linklib_cmd \
  9367. AR \
  9368. AR_FLAGS \
  9369. +archiver_list_spec \
  9370. STRIP \
  9371. RANLIB \
  9372. CC \
  9373. @@ -17957,12 +18804,14 @@ lt_cv_sys_global_symbol_pipe \
  9374. lt_cv_sys_global_symbol_to_cdecl \
  9375. lt_cv_sys_global_symbol_to_c_name_address \
  9376. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  9377. +nm_file_list_spec \
  9378. lt_prog_compiler_no_builtin_flag \
  9379. -lt_prog_compiler_wl \
  9380. lt_prog_compiler_pic \
  9381. +lt_prog_compiler_wl \
  9382. lt_prog_compiler_static \
  9383. lt_cv_prog_compiler_c_o \
  9384. need_locks \
  9385. +MANIFEST_TOOL \
  9386. DSYMUTIL \
  9387. NMEDIT \
  9388. LIPO \
  9389. @@ -17978,7 +18827,6 @@ no_undefined_flag \
  9390. hardcode_libdir_flag_spec \
  9391. hardcode_libdir_flag_spec_ld \
  9392. hardcode_libdir_separator \
  9393. -fix_srcfile_path \
  9394. exclude_expsyms \
  9395. include_expsyms \
  9396. file_list_spec \
  9397. @@ -18000,8 +18848,8 @@ LD_CXX \
  9398. reload_flag_CXX \
  9399. compiler_CXX \
  9400. lt_prog_compiler_no_builtin_flag_CXX \
  9401. -lt_prog_compiler_wl_CXX \
  9402. lt_prog_compiler_pic_CXX \
  9403. +lt_prog_compiler_wl_CXX \
  9404. lt_prog_compiler_static_CXX \
  9405. lt_cv_prog_compiler_c_o_CXX \
  9406. export_dynamic_flag_spec_CXX \
  9407. @@ -18013,7 +18861,6 @@ no_undefined_flag_CXX \
  9408. hardcode_libdir_flag_spec_CXX \
  9409. hardcode_libdir_flag_spec_ld_CXX \
  9410. hardcode_libdir_separator_CXX \
  9411. -fix_srcfile_path_CXX \
  9412. exclude_expsyms_CXX \
  9413. include_expsyms_CXX \
  9414. file_list_spec_CXX \
  9415. @@ -18047,6 +18894,7 @@ module_cmds \
  9416. module_expsym_cmds \
  9417. export_symbols_cmds \
  9418. prelink_cmds \
  9419. +postlink_cmds \
  9420. postinstall_cmds \
  9421. postuninstall_cmds \
  9422. finish_cmds \
  9423. @@ -18061,7 +18909,8 @@ archive_expsym_cmds_CXX \
  9424. module_cmds_CXX \
  9425. module_expsym_cmds_CXX \
  9426. export_symbols_cmds_CXX \
  9427. -prelink_cmds_CXX; do
  9428. +prelink_cmds_CXX \
  9429. +postlink_cmds_CXX; do
  9430. case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  9431. *[\\\\\\\`\\"\\\$]*)
  9432. eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  9433. @@ -18826,7 +19675,8 @@ $as_echo X"$file" |
  9434. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  9435. #
  9436. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  9437. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  9438. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  9439. +# Inc.
  9440. # Written by Gordon Matzigkeit, 1996
  9441. #
  9442. # This file is part of GNU Libtool.
  9443. @@ -18929,19 +19779,42 @@ SP2NL=$lt_lt_SP2NL
  9444. # turn newlines into spaces.
  9445. NL2SP=$lt_lt_NL2SP
  9446. +# convert \$build file names to \$host format.
  9447. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  9448. +
  9449. +# convert \$build files to toolchain format.
  9450. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  9451. +
  9452. # An object symbol dumper.
  9453. OBJDUMP=$lt_OBJDUMP
  9454. # Method to check whether dependent libraries are shared objects.
  9455. deplibs_check_method=$lt_deplibs_check_method
  9456. -# Command to use when deplibs_check_method == "file_magic".
  9457. +# Command to use when deplibs_check_method = "file_magic".
  9458. file_magic_cmd=$lt_file_magic_cmd
  9459. +# How to find potential files when deplibs_check_method = "file_magic".
  9460. +file_magic_glob=$lt_file_magic_glob
  9461. +
  9462. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  9463. +want_nocaseglob=$lt_want_nocaseglob
  9464. +
  9465. +# DLL creation program.
  9466. +DLLTOOL=$lt_DLLTOOL
  9467. +
  9468. +# Command to associate shared and link libraries.
  9469. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  9470. +
  9471. # The archiver.
  9472. AR=$lt_AR
  9473. +
  9474. +# Flags to create an archive.
  9475. AR_FLAGS=$lt_AR_FLAGS
  9476. +# How to feed a file listing to the archiver.
  9477. +archiver_list_spec=$lt_archiver_list_spec
  9478. +
  9479. # A symbol stripping program.
  9480. STRIP=$lt_STRIP
  9481. @@ -18971,6 +19844,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  9482. # Transform the output of nm in a C name address pair when lib prefix is needed.
  9483. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  9484. +# Specify filename containing input files for \$NM.
  9485. +nm_file_list_spec=$lt_nm_file_list_spec
  9486. +
  9487. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  9488. +lt_sysroot=$lt_sysroot
  9489. +
  9490. # The name of the directory that contains temporary libtool files.
  9491. objdir=$objdir
  9492. @@ -18980,6 +19859,9 @@ MAGIC_CMD=$MAGIC_CMD
  9493. # Must we lock files when doing compilation?
  9494. need_locks=$lt_need_locks
  9495. +# Manifest tool.
  9496. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  9497. +
  9498. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  9499. DSYMUTIL=$lt_DSYMUTIL
  9500. @@ -19094,12 +19976,12 @@ with_gcc=$GCC
  9501. # Compiler flag to turn off builtin functions.
  9502. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  9503. -# How to pass a linker flag through the compiler.
  9504. -wl=$lt_lt_prog_compiler_wl
  9505. -
  9506. # Additional compiler flags for building library objects.
  9507. pic_flag=$lt_lt_prog_compiler_pic
  9508. +# How to pass a linker flag through the compiler.
  9509. +wl=$lt_lt_prog_compiler_wl
  9510. +
  9511. # Compiler flag to prevent dynamic linking.
  9512. link_static_flag=$lt_lt_prog_compiler_static
  9513. @@ -19186,9 +20068,6 @@ inherit_rpath=$inherit_rpath
  9514. # Whether libtool must link a program against all its dependency libraries.
  9515. link_all_deplibs=$link_all_deplibs
  9516. -# Fix the shell variable \$srcfile for the compiler.
  9517. -fix_srcfile_path=$lt_fix_srcfile_path
  9518. -
  9519. # Set to "yes" if exported symbols are required.
  9520. always_export_symbols=$always_export_symbols
  9521. @@ -19204,6 +20083,9 @@ include_expsyms=$lt_include_expsyms
  9522. # Commands necessary for linking programs (against libraries) with templates.
  9523. prelink_cmds=$lt_prelink_cmds
  9524. +# Commands necessary for finishing linking programs.
  9525. +postlink_cmds=$lt_postlink_cmds
  9526. +
  9527. # Specify filename containing input files.
  9528. file_list_spec=$lt_file_list_spec
  9529. @@ -19250,210 +20132,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  9530. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  9531. # text mode, it properly converts lines to CR/LF. This bash problem
  9532. # is reportedly fixed, but why not run on old versions too?
  9533. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  9534. - || (rm -f "$cfgfile"; exit 1)
  9535. -
  9536. - case $xsi_shell in
  9537. - yes)
  9538. - cat << \_LT_EOF >> "$cfgfile"
  9539. -
  9540. -# func_dirname file append nondir_replacement
  9541. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  9542. -# otherwise set result to NONDIR_REPLACEMENT.
  9543. -func_dirname ()
  9544. -{
  9545. - case ${1} in
  9546. - */*) func_dirname_result="${1%/*}${2}" ;;
  9547. - * ) func_dirname_result="${3}" ;;
  9548. - esac
  9549. -}
  9550. -
  9551. -# func_basename file
  9552. -func_basename ()
  9553. -{
  9554. - func_basename_result="${1##*/}"
  9555. -}
  9556. -
  9557. -# func_dirname_and_basename file append nondir_replacement
  9558. -# perform func_basename and func_dirname in a single function
  9559. -# call:
  9560. -# dirname: Compute the dirname of FILE. If nonempty,
  9561. -# add APPEND to the result, otherwise set result
  9562. -# to NONDIR_REPLACEMENT.
  9563. -# value returned in "$func_dirname_result"
  9564. -# basename: Compute filename of FILE.
  9565. -# value retuned in "$func_basename_result"
  9566. -# Implementation must be kept synchronized with func_dirname
  9567. -# and func_basename. For efficiency, we do not delegate to
  9568. -# those functions but instead duplicate the functionality here.
  9569. -func_dirname_and_basename ()
  9570. -{
  9571. - case ${1} in
  9572. - */*) func_dirname_result="${1%/*}${2}" ;;
  9573. - * ) func_dirname_result="${3}" ;;
  9574. - esac
  9575. - func_basename_result="${1##*/}"
  9576. -}
  9577. -
  9578. -# func_stripname prefix suffix name
  9579. -# strip PREFIX and SUFFIX off of NAME.
  9580. -# PREFIX and SUFFIX must not contain globbing or regex special
  9581. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  9582. -# dot (in which case that matches only a dot).
  9583. -func_stripname ()
  9584. -{
  9585. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  9586. - # positional parameters, so assign one to ordinary parameter first.
  9587. - func_stripname_result=${3}
  9588. - func_stripname_result=${func_stripname_result#"${1}"}
  9589. - func_stripname_result=${func_stripname_result%"${2}"}
  9590. -}
  9591. -
  9592. -# func_opt_split
  9593. -func_opt_split ()
  9594. -{
  9595. - func_opt_split_opt=${1%%=*}
  9596. - func_opt_split_arg=${1#*=}
  9597. -}
  9598. -
  9599. -# func_lo2o object
  9600. -func_lo2o ()
  9601. -{
  9602. - case ${1} in
  9603. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  9604. - *) func_lo2o_result=${1} ;;
  9605. - esac
  9606. -}
  9607. -
  9608. -# func_xform libobj-or-source
  9609. -func_xform ()
  9610. -{
  9611. - func_xform_result=${1%.*}.lo
  9612. -}
  9613. -
  9614. -# func_arith arithmetic-term...
  9615. -func_arith ()
  9616. -{
  9617. - func_arith_result=$(( $* ))
  9618. -}
  9619. -
  9620. -# func_len string
  9621. -# STRING may not start with a hyphen.
  9622. -func_len ()
  9623. -{
  9624. - func_len_result=${#1}
  9625. -}
  9626. -
  9627. -_LT_EOF
  9628. - ;;
  9629. - *) # Bourne compatible functions.
  9630. - cat << \_LT_EOF >> "$cfgfile"
  9631. -
  9632. -# func_dirname file append nondir_replacement
  9633. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  9634. -# otherwise set result to NONDIR_REPLACEMENT.
  9635. -func_dirname ()
  9636. -{
  9637. - # Extract subdirectory from the argument.
  9638. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  9639. - if test "X$func_dirname_result" = "X${1}"; then
  9640. - func_dirname_result="${3}"
  9641. - else
  9642. - func_dirname_result="$func_dirname_result${2}"
  9643. - fi
  9644. -}
  9645. -
  9646. -# func_basename file
  9647. -func_basename ()
  9648. -{
  9649. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  9650. -}
  9651. -
  9652. -
  9653. -# func_stripname prefix suffix name
  9654. -# strip PREFIX and SUFFIX off of NAME.
  9655. -# PREFIX and SUFFIX must not contain globbing or regex special
  9656. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  9657. -# dot (in which case that matches only a dot).
  9658. -# func_strip_suffix prefix name
  9659. -func_stripname ()
  9660. -{
  9661. - case ${2} in
  9662. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  9663. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  9664. - esac
  9665. -}
  9666. -
  9667. -# sed scripts:
  9668. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  9669. -my_sed_long_arg='1s/^-[^=]*=//'
  9670. -
  9671. -# func_opt_split
  9672. -func_opt_split ()
  9673. -{
  9674. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  9675. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  9676. -}
  9677. -
  9678. -# func_lo2o object
  9679. -func_lo2o ()
  9680. -{
  9681. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  9682. -}
  9683. -
  9684. -# func_xform libobj-or-source
  9685. -func_xform ()
  9686. -{
  9687. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  9688. -}
  9689. -
  9690. -# func_arith arithmetic-term...
  9691. -func_arith ()
  9692. -{
  9693. - func_arith_result=`expr "$@"`
  9694. -}
  9695. -
  9696. -# func_len string
  9697. -# STRING may not start with a hyphen.
  9698. -func_len ()
  9699. -{
  9700. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  9701. -}
  9702. -
  9703. -_LT_EOF
  9704. -esac
  9705. -
  9706. -case $lt_shell_append in
  9707. - yes)
  9708. - cat << \_LT_EOF >> "$cfgfile"
  9709. -
  9710. -# func_append var value
  9711. -# Append VALUE to the end of shell variable VAR.
  9712. -func_append ()
  9713. -{
  9714. - eval "$1+=\$2"
  9715. -}
  9716. -_LT_EOF
  9717. - ;;
  9718. - *)
  9719. - cat << \_LT_EOF >> "$cfgfile"
  9720. -
  9721. -# func_append var value
  9722. -# Append VALUE to the end of shell variable VAR.
  9723. -func_append ()
  9724. -{
  9725. - eval "$1=\$$1\$2"
  9726. -}
  9727. -
  9728. -_LT_EOF
  9729. - ;;
  9730. - esac
  9731. -
  9732. -
  9733. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  9734. - || (rm -f "$cfgfile"; exit 1)
  9735. -
  9736. - mv -f "$cfgfile" "$ofile" ||
  9737. + sed '$q' "$ltmain" >> "$cfgfile" \
  9738. + || (rm -f "$cfgfile"; exit 1)
  9739. +
  9740. + if test x"$xsi_shell" = xyes; then
  9741. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  9742. +func_dirname ()\
  9743. +{\
  9744. +\ case ${1} in\
  9745. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  9746. +\ * ) func_dirname_result="${3}" ;;\
  9747. +\ esac\
  9748. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  9749. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9750. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9751. +test 0 -eq $? || _lt_function_replace_fail=:
  9752. +
  9753. +
  9754. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  9755. +func_basename ()\
  9756. +{\
  9757. +\ func_basename_result="${1##*/}"\
  9758. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  9759. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9760. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9761. +test 0 -eq $? || _lt_function_replace_fail=:
  9762. +
  9763. +
  9764. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  9765. +func_dirname_and_basename ()\
  9766. +{\
  9767. +\ case ${1} in\
  9768. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  9769. +\ * ) func_dirname_result="${3}" ;;\
  9770. +\ esac\
  9771. +\ func_basename_result="${1##*/}"\
  9772. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  9773. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9774. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9775. +test 0 -eq $? || _lt_function_replace_fail=:
  9776. +
  9777. +
  9778. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  9779. +func_stripname ()\
  9780. +{\
  9781. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  9782. +\ # positional parameters, so assign one to ordinary parameter first.\
  9783. +\ func_stripname_result=${3}\
  9784. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  9785. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  9786. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  9787. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9788. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9789. +test 0 -eq $? || _lt_function_replace_fail=:
  9790. +
  9791. +
  9792. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  9793. +func_split_long_opt ()\
  9794. +{\
  9795. +\ func_split_long_opt_name=${1%%=*}\
  9796. +\ func_split_long_opt_arg=${1#*=}\
  9797. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  9798. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9799. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9800. +test 0 -eq $? || _lt_function_replace_fail=:
  9801. +
  9802. +
  9803. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  9804. +func_split_short_opt ()\
  9805. +{\
  9806. +\ func_split_short_opt_arg=${1#??}\
  9807. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  9808. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  9809. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9810. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9811. +test 0 -eq $? || _lt_function_replace_fail=:
  9812. +
  9813. +
  9814. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  9815. +func_lo2o ()\
  9816. +{\
  9817. +\ case ${1} in\
  9818. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  9819. +\ *) func_lo2o_result=${1} ;;\
  9820. +\ esac\
  9821. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  9822. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9823. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9824. +test 0 -eq $? || _lt_function_replace_fail=:
  9825. +
  9826. +
  9827. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  9828. +func_xform ()\
  9829. +{\
  9830. + func_xform_result=${1%.*}.lo\
  9831. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  9832. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9833. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9834. +test 0 -eq $? || _lt_function_replace_fail=:
  9835. +
  9836. +
  9837. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  9838. +func_arith ()\
  9839. +{\
  9840. + func_arith_result=$(( $* ))\
  9841. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  9842. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9843. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9844. +test 0 -eq $? || _lt_function_replace_fail=:
  9845. +
  9846. +
  9847. + sed -e '/^func_len ()$/,/^} # func_len /c\
  9848. +func_len ()\
  9849. +{\
  9850. + func_len_result=${#1}\
  9851. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  9852. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9853. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9854. +test 0 -eq $? || _lt_function_replace_fail=:
  9855. +
  9856. +fi
  9857. +
  9858. +if test x"$lt_shell_append" = xyes; then
  9859. + sed -e '/^func_append ()$/,/^} # func_append /c\
  9860. +func_append ()\
  9861. +{\
  9862. + eval "${1}+=\\${2}"\
  9863. +} # Extended-shell func_append 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_append_quoted ()$/,/^} # func_append_quoted /c\
  9870. +func_append_quoted ()\
  9871. +{\
  9872. +\ func_quote_for_eval "${2}"\
  9873. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  9874. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  9875. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9876. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9877. +test 0 -eq $? || _lt_function_replace_fail=:
  9878. +
  9879. +
  9880. + # Save a `func_append' function call where possible by direct use of '+='
  9881. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  9882. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9883. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9884. + test 0 -eq $? || _lt_function_replace_fail=:
  9885. +else
  9886. + # Save a `func_append' function call even when '+=' is not available
  9887. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  9888. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  9889. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  9890. + test 0 -eq $? || _lt_function_replace_fail=:
  9891. +fi
  9892. +
  9893. +if test x"$_lt_function_replace_fail" = x":"; then
  9894. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  9895. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  9896. +fi
  9897. +
  9898. +
  9899. + mv -f "$cfgfile" "$ofile" ||
  9900. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  9901. chmod +x "$ofile"
  9902. @@ -19481,12 +20322,12 @@ with_gcc=$GCC_CXX
  9903. # Compiler flag to turn off builtin functions.
  9904. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  9905. -# How to pass a linker flag through the compiler.
  9906. -wl=$lt_lt_prog_compiler_wl_CXX
  9907. -
  9908. # Additional compiler flags for building library objects.
  9909. pic_flag=$lt_lt_prog_compiler_pic_CXX
  9910. +# How to pass a linker flag through the compiler.
  9911. +wl=$lt_lt_prog_compiler_wl_CXX
  9912. +
  9913. # Compiler flag to prevent dynamic linking.
  9914. link_static_flag=$lt_lt_prog_compiler_static_CXX
  9915. @@ -19573,9 +20414,6 @@ inherit_rpath=$inherit_rpath_CXX
  9916. # Whether libtool must link a program against all its dependency libraries.
  9917. link_all_deplibs=$link_all_deplibs_CXX
  9918. -# Fix the shell variable \$srcfile for the compiler.
  9919. -fix_srcfile_path=$lt_fix_srcfile_path_CXX
  9920. -
  9921. # Set to "yes" if exported symbols are required.
  9922. always_export_symbols=$always_export_symbols_CXX
  9923. @@ -19591,6 +20429,9 @@ include_expsyms=$lt_include_expsyms_CXX
  9924. # Commands necessary for linking programs (against libraries) with templates.
  9925. prelink_cmds=$lt_prelink_cmds_CXX
  9926. +# Commands necessary for finishing linking programs.
  9927. +postlink_cmds=$lt_postlink_cmds_CXX
  9928. +
  9929. # Specify filename containing input files.
  9930. file_list_spec=$lt_file_list_spec_CXX
  9931. diff --git a/libctf/configure b/libctf/configure
  9932. index 82bcf13a606..a7fb723a145 100755
  9933. --- a/libctf/configure
  9934. +++ b/libctf/configure
  9935. @@ -666,6 +666,8 @@ OTOOL
  9936. LIPO
  9937. NMEDIT
  9938. DSYMUTIL
  9939. +MANIFEST_TOOL
  9940. +DLLTOOL
  9941. OBJDUMP
  9942. LN_S
  9943. NM
  9944. @@ -797,6 +799,7 @@ enable_static
  9945. with_pic
  9946. enable_fast_install
  9947. with_gnu_ld
  9948. +with_libtool_sysroot
  9949. enable_libtool_lock
  9950. enable_largefile
  9951. enable_werror_always
  9952. @@ -1460,6 +1463,8 @@ Optional Packages:
  9953. --with-pic try to use only PIC/non-PIC objects [default=use
  9954. both]
  9955. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  9956. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  9957. + (or the compiler's sysroot if not specified).
  9958. --with-system-zlib use installed libz
  9959. Some influential environment variables:
  9960. @@ -5529,8 +5534,8 @@ esac
  9961. -macro_version='2.2.7a'
  9962. -macro_revision='1.3134'
  9963. +macro_version='2.4'
  9964. +macro_revision='1.3293'
  9965. @@ -5570,7 +5575,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  9966. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  9967. $as_echo_n "checking how to print strings... " >&6; }
  9968. # Test print first, because it will be a builtin if present.
  9969. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  9970. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  9971. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  9972. ECHO='print -r --'
  9973. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  9974. @@ -6256,8 +6261,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  9975. # Try some XSI features
  9976. xsi_shell=no
  9977. ( _lt_dummy="a/b/c"
  9978. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  9979. - = c,a/b,, \
  9980. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  9981. + = c,a/b,b/c, \
  9982. && eval 'test $(( 1 + 1 )) -eq 2 \
  9983. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  9984. && xsi_shell=yes
  9985. @@ -6306,6 +6311,80 @@ esac
  9986. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  9987. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  9988. +if ${lt_cv_to_host_file_cmd+:} false; then :
  9989. + $as_echo_n "(cached) " >&6
  9990. +else
  9991. + case $host in
  9992. + *-*-mingw* )
  9993. + case $build in
  9994. + *-*-mingw* ) # actually msys
  9995. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  9996. + ;;
  9997. + *-*-cygwin* )
  9998. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  9999. + ;;
  10000. + * ) # otherwise, assume *nix
  10001. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  10002. + ;;
  10003. + esac
  10004. + ;;
  10005. + *-*-cygwin* )
  10006. + case $build in
  10007. + *-*-mingw* ) # actually msys
  10008. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  10009. + ;;
  10010. + *-*-cygwin* )
  10011. + lt_cv_to_host_file_cmd=func_convert_file_noop
  10012. + ;;
  10013. + * ) # otherwise, assume *nix
  10014. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  10015. + ;;
  10016. + esac
  10017. + ;;
  10018. + * ) # unhandled hosts (and "normal" native builds)
  10019. + lt_cv_to_host_file_cmd=func_convert_file_noop
  10020. + ;;
  10021. +esac
  10022. +
  10023. +fi
  10024. +
  10025. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  10026. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  10027. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  10028. +
  10029. +
  10030. +
  10031. +
  10032. +
  10033. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  10034. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  10035. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  10036. + $as_echo_n "(cached) " >&6
  10037. +else
  10038. + #assume ordinary cross tools, or native build.
  10039. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  10040. +case $host in
  10041. + *-*-mingw* )
  10042. + case $build in
  10043. + *-*-mingw* ) # actually msys
  10044. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  10045. + ;;
  10046. + esac
  10047. + ;;
  10048. +esac
  10049. +
  10050. +fi
  10051. +
  10052. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  10053. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  10054. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  10055. +
  10056. +
  10057. +
  10058. +
  10059. +
  10060. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  10061. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  10062. if ${lt_cv_ld_reload_flag+:} false; then :
  10063. @@ -6322,6 +6401,11 @@ case $reload_flag in
  10064. esac
  10065. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  10066. case $host_os in
  10067. + cygwin* | mingw* | pw32* | cegcc*)
  10068. + if test "$GCC" != yes; then
  10069. + reload_cmds=false
  10070. + fi
  10071. + ;;
  10072. darwin*)
  10073. if test "$GCC" = yes; then
  10074. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  10075. @@ -6490,7 +6574,8 @@ mingw* | pw32*)
  10076. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  10077. lt_cv_file_magic_cmd='func_win32_libid'
  10078. else
  10079. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  10080. + # Keep this pattern in sync with the one in func_win32_libid.
  10081. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  10082. lt_cv_file_magic_cmd='$OBJDUMP -f'
  10083. fi
  10084. ;;
  10085. @@ -6644,6 +6729,21 @@ esac
  10086. fi
  10087. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  10088. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  10089. +
  10090. +file_magic_glob=
  10091. +want_nocaseglob=no
  10092. +if test "$build" = "$host"; then
  10093. + case $host_os in
  10094. + mingw* | pw32*)
  10095. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  10096. + want_nocaseglob=yes
  10097. + else
  10098. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  10099. + fi
  10100. + ;;
  10101. + esac
  10102. +fi
  10103. +
  10104. file_magic_cmd=$lt_cv_file_magic_cmd
  10105. deplibs_check_method=$lt_cv_deplibs_check_method
  10106. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  10107. @@ -6659,6 +6759,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  10108. +
  10109. +
  10110. +
  10111. +
  10112. +
  10113. +
  10114. +
  10115. +
  10116. +
  10117. +
  10118. +if test -n "$ac_tool_prefix"; then
  10119. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  10120. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  10121. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10122. +$as_echo_n "checking for $ac_word... " >&6; }
  10123. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  10124. + $as_echo_n "(cached) " >&6
  10125. +else
  10126. + if test -n "$DLLTOOL"; then
  10127. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  10128. +else
  10129. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10130. +for as_dir in $PATH
  10131. +do
  10132. + IFS=$as_save_IFS
  10133. + test -z "$as_dir" && as_dir=.
  10134. + for ac_exec_ext in '' $ac_executable_extensions; do
  10135. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10136. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  10137. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10138. + break 2
  10139. + fi
  10140. +done
  10141. + done
  10142. +IFS=$as_save_IFS
  10143. +
  10144. +fi
  10145. +fi
  10146. +DLLTOOL=$ac_cv_prog_DLLTOOL
  10147. +if test -n "$DLLTOOL"; then
  10148. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  10149. +$as_echo "$DLLTOOL" >&6; }
  10150. +else
  10151. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10152. +$as_echo "no" >&6; }
  10153. +fi
  10154. +
  10155. +
  10156. +fi
  10157. +if test -z "$ac_cv_prog_DLLTOOL"; then
  10158. + ac_ct_DLLTOOL=$DLLTOOL
  10159. + # Extract the first word of "dlltool", so it can be a program name with args.
  10160. +set dummy dlltool; ac_word=$2
  10161. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10162. +$as_echo_n "checking for $ac_word... " >&6; }
  10163. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  10164. + $as_echo_n "(cached) " >&6
  10165. +else
  10166. + if test -n "$ac_ct_DLLTOOL"; then
  10167. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  10168. +else
  10169. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10170. +for as_dir in $PATH
  10171. +do
  10172. + IFS=$as_save_IFS
  10173. + test -z "$as_dir" && as_dir=.
  10174. + for ac_exec_ext in '' $ac_executable_extensions; do
  10175. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10176. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  10177. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10178. + break 2
  10179. + fi
  10180. +done
  10181. + done
  10182. +IFS=$as_save_IFS
  10183. +
  10184. +fi
  10185. +fi
  10186. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  10187. +if test -n "$ac_ct_DLLTOOL"; then
  10188. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  10189. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  10190. +else
  10191. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10192. +$as_echo "no" >&6; }
  10193. +fi
  10194. +
  10195. + if test "x$ac_ct_DLLTOOL" = x; then
  10196. + DLLTOOL="false"
  10197. + else
  10198. + case $cross_compiling:$ac_tool_warned in
  10199. +yes:)
  10200. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  10201. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  10202. +ac_tool_warned=yes ;;
  10203. +esac
  10204. + DLLTOOL=$ac_ct_DLLTOOL
  10205. + fi
  10206. +else
  10207. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  10208. +fi
  10209. +
  10210. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  10211. +
  10212. +
  10213. +
  10214. +
  10215. +
  10216. +
  10217. +
  10218. +
  10219. +
  10220. +
  10221. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  10222. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  10223. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  10224. + $as_echo_n "(cached) " >&6
  10225. +else
  10226. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  10227. +
  10228. +case $host_os in
  10229. +cygwin* | mingw* | pw32* | cegcc*)
  10230. + # two different shell functions defined in ltmain.sh
  10231. + # decide which to use based on capabilities of $DLLTOOL
  10232. + case `$DLLTOOL --help 2>&1` in
  10233. + *--identify-strict*)
  10234. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  10235. + ;;
  10236. + *)
  10237. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  10238. + ;;
  10239. + esac
  10240. + ;;
  10241. +*)
  10242. + # fallback: assume linklib IS sharedlib
  10243. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  10244. + ;;
  10245. +esac
  10246. +
  10247. +fi
  10248. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  10249. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  10250. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  10251. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  10252. +
  10253. +
  10254. +
  10255. +
  10256. +
  10257. +
  10258. +
  10259. plugin_option=
  10260. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  10261. for plugin in $plugin_names; do
  10262. @@ -6673,8 +6924,10 @@ for plugin in $plugin_names; do
  10263. done
  10264. if test -n "$ac_tool_prefix"; then
  10265. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  10266. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  10267. + for ac_prog in ar
  10268. + do
  10269. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  10270. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  10271. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10272. $as_echo_n "checking for $ac_word... " >&6; }
  10273. if ${ac_cv_prog_AR+:} false; then :
  10274. @@ -6690,7 +6943,7 @@ do
  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_AR="${ac_tool_prefix}ar"
  10279. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  10280. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10281. break 2
  10282. fi
  10283. @@ -6710,11 +6963,15 @@ $as_echo "no" >&6; }
  10284. fi
  10285. + test -n "$AR" && break
  10286. + done
  10287. fi
  10288. -if test -z "$ac_cv_prog_AR"; then
  10289. +if test -z "$AR"; then
  10290. ac_ct_AR=$AR
  10291. - # Extract the first word of "ar", so it can be a program name with args.
  10292. -set dummy ar; ac_word=$2
  10293. + for ac_prog in ar
  10294. +do
  10295. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  10296. +set dummy $ac_prog; ac_word=$2
  10297. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10298. $as_echo_n "checking for $ac_word... " >&6; }
  10299. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  10300. @@ -6730,7 +6987,7 @@ do
  10301. test -z "$as_dir" && as_dir=.
  10302. for ac_exec_ext in '' $ac_executable_extensions; do
  10303. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10304. - ac_cv_prog_ac_ct_AR="ar"
  10305. + ac_cv_prog_ac_ct_AR="$ac_prog"
  10306. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10307. break 2
  10308. fi
  10309. @@ -6749,6 +7006,10 @@ else
  10310. $as_echo "no" >&6; }
  10311. fi
  10312. +
  10313. + test -n "$ac_ct_AR" && break
  10314. +done
  10315. +
  10316. if test "x$ac_ct_AR" = x; then
  10317. AR="false"
  10318. else
  10319. @@ -6760,25 +7021,19 @@ ac_tool_warned=yes ;;
  10320. esac
  10321. AR=$ac_ct_AR
  10322. fi
  10323. -else
  10324. - AR="$ac_cv_prog_AR"
  10325. fi
  10326. -test -z "$AR" && AR=ar
  10327. -if test -n "$plugin_option"; then
  10328. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  10329. - touch conftest.c
  10330. - $AR $plugin_option rc conftest.a conftest.c
  10331. - if test "$?" != 0; then
  10332. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  10333. + touch conftest.c
  10334. + $AR $plugin_option rc conftest.a conftest.c
  10335. + if test "$?" != 0; then
  10336. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  10337. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  10338. - else
  10339. - AR="$AR $plugin_option"
  10340. - fi
  10341. - rm -f conftest.*
  10342. + else
  10343. + AR="$AR $plugin_option"
  10344. fi
  10345. -fi
  10346. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  10347. + rm -f conftest.*
  10348. +: ${AR=ar}
  10349. +: ${AR_FLAGS=cru}
  10350. @@ -6790,6 +7045,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  10351. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  10352. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  10353. +if ${lt_cv_ar_at_file+:} false; then :
  10354. + $as_echo_n "(cached) " >&6
  10355. +else
  10356. + lt_cv_ar_at_file=no
  10357. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10358. +/* end confdefs.h. */
  10359. +
  10360. +int
  10361. +main ()
  10362. +{
  10363. +
  10364. + ;
  10365. + return 0;
  10366. +}
  10367. +_ACEOF
  10368. +if ac_fn_c_try_compile "$LINENO"; then :
  10369. + echo conftest.$ac_objext > conftest.lst
  10370. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  10371. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  10372. + (eval $lt_ar_try) 2>&5
  10373. + ac_status=$?
  10374. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  10375. + test $ac_status = 0; }
  10376. + if test "$ac_status" -eq 0; then
  10377. + # Ensure the archiver fails upon bogus file names.
  10378. + rm -f conftest.$ac_objext libconftest.a
  10379. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  10380. + (eval $lt_ar_try) 2>&5
  10381. + ac_status=$?
  10382. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  10383. + test $ac_status = 0; }
  10384. + if test "$ac_status" -ne 0; then
  10385. + lt_cv_ar_at_file=@
  10386. + fi
  10387. + fi
  10388. + rm -f conftest.* libconftest.a
  10389. +
  10390. +fi
  10391. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  10392. +
  10393. +fi
  10394. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  10395. +$as_echo "$lt_cv_ar_at_file" >&6; }
  10396. +
  10397. +if test "x$lt_cv_ar_at_file" = xno; then
  10398. + archiver_list_spec=
  10399. +else
  10400. + archiver_list_spec=$lt_cv_ar_at_file
  10401. +fi
  10402. +
  10403. +
  10404. +
  10405. +
  10406. +
  10407. +
  10408. +
  10409. if test -n "$ac_tool_prefix"; then
  10410. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  10411. set dummy ${ac_tool_prefix}strip; ac_word=$2
  10412. @@ -7129,8 +7442,8 @@ esac
  10413. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  10414. # Transform an extracted symbol line into symbol name and symbol address
  10415. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  10416. -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'"
  10417. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  10418. +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'"
  10419. # Handle CRLF in mingw tool chain
  10420. opt_cr=
  10421. @@ -7166,6 +7479,7 @@ for ac_symprfx in "" "_"; do
  10422. else
  10423. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  10424. fi
  10425. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  10426. # Check to see that the pipe works correctly.
  10427. pipe_works=no
  10428. @@ -7207,6 +7521,18 @@ _LT_EOF
  10429. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  10430. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  10431. cat <<_LT_EOF > conftest.$ac_ext
  10432. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  10433. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  10434. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  10435. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  10436. +# define LT_DLSYM_CONST
  10437. +#elif defined(__osf__)
  10438. +/* This system does not cope well with relocations in const data. */
  10439. +# define LT_DLSYM_CONST
  10440. +#else
  10441. +# define LT_DLSYM_CONST const
  10442. +#endif
  10443. +
  10444. #ifdef __cplusplus
  10445. extern "C" {
  10446. #endif
  10447. @@ -7218,7 +7544,7 @@ _LT_EOF
  10448. cat <<_LT_EOF >> conftest.$ac_ext
  10449. /* The mapping between symbol names and symbols. */
  10450. -const struct {
  10451. +LT_DLSYM_CONST struct {
  10452. const char *name;
  10453. void *address;
  10454. }
  10455. @@ -7244,8 +7570,8 @@ static const void *lt_preloaded_setup() {
  10456. _LT_EOF
  10457. # Now try linking the two files.
  10458. mv conftest.$ac_objext conftstm.$ac_objext
  10459. - lt_save_LIBS="$LIBS"
  10460. - lt_save_CFLAGS="$CFLAGS"
  10461. + lt_globsym_save_LIBS=$LIBS
  10462. + lt_globsym_save_CFLAGS=$CFLAGS
  10463. LIBS="conftstm.$ac_objext"
  10464. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  10465. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  10466. @@ -7255,8 +7581,8 @@ _LT_EOF
  10467. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  10468. pipe_works=yes
  10469. fi
  10470. - LIBS="$lt_save_LIBS"
  10471. - CFLAGS="$lt_save_CFLAGS"
  10472. + LIBS=$lt_globsym_save_LIBS
  10473. + CFLAGS=$lt_globsym_save_CFLAGS
  10474. else
  10475. echo "cannot find nm_test_func in $nlist" >&5
  10476. fi
  10477. @@ -7293,6 +7619,14 @@ else
  10478. $as_echo "ok" >&6; }
  10479. fi
  10480. +# Response file support.
  10481. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  10482. + nm_file_list_spec='@'
  10483. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  10484. + nm_file_list_spec='@'
  10485. +fi
  10486. +
  10487. +
  10488. @@ -7311,6 +7645,47 @@ fi
  10489. +
  10490. +
  10491. +
  10492. +
  10493. +
  10494. +
  10495. +
  10496. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  10497. +$as_echo_n "checking for sysroot... " >&6; }
  10498. +
  10499. +# Check whether --with-libtool-sysroot was given.
  10500. +if test "${with_libtool_sysroot+set}" = set; then :
  10501. + withval=$with_libtool_sysroot;
  10502. +else
  10503. + with_libtool_sysroot=no
  10504. +fi
  10505. +
  10506. +
  10507. +lt_sysroot=
  10508. +case ${with_libtool_sysroot} in #(
  10509. + yes)
  10510. + if test "$GCC" = yes; then
  10511. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  10512. + fi
  10513. + ;; #(
  10514. + /*)
  10515. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  10516. + ;; #(
  10517. + no|'')
  10518. + ;; #(
  10519. + *)
  10520. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  10521. +$as_echo "${with_libtool_sysroot}" >&6; }
  10522. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  10523. + ;;
  10524. +esac
  10525. +
  10526. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  10527. +$as_echo "${lt_sysroot:-no}" >&6; }
  10528. +
  10529. +
  10530. @@ -7520,6 +7895,123 @@ esac
  10531. need_locks="$enable_libtool_lock"
  10532. +if test -n "$ac_tool_prefix"; then
  10533. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  10534. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  10535. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10536. +$as_echo_n "checking for $ac_word... " >&6; }
  10537. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  10538. + $as_echo_n "(cached) " >&6
  10539. +else
  10540. + if test -n "$MANIFEST_TOOL"; then
  10541. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  10542. +else
  10543. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10544. +for as_dir in $PATH
  10545. +do
  10546. + IFS=$as_save_IFS
  10547. + test -z "$as_dir" && as_dir=.
  10548. + for ac_exec_ext in '' $ac_executable_extensions; do
  10549. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10550. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  10551. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10552. + break 2
  10553. + fi
  10554. +done
  10555. + done
  10556. +IFS=$as_save_IFS
  10557. +
  10558. +fi
  10559. +fi
  10560. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  10561. +if test -n "$MANIFEST_TOOL"; then
  10562. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  10563. +$as_echo "$MANIFEST_TOOL" >&6; }
  10564. +else
  10565. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10566. +$as_echo "no" >&6; }
  10567. +fi
  10568. +
  10569. +
  10570. +fi
  10571. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  10572. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  10573. + # Extract the first word of "mt", so it can be a program name with args.
  10574. +set dummy mt; ac_word=$2
  10575. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  10576. +$as_echo_n "checking for $ac_word... " >&6; }
  10577. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  10578. + $as_echo_n "(cached) " >&6
  10579. +else
  10580. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  10581. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  10582. +else
  10583. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  10584. +for as_dir in $PATH
  10585. +do
  10586. + IFS=$as_save_IFS
  10587. + test -z "$as_dir" && as_dir=.
  10588. + for ac_exec_ext in '' $ac_executable_extensions; do
  10589. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  10590. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  10591. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  10592. + break 2
  10593. + fi
  10594. +done
  10595. + done
  10596. +IFS=$as_save_IFS
  10597. +
  10598. +fi
  10599. +fi
  10600. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  10601. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  10602. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  10603. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  10604. +else
  10605. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  10606. +$as_echo "no" >&6; }
  10607. +fi
  10608. +
  10609. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  10610. + MANIFEST_TOOL=":"
  10611. + else
  10612. + case $cross_compiling:$ac_tool_warned in
  10613. +yes:)
  10614. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  10615. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  10616. +ac_tool_warned=yes ;;
  10617. +esac
  10618. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  10619. + fi
  10620. +else
  10621. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  10622. +fi
  10623. +
  10624. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  10625. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  10626. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  10627. +if ${lt_cv_path_mainfest_tool+:} false; then :
  10628. + $as_echo_n "(cached) " >&6
  10629. +else
  10630. + lt_cv_path_mainfest_tool=no
  10631. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  10632. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  10633. + cat conftest.err >&5
  10634. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  10635. + lt_cv_path_mainfest_tool=yes
  10636. + fi
  10637. + rm -f conftest*
  10638. +fi
  10639. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  10640. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  10641. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  10642. + MANIFEST_TOOL=:
  10643. +fi
  10644. +
  10645. +
  10646. +
  10647. +
  10648. +
  10649. case $host_os in
  10650. rhapsody* | darwin*)
  10651. @@ -8083,6 +8575,8 @@ _LT_EOF
  10652. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  10653. echo "$AR cru libconftest.a conftest.o" >&5
  10654. $AR cru libconftest.a conftest.o 2>&5
  10655. + echo "$RANLIB libconftest.a" >&5
  10656. + $RANLIB libconftest.a 2>&5
  10657. cat > conftest.c << _LT_EOF
  10658. int main() { return 0;}
  10659. _LT_EOF
  10660. @@ -8248,7 +8742,8 @@ fi
  10661. LIBTOOL_DEPS="$ltmain"
  10662. # Always use our own libtool.
  10663. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  10664. +LIBTOOL='$(SHELL) $(top_builddir)'
  10665. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  10666. @@ -8337,7 +8832,7 @@ aix3*)
  10667. esac
  10668. # Global variables:
  10669. -ofile=libtool
  10670. +ofile=${host_alias}-libtool
  10671. can_build_shared=yes
  10672. # All known linkers require a `.a' archive for static linking (except MSVC,
  10673. @@ -8635,8 +9130,6 @@ fi
  10674. lt_prog_compiler_pic=
  10675. lt_prog_compiler_static=
  10676. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  10677. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10678. if test "$GCC" = yes; then
  10679. lt_prog_compiler_wl='-Wl,'
  10680. @@ -8802,6 +9295,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10681. lt_prog_compiler_pic='--shared'
  10682. lt_prog_compiler_static='--static'
  10683. ;;
  10684. + nagfor*)
  10685. + # NAG Fortran compiler
  10686. + lt_prog_compiler_wl='-Wl,-Wl,,'
  10687. + lt_prog_compiler_pic='-PIC'
  10688. + lt_prog_compiler_static='-Bstatic'
  10689. + ;;
  10690. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  10691. # Portland Group compilers (*not* the Pentium gcc compiler,
  10692. # which looks to be a dead project)
  10693. @@ -8864,7 +9363,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10694. lt_prog_compiler_pic='-KPIC'
  10695. lt_prog_compiler_static='-Bstatic'
  10696. case $cc_basename in
  10697. - f77* | f90* | f95*)
  10698. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  10699. lt_prog_compiler_wl='-Qoption ld ';;
  10700. *)
  10701. lt_prog_compiler_wl='-Wl,';;
  10702. @@ -8921,13 +9420,17 @@ case $host_os in
  10703. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  10704. ;;
  10705. esac
  10706. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  10707. -$as_echo "$lt_prog_compiler_pic" >&6; }
  10708. -
  10709. -
  10710. -
  10711. -
  10712. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  10713. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  10714. +if ${lt_cv_prog_compiler_pic+:} false; then :
  10715. + $as_echo_n "(cached) " >&6
  10716. +else
  10717. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  10718. +fi
  10719. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  10720. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  10721. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  10722. #
  10723. # Check to make sure the PIC flag actually works.
  10724. @@ -8988,6 +9491,11 @@ fi
  10725. +
  10726. +
  10727. +
  10728. +
  10729. +
  10730. #
  10731. # Check to make sure the static flag actually works.
  10732. #
  10733. @@ -9338,7 +9846,8 @@ _LT_EOF
  10734. allow_undefined_flag=unsupported
  10735. always_export_symbols=no
  10736. enable_shared_with_static_runtimes=yes
  10737. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  10738. + 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'
  10739. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  10740. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  10741. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  10742. @@ -9437,12 +9946,12 @@ _LT_EOF
  10743. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  10744. hardcode_libdir_flag_spec=
  10745. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  10746. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  10747. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  10748. if test "x$supports_anon_versioning" = xyes; then
  10749. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  10750. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  10751. echo "local: *; };" >> $output_objdir/$libname.ver~
  10752. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  10753. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  10754. fi
  10755. ;;
  10756. esac
  10757. @@ -9456,8 +9965,8 @@ _LT_EOF
  10758. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  10759. wlarc=
  10760. else
  10761. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10762. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10763. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10764. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10765. fi
  10766. ;;
  10767. @@ -9475,8 +9984,8 @@ _LT_EOF
  10768. _LT_EOF
  10769. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  10770. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10771. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10772. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10773. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10774. else
  10775. ld_shlibs=no
  10776. fi
  10777. @@ -9522,8 +10031,8 @@ _LT_EOF
  10778. *)
  10779. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  10780. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10781. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10782. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  10783. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  10784. else
  10785. ld_shlibs=no
  10786. fi
  10787. @@ -9653,7 +10162,13 @@ _LT_EOF
  10788. allow_undefined_flag='-berok'
  10789. # Determine the default libpath from the value encoded in an
  10790. # empty executable.
  10791. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10792. + if test "${lt_cv_aix_libpath+set}" = set; then
  10793. + aix_libpath=$lt_cv_aix_libpath
  10794. +else
  10795. + if ${lt_cv_aix_libpath_+:} false; then :
  10796. + $as_echo_n "(cached) " >&6
  10797. +else
  10798. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10799. /* end confdefs.h. */
  10800. int
  10801. @@ -9666,22 +10181,29 @@ main ()
  10802. _ACEOF
  10803. if ac_fn_c_try_link "$LINENO"; then :
  10804. -lt_aix_libpath_sed='
  10805. - /Import File Strings/,/^$/ {
  10806. - /^0/ {
  10807. - s/^0 *\(.*\)$/\1/
  10808. - p
  10809. - }
  10810. - }'
  10811. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10812. -# Check for a 64-bit object if we didn't find anything.
  10813. -if test -z "$aix_libpath"; then
  10814. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10815. -fi
  10816. + lt_aix_libpath_sed='
  10817. + /Import File Strings/,/^$/ {
  10818. + /^0/ {
  10819. + s/^0 *\([^ ]*\) *$/\1/
  10820. + p
  10821. + }
  10822. + }'
  10823. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10824. + # Check for a 64-bit object if we didn't find anything.
  10825. + if test -z "$lt_cv_aix_libpath_"; then
  10826. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10827. + fi
  10828. fi
  10829. rm -f core conftest.err conftest.$ac_objext \
  10830. conftest$ac_exeext conftest.$ac_ext
  10831. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10832. + if test -z "$lt_cv_aix_libpath_"; then
  10833. + lt_cv_aix_libpath_="/usr/lib:/lib"
  10834. + fi
  10835. +
  10836. +fi
  10837. +
  10838. + aix_libpath=$lt_cv_aix_libpath_
  10839. +fi
  10840. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  10841. 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"
  10842. @@ -9693,7 +10215,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10843. else
  10844. # Determine the default libpath from the value encoded in an
  10845. # empty executable.
  10846. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10847. + if test "${lt_cv_aix_libpath+set}" = set; then
  10848. + aix_libpath=$lt_cv_aix_libpath
  10849. +else
  10850. + if ${lt_cv_aix_libpath_+:} false; then :
  10851. + $as_echo_n "(cached) " >&6
  10852. +else
  10853. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10854. /* end confdefs.h. */
  10855. int
  10856. @@ -9706,22 +10234,29 @@ main ()
  10857. _ACEOF
  10858. if ac_fn_c_try_link "$LINENO"; then :
  10859. -lt_aix_libpath_sed='
  10860. - /Import File Strings/,/^$/ {
  10861. - /^0/ {
  10862. - s/^0 *\(.*\)$/\1/
  10863. - p
  10864. - }
  10865. - }'
  10866. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10867. -# Check for a 64-bit object if we didn't find anything.
  10868. -if test -z "$aix_libpath"; then
  10869. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10870. -fi
  10871. + lt_aix_libpath_sed='
  10872. + /Import File Strings/,/^$/ {
  10873. + /^0/ {
  10874. + s/^0 *\([^ ]*\) *$/\1/
  10875. + p
  10876. + }
  10877. + }'
  10878. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10879. + # Check for a 64-bit object if we didn't find anything.
  10880. + if test -z "$lt_cv_aix_libpath_"; then
  10881. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  10882. + fi
  10883. fi
  10884. rm -f core conftest.err conftest.$ac_objext \
  10885. conftest$ac_exeext conftest.$ac_ext
  10886. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10887. + if test -z "$lt_cv_aix_libpath_"; then
  10888. + lt_cv_aix_libpath_="/usr/lib:/lib"
  10889. + fi
  10890. +
  10891. +fi
  10892. +
  10893. + aix_libpath=$lt_cv_aix_libpath_
  10894. +fi
  10895. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  10896. # Warning - without using the other run time loading flags,
  10897. @@ -9766,20 +10301,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10898. # Microsoft Visual C++.
  10899. # hardcode_libdir_flag_spec is actually meaningless, as there is
  10900. # no search path for DLLs.
  10901. - hardcode_libdir_flag_spec=' '
  10902. - allow_undefined_flag=unsupported
  10903. - # Tell ltmain to make .lib files, not .a files.
  10904. - libext=lib
  10905. - # Tell ltmain to make .dll files, not .so files.
  10906. - shrext_cmds=".dll"
  10907. - # FIXME: Setting linknames here is a bad hack.
  10908. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  10909. - # The linker will automatically build a .lib file if we build a DLL.
  10910. - old_archive_from_new_cmds='true'
  10911. - # FIXME: Should let the user specify the lib program.
  10912. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  10913. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  10914. - enable_shared_with_static_runtimes=yes
  10915. + case $cc_basename in
  10916. + cl*)
  10917. + # Native MSVC
  10918. + hardcode_libdir_flag_spec=' '
  10919. + allow_undefined_flag=unsupported
  10920. + always_export_symbols=yes
  10921. + file_list_spec='@'
  10922. + # Tell ltmain to make .lib files, not .a files.
  10923. + libext=lib
  10924. + # Tell ltmain to make .dll files, not .so files.
  10925. + shrext_cmds=".dll"
  10926. + # FIXME: Setting linknames here is a bad hack.
  10927. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  10928. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  10929. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  10930. + else
  10931. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  10932. + fi~
  10933. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  10934. + linknames='
  10935. + # The linker will not automatically build a static lib if we build a DLL.
  10936. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  10937. + enable_shared_with_static_runtimes=yes
  10938. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  10939. + # Don't use ranlib
  10940. + old_postinstall_cmds='chmod 644 $oldlib'
  10941. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  10942. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  10943. + case $lt_outputfile in
  10944. + *.exe|*.EXE) ;;
  10945. + *)
  10946. + lt_outputfile="$lt_outputfile.exe"
  10947. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  10948. + ;;
  10949. + esac~
  10950. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  10951. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  10952. + $RM "$lt_outputfile.manifest";
  10953. + fi'
  10954. + ;;
  10955. + *)
  10956. + # Assume MSVC wrapper
  10957. + hardcode_libdir_flag_spec=' '
  10958. + allow_undefined_flag=unsupported
  10959. + # Tell ltmain to make .lib files, not .a files.
  10960. + libext=lib
  10961. + # Tell ltmain to make .dll files, not .so files.
  10962. + shrext_cmds=".dll"
  10963. + # FIXME: Setting linknames here is a bad hack.
  10964. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  10965. + # The linker will automatically build a .lib file if we build a DLL.
  10966. + old_archive_from_new_cmds='true'
  10967. + # FIXME: Should let the user specify the lib program.
  10968. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  10969. + enable_shared_with_static_runtimes=yes
  10970. + ;;
  10971. + esac
  10972. ;;
  10973. darwin* | rhapsody*)
  10974. @@ -9840,7 +10418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10975. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  10976. freebsd* | dragonfly*)
  10977. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  10978. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  10979. hardcode_libdir_flag_spec='-R$libdir'
  10980. hardcode_direct=yes
  10981. hardcode_shlibpath_var=no
  10982. @@ -9848,7 +10426,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10983. hpux9*)
  10984. if test "$GCC" = yes; then
  10985. - 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'
  10986. + 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'
  10987. else
  10988. 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'
  10989. fi
  10990. @@ -9864,7 +10442,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10991. hpux10*)
  10992. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  10993. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  10994. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  10995. else
  10996. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  10997. fi
  10998. @@ -9888,10 +10466,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  10999. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  11000. ;;
  11001. ia64*)
  11002. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  11003. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  11004. ;;
  11005. *)
  11006. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  11007. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  11008. ;;
  11009. esac
  11010. else
  11011. @@ -9970,23 +10548,36 @@ fi
  11012. irix5* | irix6* | nonstopux*)
  11013. if test "$GCC" = yes; then
  11014. - 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'
  11015. + 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'
  11016. # Try to use the -exported_symbol ld option, if it does not
  11017. # work, assume that -exports_file does not work either and
  11018. # implicitly export all symbols.
  11019. - save_LDFLAGS="$LDFLAGS"
  11020. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  11021. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11022. + # This should be the same for all languages, so no per-tag cache variable.
  11023. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  11024. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  11025. +if ${lt_cv_irix_exported_symbol+:} false; then :
  11026. + $as_echo_n "(cached) " >&6
  11027. +else
  11028. + save_LDFLAGS="$LDFLAGS"
  11029. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  11030. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  11031. /* end confdefs.h. */
  11032. -int foo(void) {}
  11033. +int foo (void) { return 0; }
  11034. _ACEOF
  11035. if ac_fn_c_try_link "$LINENO"; then :
  11036. - 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'
  11037. -
  11038. + lt_cv_irix_exported_symbol=yes
  11039. +else
  11040. + lt_cv_irix_exported_symbol=no
  11041. fi
  11042. rm -f core conftest.err conftest.$ac_objext \
  11043. conftest$ac_exeext conftest.$ac_ext
  11044. - LDFLAGS="$save_LDFLAGS"
  11045. + LDFLAGS="$save_LDFLAGS"
  11046. +fi
  11047. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  11048. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  11049. + if test "$lt_cv_irix_exported_symbol" = yes; then
  11050. + 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'
  11051. + fi
  11052. else
  11053. 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'
  11054. 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'
  11055. @@ -10071,7 +10662,7 @@ rm -f core conftest.err conftest.$ac_objext \
  11056. osf4* | osf5*) # as osf3* with the addition of -msym flag
  11057. if test "$GCC" = yes; then
  11058. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  11059. - 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'
  11060. + 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'
  11061. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  11062. else
  11063. allow_undefined_flag=' -expect_unresolved \*'
  11064. @@ -10090,9 +10681,9 @@ rm -f core conftest.err conftest.$ac_objext \
  11065. no_undefined_flag=' -z defs'
  11066. if test "$GCC" = yes; then
  11067. wlarc='${wl}'
  11068. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  11069. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  11070. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  11071. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  11072. + $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'
  11073. else
  11074. case `$CC -V 2>&1` in
  11075. *"Compilers 5.0"*)
  11076. @@ -10668,8 +11259,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  11077. need_version=no
  11078. need_lib_prefix=no
  11079. - case $GCC,$host_os in
  11080. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  11081. + case $GCC,$cc_basename in
  11082. + yes,*)
  11083. + # gcc
  11084. library_names_spec='$libname.dll.a'
  11085. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  11086. postinstall_cmds='base_file=`basename \${file}`~
  11087. @@ -10702,13 +11294,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  11088. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  11089. ;;
  11090. esac
  11091. + dynamic_linker='Win32 ld.exe'
  11092. + ;;
  11093. +
  11094. + *,cl*)
  11095. + # Native MSVC
  11096. + libname_spec='$name'
  11097. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  11098. + library_names_spec='${libname}.dll.lib'
  11099. +
  11100. + case $build_os in
  11101. + mingw*)
  11102. + sys_lib_search_path_spec=
  11103. + lt_save_ifs=$IFS
  11104. + IFS=';'
  11105. + for lt_path in $LIB
  11106. + do
  11107. + IFS=$lt_save_ifs
  11108. + # Let DOS variable expansion print the short 8.3 style file name.
  11109. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  11110. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  11111. + done
  11112. + IFS=$lt_save_ifs
  11113. + # Convert to MSYS style.
  11114. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  11115. + ;;
  11116. + cygwin*)
  11117. + # Convert to unix form, then to dos form, then back to unix form
  11118. + # but this time dos style (no spaces!) so that the unix form looks
  11119. + # like /cygdrive/c/PROGRA~1:/cygdr...
  11120. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  11121. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  11122. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  11123. + ;;
  11124. + *)
  11125. + sys_lib_search_path_spec="$LIB"
  11126. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  11127. + # It is most probably a Windows format PATH.
  11128. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  11129. + else
  11130. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  11131. + fi
  11132. + # FIXME: find the short name or the path components, as spaces are
  11133. + # common. (e.g. "Program Files" -> "PROGRA~1")
  11134. + ;;
  11135. + esac
  11136. +
  11137. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  11138. + postinstall_cmds='base_file=`basename \${file}`~
  11139. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  11140. + dldir=$destdir/`dirname \$dlpath`~
  11141. + test -d \$dldir || mkdir -p \$dldir~
  11142. + $install_prog $dir/$dlname \$dldir/$dlname'
  11143. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  11144. + dlpath=$dir/\$dldll~
  11145. + $RM \$dlpath'
  11146. + shlibpath_overrides_runpath=yes
  11147. + dynamic_linker='Win32 link.exe'
  11148. ;;
  11149. *)
  11150. + # Assume MSVC wrapper
  11151. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  11152. + dynamic_linker='Win32 ld.exe'
  11153. ;;
  11154. esac
  11155. - dynamic_linker='Win32 ld.exe'
  11156. # FIXME: first we should search . and the directory the executable is in
  11157. shlibpath_var=PATH
  11158. ;;
  11159. @@ -10790,7 +11440,7 @@ haiku*)
  11160. soname_spec='${libname}${release}${shared_ext}$major'
  11161. shlibpath_var=LIBRARY_PATH
  11162. shlibpath_overrides_runpath=yes
  11163. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  11164. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  11165. hardcode_into_libs=yes
  11166. ;;
  11167. @@ -11586,7 +12236,7 @@ else
  11168. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  11169. lt_status=$lt_dlunknown
  11170. cat > conftest.$ac_ext <<_LT_EOF
  11171. -#line 11589 "configure"
  11172. +#line $LINENO "configure"
  11173. #include "confdefs.h"
  11174. #if HAVE_DLFCN_H
  11175. @@ -11630,10 +12280,10 @@ else
  11176. /* When -fvisbility=hidden is used, assume the code has been annotated
  11177. correspondingly for the symbols needed. */
  11178. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  11179. -void fnord () __attribute__((visibility("default")));
  11180. +int fnord () __attribute__((visibility("default")));
  11181. #endif
  11182. -void fnord () { int i=42; }
  11183. +int fnord () { return 42; }
  11184. int main ()
  11185. {
  11186. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  11187. @@ -11692,7 +12342,7 @@ else
  11188. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  11189. lt_status=$lt_dlunknown
  11190. cat > conftest.$ac_ext <<_LT_EOF
  11191. -#line 11695 "configure"
  11192. +#line $LINENO "configure"
  11193. #include "confdefs.h"
  11194. #if HAVE_DLFCN_H
  11195. @@ -11736,10 +12386,10 @@ else
  11196. /* When -fvisbility=hidden is used, assume the code has been annotated
  11197. correspondingly for the symbols needed. */
  11198. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  11199. -void fnord () __attribute__((visibility("default")));
  11200. +int fnord () __attribute__((visibility("default")));
  11201. #endif
  11202. -void fnord () { int i=42; }
  11203. +int fnord () { return 42; }
  11204. int main ()
  11205. {
  11206. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  11207. @@ -14286,13 +14936,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  11208. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  11209. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  11210. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  11211. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  11212. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  11213. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  11214. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  11215. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  11216. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  11217. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  11218. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  11219. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  11220. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  11221. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  11222. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  11223. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  11224. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  11225. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  11226. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  11227. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  11228. @@ -14307,14 +14964,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  11229. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  11230. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  11231. 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"`'
  11232. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  11233. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  11234. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  11235. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  11236. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  11237. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  11238. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  11239. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  11240. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  11241. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  11242. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  11243. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  11244. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  11245. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  11246. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  11247. @@ -14347,12 +15007,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  11248. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  11249. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  11250. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  11251. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  11252. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  11253. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  11254. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  11255. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  11256. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  11257. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  11258. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  11259. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  11260. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  11261. @@ -14407,8 +15067,13 @@ reload_flag \
  11262. OBJDUMP \
  11263. deplibs_check_method \
  11264. file_magic_cmd \
  11265. +file_magic_glob \
  11266. +want_nocaseglob \
  11267. +DLLTOOL \
  11268. +sharedlib_from_linklib_cmd \
  11269. AR \
  11270. AR_FLAGS \
  11271. +archiver_list_spec \
  11272. STRIP \
  11273. RANLIB \
  11274. CC \
  11275. @@ -14418,12 +15083,14 @@ lt_cv_sys_global_symbol_pipe \
  11276. lt_cv_sys_global_symbol_to_cdecl \
  11277. lt_cv_sys_global_symbol_to_c_name_address \
  11278. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  11279. +nm_file_list_spec \
  11280. lt_prog_compiler_no_builtin_flag \
  11281. -lt_prog_compiler_wl \
  11282. lt_prog_compiler_pic \
  11283. +lt_prog_compiler_wl \
  11284. lt_prog_compiler_static \
  11285. lt_cv_prog_compiler_c_o \
  11286. need_locks \
  11287. +MANIFEST_TOOL \
  11288. DSYMUTIL \
  11289. NMEDIT \
  11290. LIPO \
  11291. @@ -14439,7 +15106,6 @@ no_undefined_flag \
  11292. hardcode_libdir_flag_spec \
  11293. hardcode_libdir_flag_spec_ld \
  11294. hardcode_libdir_separator \
  11295. -fix_srcfile_path \
  11296. exclude_expsyms \
  11297. include_expsyms \
  11298. file_list_spec \
  11299. @@ -14475,6 +15141,7 @@ module_cmds \
  11300. module_expsym_cmds \
  11301. export_symbols_cmds \
  11302. prelink_cmds \
  11303. +postlink_cmds \
  11304. postinstall_cmds \
  11305. postuninstall_cmds \
  11306. finish_cmds \
  11307. @@ -15231,7 +15898,8 @@ $as_echo X"$file" |
  11308. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  11309. #
  11310. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  11311. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  11312. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  11313. +# Inc.
  11314. # Written by Gordon Matzigkeit, 1996
  11315. #
  11316. # This file is part of GNU Libtool.
  11317. @@ -15334,19 +16002,42 @@ SP2NL=$lt_lt_SP2NL
  11318. # turn newlines into spaces.
  11319. NL2SP=$lt_lt_NL2SP
  11320. +# convert \$build file names to \$host format.
  11321. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  11322. +
  11323. +# convert \$build files to toolchain format.
  11324. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  11325. +
  11326. # An object symbol dumper.
  11327. OBJDUMP=$lt_OBJDUMP
  11328. # Method to check whether dependent libraries are shared objects.
  11329. deplibs_check_method=$lt_deplibs_check_method
  11330. -# Command to use when deplibs_check_method == "file_magic".
  11331. +# Command to use when deplibs_check_method = "file_magic".
  11332. file_magic_cmd=$lt_file_magic_cmd
  11333. +# How to find potential files when deplibs_check_method = "file_magic".
  11334. +file_magic_glob=$lt_file_magic_glob
  11335. +
  11336. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  11337. +want_nocaseglob=$lt_want_nocaseglob
  11338. +
  11339. +# DLL creation program.
  11340. +DLLTOOL=$lt_DLLTOOL
  11341. +
  11342. +# Command to associate shared and link libraries.
  11343. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  11344. +
  11345. # The archiver.
  11346. AR=$lt_AR
  11347. +
  11348. +# Flags to create an archive.
  11349. AR_FLAGS=$lt_AR_FLAGS
  11350. +# How to feed a file listing to the archiver.
  11351. +archiver_list_spec=$lt_archiver_list_spec
  11352. +
  11353. # A symbol stripping program.
  11354. STRIP=$lt_STRIP
  11355. @@ -15376,6 +16067,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  11356. # Transform the output of nm in a C name address pair when lib prefix is needed.
  11357. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  11358. +# Specify filename containing input files for \$NM.
  11359. +nm_file_list_spec=$lt_nm_file_list_spec
  11360. +
  11361. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  11362. +lt_sysroot=$lt_sysroot
  11363. +
  11364. # The name of the directory that contains temporary libtool files.
  11365. objdir=$objdir
  11366. @@ -15385,6 +16082,9 @@ MAGIC_CMD=$MAGIC_CMD
  11367. # Must we lock files when doing compilation?
  11368. need_locks=$lt_need_locks
  11369. +# Manifest tool.
  11370. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  11371. +
  11372. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  11373. DSYMUTIL=$lt_DSYMUTIL
  11374. @@ -15499,12 +16199,12 @@ with_gcc=$GCC
  11375. # Compiler flag to turn off builtin functions.
  11376. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  11377. -# How to pass a linker flag through the compiler.
  11378. -wl=$lt_lt_prog_compiler_wl
  11379. -
  11380. # Additional compiler flags for building library objects.
  11381. pic_flag=$lt_lt_prog_compiler_pic
  11382. +# How to pass a linker flag through the compiler.
  11383. +wl=$lt_lt_prog_compiler_wl
  11384. +
  11385. # Compiler flag to prevent dynamic linking.
  11386. link_static_flag=$lt_lt_prog_compiler_static
  11387. @@ -15591,9 +16291,6 @@ inherit_rpath=$inherit_rpath
  11388. # Whether libtool must link a program against all its dependency libraries.
  11389. link_all_deplibs=$link_all_deplibs
  11390. -# Fix the shell variable \$srcfile for the compiler.
  11391. -fix_srcfile_path=$lt_fix_srcfile_path
  11392. -
  11393. # Set to "yes" if exported symbols are required.
  11394. always_export_symbols=$always_export_symbols
  11395. @@ -15609,6 +16306,9 @@ include_expsyms=$lt_include_expsyms
  11396. # Commands necessary for linking programs (against libraries) with templates.
  11397. prelink_cmds=$lt_prelink_cmds
  11398. +# Commands necessary for finishing linking programs.
  11399. +postlink_cmds=$lt_postlink_cmds
  11400. +
  11401. # Specify filename containing input files.
  11402. file_list_spec=$lt_file_list_spec
  11403. @@ -15641,210 +16341,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  11404. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  11405. # text mode, it properly converts lines to CR/LF. This bash problem
  11406. # is reportedly fixed, but why not run on old versions too?
  11407. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  11408. - || (rm -f "$cfgfile"; exit 1)
  11409. -
  11410. - case $xsi_shell in
  11411. - yes)
  11412. - cat << \_LT_EOF >> "$cfgfile"
  11413. -
  11414. -# func_dirname file append nondir_replacement
  11415. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  11416. -# otherwise set result to NONDIR_REPLACEMENT.
  11417. -func_dirname ()
  11418. -{
  11419. - case ${1} in
  11420. - */*) func_dirname_result="${1%/*}${2}" ;;
  11421. - * ) func_dirname_result="${3}" ;;
  11422. - esac
  11423. -}
  11424. -
  11425. -# func_basename file
  11426. -func_basename ()
  11427. -{
  11428. - func_basename_result="${1##*/}"
  11429. -}
  11430. -
  11431. -# func_dirname_and_basename file append nondir_replacement
  11432. -# perform func_basename and func_dirname in a single function
  11433. -# call:
  11434. -# dirname: Compute the dirname of FILE. If nonempty,
  11435. -# add APPEND to the result, otherwise set result
  11436. -# to NONDIR_REPLACEMENT.
  11437. -# value returned in "$func_dirname_result"
  11438. -# basename: Compute filename of FILE.
  11439. -# value retuned in "$func_basename_result"
  11440. -# Implementation must be kept synchronized with func_dirname
  11441. -# and func_basename. For efficiency, we do not delegate to
  11442. -# those functions but instead duplicate the functionality here.
  11443. -func_dirname_and_basename ()
  11444. -{
  11445. - case ${1} in
  11446. - */*) func_dirname_result="${1%/*}${2}" ;;
  11447. - * ) func_dirname_result="${3}" ;;
  11448. - esac
  11449. - func_basename_result="${1##*/}"
  11450. -}
  11451. -
  11452. -# func_stripname prefix suffix name
  11453. -# strip PREFIX and SUFFIX off of NAME.
  11454. -# PREFIX and SUFFIX must not contain globbing or regex special
  11455. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  11456. -# dot (in which case that matches only a dot).
  11457. -func_stripname ()
  11458. -{
  11459. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  11460. - # positional parameters, so assign one to ordinary parameter first.
  11461. - func_stripname_result=${3}
  11462. - func_stripname_result=${func_stripname_result#"${1}"}
  11463. - func_stripname_result=${func_stripname_result%"${2}"}
  11464. -}
  11465. -
  11466. -# func_opt_split
  11467. -func_opt_split ()
  11468. -{
  11469. - func_opt_split_opt=${1%%=*}
  11470. - func_opt_split_arg=${1#*=}
  11471. -}
  11472. -
  11473. -# func_lo2o object
  11474. -func_lo2o ()
  11475. -{
  11476. - case ${1} in
  11477. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  11478. - *) func_lo2o_result=${1} ;;
  11479. - esac
  11480. -}
  11481. -
  11482. -# func_xform libobj-or-source
  11483. -func_xform ()
  11484. -{
  11485. - func_xform_result=${1%.*}.lo
  11486. -}
  11487. -
  11488. -# func_arith arithmetic-term...
  11489. -func_arith ()
  11490. -{
  11491. - func_arith_result=$(( $* ))
  11492. -}
  11493. -
  11494. -# func_len string
  11495. -# STRING may not start with a hyphen.
  11496. -func_len ()
  11497. -{
  11498. - func_len_result=${#1}
  11499. -}
  11500. -
  11501. -_LT_EOF
  11502. - ;;
  11503. - *) # Bourne compatible functions.
  11504. - cat << \_LT_EOF >> "$cfgfile"
  11505. -
  11506. -# func_dirname file append nondir_replacement
  11507. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  11508. -# otherwise set result to NONDIR_REPLACEMENT.
  11509. -func_dirname ()
  11510. -{
  11511. - # Extract subdirectory from the argument.
  11512. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  11513. - if test "X$func_dirname_result" = "X${1}"; then
  11514. - func_dirname_result="${3}"
  11515. - else
  11516. - func_dirname_result="$func_dirname_result${2}"
  11517. - fi
  11518. -}
  11519. -
  11520. -# func_basename file
  11521. -func_basename ()
  11522. -{
  11523. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  11524. -}
  11525. -
  11526. -
  11527. -# func_stripname prefix suffix name
  11528. -# strip PREFIX and SUFFIX off of NAME.
  11529. -# PREFIX and SUFFIX must not contain globbing or regex special
  11530. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  11531. -# dot (in which case that matches only a dot).
  11532. -# func_strip_suffix prefix name
  11533. -func_stripname ()
  11534. -{
  11535. - case ${2} in
  11536. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  11537. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  11538. - esac
  11539. -}
  11540. -
  11541. -# sed scripts:
  11542. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  11543. -my_sed_long_arg='1s/^-[^=]*=//'
  11544. -
  11545. -# func_opt_split
  11546. -func_opt_split ()
  11547. -{
  11548. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  11549. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  11550. -}
  11551. -
  11552. -# func_lo2o object
  11553. -func_lo2o ()
  11554. -{
  11555. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  11556. -}
  11557. -
  11558. -# func_xform libobj-or-source
  11559. -func_xform ()
  11560. -{
  11561. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  11562. -}
  11563. -
  11564. -# func_arith arithmetic-term...
  11565. -func_arith ()
  11566. -{
  11567. - func_arith_result=`expr "$@"`
  11568. -}
  11569. -
  11570. -# func_len string
  11571. -# STRING may not start with a hyphen.
  11572. -func_len ()
  11573. -{
  11574. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  11575. -}
  11576. -
  11577. -_LT_EOF
  11578. -esac
  11579. -
  11580. -case $lt_shell_append in
  11581. - yes)
  11582. - cat << \_LT_EOF >> "$cfgfile"
  11583. -
  11584. -# func_append var value
  11585. -# Append VALUE to the end of shell variable VAR.
  11586. -func_append ()
  11587. -{
  11588. - eval "$1+=\$2"
  11589. -}
  11590. -_LT_EOF
  11591. - ;;
  11592. - *)
  11593. - cat << \_LT_EOF >> "$cfgfile"
  11594. -
  11595. -# func_append var value
  11596. -# Append VALUE to the end of shell variable VAR.
  11597. -func_append ()
  11598. -{
  11599. - eval "$1=\$$1\$2"
  11600. -}
  11601. -
  11602. -_LT_EOF
  11603. - ;;
  11604. - esac
  11605. -
  11606. -
  11607. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  11608. - || (rm -f "$cfgfile"; exit 1)
  11609. -
  11610. - mv -f "$cfgfile" "$ofile" ||
  11611. + sed '$q' "$ltmain" >> "$cfgfile" \
  11612. + || (rm -f "$cfgfile"; exit 1)
  11613. +
  11614. + if test x"$xsi_shell" = xyes; then
  11615. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  11616. +func_dirname ()\
  11617. +{\
  11618. +\ case ${1} in\
  11619. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  11620. +\ * ) func_dirname_result="${3}" ;;\
  11621. +\ esac\
  11622. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  11623. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11624. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11625. +test 0 -eq $? || _lt_function_replace_fail=:
  11626. +
  11627. +
  11628. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  11629. +func_basename ()\
  11630. +{\
  11631. +\ func_basename_result="${1##*/}"\
  11632. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  11633. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11634. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11635. +test 0 -eq $? || _lt_function_replace_fail=:
  11636. +
  11637. +
  11638. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  11639. +func_dirname_and_basename ()\
  11640. +{\
  11641. +\ case ${1} in\
  11642. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  11643. +\ * ) func_dirname_result="${3}" ;;\
  11644. +\ esac\
  11645. +\ func_basename_result="${1##*/}"\
  11646. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  11647. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11648. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11649. +test 0 -eq $? || _lt_function_replace_fail=:
  11650. +
  11651. +
  11652. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  11653. +func_stripname ()\
  11654. +{\
  11655. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  11656. +\ # positional parameters, so assign one to ordinary parameter first.\
  11657. +\ func_stripname_result=${3}\
  11658. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  11659. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  11660. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  11661. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11662. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11663. +test 0 -eq $? || _lt_function_replace_fail=:
  11664. +
  11665. +
  11666. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  11667. +func_split_long_opt ()\
  11668. +{\
  11669. +\ func_split_long_opt_name=${1%%=*}\
  11670. +\ func_split_long_opt_arg=${1#*=}\
  11671. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  11672. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11673. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11674. +test 0 -eq $? || _lt_function_replace_fail=:
  11675. +
  11676. +
  11677. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  11678. +func_split_short_opt ()\
  11679. +{\
  11680. +\ func_split_short_opt_arg=${1#??}\
  11681. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  11682. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  11683. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11684. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11685. +test 0 -eq $? || _lt_function_replace_fail=:
  11686. +
  11687. +
  11688. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  11689. +func_lo2o ()\
  11690. +{\
  11691. +\ case ${1} in\
  11692. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  11693. +\ *) func_lo2o_result=${1} ;;\
  11694. +\ esac\
  11695. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  11696. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11697. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11698. +test 0 -eq $? || _lt_function_replace_fail=:
  11699. +
  11700. +
  11701. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  11702. +func_xform ()\
  11703. +{\
  11704. + func_xform_result=${1%.*}.lo\
  11705. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  11706. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11707. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11708. +test 0 -eq $? || _lt_function_replace_fail=:
  11709. +
  11710. +
  11711. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  11712. +func_arith ()\
  11713. +{\
  11714. + func_arith_result=$(( $* ))\
  11715. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  11716. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11717. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11718. +test 0 -eq $? || _lt_function_replace_fail=:
  11719. +
  11720. +
  11721. + sed -e '/^func_len ()$/,/^} # func_len /c\
  11722. +func_len ()\
  11723. +{\
  11724. + func_len_result=${#1}\
  11725. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  11726. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11727. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11728. +test 0 -eq $? || _lt_function_replace_fail=:
  11729. +
  11730. +fi
  11731. +
  11732. +if test x"$lt_shell_append" = xyes; then
  11733. + sed -e '/^func_append ()$/,/^} # func_append /c\
  11734. +func_append ()\
  11735. +{\
  11736. + eval "${1}+=\\${2}"\
  11737. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  11738. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11739. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11740. +test 0 -eq $? || _lt_function_replace_fail=:
  11741. +
  11742. +
  11743. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  11744. +func_append_quoted ()\
  11745. +{\
  11746. +\ func_quote_for_eval "${2}"\
  11747. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  11748. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  11749. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11750. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11751. +test 0 -eq $? || _lt_function_replace_fail=:
  11752. +
  11753. +
  11754. + # Save a `func_append' function call where possible by direct use of '+='
  11755. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  11756. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11757. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11758. + test 0 -eq $? || _lt_function_replace_fail=:
  11759. +else
  11760. + # Save a `func_append' function call even when '+=' is not available
  11761. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  11762. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  11763. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  11764. + test 0 -eq $? || _lt_function_replace_fail=:
  11765. +fi
  11766. +
  11767. +if test x"$_lt_function_replace_fail" = x":"; then
  11768. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  11769. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  11770. +fi
  11771. +
  11772. +
  11773. + mv -f "$cfgfile" "$ofile" ||
  11774. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  11775. chmod +x "$ofile"
  11776. diff --git a/libtool.m4 b/libtool.m4
  11777. index 9a13f3b117a..5be47564443 100644
  11778. --- a/libtool.m4
  11779. +++ b/libtool.m4
  11780. @@ -1,7 +1,8 @@
  11781. # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  11782. #
  11783. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  11784. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  11785. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  11786. +# Inc.
  11787. # Written by Gordon Matzigkeit, 1996
  11788. #
  11789. # This file is free software; the Free Software Foundation gives
  11790. @@ -10,7 +11,8 @@
  11791. m4_define([_LT_COPYING], [dnl
  11792. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  11793. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  11794. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  11795. +# Inc.
  11796. # Written by Gordon Matzigkeit, 1996
  11797. #
  11798. # This file is part of GNU Libtool.
  11799. @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
  11800. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  11801. ])
  11802. -# serial 56 LT_INIT
  11803. +# serial 57 LT_INIT
  11804. # LT_PREREQ(VERSION)
  11805. @@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
  11806. LIBTOOL_DEPS="$ltmain"
  11807. # Always use our own libtool.
  11808. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  11809. +LIBTOOL='$(SHELL) $(top_builddir)'
  11810. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  11811. AC_SUBST(LIBTOOL)dnl
  11812. _LT_SETUP
  11813. @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
  11814. dnl
  11815. m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  11816. m4_require([_LT_CHECK_SHELL_FEATURES])dnl
  11817. +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
  11818. m4_require([_LT_CMD_RELOAD])dnl
  11819. m4_require([_LT_CHECK_MAGIC_METHOD])dnl
  11820. +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
  11821. m4_require([_LT_CMD_OLD_ARCHIVE])dnl
  11822. m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
  11823. +m4_require([_LT_WITH_SYSROOT])dnl
  11824. _LT_CONFIG_LIBTOOL_INIT([
  11825. # See if we are running on zsh, and set the options which allow our
  11826. @@ -199,7 +205,7 @@ aix3*)
  11827. esac
  11828. # Global variables:
  11829. -ofile=libtool
  11830. +ofile=${host_alias}-libtool
  11831. can_build_shared=yes
  11832. # All known linkers require a `.a' archive for static linking (except MSVC,
  11833. @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
  11834. m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
  11835. configured by $[0], generated by m4_PACKAGE_STRING.
  11836. -Copyright (C) 2009 Free Software Foundation, Inc.
  11837. +Copyright (C) 2010 Free Software Foundation, Inc.
  11838. This config.lt script is free software; the Free Software Foundation
  11839. gives unlimited permision to copy, distribute and modify it."
  11840. @@ -746,15 +752,12 @@ _LT_EOF
  11841. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  11842. # text mode, it properly converts lines to CR/LF. This bash problem
  11843. # is reportedly fixed, but why not run on old versions too?
  11844. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  11845. - || (rm -f "$cfgfile"; exit 1)
  11846. + sed '$q' "$ltmain" >> "$cfgfile" \
  11847. + || (rm -f "$cfgfile"; exit 1)
  11848. - _LT_PROG_XSI_SHELLFNS
  11849. + _LT_PROG_REPLACE_SHELLFNS
  11850. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  11851. - || (rm -f "$cfgfile"; exit 1)
  11852. -
  11853. - mv -f "$cfgfile" "$ofile" ||
  11854. + mv -f "$cfgfile" "$ofile" ||
  11855. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  11856. chmod +x "$ofile"
  11857. ],
  11858. @@ -980,6 +983,8 @@ _LT_EOF
  11859. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
  11860. echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
  11861. $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
  11862. + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
  11863. + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
  11864. cat > conftest.c << _LT_EOF
  11865. int main() { return 0;}
  11866. _LT_EOF
  11867. @@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
  11868. fi
  11869. ])
  11870. -# _LT_SYS_MODULE_PATH_AIX
  11871. -# -----------------------
  11872. +# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
  11873. +# ----------------------------------
  11874. # Links a minimal program and checks the executable
  11875. # for the system default hardcoded library path. In most cases,
  11876. # this is /usr/lib:/lib, but when the MPI compilers are used
  11877. # the location of the communication and MPI libs are included too.
  11878. # If we don't find anything, use the default library path according
  11879. # to the aix ld manual.
  11880. +# Store the results from the different compilers for each TAGNAME.
  11881. +# Allow to override them for all tags through lt_cv_aix_libpath.
  11882. m4_defun([_LT_SYS_MODULE_PATH_AIX],
  11883. [m4_require([_LT_DECL_SED])dnl
  11884. -AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[
  11885. -lt_aix_libpath_sed='
  11886. - /Import File Strings/,/^$/ {
  11887. - /^0/ {
  11888. - s/^0 *\(.*\)$/\1/
  11889. - p
  11890. - }
  11891. - }'
  11892. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11893. -# Check for a 64-bit object if we didn't find anything.
  11894. -if test -z "$aix_libpath"; then
  11895. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11896. -fi],[])
  11897. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  11898. +if test "${lt_cv_aix_libpath+set}" = set; then
  11899. + aix_libpath=$lt_cv_aix_libpath
  11900. +else
  11901. + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
  11902. + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
  11903. + lt_aix_libpath_sed='[
  11904. + /Import File Strings/,/^$/ {
  11905. + /^0/ {
  11906. + s/^0 *\([^ ]*\) *$/\1/
  11907. + p
  11908. + }
  11909. + }]'
  11910. + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11911. + # Check for a 64-bit object if we didn't find anything.
  11912. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  11913. + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  11914. + fi],[])
  11915. + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  11916. + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
  11917. + fi
  11918. + ])
  11919. + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
  11920. +fi
  11921. ])# _LT_SYS_MODULE_PATH_AIX
  11922. @@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  11923. AC_MSG_CHECKING([how to print strings])
  11924. # Test print first, because it will be a builtin if present.
  11925. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  11926. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  11927. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  11928. ECHO='print -r --'
  11929. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  11930. @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
  11931. ])# _LT_PROG_ECHO_BACKSLASH
  11932. +# _LT_WITH_SYSROOT
  11933. +# ----------------
  11934. +AC_DEFUN([_LT_WITH_SYSROOT],
  11935. +[AC_MSG_CHECKING([for sysroot])
  11936. +AC_ARG_WITH([libtool-sysroot],
  11937. +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
  11938. + (or the compiler's sysroot if not specified).],
  11939. +[], [with_libtool_sysroot=no])
  11940. +
  11941. +dnl lt_sysroot will always be passed unquoted. We quote it here
  11942. +dnl in case the user passed a directory name.
  11943. +lt_sysroot=
  11944. +case ${with_libtool_sysroot} in #(
  11945. + yes)
  11946. + if test "$GCC" = yes; then
  11947. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  11948. + fi
  11949. + ;; #(
  11950. + /*)
  11951. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  11952. + ;; #(
  11953. + no|'')
  11954. + ;; #(
  11955. + *)
  11956. + AC_MSG_RESULT([${with_libtool_sysroot}])
  11957. + AC_MSG_ERROR([The sysroot must be an absolute path.])
  11958. + ;;
  11959. +esac
  11960. +
  11961. + AC_MSG_RESULT([${lt_sysroot:-no}])
  11962. +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
  11963. +[dependent libraries, and in which our libraries should be installed.])])
  11964. +
  11965. # _LT_ENABLE_LOCK
  11966. # ---------------
  11967. m4_defun([_LT_ENABLE_LOCK],
  11968. @@ -1320,6 +1369,51 @@ need_locks="$enable_libtool_lock"
  11969. ])# _LT_ENABLE_LOCK
  11970. +# _LT_PROG_AR
  11971. +# -----------
  11972. +m4_defun([_LT_PROG_AR],
  11973. +[AC_CHECK_TOOLS(AR, [ar], false)
  11974. + touch conftest.c
  11975. + $AR $plugin_option rc conftest.a conftest.c
  11976. + if test "$?" != 0; then
  11977. + AC_MSG_WARN([Failed: $AR $plugin_option rc])
  11978. + else
  11979. + AR="$AR $plugin_option"
  11980. + fi
  11981. + rm -f conftest.*
  11982. +: ${AR=ar}
  11983. +: ${AR_FLAGS=cru}
  11984. +_LT_DECL([], [AR], [1], [The archiver])
  11985. +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
  11986. +
  11987. +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
  11988. + [lt_cv_ar_at_file=no
  11989. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
  11990. + [echo conftest.$ac_objext > conftest.lst
  11991. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
  11992. + AC_TRY_EVAL([lt_ar_try])
  11993. + if test "$ac_status" -eq 0; then
  11994. + # Ensure the archiver fails upon bogus file names.
  11995. + rm -f conftest.$ac_objext libconftest.a
  11996. + AC_TRY_EVAL([lt_ar_try])
  11997. + if test "$ac_status" -ne 0; then
  11998. + lt_cv_ar_at_file=@
  11999. + fi
  12000. + fi
  12001. + rm -f conftest.* libconftest.a
  12002. + ])
  12003. + ])
  12004. +
  12005. +if test "x$lt_cv_ar_at_file" = xno; then
  12006. + archiver_list_spec=
  12007. +else
  12008. + archiver_list_spec=$lt_cv_ar_at_file
  12009. +fi
  12010. +_LT_DECL([], [archiver_list_spec], [1],
  12011. + [How to feed a file listing to the archiver])
  12012. +])# _LT_PROG_AR
  12013. +
  12014. +
  12015. # _LT_CMD_OLD_ARCHIVE
  12016. # -------------------
  12017. m4_defun([_LT_CMD_OLD_ARCHIVE],
  12018. @@ -1336,23 +1430,7 @@ for plugin in $plugin_names; do
  12019. fi
  12020. done
  12021. -AC_CHECK_TOOL(AR, ar, false)
  12022. -test -z "$AR" && AR=ar
  12023. -if test -n "$plugin_option"; then
  12024. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  12025. - touch conftest.c
  12026. - $AR $plugin_option rc conftest.a conftest.c
  12027. - if test "$?" != 0; then
  12028. - AC_MSG_WARN([Failed: $AR $plugin_option rc])
  12029. - else
  12030. - AR="$AR $plugin_option"
  12031. - fi
  12032. - rm -f conftest.*
  12033. - fi
  12034. -fi
  12035. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  12036. -_LT_DECL([], [AR], [1], [The archiver])
  12037. -_LT_DECL([], [AR_FLAGS], [1])
  12038. +_LT_PROG_AR
  12039. AC_CHECK_TOOL(STRIP, strip, :)
  12040. test -z "$STRIP" && STRIP=:
  12041. @@ -1653,7 +1731,7 @@ else
  12042. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  12043. lt_status=$lt_dlunknown
  12044. cat > conftest.$ac_ext <<_LT_EOF
  12045. -[#line __oline__ "configure"
  12046. +[#line $LINENO "configure"
  12047. #include "confdefs.h"
  12048. #if HAVE_DLFCN_H
  12049. @@ -1697,10 +1775,10 @@ else
  12050. /* When -fvisbility=hidden is used, assume the code has been annotated
  12051. correspondingly for the symbols needed. */
  12052. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  12053. -void fnord () __attribute__((visibility("default")));
  12054. +int fnord () __attribute__((visibility("default")));
  12055. #endif
  12056. -void fnord () { int i=42; }
  12057. +int fnord () { return 42; }
  12058. int main ()
  12059. {
  12060. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  12061. @@ -2240,8 +2318,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  12062. need_version=no
  12063. need_lib_prefix=no
  12064. - case $GCC,$host_os in
  12065. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  12066. + case $GCC,$cc_basename in
  12067. + yes,*)
  12068. + # gcc
  12069. library_names_spec='$libname.dll.a'
  12070. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  12071. postinstall_cmds='base_file=`basename \${file}`~
  12072. @@ -2274,13 +2353,71 @@ m4_if([$1], [],[
  12073. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
  12074. ;;
  12075. esac
  12076. + dynamic_linker='Win32 ld.exe'
  12077. + ;;
  12078. +
  12079. + *,cl*)
  12080. + # Native MSVC
  12081. + libname_spec='$name'
  12082. + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
  12083. + library_names_spec='${libname}.dll.lib'
  12084. +
  12085. + case $build_os in
  12086. + mingw*)
  12087. + sys_lib_search_path_spec=
  12088. + lt_save_ifs=$IFS
  12089. + IFS=';'
  12090. + for lt_path in $LIB
  12091. + do
  12092. + IFS=$lt_save_ifs
  12093. + # Let DOS variable expansion print the short 8.3 style file name.
  12094. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  12095. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  12096. + done
  12097. + IFS=$lt_save_ifs
  12098. + # Convert to MSYS style.
  12099. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
  12100. + ;;
  12101. + cygwin*)
  12102. + # Convert to unix form, then to dos form, then back to unix form
  12103. + # but this time dos style (no spaces!) so that the unix form looks
  12104. + # like /cygdrive/c/PROGRA~1:/cygdr...
  12105. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  12106. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  12107. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  12108. + ;;
  12109. + *)
  12110. + sys_lib_search_path_spec="$LIB"
  12111. + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
  12112. + # It is most probably a Windows format PATH.
  12113. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  12114. + else
  12115. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  12116. + fi
  12117. + # FIXME: find the short name or the path components, as spaces are
  12118. + # common. (e.g. "Program Files" -> "PROGRA~1")
  12119. + ;;
  12120. + esac
  12121. +
  12122. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  12123. + postinstall_cmds='base_file=`basename \${file}`~
  12124. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  12125. + dldir=$destdir/`dirname \$dlpath`~
  12126. + test -d \$dldir || mkdir -p \$dldir~
  12127. + $install_prog $dir/$dlname \$dldir/$dlname'
  12128. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  12129. + dlpath=$dir/\$dldll~
  12130. + $RM \$dlpath'
  12131. + shlibpath_overrides_runpath=yes
  12132. + dynamic_linker='Win32 link.exe'
  12133. ;;
  12134. *)
  12135. + # Assume MSVC wrapper
  12136. library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
  12137. + dynamic_linker='Win32 ld.exe'
  12138. ;;
  12139. esac
  12140. - dynamic_linker='Win32 ld.exe'
  12141. # FIXME: first we should search . and the directory the executable is in
  12142. shlibpath_var=PATH
  12143. ;;
  12144. @@ -2362,7 +2499,7 @@ haiku*)
  12145. soname_spec='${libname}${release}${shared_ext}$major'
  12146. shlibpath_var=LIBRARY_PATH
  12147. shlibpath_overrides_runpath=yes
  12148. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  12149. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  12150. hardcode_into_libs=yes
  12151. ;;
  12152. @@ -2970,6 +3107,11 @@ case $reload_flag in
  12153. esac
  12154. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  12155. case $host_os in
  12156. + cygwin* | mingw* | pw32* | cegcc*)
  12157. + if test "$GCC" != yes; then
  12158. + reload_cmds=false
  12159. + fi
  12160. + ;;
  12161. darwin*)
  12162. if test "$GCC" = yes; then
  12163. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  12164. @@ -3036,7 +3178,8 @@ mingw* | pw32*)
  12165. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  12166. lt_cv_file_magic_cmd='func_win32_libid'
  12167. else
  12168. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  12169. + # Keep this pattern in sync with the one in func_win32_libid.
  12170. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  12171. lt_cv_file_magic_cmd='$OBJDUMP -f'
  12172. fi
  12173. ;;
  12174. @@ -3187,6 +3330,21 @@ tpf*)
  12175. ;;
  12176. esac
  12177. ])
  12178. +
  12179. +file_magic_glob=
  12180. +want_nocaseglob=no
  12181. +if test "$build" = "$host"; then
  12182. + case $host_os in
  12183. + mingw* | pw32*)
  12184. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  12185. + want_nocaseglob=yes
  12186. + else
  12187. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
  12188. + fi
  12189. + ;;
  12190. + esac
  12191. +fi
  12192. +
  12193. file_magic_cmd=$lt_cv_file_magic_cmd
  12194. deplibs_check_method=$lt_cv_deplibs_check_method
  12195. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  12196. @@ -3194,7 +3352,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  12197. _LT_DECL([], [deplibs_check_method], [1],
  12198. [Method to check whether dependent libraries are shared objects])
  12199. _LT_DECL([], [file_magic_cmd], [1],
  12200. - [Command to use when deplibs_check_method == "file_magic"])
  12201. + [Command to use when deplibs_check_method = "file_magic"])
  12202. +_LT_DECL([], [file_magic_glob], [1],
  12203. + [How to find potential files when deplibs_check_method = "file_magic"])
  12204. +_LT_DECL([], [want_nocaseglob], [1],
  12205. + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
  12206. ])# _LT_CHECK_MAGIC_METHOD
  12207. @@ -3297,6 +3459,67 @@ dnl aclocal-1.4 backwards compatibility:
  12208. dnl AC_DEFUN([AM_PROG_NM], [])
  12209. dnl AC_DEFUN([AC_PROG_NM], [])
  12210. +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
  12211. +# --------------------------------
  12212. +# how to determine the name of the shared library
  12213. +# associated with a specific link library.
  12214. +# -- PORTME fill in with the dynamic library characteristics
  12215. +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
  12216. +[m4_require([_LT_DECL_EGREP])
  12217. +m4_require([_LT_DECL_OBJDUMP])
  12218. +m4_require([_LT_DECL_DLLTOOL])
  12219. +AC_CACHE_CHECK([how to associate runtime and link libraries],
  12220. +lt_cv_sharedlib_from_linklib_cmd,
  12221. +[lt_cv_sharedlib_from_linklib_cmd='unknown'
  12222. +
  12223. +case $host_os in
  12224. +cygwin* | mingw* | pw32* | cegcc*)
  12225. + # two different shell functions defined in ltmain.sh
  12226. + # decide which to use based on capabilities of $DLLTOOL
  12227. + case `$DLLTOOL --help 2>&1` in
  12228. + *--identify-strict*)
  12229. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  12230. + ;;
  12231. + *)
  12232. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  12233. + ;;
  12234. + esac
  12235. + ;;
  12236. +*)
  12237. + # fallback: assume linklib IS sharedlib
  12238. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  12239. + ;;
  12240. +esac
  12241. +])
  12242. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  12243. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  12244. +
  12245. +_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
  12246. + [Command to associate shared and link libraries])
  12247. +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
  12248. +
  12249. +
  12250. +# _LT_PATH_MANIFEST_TOOL
  12251. +# ----------------------
  12252. +# locate the manifest tool
  12253. +m4_defun([_LT_PATH_MANIFEST_TOOL],
  12254. +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
  12255. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  12256. +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
  12257. + [lt_cv_path_mainfest_tool=no
  12258. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
  12259. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  12260. + cat conftest.err >&AS_MESSAGE_LOG_FD
  12261. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  12262. + lt_cv_path_mainfest_tool=yes
  12263. + fi
  12264. + rm -f conftest*])
  12265. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  12266. + MANIFEST_TOOL=:
  12267. +fi
  12268. +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
  12269. +])# _LT_PATH_MANIFEST_TOOL
  12270. +
  12271. # LT_LIB_M
  12272. # --------
  12273. @@ -3423,8 +3646,8 @@ esac
  12274. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  12275. # Transform an extracted symbol line into symbol name and symbol address
  12276. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
  12277. -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'"
  12278. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
  12279. +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'"
  12280. # Handle CRLF in mingw tool chain
  12281. opt_cr=
  12282. @@ -3460,6 +3683,7 @@ for ac_symprfx in "" "_"; do
  12283. else
  12284. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  12285. fi
  12286. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  12287. # Check to see that the pipe works correctly.
  12288. pipe_works=no
  12289. @@ -3493,6 +3717,18 @@ _LT_EOF
  12290. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  12291. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  12292. cat <<_LT_EOF > conftest.$ac_ext
  12293. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  12294. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  12295. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  12296. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  12297. +# define LT@&t@_DLSYM_CONST
  12298. +#elif defined(__osf__)
  12299. +/* This system does not cope well with relocations in const data. */
  12300. +# define LT@&t@_DLSYM_CONST
  12301. +#else
  12302. +# define LT@&t@_DLSYM_CONST const
  12303. +#endif
  12304. +
  12305. #ifdef __cplusplus
  12306. extern "C" {
  12307. #endif
  12308. @@ -3504,7 +3740,7 @@ _LT_EOF
  12309. cat <<_LT_EOF >> conftest.$ac_ext
  12310. /* The mapping between symbol names and symbols. */
  12311. -const struct {
  12312. +LT@&t@_DLSYM_CONST struct {
  12313. const char *name;
  12314. void *address;
  12315. }
  12316. @@ -3530,15 +3766,15 @@ static const void *lt_preloaded_setup() {
  12317. _LT_EOF
  12318. # Now try linking the two files.
  12319. mv conftest.$ac_objext conftstm.$ac_objext
  12320. - lt_save_LIBS="$LIBS"
  12321. - lt_save_CFLAGS="$CFLAGS"
  12322. + lt_globsym_save_LIBS=$LIBS
  12323. + lt_globsym_save_CFLAGS=$CFLAGS
  12324. LIBS="conftstm.$ac_objext"
  12325. CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
  12326. if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
  12327. pipe_works=yes
  12328. fi
  12329. - LIBS="$lt_save_LIBS"
  12330. - CFLAGS="$lt_save_CFLAGS"
  12331. + LIBS=$lt_globsym_save_LIBS
  12332. + CFLAGS=$lt_globsym_save_CFLAGS
  12333. else
  12334. echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
  12335. fi
  12336. @@ -3571,6 +3807,13 @@ else
  12337. AC_MSG_RESULT(ok)
  12338. fi
  12339. +# Response file support.
  12340. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  12341. + nm_file_list_spec='@'
  12342. +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
  12343. + nm_file_list_spec='@'
  12344. +fi
  12345. +
  12346. _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
  12347. [Take the output of nm and produce a listing of raw symbols and C names])
  12348. _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
  12349. @@ -3581,6 +3824,8 @@ _LT_DECL([global_symbol_to_c_name_address],
  12350. _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
  12351. [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
  12352. [Transform the output of nm in a C name address pair when lib prefix is needed])
  12353. +_LT_DECL([], [nm_file_list_spec], [1],
  12354. + [Specify filename containing input files for $NM])
  12355. ]) # _LT_CMD_GLOBAL_SYMBOLS
  12356. @@ -3592,7 +3837,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
  12357. _LT_TAGVAR(lt_prog_compiler_pic, $1)=
  12358. _LT_TAGVAR(lt_prog_compiler_static, $1)=
  12359. -AC_MSG_CHECKING([for $compiler option to produce PIC])
  12360. m4_if([$1], [CXX], [
  12361. # C++ specific cases for pic, static, wl, etc.
  12362. if test "$GXX" = yes; then
  12363. @@ -3698,6 +3942,12 @@ m4_if([$1], [CXX], [
  12364. ;;
  12365. esac
  12366. ;;
  12367. + mingw* | cygwin* | os2* | pw32* | cegcc*)
  12368. + # This hack is so that the source file can tell whether it is being
  12369. + # built for inclusion in a dll (and should export symbols for example).
  12370. + m4_if([$1], [GCJ], [],
  12371. + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
  12372. + ;;
  12373. dgux*)
  12374. case $cc_basename in
  12375. ec++*)
  12376. @@ -3850,7 +4100,7 @@ m4_if([$1], [CXX], [
  12377. ;;
  12378. solaris*)
  12379. case $cc_basename in
  12380. - CC*)
  12381. + CC* | sunCC*)
  12382. # Sun C++ 4.2, 5.x and Centerline C++
  12383. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  12384. _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  12385. @@ -4073,6 +4323,12 @@ m4_if([$1], [CXX], [
  12386. _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
  12387. _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
  12388. ;;
  12389. + nagfor*)
  12390. + # NAG Fortran compiler
  12391. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
  12392. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  12393. + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  12394. + ;;
  12395. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  12396. # Portland Group compilers (*not* the Pentium gcc compiler,
  12397. # which looks to be a dead project)
  12398. @@ -4135,7 +4391,7 @@ m4_if([$1], [CXX], [
  12399. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  12400. _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
  12401. case $cc_basename in
  12402. - f77* | f90* | f95*)
  12403. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  12404. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
  12405. *)
  12406. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
  12407. @@ -4192,9 +4448,11 @@ case $host_os in
  12408. _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
  12409. ;;
  12410. esac
  12411. -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
  12412. -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
  12413. - [How to pass a linker flag through the compiler])
  12414. +
  12415. +AC_CACHE_CHECK([for $compiler option to produce PIC],
  12416. + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
  12417. + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
  12418. +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
  12419. #
  12420. # Check to make sure the PIC flag actually works.
  12421. @@ -4213,6 +4471,8 @@ fi
  12422. _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
  12423. [Additional compiler flags for building library objects])
  12424. +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
  12425. + [How to pass a linker flag through the compiler])
  12426. #
  12427. # Check to make sure the static flag actually works.
  12428. #
  12429. @@ -4233,6 +4493,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
  12430. m4_defun([_LT_LINKER_SHLIBS],
  12431. [AC_REQUIRE([LT_PATH_LD])dnl
  12432. AC_REQUIRE([LT_PATH_NM])dnl
  12433. +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
  12434. m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  12435. m4_require([_LT_DECL_EGREP])dnl
  12436. m4_require([_LT_DECL_SED])dnl
  12437. @@ -4241,6 +4502,7 @@ m4_require([_LT_TAG_COMPILER])dnl
  12438. AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
  12439. m4_if([$1], [CXX], [
  12440. _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  12441. + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
  12442. case $host_os in
  12443. aix[[4-9]]*)
  12444. # If we're using GNU nm, then we don't want the "-C" option.
  12445. @@ -4255,15 +4517,20 @@ m4_if([$1], [CXX], [
  12446. ;;
  12447. pw32*)
  12448. _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
  12449. - ;;
  12450. + ;;
  12451. cygwin* | mingw* | cegcc*)
  12452. - _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'
  12453. - ;;
  12454. + case $cc_basename in
  12455. + cl*) ;;
  12456. + *)
  12457. + _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'
  12458. + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
  12459. + ;;
  12460. + esac
  12461. + ;;
  12462. *)
  12463. _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
  12464. - ;;
  12465. + ;;
  12466. esac
  12467. - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
  12468. ], [
  12469. runpath_var=
  12470. _LT_TAGVAR(allow_undefined_flag, $1)=
  12471. @@ -4431,7 +4698,8 @@ _LT_EOF
  12472. _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  12473. _LT_TAGVAR(always_export_symbols, $1)=no
  12474. _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  12475. - _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'
  12476. + _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'
  12477. + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
  12478. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  12479. _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'
  12480. @@ -4530,12 +4798,12 @@ _LT_EOF
  12481. _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
  12482. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
  12483. _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
  12484. - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  12485. + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  12486. if test "x$supports_anon_versioning" = xyes; then
  12487. _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
  12488. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  12489. echo "local: *; };" >> $output_objdir/$libname.ver~
  12490. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  12491. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  12492. fi
  12493. ;;
  12494. esac
  12495. @@ -4549,8 +4817,8 @@ _LT_EOF
  12496. _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  12497. wlarc=
  12498. else
  12499. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  12500. - _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'
  12501. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  12502. + _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'
  12503. fi
  12504. ;;
  12505. @@ -4568,8 +4836,8 @@ _LT_EOF
  12506. _LT_EOF
  12507. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  12508. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  12509. - _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'
  12510. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  12511. + _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'
  12512. else
  12513. _LT_TAGVAR(ld_shlibs, $1)=no
  12514. fi
  12515. @@ -4615,8 +4883,8 @@ _LT_EOF
  12516. *)
  12517. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  12518. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  12519. - _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'
  12520. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  12521. + _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'
  12522. else
  12523. _LT_TAGVAR(ld_shlibs, $1)=no
  12524. fi
  12525. @@ -4746,7 +5014,7 @@ _LT_EOF
  12526. _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
  12527. # Determine the default libpath from the value encoded in an
  12528. # empty executable.
  12529. - _LT_SYS_MODULE_PATH_AIX
  12530. + _LT_SYS_MODULE_PATH_AIX([$1])
  12531. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  12532. _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"
  12533. else
  12534. @@ -4757,7 +5025,7 @@ _LT_EOF
  12535. else
  12536. # Determine the default libpath from the value encoded in an
  12537. # empty executable.
  12538. - _LT_SYS_MODULE_PATH_AIX
  12539. + _LT_SYS_MODULE_PATH_AIX([$1])
  12540. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  12541. # Warning - without using the other run time loading flags,
  12542. # -berok will link without error, but may produce a broken library.
  12543. @@ -4801,20 +5069,63 @@ _LT_EOF
  12544. # Microsoft Visual C++.
  12545. # hardcode_libdir_flag_spec is actually meaningless, as there is
  12546. # no search path for DLLs.
  12547. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  12548. - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  12549. - # Tell ltmain to make .lib files, not .a files.
  12550. - libext=lib
  12551. - # Tell ltmain to make .dll files, not .so files.
  12552. - shrext_cmds=".dll"
  12553. - # FIXME: Setting linknames here is a bad hack.
  12554. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  12555. - # The linker will automatically build a .lib file if we build a DLL.
  12556. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  12557. - # FIXME: Should let the user specify the lib program.
  12558. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
  12559. - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
  12560. - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  12561. + case $cc_basename in
  12562. + cl*)
  12563. + # Native MSVC
  12564. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  12565. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  12566. + _LT_TAGVAR(always_export_symbols, $1)=yes
  12567. + _LT_TAGVAR(file_list_spec, $1)='@'
  12568. + # Tell ltmain to make .lib files, not .a files.
  12569. + libext=lib
  12570. + # Tell ltmain to make .dll files, not .so files.
  12571. + shrext_cmds=".dll"
  12572. + # FIXME: Setting linknames here is a bad hack.
  12573. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  12574. + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  12575. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  12576. + else
  12577. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  12578. + fi~
  12579. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  12580. + linknames='
  12581. + # The linker will not automatically build a static lib if we build a DLL.
  12582. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  12583. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  12584. + _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'
  12585. + # Don't use ranlib
  12586. + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
  12587. + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
  12588. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  12589. + case $lt_outputfile in
  12590. + *.exe|*.EXE) ;;
  12591. + *)
  12592. + lt_outputfile="$lt_outputfile.exe"
  12593. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  12594. + ;;
  12595. + esac~
  12596. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  12597. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  12598. + $RM "$lt_outputfile.manifest";
  12599. + fi'
  12600. + ;;
  12601. + *)
  12602. + # Assume MSVC wrapper
  12603. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  12604. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  12605. + # Tell ltmain to make .lib files, not .a files.
  12606. + libext=lib
  12607. + # Tell ltmain to make .dll files, not .so files.
  12608. + shrext_cmds=".dll"
  12609. + # FIXME: Setting linknames here is a bad hack.
  12610. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  12611. + # The linker will automatically build a .lib file if we build a DLL.
  12612. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  12613. + # FIXME: Should let the user specify the lib program.
  12614. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
  12615. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  12616. + ;;
  12617. + esac
  12618. ;;
  12619. darwin* | rhapsody*)
  12620. @@ -4848,7 +5159,7 @@ _LT_EOF
  12621. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  12622. freebsd* | dragonfly*)
  12623. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  12624. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  12625. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  12626. _LT_TAGVAR(hardcode_direct, $1)=yes
  12627. _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
  12628. @@ -4856,7 +5167,7 @@ _LT_EOF
  12629. hpux9*)
  12630. if test "$GCC" = yes; then
  12631. - _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'
  12632. + _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'
  12633. else
  12634. _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'
  12635. fi
  12636. @@ -4872,7 +5183,7 @@ _LT_EOF
  12637. hpux10*)
  12638. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  12639. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  12640. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  12641. else
  12642. _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  12643. fi
  12644. @@ -4896,10 +5207,10 @@ _LT_EOF
  12645. _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  12646. ;;
  12647. ia64*)
  12648. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  12649. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  12650. ;;
  12651. *)
  12652. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  12653. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  12654. ;;
  12655. esac
  12656. else
  12657. @@ -4946,16 +5257,31 @@ _LT_EOF
  12658. irix5* | irix6* | nonstopux*)
  12659. if test "$GCC" = yes; then
  12660. - _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'
  12661. + _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'
  12662. # Try to use the -exported_symbol ld option, if it does not
  12663. # work, assume that -exports_file does not work either and
  12664. # implicitly export all symbols.
  12665. - save_LDFLAGS="$LDFLAGS"
  12666. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  12667. - AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])],
  12668. - _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'
  12669. - )
  12670. - LDFLAGS="$save_LDFLAGS"
  12671. + # This should be the same for all languages, so no per-tag cache variable.
  12672. + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
  12673. + [lt_cv_irix_exported_symbol],
  12674. + [save_LDFLAGS="$LDFLAGS"
  12675. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  12676. + AC_LINK_IFELSE(
  12677. + [AC_LANG_SOURCE(
  12678. + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
  12679. + [C++], [[int foo (void) { return 0; }]],
  12680. + [Fortran 77], [[
  12681. + subroutine foo
  12682. + end]],
  12683. + [Fortran], [[
  12684. + subroutine foo
  12685. + end]])])],
  12686. + [lt_cv_irix_exported_symbol=yes],
  12687. + [lt_cv_irix_exported_symbol=no])
  12688. + LDFLAGS="$save_LDFLAGS"])
  12689. + if test "$lt_cv_irix_exported_symbol" = yes; then
  12690. + _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'
  12691. + fi
  12692. else
  12693. _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'
  12694. _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'
  12695. @@ -5040,7 +5366,7 @@ _LT_EOF
  12696. osf4* | osf5*) # as osf3* with the addition of -msym flag
  12697. if test "$GCC" = yes; then
  12698. _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
  12699. - _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'
  12700. + _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'
  12701. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  12702. else
  12703. _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
  12704. @@ -5059,9 +5385,9 @@ _LT_EOF
  12705. _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
  12706. if test "$GCC" = yes; then
  12707. wlarc='${wl}'
  12708. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  12709. + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  12710. _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  12711. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  12712. + $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'
  12713. else
  12714. case `$CC -V 2>&1` in
  12715. *"Compilers 5.0"*)
  12716. @@ -5333,8 +5659,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
  12717. to runtime path list])
  12718. _LT_TAGDECL([], [link_all_deplibs], [0],
  12719. [Whether libtool must link a program against all its dependency libraries])
  12720. -_LT_TAGDECL([], [fix_srcfile_path], [1],
  12721. - [Fix the shell variable $srcfile for the compiler])
  12722. _LT_TAGDECL([], [always_export_symbols], [0],
  12723. [Set to "yes" if exported symbols are required])
  12724. _LT_TAGDECL([], [export_symbols_cmds], [2],
  12725. @@ -5345,6 +5669,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
  12726. [Symbols that must always be exported])
  12727. _LT_TAGDECL([], [prelink_cmds], [2],
  12728. [Commands necessary for linking programs (against libraries) with templates])
  12729. +_LT_TAGDECL([], [postlink_cmds], [2],
  12730. + [Commands necessary for finishing linking programs])
  12731. _LT_TAGDECL([], [file_list_spec], [1],
  12732. [Specify filename containing input files])
  12733. dnl FIXME: Not yet implemented
  12734. @@ -5446,6 +5772,7 @@ CC="$lt_save_CC"
  12735. m4_defun([_LT_LANG_CXX_CONFIG],
  12736. [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  12737. m4_require([_LT_DECL_EGREP])dnl
  12738. +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
  12739. if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  12740. ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
  12741. (test "X$CXX" != "Xg++"))) ; then
  12742. @@ -5507,6 +5834,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12743. # Allow CC to be a program name with arguments.
  12744. lt_save_CC=$CC
  12745. + lt_save_CFLAGS=$CFLAGS
  12746. lt_save_LD=$LD
  12747. lt_save_GCC=$GCC
  12748. GCC=$GXX
  12749. @@ -5524,6 +5852,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12750. fi
  12751. test -z "${LDCXX+set}" || LD=$LDCXX
  12752. CC=${CXX-"c++"}
  12753. + CFLAGS=$CXXFLAGS
  12754. compiler=$CC
  12755. _LT_TAGVAR(compiler, $1)=$CC
  12756. _LT_CC_BASENAME([$compiler])
  12757. @@ -5687,7 +6016,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12758. _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
  12759. # Determine the default libpath from the value encoded in an empty
  12760. # executable.
  12761. - _LT_SYS_MODULE_PATH_AIX
  12762. + _LT_SYS_MODULE_PATH_AIX([$1])
  12763. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  12764. _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"
  12765. @@ -5699,7 +6028,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12766. else
  12767. # Determine the default libpath from the value encoded in an
  12768. # empty executable.
  12769. - _LT_SYS_MODULE_PATH_AIX
  12770. + _LT_SYS_MODULE_PATH_AIX([$1])
  12771. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  12772. # Warning - without using the other run time loading flags,
  12773. # -berok will link without error, but may produce a broken library.
  12774. @@ -5741,29 +6070,75 @@ if test "$_lt_caught_CXX_error" != yes; then
  12775. ;;
  12776. cygwin* | mingw* | pw32* | cegcc*)
  12777. - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
  12778. - # as there is no search path for DLLs.
  12779. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  12780. - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
  12781. - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  12782. - _LT_TAGVAR(always_export_symbols, $1)=no
  12783. - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  12784. -
  12785. - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  12786. - _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'
  12787. - # If the export-symbols file already is a .def file (1st line
  12788. - # is EXPORTS), use it as is; otherwise, prepend...
  12789. - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  12790. - cp $export_symbols $output_objdir/$soname.def;
  12791. - else
  12792. - echo EXPORTS > $output_objdir/$soname.def;
  12793. - cat $export_symbols >> $output_objdir/$soname.def;
  12794. - fi~
  12795. - $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'
  12796. - else
  12797. - _LT_TAGVAR(ld_shlibs, $1)=no
  12798. - fi
  12799. - ;;
  12800. + case $GXX,$cc_basename in
  12801. + ,cl* | no,cl*)
  12802. + # Native MSVC
  12803. + # hardcode_libdir_flag_spec is actually meaningless, as there is
  12804. + # no search path for DLLs.
  12805. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
  12806. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  12807. + _LT_TAGVAR(always_export_symbols, $1)=yes
  12808. + _LT_TAGVAR(file_list_spec, $1)='@'
  12809. + # Tell ltmain to make .lib files, not .a files.
  12810. + libext=lib
  12811. + # Tell ltmain to make .dll files, not .so files.
  12812. + shrext_cmds=".dll"
  12813. + # FIXME: Setting linknames here is a bad hack.
  12814. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  12815. + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  12816. + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  12817. + else
  12818. + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  12819. + fi~
  12820. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  12821. + linknames='
  12822. + # The linker will not automatically build a static lib if we build a DLL.
  12823. + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
  12824. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  12825. + # Don't use ranlib
  12826. + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
  12827. + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
  12828. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  12829. + case $lt_outputfile in
  12830. + *.exe|*.EXE) ;;
  12831. + *)
  12832. + lt_outputfile="$lt_outputfile.exe"
  12833. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  12834. + ;;
  12835. + esac~
  12836. + func_to_tool_file "$lt_outputfile"~
  12837. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  12838. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  12839. + $RM "$lt_outputfile.manifest";
  12840. + fi'
  12841. + ;;
  12842. + *)
  12843. + # g++
  12844. + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
  12845. + # as there is no search path for DLLs.
  12846. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
  12847. + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
  12848. + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
  12849. + _LT_TAGVAR(always_export_symbols, $1)=no
  12850. + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
  12851. +
  12852. + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  12853. + _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'
  12854. + # If the export-symbols file already is a .def file (1st line
  12855. + # is EXPORTS), use it as is; otherwise, prepend...
  12856. + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  12857. + cp $export_symbols $output_objdir/$soname.def;
  12858. + else
  12859. + echo EXPORTS > $output_objdir/$soname.def;
  12860. + cat $export_symbols >> $output_objdir/$soname.def;
  12861. + fi~
  12862. + $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'
  12863. + else
  12864. + _LT_TAGVAR(ld_shlibs, $1)=no
  12865. + fi
  12866. + ;;
  12867. + esac
  12868. + ;;
  12869. darwin* | rhapsody*)
  12870. _LT_DARWIN_LINKER_FEATURES($1)
  12871. ;;
  12872. @@ -5838,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12873. ;;
  12874. *)
  12875. if test "$GXX" = yes; then
  12876. - _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'
  12877. + _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'
  12878. else
  12879. # FIXME: insert proper C++ library support
  12880. _LT_TAGVAR(ld_shlibs, $1)=no
  12881. @@ -5909,10 +6284,10 @@ if test "$_lt_caught_CXX_error" != yes; then
  12882. _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
  12883. ;;
  12884. ia64*)
  12885. - _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'
  12886. + _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'
  12887. ;;
  12888. *)
  12889. - _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'
  12890. + _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'
  12891. ;;
  12892. esac
  12893. fi
  12894. @@ -5953,9 +6328,9 @@ if test "$_lt_caught_CXX_error" != yes; then
  12895. *)
  12896. if test "$GXX" = yes; then
  12897. if test "$with_gnu_ld" = no; then
  12898. - _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'
  12899. + _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'
  12900. else
  12901. - _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'
  12902. + _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'
  12903. fi
  12904. fi
  12905. _LT_TAGVAR(link_all_deplibs, $1)=yes
  12906. @@ -6025,20 +6400,20 @@ if test "$_lt_caught_CXX_error" != yes; then
  12907. _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
  12908. rm -rf $tpldir~
  12909. $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
  12910. - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
  12911. + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
  12912. _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
  12913. rm -rf $tpldir~
  12914. $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
  12915. - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
  12916. + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
  12917. $RANLIB $oldlib'
  12918. _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
  12919. rm -rf $tpldir~
  12920. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  12921. - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  12922. + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  12923. _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
  12924. rm -rf $tpldir~
  12925. $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
  12926. - $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'
  12927. + $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'
  12928. ;;
  12929. *) # Version 6 and above use weak symbols
  12930. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
  12931. @@ -6233,7 +6608,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12932. _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'
  12933. ;;
  12934. *)
  12935. - _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'
  12936. + _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'
  12937. ;;
  12938. esac
  12939. @@ -6279,7 +6654,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12940. solaris*)
  12941. case $cc_basename in
  12942. - CC*)
  12943. + CC* | sunCC*)
  12944. # Sun C++ 4.2, 5.x and Centerline C++
  12945. _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
  12946. _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
  12947. @@ -6320,9 +6695,9 @@ if test "$_lt_caught_CXX_error" != yes; then
  12948. if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  12949. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
  12950. if $CC --version | $GREP -v '^2\.7' > /dev/null; then
  12951. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
  12952. + _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'
  12953. _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  12954. - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  12955. + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
  12956. # Commands to make compiler produce verbose output that lists
  12957. # what "hidden" libraries, object files and flags are used when
  12958. @@ -6451,6 +6826,7 @@ if test "$_lt_caught_CXX_error" != yes; then
  12959. fi # test -n "$compiler"
  12960. CC=$lt_save_CC
  12961. + CFLAGS=$lt_save_CFLAGS
  12962. LDCXX=$LD
  12963. LD=$lt_save_LD
  12964. GCC=$lt_save_GCC
  12965. @@ -6465,6 +6841,29 @@ AC_LANG_POP
  12966. ])# _LT_LANG_CXX_CONFIG
  12967. +# _LT_FUNC_STRIPNAME_CNF
  12968. +# ----------------------
  12969. +# func_stripname_cnf prefix suffix name
  12970. +# strip PREFIX and SUFFIX off of NAME.
  12971. +# PREFIX and SUFFIX must not contain globbing or regex special
  12972. +# characters, hashes, percent signs, but SUFFIX may contain a leading
  12973. +# dot (in which case that matches only a dot).
  12974. +#
  12975. +# This function is identical to the (non-XSI) version of func_stripname,
  12976. +# except this one can be used by m4 code that may be executed by configure,
  12977. +# rather than the libtool script.
  12978. +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
  12979. +AC_REQUIRE([_LT_DECL_SED])
  12980. +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
  12981. +func_stripname_cnf ()
  12982. +{
  12983. + case ${2} in
  12984. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  12985. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  12986. + esac
  12987. +} # func_stripname_cnf
  12988. +])# _LT_FUNC_STRIPNAME_CNF
  12989. +
  12990. # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
  12991. # ---------------------------------
  12992. # Figure out "hidden" library dependencies from verbose
  12993. @@ -6473,6 +6872,7 @@ AC_LANG_POP
  12994. # objects, libraries and library flags.
  12995. m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
  12996. [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
  12997. +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
  12998. # Dependencies to place before and after the object being linked:
  12999. _LT_TAGVAR(predep_objects, $1)=
  13000. _LT_TAGVAR(postdep_objects, $1)=
  13001. @@ -6523,6 +6923,13 @@ public class foo {
  13002. };
  13003. _LT_EOF
  13004. ])
  13005. +
  13006. +_lt_libdeps_save_CFLAGS=$CFLAGS
  13007. +case "$CC $CFLAGS " in #(
  13008. +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
  13009. +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
  13010. +esac
  13011. +
  13012. dnl Parse the compiler output and extract the necessary
  13013. dnl objects, libraries and library flags.
  13014. if AC_TRY_EVAL(ac_compile); then
  13015. @@ -6534,7 +6941,7 @@ if AC_TRY_EVAL(ac_compile); then
  13016. pre_test_object_deps_done=no
  13017. for p in `eval "$output_verbose_link_cmd"`; do
  13018. - case $p in
  13019. + case ${prev}${p} in
  13020. -L* | -R* | -l*)
  13021. # Some compilers place space between "-{L,R}" and the path.
  13022. @@ -6543,13 +6950,22 @@ if AC_TRY_EVAL(ac_compile); then
  13023. test $p = "-R"; then
  13024. prev=$p
  13025. continue
  13026. - else
  13027. - prev=
  13028. fi
  13029. + # Expand the sysroot to ease extracting the directories later.
  13030. + if test -z "$prev"; then
  13031. + case $p in
  13032. + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
  13033. + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
  13034. + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
  13035. + esac
  13036. + fi
  13037. + case $p in
  13038. + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
  13039. + esac
  13040. if test "$pre_test_object_deps_done" = no; then
  13041. - case $p in
  13042. - -L* | -R*)
  13043. + case ${prev} in
  13044. + -L | -R)
  13045. # Internal compiler library paths should come after those
  13046. # provided the user. The postdeps already come after the
  13047. # user supplied libs so there is no need to process them.
  13048. @@ -6569,8 +6985,10 @@ if AC_TRY_EVAL(ac_compile); then
  13049. _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
  13050. fi
  13051. fi
  13052. + prev=
  13053. ;;
  13054. + *.lto.$objext) ;; # Ignore GCC LTO objects
  13055. *.$objext)
  13056. # This assumes that the test object file only shows up
  13057. # once in the compiler output.
  13058. @@ -6606,6 +7024,7 @@ else
  13059. fi
  13060. $RM -f confest.$objext
  13061. +CFLAGS=$_lt_libdeps_save_CFLAGS
  13062. # PORTME: override above test on systems where it is broken
  13063. m4_if([$1], [CXX],
  13064. @@ -6642,7 +7061,7 @@ linux*)
  13065. solaris*)
  13066. case $cc_basename in
  13067. - CC*)
  13068. + CC* | sunCC*)
  13069. # The more standards-conforming stlport4 library is
  13070. # incompatible with the Cstd library. Avoid specifying
  13071. # it if it's in CXXFLAGS. Ignore libCrun as
  13072. @@ -6755,7 +7174,9 @@ if test "$_lt_disable_F77" != yes; then
  13073. # Allow CC to be a program name with arguments.
  13074. lt_save_CC="$CC"
  13075. lt_save_GCC=$GCC
  13076. + lt_save_CFLAGS=$CFLAGS
  13077. CC=${F77-"f77"}
  13078. + CFLAGS=$FFLAGS
  13079. compiler=$CC
  13080. _LT_TAGVAR(compiler, $1)=$CC
  13081. _LT_CC_BASENAME([$compiler])
  13082. @@ -6809,6 +7230,7 @@ if test "$_lt_disable_F77" != yes; then
  13083. GCC=$lt_save_GCC
  13084. CC="$lt_save_CC"
  13085. + CFLAGS="$lt_save_CFLAGS"
  13086. fi # test "$_lt_disable_F77" != yes
  13087. AC_LANG_POP
  13088. @@ -6885,7 +7307,9 @@ if test "$_lt_disable_FC" != yes; then
  13089. # Allow CC to be a program name with arguments.
  13090. lt_save_CC="$CC"
  13091. lt_save_GCC=$GCC
  13092. + lt_save_CFLAGS=$CFLAGS
  13093. CC=${FC-"f95"}
  13094. + CFLAGS=$FCFLAGS
  13095. compiler=$CC
  13096. GCC=$ac_cv_fc_compiler_gnu
  13097. @@ -6941,7 +7365,8 @@ if test "$_lt_disable_FC" != yes; then
  13098. fi # test -n "$compiler"
  13099. GCC=$lt_save_GCC
  13100. - CC="$lt_save_CC"
  13101. + CC=$lt_save_CC
  13102. + CFLAGS=$lt_save_CFLAGS
  13103. fi # test "$_lt_disable_FC" != yes
  13104. AC_LANG_POP
  13105. @@ -6978,10 +7403,12 @@ _LT_COMPILER_BOILERPLATE
  13106. _LT_LINKER_BOILERPLATE
  13107. # Allow CC to be a program name with arguments.
  13108. -lt_save_CC="$CC"
  13109. +lt_save_CC=$CC
  13110. +lt_save_CFLAGS=$CFLAGS
  13111. lt_save_GCC=$GCC
  13112. GCC=yes
  13113. CC=${GCJ-"gcj"}
  13114. +CFLAGS=$GCJFLAGS
  13115. compiler=$CC
  13116. _LT_TAGVAR(compiler, $1)=$CC
  13117. _LT_TAGVAR(LD, $1)="$LD"
  13118. @@ -7012,7 +7439,8 @@ fi
  13119. AC_LANG_RESTORE
  13120. GCC=$lt_save_GCC
  13121. -CC="$lt_save_CC"
  13122. +CC=$lt_save_CC
  13123. +CFLAGS=$lt_save_CFLAGS
  13124. ])# _LT_LANG_GCJ_CONFIG
  13125. @@ -7047,9 +7475,11 @@ _LT_LINKER_BOILERPLATE
  13126. # Allow CC to be a program name with arguments.
  13127. lt_save_CC="$CC"
  13128. +lt_save_CFLAGS=$CFLAGS
  13129. lt_save_GCC=$GCC
  13130. GCC=
  13131. CC=${RC-"windres"}
  13132. +CFLAGS=
  13133. compiler=$CC
  13134. _LT_TAGVAR(compiler, $1)=$CC
  13135. _LT_CC_BASENAME([$compiler])
  13136. @@ -7062,7 +7492,8 @@ fi
  13137. GCC=$lt_save_GCC
  13138. AC_LANG_RESTORE
  13139. -CC="$lt_save_CC"
  13140. +CC=$lt_save_CC
  13141. +CFLAGS=$lt_save_CFLAGS
  13142. ])# _LT_LANG_RC_CONFIG
  13143. @@ -7121,6 +7552,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
  13144. AC_SUBST([OBJDUMP])
  13145. ])
  13146. +# _LT_DECL_DLLTOOL
  13147. +# ----------------
  13148. +# Ensure DLLTOOL variable is set.
  13149. +m4_defun([_LT_DECL_DLLTOOL],
  13150. +[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
  13151. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  13152. +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
  13153. +AC_SUBST([DLLTOOL])
  13154. +])
  13155. # _LT_DECL_SED
  13156. # ------------
  13157. @@ -7214,8 +7654,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
  13158. # Try some XSI features
  13159. xsi_shell=no
  13160. ( _lt_dummy="a/b/c"
  13161. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  13162. - = c,a/b,, \
  13163. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  13164. + = c,a/b,b/c, \
  13165. && eval 'test $(( 1 + 1 )) -eq 2 \
  13166. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  13167. && xsi_shell=yes
  13168. @@ -7254,206 +7694,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
  13169. ])# _LT_CHECK_SHELL_FEATURES
  13170. -# _LT_PROG_XSI_SHELLFNS
  13171. -# ---------------------
  13172. -# Bourne and XSI compatible variants of some useful shell functions.
  13173. -m4_defun([_LT_PROG_XSI_SHELLFNS],
  13174. -[case $xsi_shell in
  13175. - yes)
  13176. - cat << \_LT_EOF >> "$cfgfile"
  13177. -
  13178. -# func_dirname file append nondir_replacement
  13179. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  13180. -# otherwise set result to NONDIR_REPLACEMENT.
  13181. -func_dirname ()
  13182. -{
  13183. - case ${1} in
  13184. - */*) func_dirname_result="${1%/*}${2}" ;;
  13185. - * ) func_dirname_result="${3}" ;;
  13186. - esac
  13187. -}
  13188. -
  13189. -# func_basename file
  13190. -func_basename ()
  13191. -{
  13192. - func_basename_result="${1##*/}"
  13193. -}
  13194. -
  13195. -# func_dirname_and_basename file append nondir_replacement
  13196. -# perform func_basename and func_dirname in a single function
  13197. -# call:
  13198. -# dirname: Compute the dirname of FILE. If nonempty,
  13199. -# add APPEND to the result, otherwise set result
  13200. -# to NONDIR_REPLACEMENT.
  13201. -# value returned in "$func_dirname_result"
  13202. -# basename: Compute filename of FILE.
  13203. -# value retuned in "$func_basename_result"
  13204. -# Implementation must be kept synchronized with func_dirname
  13205. -# and func_basename. For efficiency, we do not delegate to
  13206. -# those functions but instead duplicate the functionality here.
  13207. -func_dirname_and_basename ()
  13208. -{
  13209. - case ${1} in
  13210. - */*) func_dirname_result="${1%/*}${2}" ;;
  13211. - * ) func_dirname_result="${3}" ;;
  13212. - esac
  13213. - func_basename_result="${1##*/}"
  13214. -}
  13215. -
  13216. -# func_stripname prefix suffix name
  13217. -# strip PREFIX and SUFFIX off of NAME.
  13218. -# PREFIX and SUFFIX must not contain globbing or regex special
  13219. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  13220. -# dot (in which case that matches only a dot).
  13221. -func_stripname ()
  13222. -{
  13223. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  13224. - # positional parameters, so assign one to ordinary parameter first.
  13225. - func_stripname_result=${3}
  13226. - func_stripname_result=${func_stripname_result#"${1}"}
  13227. - func_stripname_result=${func_stripname_result%"${2}"}
  13228. -}
  13229. -
  13230. -# func_opt_split
  13231. -func_opt_split ()
  13232. -{
  13233. - func_opt_split_opt=${1%%=*}
  13234. - func_opt_split_arg=${1#*=}
  13235. -}
  13236. -
  13237. -# func_lo2o object
  13238. -func_lo2o ()
  13239. -{
  13240. - case ${1} in
  13241. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  13242. - *) func_lo2o_result=${1} ;;
  13243. - esac
  13244. -}
  13245. -
  13246. -# func_xform libobj-or-source
  13247. -func_xform ()
  13248. -{
  13249. - func_xform_result=${1%.*}.lo
  13250. -}
  13251. -
  13252. -# func_arith arithmetic-term...
  13253. -func_arith ()
  13254. -{
  13255. - func_arith_result=$(( $[*] ))
  13256. -}
  13257. -
  13258. -# func_len string
  13259. -# STRING may not start with a hyphen.
  13260. -func_len ()
  13261. -{
  13262. - func_len_result=${#1}
  13263. -}
  13264. +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
  13265. +# ------------------------------------------------------
  13266. +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
  13267. +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
  13268. +m4_defun([_LT_PROG_FUNCTION_REPLACE],
  13269. +[dnl {
  13270. +sed -e '/^$1 ()$/,/^} # $1 /c\
  13271. +$1 ()\
  13272. +{\
  13273. +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
  13274. +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
  13275. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  13276. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  13277. +test 0 -eq $? || _lt_function_replace_fail=:
  13278. +])
  13279. -_LT_EOF
  13280. - ;;
  13281. - *) # Bourne compatible functions.
  13282. - cat << \_LT_EOF >> "$cfgfile"
  13283. -# func_dirname file append nondir_replacement
  13284. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  13285. -# otherwise set result to NONDIR_REPLACEMENT.
  13286. -func_dirname ()
  13287. -{
  13288. - # Extract subdirectory from the argument.
  13289. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  13290. - if test "X$func_dirname_result" = "X${1}"; then
  13291. - func_dirname_result="${3}"
  13292. - else
  13293. - func_dirname_result="$func_dirname_result${2}"
  13294. - fi
  13295. -}
  13296. +# _LT_PROG_REPLACE_SHELLFNS
  13297. +# -------------------------
  13298. +# Replace existing portable implementations of several shell functions with
  13299. +# equivalent extended shell implementations where those features are available..
  13300. +m4_defun([_LT_PROG_REPLACE_SHELLFNS],
  13301. +[if test x"$xsi_shell" = xyes; then
  13302. + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
  13303. + case ${1} in
  13304. + */*) func_dirname_result="${1%/*}${2}" ;;
  13305. + * ) func_dirname_result="${3}" ;;
  13306. + esac])
  13307. +
  13308. + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
  13309. + func_basename_result="${1##*/}"])
  13310. +
  13311. + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
  13312. + case ${1} in
  13313. + */*) func_dirname_result="${1%/*}${2}" ;;
  13314. + * ) func_dirname_result="${3}" ;;
  13315. + esac
  13316. + func_basename_result="${1##*/}"])
  13317. -# func_basename file
  13318. -func_basename ()
  13319. -{
  13320. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  13321. -}
  13322. + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
  13323. + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  13324. + # positional parameters, so assign one to ordinary parameter first.
  13325. + func_stripname_result=${3}
  13326. + func_stripname_result=${func_stripname_result#"${1}"}
  13327. + func_stripname_result=${func_stripname_result%"${2}"}])
  13328. -dnl func_dirname_and_basename
  13329. -dnl A portable version of this function is already defined in general.m4sh
  13330. -dnl so there is no need for it here.
  13331. + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
  13332. + func_split_long_opt_name=${1%%=*}
  13333. + func_split_long_opt_arg=${1#*=}])
  13334. -# func_stripname prefix suffix name
  13335. -# strip PREFIX and SUFFIX off of NAME.
  13336. -# PREFIX and SUFFIX must not contain globbing or regex special
  13337. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  13338. -# dot (in which case that matches only a dot).
  13339. -# func_strip_suffix prefix name
  13340. -func_stripname ()
  13341. -{
  13342. - case ${2} in
  13343. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  13344. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  13345. - esac
  13346. -}
  13347. + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
  13348. + func_split_short_opt_arg=${1#??}
  13349. + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
  13350. -# sed scripts:
  13351. -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
  13352. -my_sed_long_arg='1s/^-[[^=]]*=//'
  13353. + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
  13354. + case ${1} in
  13355. + *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  13356. + *) func_lo2o_result=${1} ;;
  13357. + esac])
  13358. -# func_opt_split
  13359. -func_opt_split ()
  13360. -{
  13361. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  13362. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  13363. -}
  13364. + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
  13365. -# func_lo2o object
  13366. -func_lo2o ()
  13367. -{
  13368. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  13369. -}
  13370. + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
  13371. -# func_xform libobj-or-source
  13372. -func_xform ()
  13373. -{
  13374. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
  13375. -}
  13376. + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
  13377. +fi
  13378. -# func_arith arithmetic-term...
  13379. -func_arith ()
  13380. -{
  13381. - func_arith_result=`expr "$[@]"`
  13382. -}
  13383. +if test x"$lt_shell_append" = xyes; then
  13384. + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
  13385. -# func_len string
  13386. -# STRING may not start with a hyphen.
  13387. -func_len ()
  13388. -{
  13389. - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
  13390. -}
  13391. + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
  13392. + func_quote_for_eval "${2}"
  13393. +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
  13394. + eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
  13395. -_LT_EOF
  13396. -esac
  13397. + # Save a `func_append' function call where possible by direct use of '+='
  13398. + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  13399. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  13400. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  13401. + test 0 -eq $? || _lt_function_replace_fail=:
  13402. +else
  13403. + # Save a `func_append' function call even when '+=' is not available
  13404. + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  13405. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  13406. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  13407. + test 0 -eq $? || _lt_function_replace_fail=:
  13408. +fi
  13409. -case $lt_shell_append in
  13410. - yes)
  13411. - cat << \_LT_EOF >> "$cfgfile"
  13412. +if test x"$_lt_function_replace_fail" = x":"; then
  13413. + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
  13414. +fi
  13415. +])
  13416. -# func_append var value
  13417. -# Append VALUE to the end of shell variable VAR.
  13418. -func_append ()
  13419. -{
  13420. - eval "$[1]+=\$[2]"
  13421. -}
  13422. -_LT_EOF
  13423. +# _LT_PATH_CONVERSION_FUNCTIONS
  13424. +# -----------------------------
  13425. +# Determine which file name conversion functions should be used by
  13426. +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
  13427. +# for certain cross-compile configurations and native mingw.
  13428. +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
  13429. +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
  13430. +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
  13431. +AC_MSG_CHECKING([how to convert $build file names to $host format])
  13432. +AC_CACHE_VAL(lt_cv_to_host_file_cmd,
  13433. +[case $host in
  13434. + *-*-mingw* )
  13435. + case $build in
  13436. + *-*-mingw* ) # actually msys
  13437. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  13438. + ;;
  13439. + *-*-cygwin* )
  13440. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  13441. + ;;
  13442. + * ) # otherwise, assume *nix
  13443. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  13444. + ;;
  13445. + esac
  13446. ;;
  13447. - *)
  13448. - cat << \_LT_EOF >> "$cfgfile"
  13449. -
  13450. -# func_append var value
  13451. -# Append VALUE to the end of shell variable VAR.
  13452. -func_append ()
  13453. -{
  13454. - eval "$[1]=\$$[1]\$[2]"
  13455. -}
  13456. -
  13457. -_LT_EOF
  13458. + *-*-cygwin* )
  13459. + case $build in
  13460. + *-*-mingw* ) # actually msys
  13461. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  13462. + ;;
  13463. + *-*-cygwin* )
  13464. + lt_cv_to_host_file_cmd=func_convert_file_noop
  13465. + ;;
  13466. + * ) # otherwise, assume *nix
  13467. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  13468. + ;;
  13469. + esac
  13470. ;;
  13471. - esac
  13472. + * ) # unhandled hosts (and "normal" native builds)
  13473. + lt_cv_to_host_file_cmd=func_convert_file_noop
  13474. + ;;
  13475. +esac
  13476. +])
  13477. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  13478. +AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
  13479. +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
  13480. + [0], [convert $build file names to $host format])dnl
  13481. +
  13482. +AC_MSG_CHECKING([how to convert $build file names to toolchain format])
  13483. +AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
  13484. +[#assume ordinary cross tools, or native build.
  13485. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  13486. +case $host in
  13487. + *-*-mingw* )
  13488. + case $build in
  13489. + *-*-mingw* ) # actually msys
  13490. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  13491. + ;;
  13492. + esac
  13493. + ;;
  13494. +esac
  13495. ])
  13496. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  13497. +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
  13498. +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
  13499. + [0], [convert $build files to toolchain format])dnl
  13500. +])# _LT_PATH_CONVERSION_FUNCTIONS
  13501. diff --git a/ltmain.sh b/ltmain.sh
  13502. index 9503ec85d70..70e856e0659 100644
  13503. --- a/ltmain.sh
  13504. +++ b/ltmain.sh
  13505. @@ -1,10 +1,9 @@
  13506. -# Generated from ltmain.m4sh.
  13507. -# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
  13508. +# libtool (GNU libtool) 2.4
  13509. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
  13510. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
  13511. -# 2007, 2008, 2009 Free Software Foundation, Inc.
  13512. +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  13513. # This is free software; see the source for copying conditions. There is NO
  13514. # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  13515. @@ -38,7 +37,6 @@
  13516. # -n, --dry-run display commands without modifying any files
  13517. # --features display basic configuration information and exit
  13518. # --mode=MODE use operation mode MODE
  13519. -# --no-finish let install mode avoid finish commands
  13520. # --preserve-dup-deps don't remove duplicate dependency libraries
  13521. # --quiet, --silent don't print informational messages
  13522. # --no-quiet, --no-silent
  13523. @@ -71,17 +69,19 @@
  13524. # compiler: $LTCC
  13525. # compiler flags: $LTCFLAGS
  13526. # linker: $LD (gnu? $with_gnu_ld)
  13527. -# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
  13528. +# $progname: (GNU libtool) 2.4
  13529. # automake: $automake_version
  13530. # autoconf: $autoconf_version
  13531. #
  13532. # Report bugs to <bug-libtool@gnu.org>.
  13533. +# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
  13534. +# General help using GNU software: <http://www.gnu.org/gethelp/>.
  13535. PROGRAM=libtool
  13536. PACKAGE=libtool
  13537. -VERSION=2.2.7a
  13538. -TIMESTAMP=" 1.3134 2009-11-29"
  13539. -package_revision=1.3134
  13540. +VERSION=2.4
  13541. +TIMESTAMP=""
  13542. +package_revision=1.3293
  13543. # Be Bourne compatible
  13544. if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  13545. @@ -106,9 +106,6 @@ _LTECHO_EOF'
  13546. }
  13547. # NLS nuisances: We save the old values to restore during execute mode.
  13548. -# Only set LANG and LC_ALL to C if already set.
  13549. -# These must not be set unconditionally because not all systems understand
  13550. -# e.g. LANG=C (notably SCO).
  13551. lt_user_locale=
  13552. lt_safe_locale=
  13553. for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
  13554. @@ -121,15 +118,13 @@ do
  13555. lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
  13556. fi"
  13557. done
  13558. +LC_ALL=C
  13559. +LANGUAGE=C
  13560. +export LANGUAGE LC_ALL
  13561. $lt_unset CDPATH
  13562. -
  13563. -
  13564. -
  13565. -
  13566. -
  13567. # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
  13568. # is ksh but when the shell is invoked as "sh" and the current value of
  13569. # the _XPG environment variable is not equal to 1 (one), the special
  13570. @@ -140,7 +135,7 @@ progpath="$0"
  13571. : ${CP="cp -f"}
  13572. -: ${ECHO=$as_echo}
  13573. +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
  13574. : ${EGREP="/bin/grep -E"}
  13575. : ${FGREP="/bin/grep -F"}
  13576. : ${GREP="/bin/grep"}
  13577. @@ -149,7 +144,7 @@ progpath="$0"
  13578. : ${MKDIR="mkdir"}
  13579. : ${MV="mv -f"}
  13580. : ${RM="rm -f"}
  13581. -: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
  13582. +: ${SED="/bin/sed"}
  13583. : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
  13584. : ${Xsed="$SED -e 1s/^X//"}
  13585. @@ -169,6 +164,27 @@ IFS=" $lt_nl"
  13586. dirname="s,/[^/]*$,,"
  13587. basename="s,^.*/,,"
  13588. +# func_dirname file append nondir_replacement
  13589. +# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  13590. +# otherwise set result to NONDIR_REPLACEMENT.
  13591. +func_dirname ()
  13592. +{
  13593. + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  13594. + if test "X$func_dirname_result" = "X${1}"; then
  13595. + func_dirname_result="${3}"
  13596. + else
  13597. + func_dirname_result="$func_dirname_result${2}"
  13598. + fi
  13599. +} # func_dirname may be replaced by extended shell implementation
  13600. +
  13601. +
  13602. +# func_basename file
  13603. +func_basename ()
  13604. +{
  13605. + func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  13606. +} # func_basename may be replaced by extended shell implementation
  13607. +
  13608. +
  13609. # func_dirname_and_basename file append nondir_replacement
  13610. # perform func_basename and func_dirname in a single function
  13611. # call:
  13612. @@ -183,17 +199,31 @@ basename="s,^.*/,,"
  13613. # those functions but instead duplicate the functionality here.
  13614. func_dirname_and_basename ()
  13615. {
  13616. - # Extract subdirectory from the argument.
  13617. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
  13618. - if test "X$func_dirname_result" = "X${1}"; then
  13619. - func_dirname_result="${3}"
  13620. - else
  13621. - func_dirname_result="$func_dirname_result${2}"
  13622. - fi
  13623. - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
  13624. -}
  13625. + # Extract subdirectory from the argument.
  13626. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
  13627. + if test "X$func_dirname_result" = "X${1}"; then
  13628. + func_dirname_result="${3}"
  13629. + else
  13630. + func_dirname_result="$func_dirname_result${2}"
  13631. + fi
  13632. + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
  13633. +} # func_dirname_and_basename may be replaced by extended shell implementation
  13634. +
  13635. +
  13636. +# func_stripname prefix suffix name
  13637. +# strip PREFIX and SUFFIX off of NAME.
  13638. +# PREFIX and SUFFIX must not contain globbing or regex special
  13639. +# characters, hashes, percent signs, but SUFFIX may contain a leading
  13640. +# dot (in which case that matches only a dot).
  13641. +# func_strip_suffix prefix name
  13642. +func_stripname ()
  13643. +{
  13644. + case ${2} in
  13645. + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  13646. + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  13647. + esac
  13648. +} # func_stripname may be replaced by extended shell implementation
  13649. -# Generated shell functions inserted here.
  13650. # These SED scripts presuppose an absolute path with a trailing slash.
  13651. pathcar='s,^/\([^/]*\).*$,\1,'
  13652. @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
  13653. # Same as above, but do not quote variable references.
  13654. double_quote_subst='s/\(["`\\]\)/\\\1/g'
  13655. +# Sed substitution that turns a string into a regex matching for the
  13656. +# string literally.
  13657. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
  13658. +
  13659. +# Sed substitution that converts a w32 file name or path
  13660. +# which contains forward slashes, into one that contains
  13661. +# (escaped) backslashes. A very naive implementation.
  13662. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
  13663. +
  13664. # Re-`\' parameter expansions in output of double_quote_subst that were
  13665. # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
  13666. # in input to double_quote_subst, that '$' was protected from expansion.
  13667. @@ -404,7 +443,7 @@ opt_warning=:
  13668. # name if it has been set yet.
  13669. func_echo ()
  13670. {
  13671. - $ECHO "$progname${mode+: }$mode: $*"
  13672. + $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
  13673. }
  13674. # func_verbose arg...
  13675. @@ -430,14 +469,14 @@ func_echo_all ()
  13676. # Echo program name prefixed message to standard error.
  13677. func_error ()
  13678. {
  13679. - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
  13680. + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
  13681. }
  13682. # func_warning arg...
  13683. # Echo program name prefixed warning message to standard error.
  13684. func_warning ()
  13685. {
  13686. - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
  13687. + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
  13688. # bash bug again:
  13689. :
  13690. @@ -656,19 +695,35 @@ func_show_eval_locale ()
  13691. fi
  13692. }
  13693. -
  13694. -
  13695. +# func_tr_sh
  13696. +# Turn $1 into a string suitable for a shell variable name.
  13697. +# Result is stored in $func_tr_sh_result. All characters
  13698. +# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
  13699. +# if $1 begins with a digit, a '_' is prepended as well.
  13700. +func_tr_sh ()
  13701. +{
  13702. + case $1 in
  13703. + [0-9]* | *[!a-zA-Z0-9_]*)
  13704. + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
  13705. + ;;
  13706. + * )
  13707. + func_tr_sh_result=$1
  13708. + ;;
  13709. + esac
  13710. +}
  13711. # func_version
  13712. # Echo version message to standard output and exit.
  13713. func_version ()
  13714. {
  13715. + $opt_debug
  13716. +
  13717. $SED -n '/(C)/!b go
  13718. :more
  13719. /\./!{
  13720. N
  13721. - s/\n# //
  13722. + s/\n# / /
  13723. b more
  13724. }
  13725. :go
  13726. @@ -685,7 +740,9 @@ func_version ()
  13727. # Echo short help message to standard output and exit.
  13728. func_usage ()
  13729. {
  13730. - $SED -n '/^# Usage:/,/^# *-h/ {
  13731. + $opt_debug
  13732. +
  13733. + $SED -n '/^# Usage:/,/^# *.*--help/ {
  13734. s/^# //
  13735. s/^# *$//
  13736. s/\$progname/'$progname'/
  13737. @@ -701,7 +758,10 @@ func_usage ()
  13738. # unless 'noexit' is passed as argument.
  13739. func_help ()
  13740. {
  13741. + $opt_debug
  13742. +
  13743. $SED -n '/^# Usage:/,/# Report bugs to/ {
  13744. + :print
  13745. s/^# //
  13746. s/^# *$//
  13747. s*\$progname*'$progname'*
  13748. @@ -714,7 +774,11 @@ func_help ()
  13749. s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
  13750. s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
  13751. p
  13752. - }' < "$progpath"
  13753. + d
  13754. + }
  13755. + /^# .* home page:/b print
  13756. + /^# General help using/b print
  13757. + ' < "$progpath"
  13758. ret=$?
  13759. if test -z "$1"; then
  13760. exit $ret
  13761. @@ -726,12 +790,39 @@ func_help ()
  13762. # exit_cmd.
  13763. func_missing_arg ()
  13764. {
  13765. - func_error "missing argument for $1"
  13766. + $opt_debug
  13767. +
  13768. + func_error "missing argument for $1."
  13769. exit_cmd=exit
  13770. }
  13771. -exit_cmd=:
  13772. +# func_split_short_opt shortopt
  13773. +# Set func_split_short_opt_name and func_split_short_opt_arg shell
  13774. +# variables after splitting SHORTOPT after the 2nd character.
  13775. +func_split_short_opt ()
  13776. +{
  13777. + my_sed_short_opt='1s/^\(..\).*$/\1/;q'
  13778. + my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
  13779. +
  13780. + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
  13781. + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
  13782. +} # func_split_short_opt may be replaced by extended shell implementation
  13783. +
  13784. +
  13785. +# func_split_long_opt longopt
  13786. +# Set func_split_long_opt_name and func_split_long_opt_arg shell
  13787. +# variables after splitting LONGOPT at the `=' sign.
  13788. +func_split_long_opt ()
  13789. +{
  13790. + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
  13791. + my_sed_long_arg='1s/^--[^=]*=//'
  13792. +
  13793. + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
  13794. + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
  13795. +} # func_split_long_opt may be replaced by extended shell implementation
  13796. +
  13797. +exit_cmd=:
  13798. @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
  13799. magic_exe="%%%MAGIC EXE variable%%%"
  13800. # Global variables.
  13801. -# $mode is unset
  13802. nonopt=
  13803. -execute_dlfiles=
  13804. preserve_args=
  13805. lo2o="s/\\.lo\$/.${objext}/"
  13806. o2lo="s/\\.${objext}\$/.lo/"
  13807. extracted_archives=
  13808. extracted_serial=0
  13809. -opt_dry_run=false
  13810. -opt_finish=:
  13811. -opt_duplicate_deps=false
  13812. -opt_silent=false
  13813. -opt_debug=:
  13814. -
  13815. # If this variable is set in any of the actions, the command in it
  13816. # will be execed at the end. This prevents here-documents from being
  13817. # left over by shells.
  13818. exec_cmd=
  13819. +# func_append var value
  13820. +# Append VALUE to the end of shell variable VAR.
  13821. +func_append ()
  13822. +{
  13823. + eval "${1}=\$${1}\${2}"
  13824. +} # func_append may be replaced by extended shell implementation
  13825. +
  13826. +# func_append_quoted var value
  13827. +# Quote VALUE and append to the end of shell variable VAR, separated
  13828. +# by a space.
  13829. +func_append_quoted ()
  13830. +{
  13831. + func_quote_for_eval "${2}"
  13832. + eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
  13833. +} # func_append_quoted may be replaced by extended shell implementation
  13834. +
  13835. +
  13836. +# func_arith arithmetic-term...
  13837. +func_arith ()
  13838. +{
  13839. + func_arith_result=`expr "${@}"`
  13840. +} # func_arith may be replaced by extended shell implementation
  13841. +
  13842. +
  13843. +# func_len string
  13844. +# STRING may not start with a hyphen.
  13845. +func_len ()
  13846. +{
  13847. + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
  13848. +} # func_len may be replaced by extended shell implementation
  13849. +
  13850. +
  13851. +# func_lo2o object
  13852. +func_lo2o ()
  13853. +{
  13854. + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  13855. +} # func_lo2o may be replaced by extended shell implementation
  13856. +
  13857. +
  13858. +# func_xform libobj-or-source
  13859. +func_xform ()
  13860. +{
  13861. + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  13862. +} # func_xform may be replaced by extended shell implementation
  13863. +
  13864. +
  13865. # func_fatal_configuration arg...
  13866. # Echo program name prefixed message to standard error, followed by
  13867. # a configuration failure hint, and exit.
  13868. @@ -850,130 +979,204 @@ func_enable_tag ()
  13869. esac
  13870. }
  13871. -# Parse options once, thoroughly. This comes as soon as possible in
  13872. -# the script to make things like `libtool --version' happen quickly.
  13873. +# func_check_version_match
  13874. +# Ensure that we are using m4 macros, and libtool script from the same
  13875. +# release of libtool.
  13876. +func_check_version_match ()
  13877. {
  13878. + if test "$package_revision" != "$macro_revision"; then
  13879. + if test "$VERSION" != "$macro_version"; then
  13880. + if test -z "$macro_version"; then
  13881. + cat >&2 <<_LT_EOF
  13882. +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  13883. +$progname: definition of this LT_INIT comes from an older release.
  13884. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  13885. +$progname: and run autoconf again.
  13886. +_LT_EOF
  13887. + else
  13888. + cat >&2 <<_LT_EOF
  13889. +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  13890. +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
  13891. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  13892. +$progname: and run autoconf again.
  13893. +_LT_EOF
  13894. + fi
  13895. + else
  13896. + cat >&2 <<_LT_EOF
  13897. +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
  13898. +$progname: but the definition of this LT_INIT comes from revision $macro_revision.
  13899. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision
  13900. +$progname: of $PACKAGE $VERSION and run autoconf again.
  13901. +_LT_EOF
  13902. + fi
  13903. - # Shorthand for --mode=foo, only valid as the first argument
  13904. - case $1 in
  13905. - clean|clea|cle|cl)
  13906. - shift; set dummy --mode clean ${1+"$@"}; shift
  13907. - ;;
  13908. - compile|compil|compi|comp|com|co|c)
  13909. - shift; set dummy --mode compile ${1+"$@"}; shift
  13910. - ;;
  13911. - execute|execut|execu|exec|exe|ex|e)
  13912. - shift; set dummy --mode execute ${1+"$@"}; shift
  13913. - ;;
  13914. - finish|finis|fini|fin|fi|f)
  13915. - shift; set dummy --mode finish ${1+"$@"}; shift
  13916. - ;;
  13917. - install|instal|insta|inst|ins|in|i)
  13918. - shift; set dummy --mode install ${1+"$@"}; shift
  13919. - ;;
  13920. - link|lin|li|l)
  13921. - shift; set dummy --mode link ${1+"$@"}; shift
  13922. - ;;
  13923. - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
  13924. - shift; set dummy --mode uninstall ${1+"$@"}; shift
  13925. - ;;
  13926. - esac
  13927. + exit $EXIT_MISMATCH
  13928. + fi
  13929. +}
  13930. +
  13931. +
  13932. +# Shorthand for --mode=foo, only valid as the first argument
  13933. +case $1 in
  13934. +clean|clea|cle|cl)
  13935. + shift; set dummy --mode clean ${1+"$@"}; shift
  13936. + ;;
  13937. +compile|compil|compi|comp|com|co|c)
  13938. + shift; set dummy --mode compile ${1+"$@"}; shift
  13939. + ;;
  13940. +execute|execut|execu|exec|exe|ex|e)
  13941. + shift; set dummy --mode execute ${1+"$@"}; shift
  13942. + ;;
  13943. +finish|finis|fini|fin|fi|f)
  13944. + shift; set dummy --mode finish ${1+"$@"}; shift
  13945. + ;;
  13946. +install|instal|insta|inst|ins|in|i)
  13947. + shift; set dummy --mode install ${1+"$@"}; shift
  13948. + ;;
  13949. +link|lin|li|l)
  13950. + shift; set dummy --mode link ${1+"$@"}; shift
  13951. + ;;
  13952. +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
  13953. + shift; set dummy --mode uninstall ${1+"$@"}; shift
  13954. + ;;
  13955. +esac
  13956. - # Parse non-mode specific arguments:
  13957. - while test "$#" -gt 0; do
  13958. +
  13959. +
  13960. +# Option defaults:
  13961. +opt_debug=:
  13962. +opt_dry_run=false
  13963. +opt_config=false
  13964. +opt_preserve_dup_deps=false
  13965. +opt_features=false
  13966. +opt_finish=false
  13967. +opt_help=false
  13968. +opt_help_all=false
  13969. +opt_silent=:
  13970. +opt_verbose=:
  13971. +opt_silent=false
  13972. +opt_verbose=false
  13973. +
  13974. +
  13975. +# Parse options once, thoroughly. This comes as soon as possible in the
  13976. +# script to make things like `--version' happen as quickly as we can.
  13977. +{
  13978. + # this just eases exit handling
  13979. + while test $# -gt 0; do
  13980. opt="$1"
  13981. shift
  13982. -
  13983. case $opt in
  13984. - --config) func_config ;;
  13985. -
  13986. - --debug) preserve_args="$preserve_args $opt"
  13987. + --debug|-x) opt_debug='set -x'
  13988. func_echo "enabling shell trace mode"
  13989. - opt_debug='set -x'
  13990. $opt_debug
  13991. ;;
  13992. -
  13993. - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
  13994. - execute_dlfiles="$execute_dlfiles $1"
  13995. - shift
  13996. + --dry-run|--dryrun|-n)
  13997. + opt_dry_run=:
  13998. ;;
  13999. -
  14000. - --dry-run | -n) opt_dry_run=: ;;
  14001. - --features) func_features ;;
  14002. - --finish) mode="finish" ;;
  14003. - --no-finish) opt_finish=false ;;
  14004. -
  14005. - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
  14006. - case $1 in
  14007. - # Valid mode arguments:
  14008. - clean) ;;
  14009. - compile) ;;
  14010. - execute) ;;
  14011. - finish) ;;
  14012. - install) ;;
  14013. - link) ;;
  14014. - relink) ;;
  14015. - uninstall) ;;
  14016. -
  14017. - # Catch anything else as an error
  14018. - *) func_error "invalid argument for $opt"
  14019. - exit_cmd=exit
  14020. - break
  14021. - ;;
  14022. - esac
  14023. -
  14024. - mode="$1"
  14025. + --config)
  14026. + opt_config=:
  14027. +func_config
  14028. + ;;
  14029. + --dlopen|-dlopen)
  14030. + optarg="$1"
  14031. + opt_dlopen="${opt_dlopen+$opt_dlopen
  14032. +}$optarg"
  14033. shift
  14034. ;;
  14035. -
  14036. --preserve-dup-deps)
  14037. - opt_duplicate_deps=: ;;
  14038. -
  14039. - --quiet|--silent) preserve_args="$preserve_args $opt"
  14040. - opt_silent=:
  14041. - opt_verbose=false
  14042. + opt_preserve_dup_deps=:
  14043. ;;
  14044. -
  14045. - --no-quiet|--no-silent)
  14046. - preserve_args="$preserve_args $opt"
  14047. - opt_silent=false
  14048. + --features)
  14049. + opt_features=:
  14050. +func_features
  14051. ;;
  14052. -
  14053. - --verbose| -v) preserve_args="$preserve_args $opt"
  14054. + --finish)
  14055. + opt_finish=:
  14056. +set dummy --mode finish ${1+"$@"}; shift
  14057. + ;;
  14058. + --help)
  14059. + opt_help=:
  14060. + ;;
  14061. + --help-all)
  14062. + opt_help_all=:
  14063. +opt_help=': help-all'
  14064. + ;;
  14065. + --mode)
  14066. + test $# = 0 && func_missing_arg $opt && break
  14067. + optarg="$1"
  14068. + opt_mode="$optarg"
  14069. +case $optarg in
  14070. + # Valid mode arguments:
  14071. + clean|compile|execute|finish|install|link|relink|uninstall) ;;
  14072. +
  14073. + # Catch anything else as an error
  14074. + *) func_error "invalid argument for $opt"
  14075. + exit_cmd=exit
  14076. + break
  14077. + ;;
  14078. +esac
  14079. + shift
  14080. + ;;
  14081. + --no-silent|--no-quiet)
  14082. opt_silent=false
  14083. - opt_verbose=:
  14084. +func_append preserve_args " $opt"
  14085. ;;
  14086. -
  14087. - --no-verbose) preserve_args="$preserve_args $opt"
  14088. + --no-verbose)
  14089. opt_verbose=false
  14090. +func_append preserve_args " $opt"
  14091. ;;
  14092. -
  14093. - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
  14094. - preserve_args="$preserve_args $opt $1"
  14095. - func_enable_tag "$1" # tagname is set here
  14096. + --silent|--quiet)
  14097. + opt_silent=:
  14098. +func_append preserve_args " $opt"
  14099. + opt_verbose=false
  14100. + ;;
  14101. + --verbose|-v)
  14102. + opt_verbose=:
  14103. +func_append preserve_args " $opt"
  14104. +opt_silent=false
  14105. + ;;
  14106. + --tag)
  14107. + test $# = 0 && func_missing_arg $opt && break
  14108. + optarg="$1"
  14109. + opt_tag="$optarg"
  14110. +func_append preserve_args " $opt $optarg"
  14111. +func_enable_tag "$optarg"
  14112. shift
  14113. ;;
  14114. + -\?|-h) func_usage ;;
  14115. + --help) func_help ;;
  14116. + --version) func_version ;;
  14117. +
  14118. # Separate optargs to long options:
  14119. - -dlopen=*|--mode=*|--tag=*)
  14120. - func_opt_split "$opt"
  14121. - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
  14122. + --*=*)
  14123. + func_split_long_opt "$opt"
  14124. + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
  14125. shift
  14126. ;;
  14127. - -\?|-h) func_usage ;;
  14128. - --help) opt_help=: ;;
  14129. - --help-all) opt_help=': help-all' ;;
  14130. - --version) func_version ;;
  14131. -
  14132. - -*) func_fatal_help "unrecognized option \`$opt'" ;;
  14133. -
  14134. - *) nonopt="$opt"
  14135. - break
  14136. + # Separate non-argument short options:
  14137. + -\?*|-h*|-n*|-v*)
  14138. + func_split_short_opt "$opt"
  14139. + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
  14140. + shift
  14141. ;;
  14142. +
  14143. + --) break ;;
  14144. + -*) func_fatal_help "unrecognized option \`$opt'" ;;
  14145. + *) set dummy "$opt" ${1+"$@"}; shift; break ;;
  14146. esac
  14147. done
  14148. + # Validate options:
  14149. +
  14150. + # save first non-option argument
  14151. + if test "$#" -gt 0; then
  14152. + nonopt="$opt"
  14153. + shift
  14154. + fi
  14155. +
  14156. + # preserve --debug
  14157. + test "$opt_debug" = : || func_append preserve_args " --debug"
  14158. case $host in
  14159. *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
  14160. @@ -981,82 +1184,44 @@ func_enable_tag ()
  14161. opt_duplicate_compiler_generated_deps=:
  14162. ;;
  14163. *)
  14164. - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
  14165. + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
  14166. ;;
  14167. esac
  14168. - # Having warned about all mis-specified options, bail out if
  14169. - # anything was wrong.
  14170. - $exit_cmd $EXIT_FAILURE
  14171. -}
  14172. + $opt_help || {
  14173. + # Sanity checks first:
  14174. + func_check_version_match
  14175. -# func_check_version_match
  14176. -# Ensure that we are using m4 macros, and libtool script from the same
  14177. -# release of libtool.
  14178. -func_check_version_match ()
  14179. -{
  14180. - if test "$package_revision" != "$macro_revision"; then
  14181. - if test "$VERSION" != "$macro_version"; then
  14182. - if test -z "$macro_version"; then
  14183. - cat >&2 <<_LT_EOF
  14184. -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  14185. -$progname: definition of this LT_INIT comes from an older release.
  14186. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  14187. -$progname: and run autoconf again.
  14188. -_LT_EOF
  14189. - else
  14190. - cat >&2 <<_LT_EOF
  14191. -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
  14192. -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
  14193. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
  14194. -$progname: and run autoconf again.
  14195. -_LT_EOF
  14196. - fi
  14197. - else
  14198. - cat >&2 <<_LT_EOF
  14199. -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
  14200. -$progname: but the definition of this LT_INIT comes from revision $macro_revision.
  14201. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision
  14202. -$progname: of $PACKAGE $VERSION and run autoconf again.
  14203. -_LT_EOF
  14204. + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
  14205. + func_fatal_configuration "not configured to build any kind of library"
  14206. fi
  14207. - exit $EXIT_MISMATCH
  14208. - fi
  14209. -}
  14210. -
  14211. + # Darwin sucks
  14212. + eval std_shrext=\"$shrext_cmds\"
  14213. -## ----------- ##
  14214. -## Main. ##
  14215. -## ----------- ##
  14216. -
  14217. -$opt_help || {
  14218. - # Sanity checks first:
  14219. - func_check_version_match
  14220. -
  14221. - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
  14222. - func_fatal_configuration "not configured to build any kind of library"
  14223. - fi
  14224. + # Only execute mode is allowed to have -dlopen flags.
  14225. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
  14226. + func_error "unrecognized option \`-dlopen'"
  14227. + $ECHO "$help" 1>&2
  14228. + exit $EXIT_FAILURE
  14229. + fi
  14230. - test -z "$mode" && func_fatal_error "error: you must specify a MODE."
  14231. + # Change the help message to a mode-specific one.
  14232. + generic_help="$help"
  14233. + help="Try \`$progname --help --mode=$opt_mode' for more information."
  14234. + }
  14235. - # Darwin sucks
  14236. - eval "std_shrext=\"$shrext_cmds\""
  14237. + # Bail if the options were screwed
  14238. + $exit_cmd $EXIT_FAILURE
  14239. +}
  14240. - # Only execute mode is allowed to have -dlopen flags.
  14241. - if test -n "$execute_dlfiles" && test "$mode" != execute; then
  14242. - func_error "unrecognized option \`-dlopen'"
  14243. - $ECHO "$help" 1>&2
  14244. - exit $EXIT_FAILURE
  14245. - fi
  14246. - # Change the help message to a mode-specific one.
  14247. - generic_help="$help"
  14248. - help="Try \`$progname --help --mode=$mode' for more information."
  14249. -}
  14250. +## ----------- ##
  14251. +## Main. ##
  14252. +## ----------- ##
  14253. # func_lalib_p file
  14254. # True iff FILE is a libtool `.la' library or `.lo' object file.
  14255. @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
  14256. # temporary ltwrapper_script.
  14257. func_ltwrapper_scriptname ()
  14258. {
  14259. - func_ltwrapper_scriptname_result=""
  14260. - if func_ltwrapper_executable_p "$1"; then
  14261. - func_dirname_and_basename "$1" "" "."
  14262. - func_stripname '' '.exe' "$func_basename_result"
  14263. - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
  14264. - fi
  14265. + func_dirname_and_basename "$1" "" "."
  14266. + func_stripname '' '.exe' "$func_basename_result"
  14267. + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
  14268. }
  14269. # func_ltwrapper_p file
  14270. @@ -1149,7 +1311,7 @@ func_execute_cmds ()
  14271. save_ifs=$IFS; IFS='~'
  14272. for cmd in $1; do
  14273. IFS=$save_ifs
  14274. - eval "cmd=\"$cmd\""
  14275. + eval cmd=\"$cmd\"
  14276. func_show_eval "$cmd" "${2-:}"
  14277. done
  14278. IFS=$save_ifs
  14279. @@ -1172,6 +1334,37 @@ func_source ()
  14280. }
  14281. +# func_resolve_sysroot PATH
  14282. +# Replace a leading = in PATH with a sysroot. Store the result into
  14283. +# func_resolve_sysroot_result
  14284. +func_resolve_sysroot ()
  14285. +{
  14286. + func_resolve_sysroot_result=$1
  14287. + case $func_resolve_sysroot_result in
  14288. + =*)
  14289. + func_stripname '=' '' "$func_resolve_sysroot_result"
  14290. + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
  14291. + ;;
  14292. + esac
  14293. +}
  14294. +
  14295. +# func_replace_sysroot PATH
  14296. +# If PATH begins with the sysroot, replace it with = and
  14297. +# store the result into func_replace_sysroot_result.
  14298. +func_replace_sysroot ()
  14299. +{
  14300. + case "$lt_sysroot:$1" in
  14301. + ?*:"$lt_sysroot"*)
  14302. + func_stripname "$lt_sysroot" '' "$1"
  14303. + func_replace_sysroot_result="=$func_stripname_result"
  14304. + ;;
  14305. + *)
  14306. + # Including no sysroot.
  14307. + func_replace_sysroot_result=$1
  14308. + ;;
  14309. + esac
  14310. +}
  14311. +
  14312. # func_infer_tag arg
  14313. # Infer tagged configuration to use if any are available and
  14314. # if one wasn't chosen via the "--tag" command line option.
  14315. @@ -1184,8 +1377,7 @@ func_infer_tag ()
  14316. if test -n "$available_tags" && test -z "$tagname"; then
  14317. CC_quoted=
  14318. for arg in $CC; do
  14319. - func_quote_for_eval "$arg"
  14320. - CC_quoted="$CC_quoted $func_quote_for_eval_result"
  14321. + func_append_quoted CC_quoted "$arg"
  14322. done
  14323. CC_expanded=`func_echo_all $CC`
  14324. CC_quoted_expanded=`func_echo_all $CC_quoted`
  14325. @@ -1204,8 +1396,7 @@ func_infer_tag ()
  14326. CC_quoted=
  14327. for arg in $CC; do
  14328. # Double-quote args containing other shell metacharacters.
  14329. - func_quote_for_eval "$arg"
  14330. - CC_quoted="$CC_quoted $func_quote_for_eval_result"
  14331. + func_append_quoted CC_quoted "$arg"
  14332. done
  14333. CC_expanded=`func_echo_all $CC`
  14334. CC_quoted_expanded=`func_echo_all $CC_quoted`
  14335. @@ -1274,6 +1465,486 @@ EOF
  14336. }
  14337. }
  14338. +
  14339. +##################################################
  14340. +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
  14341. +##################################################
  14342. +
  14343. +# func_convert_core_file_wine_to_w32 ARG
  14344. +# Helper function used by file name conversion functions when $build is *nix,
  14345. +# and $host is mingw, cygwin, or some other w32 environment. Relies on a
  14346. +# correctly configured wine environment available, with the winepath program
  14347. +# in $build's $PATH.
  14348. +#
  14349. +# ARG is the $build file name to be converted to w32 format.
  14350. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will
  14351. +# be empty on error (or when ARG is empty)
  14352. +func_convert_core_file_wine_to_w32 ()
  14353. +{
  14354. + $opt_debug
  14355. + func_convert_core_file_wine_to_w32_result="$1"
  14356. + if test -n "$1"; then
  14357. + # Unfortunately, winepath does not exit with a non-zero error code, so we
  14358. + # are forced to check the contents of stdout. On the other hand, if the
  14359. + # command is not found, the shell will set an exit code of 127 and print
  14360. + # *an error message* to stdout. So we must check for both error code of
  14361. + # zero AND non-empty stdout, which explains the odd construction:
  14362. + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
  14363. + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
  14364. + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
  14365. + $SED -e "$lt_sed_naive_backslashify"`
  14366. + else
  14367. + func_convert_core_file_wine_to_w32_result=
  14368. + fi
  14369. + fi
  14370. +}
  14371. +# end: func_convert_core_file_wine_to_w32
  14372. +
  14373. +
  14374. +# func_convert_core_path_wine_to_w32 ARG
  14375. +# Helper function used by path conversion functions when $build is *nix, and
  14376. +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
  14377. +# configured wine environment available, with the winepath program in $build's
  14378. +# $PATH. Assumes ARG has no leading or trailing path separator characters.
  14379. +#
  14380. +# ARG is path to be converted from $build format to win32.
  14381. +# Result is available in $func_convert_core_path_wine_to_w32_result.
  14382. +# Unconvertible file (directory) names in ARG are skipped; if no directory names
  14383. +# are convertible, then the result may be empty.
  14384. +func_convert_core_path_wine_to_w32 ()
  14385. +{
  14386. + $opt_debug
  14387. + # unfortunately, winepath doesn't convert paths, only file names
  14388. + func_convert_core_path_wine_to_w32_result=""
  14389. + if test -n "$1"; then
  14390. + oldIFS=$IFS
  14391. + IFS=:
  14392. + for func_convert_core_path_wine_to_w32_f in $1; do
  14393. + IFS=$oldIFS
  14394. + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
  14395. + if test -n "$func_convert_core_file_wine_to_w32_result" ; then
  14396. + if test -z "$func_convert_core_path_wine_to_w32_result"; then
  14397. + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
  14398. + else
  14399. + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
  14400. + fi
  14401. + fi
  14402. + done
  14403. + IFS=$oldIFS
  14404. + fi
  14405. +}
  14406. +# end: func_convert_core_path_wine_to_w32
  14407. +
  14408. +
  14409. +# func_cygpath ARGS...
  14410. +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
  14411. +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
  14412. +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
  14413. +# (2), returns the Cygwin file name or path in func_cygpath_result (input
  14414. +# file name or path is assumed to be in w32 format, as previously converted
  14415. +# from $build's *nix or MSYS format). In case (3), returns the w32 file name
  14416. +# or path in func_cygpath_result (input file name or path is assumed to be in
  14417. +# Cygwin format). Returns an empty string on error.
  14418. +#
  14419. +# ARGS are passed to cygpath, with the last one being the file name or path to
  14420. +# be converted.
  14421. +#
  14422. +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
  14423. +# environment variable; do not put it in $PATH.
  14424. +func_cygpath ()
  14425. +{
  14426. + $opt_debug
  14427. + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
  14428. + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
  14429. + if test "$?" -ne 0; then
  14430. + # on failure, ensure result is empty
  14431. + func_cygpath_result=
  14432. + fi
  14433. + else
  14434. + func_cygpath_result=
  14435. + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
  14436. + fi
  14437. +}
  14438. +#end: func_cygpath
  14439. +
  14440. +
  14441. +# func_convert_core_msys_to_w32 ARG
  14442. +# Convert file name or path ARG from MSYS format to w32 format. Return
  14443. +# result in func_convert_core_msys_to_w32_result.
  14444. +func_convert_core_msys_to_w32 ()
  14445. +{
  14446. + $opt_debug
  14447. + # awkward: cmd appends spaces to result
  14448. + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
  14449. + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
  14450. +}
  14451. +#end: func_convert_core_msys_to_w32
  14452. +
  14453. +
  14454. +# func_convert_file_check ARG1 ARG2
  14455. +# Verify that ARG1 (a file name in $build format) was converted to $host
  14456. +# format in ARG2. Otherwise, emit an error message, but continue (resetting
  14457. +# func_to_host_file_result to ARG1).
  14458. +func_convert_file_check ()
  14459. +{
  14460. + $opt_debug
  14461. + if test -z "$2" && test -n "$1" ; then
  14462. + func_error "Could not determine host file name corresponding to"
  14463. + func_error " \`$1'"
  14464. + func_error "Continuing, but uninstalled executables may not work."
  14465. + # Fallback:
  14466. + func_to_host_file_result="$1"
  14467. + fi
  14468. +}
  14469. +# end func_convert_file_check
  14470. +
  14471. +
  14472. +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
  14473. +# Verify that FROM_PATH (a path in $build format) was converted to $host
  14474. +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
  14475. +# func_to_host_file_result to a simplistic fallback value (see below).
  14476. +func_convert_path_check ()
  14477. +{
  14478. + $opt_debug
  14479. + if test -z "$4" && test -n "$3"; then
  14480. + func_error "Could not determine the host path corresponding to"
  14481. + func_error " \`$3'"
  14482. + func_error "Continuing, but uninstalled executables may not work."
  14483. + # Fallback. This is a deliberately simplistic "conversion" and
  14484. + # should not be "improved". See libtool.info.
  14485. + if test "x$1" != "x$2"; then
  14486. + lt_replace_pathsep_chars="s|$1|$2|g"
  14487. + func_to_host_path_result=`echo "$3" |
  14488. + $SED -e "$lt_replace_pathsep_chars"`
  14489. + else
  14490. + func_to_host_path_result="$3"
  14491. + fi
  14492. + fi
  14493. +}
  14494. +# end func_convert_path_check
  14495. +
  14496. +
  14497. +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
  14498. +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
  14499. +# and appending REPL if ORIG matches BACKPAT.
  14500. +func_convert_path_front_back_pathsep ()
  14501. +{
  14502. + $opt_debug
  14503. + case $4 in
  14504. + $1 ) func_to_host_path_result="$3$func_to_host_path_result"
  14505. + ;;
  14506. + esac
  14507. + case $4 in
  14508. + $2 ) func_append func_to_host_path_result "$3"
  14509. + ;;
  14510. + esac
  14511. +}
  14512. +# end func_convert_path_front_back_pathsep
  14513. +
  14514. +
  14515. +##################################################
  14516. +# $build to $host FILE NAME CONVERSION FUNCTIONS #
  14517. +##################################################
  14518. +# invoked via `$to_host_file_cmd ARG'
  14519. +#
  14520. +# In each case, ARG is the path to be converted from $build to $host format.
  14521. +# Result will be available in $func_to_host_file_result.
  14522. +
  14523. +
  14524. +# func_to_host_file ARG
  14525. +# Converts the file name ARG from $build format to $host format. Return result
  14526. +# in func_to_host_file_result.
  14527. +func_to_host_file ()
  14528. +{
  14529. + $opt_debug
  14530. + $to_host_file_cmd "$1"
  14531. +}
  14532. +# end func_to_host_file
  14533. +
  14534. +
  14535. +# func_to_tool_file ARG LAZY
  14536. +# converts the file name ARG from $build format to toolchain format. Return
  14537. +# result in func_to_tool_file_result. If the conversion in use is listed
  14538. +# in (the comma separated) LAZY, no conversion takes place.
  14539. +func_to_tool_file ()
  14540. +{
  14541. + $opt_debug
  14542. + case ,$2, in
  14543. + *,"$to_tool_file_cmd",*)
  14544. + func_to_tool_file_result=$1
  14545. + ;;
  14546. + *)
  14547. + $to_tool_file_cmd "$1"
  14548. + func_to_tool_file_result=$func_to_host_file_result
  14549. + ;;
  14550. + esac
  14551. +}
  14552. +# end func_to_tool_file
  14553. +
  14554. +
  14555. +# func_convert_file_noop ARG
  14556. +# Copy ARG to func_to_host_file_result.
  14557. +func_convert_file_noop ()
  14558. +{
  14559. + func_to_host_file_result="$1"
  14560. +}
  14561. +# end func_convert_file_noop
  14562. +
  14563. +
  14564. +# func_convert_file_msys_to_w32 ARG
  14565. +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
  14566. +# conversion to w32 is not available inside the cwrapper. Returns result in
  14567. +# func_to_host_file_result.
  14568. +func_convert_file_msys_to_w32 ()
  14569. +{
  14570. + $opt_debug
  14571. + func_to_host_file_result="$1"
  14572. + if test -n "$1"; then
  14573. + func_convert_core_msys_to_w32 "$1"
  14574. + func_to_host_file_result="$func_convert_core_msys_to_w32_result"
  14575. + fi
  14576. + func_convert_file_check "$1" "$func_to_host_file_result"
  14577. +}
  14578. +# end func_convert_file_msys_to_w32
  14579. +
  14580. +
  14581. +# func_convert_file_cygwin_to_w32 ARG
  14582. +# Convert file name ARG from Cygwin to w32 format. Returns result in
  14583. +# func_to_host_file_result.
  14584. +func_convert_file_cygwin_to_w32 ()
  14585. +{
  14586. + $opt_debug
  14587. + func_to_host_file_result="$1"
  14588. + if test -n "$1"; then
  14589. + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
  14590. + # LT_CYGPATH in this case.
  14591. + func_to_host_file_result=`cygpath -m "$1"`
  14592. + fi
  14593. + func_convert_file_check "$1" "$func_to_host_file_result"
  14594. +}
  14595. +# end func_convert_file_cygwin_to_w32
  14596. +
  14597. +
  14598. +# func_convert_file_nix_to_w32 ARG
  14599. +# Convert file name ARG from *nix to w32 format. Requires a wine environment
  14600. +# and a working winepath. Returns result in func_to_host_file_result.
  14601. +func_convert_file_nix_to_w32 ()
  14602. +{
  14603. + $opt_debug
  14604. + func_to_host_file_result="$1"
  14605. + if test -n "$1"; then
  14606. + func_convert_core_file_wine_to_w32 "$1"
  14607. + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
  14608. + fi
  14609. + func_convert_file_check "$1" "$func_to_host_file_result"
  14610. +}
  14611. +# end func_convert_file_nix_to_w32
  14612. +
  14613. +
  14614. +# func_convert_file_msys_to_cygwin ARG
  14615. +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
  14616. +# Returns result in func_to_host_file_result.
  14617. +func_convert_file_msys_to_cygwin ()
  14618. +{
  14619. + $opt_debug
  14620. + func_to_host_file_result="$1"
  14621. + if test -n "$1"; then
  14622. + func_convert_core_msys_to_w32 "$1"
  14623. + func_cygpath -u "$func_convert_core_msys_to_w32_result"
  14624. + func_to_host_file_result="$func_cygpath_result"
  14625. + fi
  14626. + func_convert_file_check "$1" "$func_to_host_file_result"
  14627. +}
  14628. +# end func_convert_file_msys_to_cygwin
  14629. +
  14630. +
  14631. +# func_convert_file_nix_to_cygwin ARG
  14632. +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
  14633. +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
  14634. +# in func_to_host_file_result.
  14635. +func_convert_file_nix_to_cygwin ()
  14636. +{
  14637. + $opt_debug
  14638. + func_to_host_file_result="$1"
  14639. + if test -n "$1"; then
  14640. + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
  14641. + func_convert_core_file_wine_to_w32 "$1"
  14642. + func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
  14643. + func_to_host_file_result="$func_cygpath_result"
  14644. + fi
  14645. + func_convert_file_check "$1" "$func_to_host_file_result"
  14646. +}
  14647. +# end func_convert_file_nix_to_cygwin
  14648. +
  14649. +
  14650. +#############################################
  14651. +# $build to $host PATH CONVERSION FUNCTIONS #
  14652. +#############################################
  14653. +# invoked via `$to_host_path_cmd ARG'
  14654. +#
  14655. +# In each case, ARG is the path to be converted from $build to $host format.
  14656. +# The result will be available in $func_to_host_path_result.
  14657. +#
  14658. +# Path separators are also converted from $build format to $host format. If
  14659. +# ARG begins or ends with a path separator character, it is preserved (but
  14660. +# converted to $host format) on output.
  14661. +#
  14662. +# All path conversion functions are named using the following convention:
  14663. +# file name conversion function : func_convert_file_X_to_Y ()
  14664. +# path conversion function : func_convert_path_X_to_Y ()
  14665. +# where, for any given $build/$host combination the 'X_to_Y' value is the
  14666. +# same. If conversion functions are added for new $build/$host combinations,
  14667. +# the two new functions must follow this pattern, or func_init_to_host_path_cmd
  14668. +# will break.
  14669. +
  14670. +
  14671. +# func_init_to_host_path_cmd
  14672. +# Ensures that function "pointer" variable $to_host_path_cmd is set to the
  14673. +# appropriate value, based on the value of $to_host_file_cmd.
  14674. +to_host_path_cmd=
  14675. +func_init_to_host_path_cmd ()
  14676. +{
  14677. + $opt_debug
  14678. + if test -z "$to_host_path_cmd"; then
  14679. + func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
  14680. + to_host_path_cmd="func_convert_path_${func_stripname_result}"
  14681. + fi
  14682. +}
  14683. +
  14684. +
  14685. +# func_to_host_path ARG
  14686. +# Converts the path ARG from $build format to $host format. Return result
  14687. +# in func_to_host_path_result.
  14688. +func_to_host_path ()
  14689. +{
  14690. + $opt_debug
  14691. + func_init_to_host_path_cmd
  14692. + $to_host_path_cmd "$1"
  14693. +}
  14694. +# end func_to_host_path
  14695. +
  14696. +
  14697. +# func_convert_path_noop ARG
  14698. +# Copy ARG to func_to_host_path_result.
  14699. +func_convert_path_noop ()
  14700. +{
  14701. + func_to_host_path_result="$1"
  14702. +}
  14703. +# end func_convert_path_noop
  14704. +
  14705. +
  14706. +# func_convert_path_msys_to_w32 ARG
  14707. +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
  14708. +# conversion to w32 is not available inside the cwrapper. Returns result in
  14709. +# func_to_host_path_result.
  14710. +func_convert_path_msys_to_w32 ()
  14711. +{
  14712. + $opt_debug
  14713. + func_to_host_path_result="$1"
  14714. + if test -n "$1"; then
  14715. + # Remove leading and trailing path separator characters from ARG. MSYS
  14716. + # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
  14717. + # and winepath ignores them completely.
  14718. + func_stripname : : "$1"
  14719. + func_to_host_path_tmp1=$func_stripname_result
  14720. + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
  14721. + func_to_host_path_result="$func_convert_core_msys_to_w32_result"
  14722. + func_convert_path_check : ";" \
  14723. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  14724. + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
  14725. + fi
  14726. +}
  14727. +# end func_convert_path_msys_to_w32
  14728. +
  14729. +
  14730. +# func_convert_path_cygwin_to_w32 ARG
  14731. +# Convert path ARG from Cygwin to w32 format. Returns result in
  14732. +# func_to_host_file_result.
  14733. +func_convert_path_cygwin_to_w32 ()
  14734. +{
  14735. + $opt_debug
  14736. + func_to_host_path_result="$1"
  14737. + if test -n "$1"; then
  14738. + # See func_convert_path_msys_to_w32:
  14739. + func_stripname : : "$1"
  14740. + func_to_host_path_tmp1=$func_stripname_result
  14741. + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
  14742. + func_convert_path_check : ";" \
  14743. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  14744. + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
  14745. + fi
  14746. +}
  14747. +# end func_convert_path_cygwin_to_w32
  14748. +
  14749. +
  14750. +# func_convert_path_nix_to_w32 ARG
  14751. +# Convert path ARG from *nix to w32 format. Requires a wine environment and
  14752. +# a working winepath. Returns result in func_to_host_file_result.
  14753. +func_convert_path_nix_to_w32 ()
  14754. +{
  14755. + $opt_debug
  14756. + func_to_host_path_result="$1"
  14757. + if test -n "$1"; then
  14758. + # See func_convert_path_msys_to_w32:
  14759. + func_stripname : : "$1"
  14760. + func_to_host_path_tmp1=$func_stripname_result
  14761. + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
  14762. + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
  14763. + func_convert_path_check : ";" \
  14764. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  14765. + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
  14766. + fi
  14767. +}
  14768. +# end func_convert_path_nix_to_w32
  14769. +
  14770. +
  14771. +# func_convert_path_msys_to_cygwin ARG
  14772. +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
  14773. +# Returns result in func_to_host_file_result.
  14774. +func_convert_path_msys_to_cygwin ()
  14775. +{
  14776. + $opt_debug
  14777. + func_to_host_path_result="$1"
  14778. + if test -n "$1"; then
  14779. + # See func_convert_path_msys_to_w32:
  14780. + func_stripname : : "$1"
  14781. + func_to_host_path_tmp1=$func_stripname_result
  14782. + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
  14783. + func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
  14784. + func_to_host_path_result="$func_cygpath_result"
  14785. + func_convert_path_check : : \
  14786. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  14787. + func_convert_path_front_back_pathsep ":*" "*:" : "$1"
  14788. + fi
  14789. +}
  14790. +# end func_convert_path_msys_to_cygwin
  14791. +
  14792. +
  14793. +# func_convert_path_nix_to_cygwin ARG
  14794. +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
  14795. +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
  14796. +# func_to_host_file_result.
  14797. +func_convert_path_nix_to_cygwin ()
  14798. +{
  14799. + $opt_debug
  14800. + func_to_host_path_result="$1"
  14801. + if test -n "$1"; then
  14802. + # Remove leading and trailing path separator characters from
  14803. + # ARG. msys behavior is inconsistent here, cygpath turns them
  14804. + # into '.;' and ';.', and winepath ignores them completely.
  14805. + func_stripname : : "$1"
  14806. + func_to_host_path_tmp1=$func_stripname_result
  14807. + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
  14808. + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
  14809. + func_to_host_path_result="$func_cygpath_result"
  14810. + func_convert_path_check : : \
  14811. + "$func_to_host_path_tmp1" "$func_to_host_path_result"
  14812. + func_convert_path_front_back_pathsep ":*" "*:" : "$1"
  14813. + fi
  14814. +}
  14815. +# end func_convert_path_nix_to_cygwin
  14816. +
  14817. +
  14818. # func_mode_compile arg...
  14819. func_mode_compile ()
  14820. {
  14821. @@ -1314,12 +1985,12 @@ func_mode_compile ()
  14822. ;;
  14823. -pie | -fpie | -fPIE)
  14824. - pie_flag="$pie_flag $arg"
  14825. + func_append pie_flag " $arg"
  14826. continue
  14827. ;;
  14828. -shared | -static | -prefer-pic | -prefer-non-pic)
  14829. - later="$later $arg"
  14830. + func_append later " $arg"
  14831. continue
  14832. ;;
  14833. @@ -1340,15 +2011,14 @@ func_mode_compile ()
  14834. save_ifs="$IFS"; IFS=','
  14835. for arg in $args; do
  14836. IFS="$save_ifs"
  14837. - func_quote_for_eval "$arg"
  14838. - lastarg="$lastarg $func_quote_for_eval_result"
  14839. + func_append_quoted lastarg "$arg"
  14840. done
  14841. IFS="$save_ifs"
  14842. func_stripname ' ' '' "$lastarg"
  14843. lastarg=$func_stripname_result
  14844. # Add the arguments to base_compile.
  14845. - base_compile="$base_compile $lastarg"
  14846. + func_append base_compile " $lastarg"
  14847. continue
  14848. ;;
  14849. @@ -1364,8 +2034,7 @@ func_mode_compile ()
  14850. esac # case $arg_mode
  14851. # Aesthetically quote the previous argument.
  14852. - func_quote_for_eval "$lastarg"
  14853. - base_compile="$base_compile $func_quote_for_eval_result"
  14854. + func_append_quoted base_compile "$lastarg"
  14855. done # for arg
  14856. case $arg_mode in
  14857. @@ -1496,17 +2165,16 @@ compiler."
  14858. $opt_dry_run || $RM $removelist
  14859. exit $EXIT_FAILURE
  14860. fi
  14861. - removelist="$removelist $output_obj"
  14862. + func_append removelist " $output_obj"
  14863. $ECHO "$srcfile" > "$lockfile"
  14864. fi
  14865. $opt_dry_run || $RM $removelist
  14866. - removelist="$removelist $lockfile"
  14867. + func_append removelist " $lockfile"
  14868. trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
  14869. - if test -n "$fix_srcfile_path"; then
  14870. - eval "srcfile=\"$fix_srcfile_path\""
  14871. - fi
  14872. + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
  14873. + srcfile=$func_to_tool_file_result
  14874. func_quote_for_eval "$srcfile"
  14875. qsrcfile=$func_quote_for_eval_result
  14876. @@ -1526,7 +2194,7 @@ compiler."
  14877. if test -z "$output_obj"; then
  14878. # Place PIC objects in $objdir
  14879. - command="$command -o $lobj"
  14880. + func_append command " -o $lobj"
  14881. fi
  14882. func_show_eval_locale "$command" \
  14883. @@ -1573,11 +2241,11 @@ compiler."
  14884. command="$base_compile $qsrcfile $pic_flag"
  14885. fi
  14886. if test "$compiler_c_o" = yes; then
  14887. - command="$command -o $obj"
  14888. + func_append command " -o $obj"
  14889. fi
  14890. # Suppress compiler output if we already did a PIC compilation.
  14891. - command="$command$suppress_output"
  14892. + func_append command "$suppress_output"
  14893. func_show_eval_locale "$command" \
  14894. '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
  14895. @@ -1622,13 +2290,13 @@ compiler."
  14896. }
  14897. $opt_help || {
  14898. - test "$mode" = compile && func_mode_compile ${1+"$@"}
  14899. + test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
  14900. }
  14901. func_mode_help ()
  14902. {
  14903. # We need to display help for each of the modes.
  14904. - case $mode in
  14905. + case $opt_mode in
  14906. "")
  14907. # Generic help is extracted from the usage comments
  14908. # at the start of this file.
  14909. @@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
  14910. -o OUTPUT-FILE set the output file name to OUTPUT-FILE
  14911. -no-suppress do not suppress compiler output for multiple passes
  14912. - -prefer-pic try to building PIC objects only
  14913. - -prefer-non-pic try to building non-PIC objects only
  14914. + -prefer-pic try to build PIC objects only
  14915. + -prefer-non-pic try to build non-PIC objects only
  14916. -shared do not build a \`.o' file suitable for static linking
  14917. -static only build a \`.o' file suitable for static linking
  14918. -Wc,FLAG pass FLAG directly to the compiler
  14919. @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
  14920. ;;
  14921. *)
  14922. - func_fatal_help "invalid operation mode \`$mode'"
  14923. + func_fatal_help "invalid operation mode \`$opt_mode'"
  14924. ;;
  14925. esac
  14926. @@ -1819,13 +2487,13 @@ if $opt_help; then
  14927. else
  14928. {
  14929. func_help noexit
  14930. - for mode in compile link execute install finish uninstall clean; do
  14931. + for opt_mode in compile link execute install finish uninstall clean; do
  14932. func_mode_help
  14933. done
  14934. } | sed -n '1p; 2,$s/^Usage:/ or: /p'
  14935. {
  14936. func_help noexit
  14937. - for mode in compile link execute install finish uninstall clean; do
  14938. + for opt_mode in compile link execute install finish uninstall clean; do
  14939. echo
  14940. func_mode_help
  14941. done
  14942. @@ -1854,13 +2522,16 @@ func_mode_execute ()
  14943. func_fatal_help "you must specify a COMMAND"
  14944. # Handle -dlopen flags immediately.
  14945. - for file in $execute_dlfiles; do
  14946. + for file in $opt_dlopen; do
  14947. test -f "$file" \
  14948. || func_fatal_help "\`$file' is not a file"
  14949. dir=
  14950. case $file in
  14951. *.la)
  14952. + func_resolve_sysroot "$file"
  14953. + file=$func_resolve_sysroot_result
  14954. +
  14955. # Check to see that this really is a libtool archive.
  14956. func_lalib_unsafe_p "$file" \
  14957. || func_fatal_help "\`$lib' is not a valid libtool archive"
  14958. @@ -1882,7 +2553,7 @@ func_mode_execute ()
  14959. dir="$func_dirname_result"
  14960. if test -f "$dir/$objdir/$dlname"; then
  14961. - dir="$dir/$objdir"
  14962. + func_append dir "/$objdir"
  14963. else
  14964. if test ! -f "$dir/$dlname"; then
  14965. func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
  14966. @@ -1907,10 +2578,10 @@ func_mode_execute ()
  14967. test -n "$absdir" && dir="$absdir"
  14968. # Now add the directory to shlibpath_var.
  14969. - if eval test -z \"\$$shlibpath_var\"; then
  14970. - eval $shlibpath_var=\$dir
  14971. + if eval "test -z \"\$$shlibpath_var\""; then
  14972. + eval "$shlibpath_var=\"\$dir\""
  14973. else
  14974. - eval $shlibpath_var=\$dir:\$$shlibpath_var
  14975. + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
  14976. fi
  14977. done
  14978. @@ -1939,8 +2610,7 @@ func_mode_execute ()
  14979. ;;
  14980. esac
  14981. # Quote arguments (to preserve shell metacharacters).
  14982. - func_quote_for_eval "$file"
  14983. - args="$args $func_quote_for_eval_result"
  14984. + func_append_quoted args "$file"
  14985. done
  14986. if test "X$opt_dry_run" = Xfalse; then
  14987. @@ -1972,22 +2642,59 @@ func_mode_execute ()
  14988. fi
  14989. }
  14990. -test "$mode" = execute && func_mode_execute ${1+"$@"}
  14991. +test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
  14992. # func_mode_finish arg...
  14993. func_mode_finish ()
  14994. {
  14995. $opt_debug
  14996. - libdirs="$nonopt"
  14997. + libs=
  14998. + libdirs=
  14999. admincmds=
  15000. - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
  15001. - for dir
  15002. - do
  15003. - libdirs="$libdirs $dir"
  15004. - done
  15005. + for opt in "$nonopt" ${1+"$@"}
  15006. + do
  15007. + if test -d "$opt"; then
  15008. + func_append libdirs " $opt"
  15009. + elif test -f "$opt"; then
  15010. + if func_lalib_unsafe_p "$opt"; then
  15011. + func_append libs " $opt"
  15012. + else
  15013. + func_warning "\`$opt' is not a valid libtool archive"
  15014. + fi
  15015. +
  15016. + else
  15017. + func_fatal_error "invalid argument \`$opt'"
  15018. + fi
  15019. + done
  15020. +
  15021. + if test -n "$libs"; then
  15022. + if test -n "$lt_sysroot"; then
  15023. + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
  15024. + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
  15025. + else
  15026. + sysroot_cmd=
  15027. + fi
  15028. +
  15029. + # Remove sysroot references
  15030. + if $opt_dry_run; then
  15031. + for lib in $libs; do
  15032. + echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
  15033. + done
  15034. + else
  15035. + tmpdir=`func_mktempdir`
  15036. + for lib in $libs; do
  15037. + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
  15038. + > $tmpdir/tmp-la
  15039. + mv -f $tmpdir/tmp-la $lib
  15040. + done
  15041. + ${RM}r "$tmpdir"
  15042. + fi
  15043. + fi
  15044. +
  15045. + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
  15046. for libdir in $libdirs; do
  15047. if test -n "$finish_cmds"; then
  15048. # Do each command in the finish commands.
  15049. @@ -1997,7 +2704,7 @@ func_mode_finish ()
  15050. if test -n "$finish_eval"; then
  15051. # Do the single finish_eval.
  15052. eval cmds=\"$finish_eval\"
  15053. - $opt_dry_run || eval "$cmds" || admincmds="$admincmds
  15054. + $opt_dry_run || eval "$cmds" || func_append admincmds "
  15055. $cmds"
  15056. fi
  15057. done
  15058. @@ -2006,53 +2713,55 @@ func_mode_finish ()
  15059. # Exit here if they wanted silent mode.
  15060. $opt_silent && exit $EXIT_SUCCESS
  15061. - echo "----------------------------------------------------------------------"
  15062. - echo "Libraries have been installed in:"
  15063. - for libdir in $libdirs; do
  15064. - $ECHO " $libdir"
  15065. - done
  15066. - echo
  15067. - echo "If you ever happen to want to link against installed libraries"
  15068. - echo "in a given directory, LIBDIR, you must either use libtool, and"
  15069. - echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
  15070. - echo "flag during linking and do at least one of the following:"
  15071. - if test -n "$shlibpath_var"; then
  15072. - echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
  15073. - echo " during execution"
  15074. - fi
  15075. - if test -n "$runpath_var"; then
  15076. - echo " - add LIBDIR to the \`$runpath_var' environment variable"
  15077. - echo " during linking"
  15078. - fi
  15079. - if test -n "$hardcode_libdir_flag_spec"; then
  15080. - libdir=LIBDIR
  15081. - eval "flag=\"$hardcode_libdir_flag_spec\""
  15082. + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
  15083. + echo "----------------------------------------------------------------------"
  15084. + echo "Libraries have been installed in:"
  15085. + for libdir in $libdirs; do
  15086. + $ECHO " $libdir"
  15087. + done
  15088. + echo
  15089. + echo "If you ever happen to want to link against installed libraries"
  15090. + echo "in a given directory, LIBDIR, you must either use libtool, and"
  15091. + echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
  15092. + echo "flag during linking and do at least one of the following:"
  15093. + if test -n "$shlibpath_var"; then
  15094. + echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
  15095. + echo " during execution"
  15096. + fi
  15097. + if test -n "$runpath_var"; then
  15098. + echo " - add LIBDIR to the \`$runpath_var' environment variable"
  15099. + echo " during linking"
  15100. + fi
  15101. + if test -n "$hardcode_libdir_flag_spec"; then
  15102. + libdir=LIBDIR
  15103. + eval flag=\"$hardcode_libdir_flag_spec\"
  15104. - $ECHO " - use the \`$flag' linker flag"
  15105. - fi
  15106. - if test -n "$admincmds"; then
  15107. - $ECHO " - have your system administrator run these commands:$admincmds"
  15108. - fi
  15109. - if test -f /etc/ld.so.conf; then
  15110. - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
  15111. - fi
  15112. - echo
  15113. + $ECHO " - use the \`$flag' linker flag"
  15114. + fi
  15115. + if test -n "$admincmds"; then
  15116. + $ECHO " - have your system administrator run these commands:$admincmds"
  15117. + fi
  15118. + if test -f /etc/ld.so.conf; then
  15119. + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
  15120. + fi
  15121. + echo
  15122. - echo "See any operating system documentation about shared libraries for"
  15123. - case $host in
  15124. - solaris2.[6789]|solaris2.1[0-9])
  15125. - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
  15126. - echo "pages."
  15127. - ;;
  15128. - *)
  15129. - echo "more information, such as the ld(1) and ld.so(8) manual pages."
  15130. - ;;
  15131. - esac
  15132. - echo "----------------------------------------------------------------------"
  15133. + echo "See any operating system documentation about shared libraries for"
  15134. + case $host in
  15135. + solaris2.[6789]|solaris2.1[0-9])
  15136. + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
  15137. + echo "pages."
  15138. + ;;
  15139. + *)
  15140. + echo "more information, such as the ld(1) and ld.so(8) manual pages."
  15141. + ;;
  15142. + esac
  15143. + echo "----------------------------------------------------------------------"
  15144. + fi
  15145. exit $EXIT_SUCCESS
  15146. }
  15147. -test "$mode" = finish && func_mode_finish ${1+"$@"}
  15148. +test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
  15149. # func_mode_install arg...
  15150. @@ -2077,7 +2786,7 @@ func_mode_install ()
  15151. # The real first argument should be the name of the installation program.
  15152. # Aesthetically quote it.
  15153. func_quote_for_eval "$arg"
  15154. - install_prog="$install_prog$func_quote_for_eval_result"
  15155. + func_append install_prog "$func_quote_for_eval_result"
  15156. install_shared_prog=$install_prog
  15157. case " $install_prog " in
  15158. *[\\\ /]cp\ *) install_cp=: ;;
  15159. @@ -2097,7 +2806,7 @@ func_mode_install ()
  15160. do
  15161. arg2=
  15162. if test -n "$dest"; then
  15163. - files="$files $dest"
  15164. + func_append files " $dest"
  15165. dest=$arg
  15166. continue
  15167. fi
  15168. @@ -2135,11 +2844,11 @@ func_mode_install ()
  15169. # Aesthetically quote the argument.
  15170. func_quote_for_eval "$arg"
  15171. - install_prog="$install_prog $func_quote_for_eval_result"
  15172. + func_append install_prog " $func_quote_for_eval_result"
  15173. if test -n "$arg2"; then
  15174. func_quote_for_eval "$arg2"
  15175. fi
  15176. - install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
  15177. + func_append install_shared_prog " $func_quote_for_eval_result"
  15178. done
  15179. test -z "$install_prog" && \
  15180. @@ -2151,7 +2860,7 @@ func_mode_install ()
  15181. if test -n "$install_override_mode" && $no_mode; then
  15182. if $install_cp; then :; else
  15183. func_quote_for_eval "$install_override_mode"
  15184. - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
  15185. + func_append install_shared_prog " -m $func_quote_for_eval_result"
  15186. fi
  15187. fi
  15188. @@ -2209,10 +2918,13 @@ func_mode_install ()
  15189. case $file in
  15190. *.$libext)
  15191. # Do the static libraries later.
  15192. - staticlibs="$staticlibs $file"
  15193. + func_append staticlibs " $file"
  15194. ;;
  15195. *.la)
  15196. + func_resolve_sysroot "$file"
  15197. + file=$func_resolve_sysroot_result
  15198. +
  15199. # Check to see that this really is a libtool archive.
  15200. func_lalib_unsafe_p "$file" \
  15201. || func_fatal_help "\`$file' is not a valid libtool archive"
  15202. @@ -2226,23 +2938,30 @@ func_mode_install ()
  15203. if test "X$destdir" = "X$libdir"; then
  15204. case "$current_libdirs " in
  15205. *" $libdir "*) ;;
  15206. - *) current_libdirs="$current_libdirs $libdir" ;;
  15207. + *) func_append current_libdirs " $libdir" ;;
  15208. esac
  15209. else
  15210. # Note the libdir as a future libdir.
  15211. case "$future_libdirs " in
  15212. *" $libdir "*) ;;
  15213. - *) future_libdirs="$future_libdirs $libdir" ;;
  15214. + *) func_append future_libdirs " $libdir" ;;
  15215. esac
  15216. fi
  15217. func_dirname "$file" "/" ""
  15218. dir="$func_dirname_result"
  15219. - dir="$dir$objdir"
  15220. + func_append dir "$objdir"
  15221. if test -n "$relink_command"; then
  15222. + # Strip any trailing slash from the destination.
  15223. + func_stripname '' '/' "$libdir"
  15224. + destlibdir=$func_stripname_result
  15225. +
  15226. + func_stripname '' '/' "$destdir"
  15227. + s_destdir=$func_stripname_result
  15228. +
  15229. # Determine the prefix the user has applied to our future dir.
  15230. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
  15231. + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
  15232. # Don't allow the user to place us outside of our expected
  15233. # location b/c this prevents finding dependent libraries that
  15234. @@ -2315,7 +3034,7 @@ func_mode_install ()
  15235. func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
  15236. # Maybe install the static library, too.
  15237. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
  15238. + test -n "$old_library" && func_append staticlibs " $dir/$old_library"
  15239. ;;
  15240. *.lo)
  15241. @@ -2503,7 +3222,7 @@ func_mode_install ()
  15242. test -n "$future_libdirs" && \
  15243. func_warning "remember to run \`$progname --finish$future_libdirs'"
  15244. - if test -n "$current_libdirs" && $opt_finish; then
  15245. + if test -n "$current_libdirs"; then
  15246. # Maybe just do a dry run.
  15247. $opt_dry_run && current_libdirs=" -n$current_libdirs"
  15248. exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
  15249. @@ -2512,7 +3231,7 @@ func_mode_install ()
  15250. fi
  15251. }
  15252. -test "$mode" = install && func_mode_install ${1+"$@"}
  15253. +test "$opt_mode" = install && func_mode_install ${1+"$@"}
  15254. # func_generate_dlsyms outputname originator pic_p
  15255. @@ -2559,6 +3278,18 @@ extern \"C\" {
  15256. #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
  15257. #endif
  15258. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  15259. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  15260. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  15261. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  15262. +# define LT_DLSYM_CONST
  15263. +#elif defined(__osf__)
  15264. +/* This system does not cope well with relocations in const data. */
  15265. +# define LT_DLSYM_CONST
  15266. +#else
  15267. +# define LT_DLSYM_CONST const
  15268. +#endif
  15269. +
  15270. /* External symbol declarations for the compiler. */\
  15271. "
  15272. @@ -2570,21 +3301,22 @@ extern \"C\" {
  15273. # Add our own program objects to the symbol list.
  15274. progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
  15275. for progfile in $progfiles; do
  15276. - func_verbose "extracting global C symbols from \`$progfile'"
  15277. - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
  15278. + func_to_tool_file "$progfile" func_convert_file_msys_to_w32
  15279. + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
  15280. + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
  15281. done
  15282. if test -n "$exclude_expsyms"; then
  15283. $opt_dry_run || {
  15284. - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
  15285. - $MV "$nlist"T "$nlist"
  15286. + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
  15287. + eval '$MV "$nlist"T "$nlist"'
  15288. }
  15289. fi
  15290. if test -n "$export_symbols_regex"; then
  15291. $opt_dry_run || {
  15292. - $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
  15293. - $MV "$nlist"T "$nlist"
  15294. + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
  15295. + eval '$MV "$nlist"T "$nlist"'
  15296. }
  15297. fi
  15298. @@ -2593,23 +3325,23 @@ extern \"C\" {
  15299. export_symbols="$output_objdir/$outputname.exp"
  15300. $opt_dry_run || {
  15301. $RM $export_symbols
  15302. - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
  15303. + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
  15304. case $host in
  15305. *cygwin* | *mingw* | *cegcc* )
  15306. - echo EXPORTS > "$output_objdir/$outputname.def"
  15307. - cat "$export_symbols" >> "$output_objdir/$outputname.def"
  15308. + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
  15309. + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
  15310. ;;
  15311. esac
  15312. }
  15313. else
  15314. $opt_dry_run || {
  15315. - ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
  15316. - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
  15317. - $MV "$nlist"T "$nlist"
  15318. + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
  15319. + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
  15320. + eval '$MV "$nlist"T "$nlist"'
  15321. case $host in
  15322. *cygwin* | *mingw* | *cegcc* )
  15323. - echo EXPORTS > "$output_objdir/$outputname.def"
  15324. - cat "$nlist" >> "$output_objdir/$outputname.def"
  15325. + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
  15326. + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
  15327. ;;
  15328. esac
  15329. }
  15330. @@ -2620,10 +3352,52 @@ extern \"C\" {
  15331. func_verbose "extracting global C symbols from \`$dlprefile'"
  15332. func_basename "$dlprefile"
  15333. name="$func_basename_result"
  15334. - $opt_dry_run || {
  15335. - $ECHO ": $name " >> "$nlist"
  15336. - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
  15337. - }
  15338. + case $host in
  15339. + *cygwin* | *mingw* | *cegcc* )
  15340. + # if an import library, we need to obtain dlname
  15341. + if func_win32_import_lib_p "$dlprefile"; then
  15342. + func_tr_sh "$dlprefile"
  15343. + eval "curr_lafile=\$libfile_$func_tr_sh_result"
  15344. + dlprefile_dlbasename=""
  15345. + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
  15346. + # Use subshell, to avoid clobbering current variable values
  15347. + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
  15348. + if test -n "$dlprefile_dlname" ; then
  15349. + func_basename "$dlprefile_dlname"
  15350. + dlprefile_dlbasename="$func_basename_result"
  15351. + else
  15352. + # no lafile. user explicitly requested -dlpreopen <import library>.
  15353. + $sharedlib_from_linklib_cmd "$dlprefile"
  15354. + dlprefile_dlbasename=$sharedlib_from_linklib_result
  15355. + fi
  15356. + fi
  15357. + $opt_dry_run || {
  15358. + if test -n "$dlprefile_dlbasename" ; then
  15359. + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
  15360. + else
  15361. + func_warning "Could not compute DLL name from $name"
  15362. + eval '$ECHO ": $name " >> "$nlist"'
  15363. + fi
  15364. + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
  15365. + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
  15366. + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
  15367. + }
  15368. + else # not an import lib
  15369. + $opt_dry_run || {
  15370. + eval '$ECHO ": $name " >> "$nlist"'
  15371. + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
  15372. + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
  15373. + }
  15374. + fi
  15375. + ;;
  15376. + *)
  15377. + $opt_dry_run || {
  15378. + eval '$ECHO ": $name " >> "$nlist"'
  15379. + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
  15380. + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
  15381. + }
  15382. + ;;
  15383. + esac
  15384. done
  15385. $opt_dry_run || {
  15386. @@ -2661,26 +3435,9 @@ typedef struct {
  15387. const char *name;
  15388. void *address;
  15389. } lt_dlsymlist;
  15390. -"
  15391. - case $host in
  15392. - *cygwin* | *mingw* | *cegcc* )
  15393. - echo >> "$output_objdir/$my_dlsyms" "\
  15394. -/* DATA imports from DLLs on WIN32 con't be const, because
  15395. - runtime relocations are performed -- see ld's documentation
  15396. - on pseudo-relocs. */"
  15397. - lt_dlsym_const= ;;
  15398. - *osf5*)
  15399. - echo >> "$output_objdir/$my_dlsyms" "\
  15400. -/* This system does not cope well with relocations in const data */"
  15401. - lt_dlsym_const= ;;
  15402. - *)
  15403. - lt_dlsym_const=const ;;
  15404. - esac
  15405. -
  15406. - echo >> "$output_objdir/$my_dlsyms" "\
  15407. -extern $lt_dlsym_const lt_dlsymlist
  15408. +extern LT_DLSYM_CONST lt_dlsymlist
  15409. lt_${my_prefix}_LTX_preloaded_symbols[];
  15410. -$lt_dlsym_const lt_dlsymlist
  15411. +LT_DLSYM_CONST lt_dlsymlist
  15412. lt_${my_prefix}_LTX_preloaded_symbols[] =
  15413. {\
  15414. { \"$my_originator\", (void *) 0 },"
  15415. @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
  15416. for arg in $LTCFLAGS; do
  15417. case $arg in
  15418. -pie | -fpie | -fPIE) ;;
  15419. - *) symtab_cflags="$symtab_cflags $arg" ;;
  15420. + *) func_append symtab_cflags " $arg" ;;
  15421. esac
  15422. done
  15423. @@ -2796,9 +3553,11 @@ func_win32_libid ()
  15424. win32_libid_type="x86 archive import"
  15425. ;;
  15426. *ar\ archive*) # could be an import, or static
  15427. - if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
  15428. - $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
  15429. - win32_nmres=`$NM -f posix -A "$1" |
  15430. + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
  15431. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
  15432. + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
  15433. + func_to_tool_file "$1" func_convert_file_msys_to_w32
  15434. + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
  15435. $SED -n -e '
  15436. 1,100{
  15437. / I /{
  15438. @@ -2827,6 +3586,131 @@ func_win32_libid ()
  15439. $ECHO "$win32_libid_type"
  15440. }
  15441. +# func_cygming_dll_for_implib ARG
  15442. +#
  15443. +# Platform-specific function to extract the
  15444. +# name of the DLL associated with the specified
  15445. +# import library ARG.
  15446. +# Invoked by eval'ing the libtool variable
  15447. +# $sharedlib_from_linklib_cmd
  15448. +# Result is available in the variable
  15449. +# $sharedlib_from_linklib_result
  15450. +func_cygming_dll_for_implib ()
  15451. +{
  15452. + $opt_debug
  15453. + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
  15454. +}
  15455. +
  15456. +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
  15457. +#
  15458. +# The is the core of a fallback implementation of a
  15459. +# platform-specific function to extract the name of the
  15460. +# DLL associated with the specified import library LIBNAME.
  15461. +#
  15462. +# SECTION_NAME is either .idata$6 or .idata$7, depending
  15463. +# on the platform and compiler that created the implib.
  15464. +#
  15465. +# Echos the name of the DLL associated with the
  15466. +# specified import library.
  15467. +func_cygming_dll_for_implib_fallback_core ()
  15468. +{
  15469. + $opt_debug
  15470. + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
  15471. + $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
  15472. + $SED '/^Contents of section '"$match_literal"':/{
  15473. + # Place marker at beginning of archive member dllname section
  15474. + s/.*/====MARK====/
  15475. + p
  15476. + d
  15477. + }
  15478. + # These lines can sometimes be longer than 43 characters, but
  15479. + # are always uninteresting
  15480. + /:[ ]*file format pe[i]\{,1\}-/d
  15481. + /^In archive [^:]*:/d
  15482. + # Ensure marker is printed
  15483. + /^====MARK====/p
  15484. + # Remove all lines with less than 43 characters
  15485. + /^.\{43\}/!d
  15486. + # From remaining lines, remove first 43 characters
  15487. + s/^.\{43\}//' |
  15488. + $SED -n '
  15489. + # Join marker and all lines until next marker into a single line
  15490. + /^====MARK====/ b para
  15491. + H
  15492. + $ b para
  15493. + b
  15494. + :para
  15495. + x
  15496. + s/\n//g
  15497. + # Remove the marker
  15498. + s/^====MARK====//
  15499. + # Remove trailing dots and whitespace
  15500. + s/[\. \t]*$//
  15501. + # Print
  15502. + /./p' |
  15503. + # we now have a list, one entry per line, of the stringified
  15504. + # contents of the appropriate section of all members of the
  15505. + # archive which possess that section. Heuristic: eliminate
  15506. + # all those which have a first or second character that is
  15507. + # a '.' (that is, objdump's representation of an unprintable
  15508. + # character.) This should work for all archives with less than
  15509. + # 0x302f exports -- but will fail for DLLs whose name actually
  15510. + # begins with a literal '.' or a single character followed by
  15511. + # a '.'.
  15512. + #
  15513. + # Of those that remain, print the first one.
  15514. + $SED -e '/^\./d;/^.\./d;q'
  15515. +}
  15516. +
  15517. +# func_cygming_gnu_implib_p ARG
  15518. +# This predicate returns with zero status (TRUE) if
  15519. +# ARG is a GNU/binutils-style import library. Returns
  15520. +# with nonzero status (FALSE) otherwise.
  15521. +func_cygming_gnu_implib_p ()
  15522. +{
  15523. + $opt_debug
  15524. + func_to_tool_file "$1" func_convert_file_msys_to_w32
  15525. + 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)$'`
  15526. + test -n "$func_cygming_gnu_implib_tmp"
  15527. +}
  15528. +
  15529. +# func_cygming_ms_implib_p ARG
  15530. +# This predicate returns with zero status (TRUE) if
  15531. +# ARG is an MS-style import library. Returns
  15532. +# with nonzero status (FALSE) otherwise.
  15533. +func_cygming_ms_implib_p ()
  15534. +{
  15535. + $opt_debug
  15536. + func_to_tool_file "$1" func_convert_file_msys_to_w32
  15537. + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
  15538. + test -n "$func_cygming_ms_implib_tmp"
  15539. +}
  15540. +
  15541. +# func_cygming_dll_for_implib_fallback ARG
  15542. +# Platform-specific function to extract the
  15543. +# name of the DLL associated with the specified
  15544. +# import library ARG.
  15545. +#
  15546. +# This fallback implementation is for use when $DLLTOOL
  15547. +# does not support the --identify-strict option.
  15548. +# Invoked by eval'ing the libtool variable
  15549. +# $sharedlib_from_linklib_cmd
  15550. +# Result is available in the variable
  15551. +# $sharedlib_from_linklib_result
  15552. +func_cygming_dll_for_implib_fallback ()
  15553. +{
  15554. + $opt_debug
  15555. + if func_cygming_gnu_implib_p "$1" ; then
  15556. + # binutils import library
  15557. + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
  15558. + elif func_cygming_ms_implib_p "$1" ; then
  15559. + # ms-generated import library
  15560. + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
  15561. + else
  15562. + # unknown
  15563. + sharedlib_from_linklib_result=""
  15564. + fi
  15565. +}
  15566. # func_extract_an_archive dir oldlib
  15567. @@ -2917,7 +3801,7 @@ func_extract_archives ()
  15568. darwin_file=
  15569. darwin_files=
  15570. for darwin_file in $darwin_filelist; do
  15571. - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
  15572. + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
  15573. $LIPO -create -output "$darwin_file" $darwin_files
  15574. done # $darwin_filelist
  15575. $RM -rf unfat-$$
  15576. @@ -2932,7 +3816,7 @@ func_extract_archives ()
  15577. func_extract_an_archive "$my_xdir" "$my_xabs"
  15578. ;;
  15579. esac
  15580. - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
  15581. + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
  15582. done
  15583. func_extract_archives_result="$my_oldobjs"
  15584. @@ -3014,7 +3898,110 @@ func_fallback_echo ()
  15585. _LTECHO_EOF'
  15586. }
  15587. ECHO=\"$qECHO\"
  15588. - fi\
  15589. + fi
  15590. +
  15591. +# Very basic option parsing. These options are (a) specific to
  15592. +# the libtool wrapper, (b) are identical between the wrapper
  15593. +# /script/ and the wrapper /executable/ which is used only on
  15594. +# windows platforms, and (c) all begin with the string "--lt-"
  15595. +# (application programs are unlikely to have options which match
  15596. +# this pattern).
  15597. +#
  15598. +# There are only two supported options: --lt-debug and
  15599. +# --lt-dump-script. There is, deliberately, no --lt-help.
  15600. +#
  15601. +# The first argument to this parsing function should be the
  15602. +# script's $0 value, followed by "$@".
  15603. +lt_option_debug=
  15604. +func_parse_lt_options ()
  15605. +{
  15606. + lt_script_arg0=\$0
  15607. + shift
  15608. + for lt_opt
  15609. + do
  15610. + case \"\$lt_opt\" in
  15611. + --lt-debug) lt_option_debug=1 ;;
  15612. + --lt-dump-script)
  15613. + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
  15614. + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
  15615. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
  15616. + cat \"\$lt_dump_D/\$lt_dump_F\"
  15617. + exit 0
  15618. + ;;
  15619. + --lt-*)
  15620. + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
  15621. + exit 1
  15622. + ;;
  15623. + esac
  15624. + done
  15625. +
  15626. + # Print the debug banner immediately:
  15627. + if test -n \"\$lt_option_debug\"; then
  15628. + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
  15629. + fi
  15630. +}
  15631. +
  15632. +# Used when --lt-debug. Prints its arguments to stdout
  15633. +# (redirection is the responsibility of the caller)
  15634. +func_lt_dump_args ()
  15635. +{
  15636. + lt_dump_args_N=1;
  15637. + for lt_arg
  15638. + do
  15639. + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
  15640. + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
  15641. + done
  15642. +}
  15643. +
  15644. +# Core function for launching the target application
  15645. +func_exec_program_core ()
  15646. +{
  15647. +"
  15648. + case $host in
  15649. + # Backslashes separate directories on plain windows
  15650. + *-*-mingw | *-*-os2* | *-cegcc*)
  15651. + $ECHO "\
  15652. + if test -n \"\$lt_option_debug\"; then
  15653. + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
  15654. + func_lt_dump_args \${1+\"\$@\"} 1>&2
  15655. + fi
  15656. + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
  15657. +"
  15658. + ;;
  15659. +
  15660. + *)
  15661. + $ECHO "\
  15662. + if test -n \"\$lt_option_debug\"; then
  15663. + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
  15664. + func_lt_dump_args \${1+\"\$@\"} 1>&2
  15665. + fi
  15666. + exec \"\$progdir/\$program\" \${1+\"\$@\"}
  15667. +"
  15668. + ;;
  15669. + esac
  15670. + $ECHO "\
  15671. + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
  15672. + exit 1
  15673. +}
  15674. +
  15675. +# A function to encapsulate launching the target application
  15676. +# Strips options in the --lt-* namespace from \$@ and
  15677. +# launches target application with the remaining arguments.
  15678. +func_exec_program ()
  15679. +{
  15680. + for lt_wr_arg
  15681. + do
  15682. + case \$lt_wr_arg in
  15683. + --lt-*) ;;
  15684. + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
  15685. + esac
  15686. + shift
  15687. + done
  15688. + func_exec_program_core \${1+\"\$@\"}
  15689. +}
  15690. +
  15691. + # Parse options
  15692. + func_parse_lt_options \"\$0\" \${1+\"\$@\"}
  15693. # Find the directory that this script lives in.
  15694. thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
  15695. @@ -3078,7 +4065,7 @@ _LTECHO_EOF'
  15696. # relink executable if necessary
  15697. if test -n \"\$relink_command\"; then
  15698. - if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
  15699. + if relink_command_output=\`eval \$relink_command 2>&1\`; then :
  15700. else
  15701. $ECHO \"\$relink_command_output\" >&2
  15702. $RM \"\$progdir/\$file\"
  15703. @@ -3102,6 +4089,18 @@ _LTECHO_EOF'
  15704. if test -f \"\$progdir/\$program\"; then"
  15705. + # fixup the dll searchpath if we need to.
  15706. + #
  15707. + # Fix the DLL searchpath if we need to. Do this before prepending
  15708. + # to shlibpath, because on Windows, both are PATH and uninstalled
  15709. + # libraries must come first.
  15710. + if test -n "$dllsearchpath"; then
  15711. + $ECHO "\
  15712. + # Add the dll search path components to the executable PATH
  15713. + PATH=$dllsearchpath:\$PATH
  15714. +"
  15715. + fi
  15716. +
  15717. # Export our shlibpath_var if we have one.
  15718. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
  15719. $ECHO "\
  15720. @@ -3116,35 +4115,10 @@ _LTECHO_EOF'
  15721. "
  15722. fi
  15723. - # fixup the dll searchpath if we need to.
  15724. - if test -n "$dllsearchpath"; then
  15725. - $ECHO "\
  15726. - # Add the dll search path components to the executable PATH
  15727. - PATH=$dllsearchpath:\$PATH
  15728. -"
  15729. - fi
  15730. -
  15731. $ECHO "\
  15732. if test \"\$libtool_execute_magic\" != \"$magic\"; then
  15733. # Run the actual program with our arguments.
  15734. -"
  15735. - case $host in
  15736. - # Backslashes separate directories on plain windows
  15737. - *-*-mingw | *-*-os2* | *-cegcc*)
  15738. - $ECHO "\
  15739. - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
  15740. -"
  15741. - ;;
  15742. -
  15743. - *)
  15744. - $ECHO "\
  15745. - exec \"\$progdir/\$program\" \${1+\"\$@\"}
  15746. -"
  15747. - ;;
  15748. - esac
  15749. - $ECHO "\
  15750. - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
  15751. - exit 1
  15752. + func_exec_program \${1+\"\$@\"}
  15753. fi
  15754. else
  15755. # The program doesn't exist.
  15756. @@ -3158,166 +4132,6 @@ fi\
  15757. }
  15758. -# func_to_host_path arg
  15759. -#
  15760. -# Convert paths to host format when used with build tools.
  15761. -# Intended for use with "native" mingw (where libtool itself
  15762. -# is running under the msys shell), or in the following cross-
  15763. -# build environments:
  15764. -# $build $host
  15765. -# mingw (msys) mingw [e.g. native]
  15766. -# cygwin mingw
  15767. -# *nix + wine mingw
  15768. -# where wine is equipped with the `winepath' executable.
  15769. -# In the native mingw case, the (msys) shell automatically
  15770. -# converts paths for any non-msys applications it launches,
  15771. -# but that facility isn't available from inside the cwrapper.
  15772. -# Similar accommodations are necessary for $host mingw and
  15773. -# $build cygwin. Calling this function does no harm for other
  15774. -# $host/$build combinations not listed above.
  15775. -#
  15776. -# ARG is the path (on $build) that should be converted to
  15777. -# the proper representation for $host. The result is stored
  15778. -# in $func_to_host_path_result.
  15779. -func_to_host_path ()
  15780. -{
  15781. - func_to_host_path_result="$1"
  15782. - if test -n "$1"; then
  15783. - case $host in
  15784. - *mingw* )
  15785. - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
  15786. - case $build in
  15787. - *mingw* ) # actually, msys
  15788. - # awkward: cmd appends spaces to result
  15789. - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
  15790. - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
  15791. - ;;
  15792. - *cygwin* )
  15793. - func_to_host_path_result=`cygpath -w "$1" |
  15794. - $SED -e "$lt_sed_naive_backslashify"`
  15795. - ;;
  15796. - * )
  15797. - # Unfortunately, winepath does not exit with a non-zero
  15798. - # error code, so we are forced to check the contents of
  15799. - # stdout. On the other hand, if the command is not
  15800. - # found, the shell will set an exit code of 127 and print
  15801. - # *an error message* to stdout. So we must check for both
  15802. - # error code of zero AND non-empty stdout, which explains
  15803. - # the odd construction:
  15804. - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
  15805. - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
  15806. - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
  15807. - $SED -e "$lt_sed_naive_backslashify"`
  15808. - else
  15809. - # Allow warning below.
  15810. - func_to_host_path_result=
  15811. - fi
  15812. - ;;
  15813. - esac
  15814. - if test -z "$func_to_host_path_result" ; then
  15815. - func_error "Could not determine host path corresponding to"
  15816. - func_error " \`$1'"
  15817. - func_error "Continuing, but uninstalled executables may not work."
  15818. - # Fallback:
  15819. - func_to_host_path_result="$1"
  15820. - fi
  15821. - ;;
  15822. - esac
  15823. - fi
  15824. -}
  15825. -# end: func_to_host_path
  15826. -
  15827. -# func_to_host_pathlist arg
  15828. -#
  15829. -# Convert pathlists to host format when used with build tools.
  15830. -# See func_to_host_path(), above. This function supports the
  15831. -# following $build/$host combinations (but does no harm for
  15832. -# combinations not listed here):
  15833. -# $build $host
  15834. -# mingw (msys) mingw [e.g. native]
  15835. -# cygwin mingw
  15836. -# *nix + wine mingw
  15837. -#
  15838. -# Path separators are also converted from $build format to
  15839. -# $host format. If ARG begins or ends with a path separator
  15840. -# character, it is preserved (but converted to $host format)
  15841. -# on output.
  15842. -#
  15843. -# ARG is a pathlist (on $build) that should be converted to
  15844. -# the proper representation on $host. The result is stored
  15845. -# in $func_to_host_pathlist_result.
  15846. -func_to_host_pathlist ()
  15847. -{
  15848. - func_to_host_pathlist_result="$1"
  15849. - if test -n "$1"; then
  15850. - case $host in
  15851. - *mingw* )
  15852. - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
  15853. - # Remove leading and trailing path separator characters from
  15854. - # ARG. msys behavior is inconsistent here, cygpath turns them
  15855. - # into '.;' and ';.', and winepath ignores them completely.
  15856. - func_stripname : : "$1"
  15857. - func_to_host_pathlist_tmp1=$func_stripname_result
  15858. - case $build in
  15859. - *mingw* ) # Actually, msys.
  15860. - # Awkward: cmd appends spaces to result.
  15861. - func_to_host_pathlist_result=`
  15862. - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
  15863. - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
  15864. - ;;
  15865. - *cygwin* )
  15866. - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
  15867. - $SED -e "$lt_sed_naive_backslashify"`
  15868. - ;;
  15869. - * )
  15870. - # unfortunately, winepath doesn't convert pathlists
  15871. - func_to_host_pathlist_result=""
  15872. - func_to_host_pathlist_oldIFS=$IFS
  15873. - IFS=:
  15874. - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
  15875. - IFS=$func_to_host_pathlist_oldIFS
  15876. - if test -n "$func_to_host_pathlist_f" ; then
  15877. - func_to_host_path "$func_to_host_pathlist_f"
  15878. - if test -n "$func_to_host_path_result" ; then
  15879. - if test -z "$func_to_host_pathlist_result" ; then
  15880. - func_to_host_pathlist_result="$func_to_host_path_result"
  15881. - else
  15882. - func_append func_to_host_pathlist_result ";$func_to_host_path_result"
  15883. - fi
  15884. - fi
  15885. - fi
  15886. - done
  15887. - IFS=$func_to_host_pathlist_oldIFS
  15888. - ;;
  15889. - esac
  15890. - if test -z "$func_to_host_pathlist_result"; then
  15891. - func_error "Could not determine the host path(s) corresponding to"
  15892. - func_error " \`$1'"
  15893. - func_error "Continuing, but uninstalled executables may not work."
  15894. - # Fallback. This may break if $1 contains DOS-style drive
  15895. - # specifications. The fix is not to complicate the expression
  15896. - # below, but for the user to provide a working wine installation
  15897. - # with winepath so that path translation in the cross-to-mingw
  15898. - # case works properly.
  15899. - lt_replace_pathsep_nix_to_dos="s|:|;|g"
  15900. - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
  15901. - $SED -e "$lt_replace_pathsep_nix_to_dos"`
  15902. - fi
  15903. - # Now, add the leading and trailing path separators back
  15904. - case "$1" in
  15905. - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
  15906. - ;;
  15907. - esac
  15908. - case "$1" in
  15909. - *: ) func_append func_to_host_pathlist_result ";"
  15910. - ;;
  15911. - esac
  15912. - ;;
  15913. - esac
  15914. - fi
  15915. -}
  15916. -# end: func_to_host_pathlist
  15917. -
  15918. # func_emit_cwrapperexe_src
  15919. # emit the source code for a wrapper executable on stdout
  15920. # Must ONLY be called from within func_mode_link because
  15921. @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
  15922. This wrapper executable should never be moved out of the build directory.
  15923. If it is, it will not operate correctly.
  15924. -
  15925. - Currently, it simply execs the wrapper *script* "$SHELL $output",
  15926. - but could eventually absorb all of the scripts functionality and
  15927. - exec $objdir/$outputname directly.
  15928. */
  15929. EOF
  15930. cat <<"EOF"
  15931. @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
  15932. if (stale) { free ((void *) stale); stale = 0; } \
  15933. } while (0)
  15934. -#undef LTWRAPPER_DEBUGPRINTF
  15935. -#if defined LT_DEBUGWRAPPER
  15936. -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
  15937. -static void
  15938. -ltwrapper_debugprintf (const char *fmt, ...)
  15939. -{
  15940. - va_list args;
  15941. - va_start (args, fmt);
  15942. - (void) vfprintf (stderr, fmt, args);
  15943. - va_end (args);
  15944. -}
  15945. +#if defined(LT_DEBUGWRAPPER)
  15946. +static int lt_debug = 1;
  15947. #else
  15948. -# define LTWRAPPER_DEBUGPRINTF(args)
  15949. +static int lt_debug = 0;
  15950. #endif
  15951. -const char *program_name = NULL;
  15952. +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
  15953. void *xmalloc (size_t num);
  15954. char *xstrdup (const char *string);
  15955. @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
  15956. int make_executable (const char *path);
  15957. int check_executable (const char *path);
  15958. char *strendzap (char *str, const char *pat);
  15959. -void lt_fatal (const char *message, ...);
  15960. +void lt_debugprintf (const char *file, int line, const char *fmt, ...);
  15961. +void lt_fatal (const char *file, int line, const char *message, ...);
  15962. +static const char *nonnull (const char *s);
  15963. +static const char *nonempty (const char *s);
  15964. void lt_setenv (const char *name, const char *value);
  15965. char *lt_extend_str (const char *orig_value, const char *add, int to_end);
  15966. void lt_update_exe_path (const char *name, const char *value);
  15967. @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
  15968. EOF
  15969. cat <<EOF
  15970. -const char * MAGIC_EXE = "$magic_exe";
  15971. +volatile const char * MAGIC_EXE = "$magic_exe";
  15972. const char * LIB_PATH_VARNAME = "$shlibpath_var";
  15973. EOF
  15974. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
  15975. - func_to_host_pathlist "$temp_rpath"
  15976. + func_to_host_path "$temp_rpath"
  15977. cat <<EOF
  15978. -const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
  15979. +const char * LIB_PATH_VALUE = "$func_to_host_path_result";
  15980. EOF
  15981. else
  15982. cat <<"EOF"
  15983. @@ -3513,10 +4317,10 @@ EOF
  15984. fi
  15985. if test -n "$dllsearchpath"; then
  15986. - func_to_host_pathlist "$dllsearchpath:"
  15987. + func_to_host_path "$dllsearchpath:"
  15988. cat <<EOF
  15989. const char * EXE_PATH_VARNAME = "PATH";
  15990. -const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
  15991. +const char * EXE_PATH_VALUE = "$func_to_host_path_result";
  15992. EOF
  15993. else
  15994. cat <<"EOF"
  15995. @@ -3539,12 +4343,10 @@ EOF
  15996. cat <<"EOF"
  15997. #define LTWRAPPER_OPTION_PREFIX "--lt-"
  15998. -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
  15999. -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
  16000. static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
  16001. -
  16002. static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
  16003. +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
  16004. int
  16005. main (int argc, char *argv[])
  16006. @@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
  16007. int i;
  16008. program_name = (char *) xstrdup (base_name (argv[0]));
  16009. - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
  16010. - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
  16011. + newargz = XMALLOC (char *, argc + 1);
  16012. - /* very simple arg parsing; don't want to rely on getopt */
  16013. + /* very simple arg parsing; don't want to rely on getopt
  16014. + * also, copy all non cwrapper options to newargz, except
  16015. + * argz[0], which is handled differently
  16016. + */
  16017. + newargc=0;
  16018. for (i = 1; i < argc; i++)
  16019. {
  16020. if (strcmp (argv[i], dumpscript_opt) == 0)
  16021. @@ -3581,21 +4386,54 @@ EOF
  16022. lt_dump_script (stdout);
  16023. return 0;
  16024. }
  16025. + if (strcmp (argv[i], debug_opt) == 0)
  16026. + {
  16027. + lt_debug = 1;
  16028. + continue;
  16029. + }
  16030. + if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
  16031. + {
  16032. + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
  16033. + namespace, but it is not one of the ones we know about and
  16034. + have already dealt with, above (inluding dump-script), then
  16035. + report an error. Otherwise, targets might begin to believe
  16036. + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
  16037. + namespace. The first time any user complains about this, we'll
  16038. + need to make LTWRAPPER_OPTION_PREFIX a configure-time option
  16039. + or a configure.ac-settable value.
  16040. + */
  16041. + lt_fatal (__FILE__, __LINE__,
  16042. + "unrecognized %s option: '%s'",
  16043. + ltwrapper_option_prefix, argv[i]);
  16044. + }
  16045. + /* otherwise ... */
  16046. + newargz[++newargc] = xstrdup (argv[i]);
  16047. }
  16048. + newargz[++newargc] = NULL;
  16049. +
  16050. +EOF
  16051. + cat <<EOF
  16052. + /* The GNU banner must be the first non-error debug message */
  16053. + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
  16054. +EOF
  16055. + cat <<"EOF"
  16056. + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
  16057. + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
  16058. - newargz = XMALLOC (char *, argc + 1);
  16059. tmp_pathspec = find_executable (argv[0]);
  16060. if (tmp_pathspec == NULL)
  16061. - lt_fatal ("Couldn't find %s", argv[0]);
  16062. - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
  16063. - tmp_pathspec));
  16064. + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
  16065. + lt_debugprintf (__FILE__, __LINE__,
  16066. + "(main) found exe (before symlink chase) at: %s\n",
  16067. + tmp_pathspec);
  16068. actual_cwrapper_path = chase_symlinks (tmp_pathspec);
  16069. - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
  16070. - actual_cwrapper_path));
  16071. + lt_debugprintf (__FILE__, __LINE__,
  16072. + "(main) found exe (after symlink chase) at: %s\n",
  16073. + actual_cwrapper_path);
  16074. XFREE (tmp_pathspec);
  16075. - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
  16076. + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
  16077. strendzap (actual_cwrapper_path, actual_cwrapper_name);
  16078. /* wrapper name transforms */
  16079. @@ -3613,8 +4451,9 @@ EOF
  16080. target_name = tmp_pathspec;
  16081. tmp_pathspec = 0;
  16082. - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
  16083. - target_name));
  16084. + lt_debugprintf (__FILE__, __LINE__,
  16085. + "(main) libtool target name: %s\n",
  16086. + target_name);
  16087. EOF
  16088. cat <<EOF
  16089. @@ -3664,35 +4503,19 @@ EOF
  16090. lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
  16091. lt_setenv ("DUALCASE", "1"); /* for MSK sh */
  16092. - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
  16093. + /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
  16094. + be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
  16095. + because on Windows, both *_VARNAMEs are PATH but uninstalled
  16096. + libraries must come first. */
  16097. lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
  16098. + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
  16099. - newargc=0;
  16100. - for (i = 1; i < argc; i++)
  16101. - {
  16102. - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
  16103. - {
  16104. - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
  16105. - namespace, but it is not one of the ones we know about and
  16106. - have already dealt with, above (inluding dump-script), then
  16107. - report an error. Otherwise, targets might begin to believe
  16108. - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
  16109. - namespace. The first time any user complains about this, we'll
  16110. - need to make LTWRAPPER_OPTION_PREFIX a configure-time option
  16111. - or a configure.ac-settable value.
  16112. - */
  16113. - lt_fatal ("Unrecognized option in %s namespace: '%s'",
  16114. - ltwrapper_option_prefix, argv[i]);
  16115. - }
  16116. - /* otherwise ... */
  16117. - newargz[++newargc] = xstrdup (argv[i]);
  16118. - }
  16119. - newargz[++newargc] = NULL;
  16120. -
  16121. - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
  16122. + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
  16123. + nonnull (lt_argv_zero));
  16124. for (i = 0; i < newargc; i++)
  16125. {
  16126. - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
  16127. + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
  16128. + i, nonnull (newargz[i]));
  16129. }
  16130. EOF
  16131. @@ -3706,7 +4529,9 @@ EOF
  16132. if (rval == -1)
  16133. {
  16134. /* failed to start process */
  16135. - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
  16136. + lt_debugprintf (__FILE__, __LINE__,
  16137. + "(main) failed to launch target \"%s\": %s\n",
  16138. + lt_argv_zero, nonnull (strerror (errno)));
  16139. return 127;
  16140. }
  16141. return rval;
  16142. @@ -3728,7 +4553,7 @@ xmalloc (size_t num)
  16143. {
  16144. void *p = (void *) malloc (num);
  16145. if (!p)
  16146. - lt_fatal ("Memory exhausted");
  16147. + lt_fatal (__FILE__, __LINE__, "memory exhausted");
  16148. return p;
  16149. }
  16150. @@ -3762,8 +4587,8 @@ check_executable (const char *path)
  16151. {
  16152. struct stat st;
  16153. - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
  16154. - path ? (*path ? path : "EMPTY!") : "NULL!"));
  16155. + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
  16156. + nonempty (path));
  16157. if ((!path) || (!*path))
  16158. return 0;
  16159. @@ -3780,8 +4605,8 @@ make_executable (const char *path)
  16160. int rval = 0;
  16161. struct stat st;
  16162. - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
  16163. - path ? (*path ? path : "EMPTY!") : "NULL!"));
  16164. + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
  16165. + nonempty (path));
  16166. if ((!path) || (!*path))
  16167. return 0;
  16168. @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
  16169. int tmp_len;
  16170. char *concat_name;
  16171. - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
  16172. - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
  16173. + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
  16174. + nonempty (wrapper));
  16175. if ((wrapper == NULL) || (*wrapper == '\0'))
  16176. return NULL;
  16177. @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
  16178. {
  16179. /* empty path: current directory */
  16180. if (getcwd (tmp, LT_PATHMAX) == NULL)
  16181. - lt_fatal ("getcwd failed");
  16182. + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
  16183. + nonnull (strerror (errno)));
  16184. tmp_len = strlen (tmp);
  16185. concat_name =
  16186. XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
  16187. @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
  16188. }
  16189. /* Relative path | not found in path: prepend cwd */
  16190. if (getcwd (tmp, LT_PATHMAX) == NULL)
  16191. - lt_fatal ("getcwd failed");
  16192. + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
  16193. + nonnull (strerror (errno)));
  16194. tmp_len = strlen (tmp);
  16195. concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
  16196. memcpy (concat_name, tmp, tmp_len);
  16197. @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
  16198. int has_symlinks = 0;
  16199. while (strlen (tmp_pathspec) && !has_symlinks)
  16200. {
  16201. - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
  16202. - tmp_pathspec));
  16203. + lt_debugprintf (__FILE__, __LINE__,
  16204. + "checking path component for symlinks: %s\n",
  16205. + tmp_pathspec);
  16206. if (lstat (tmp_pathspec, &s) == 0)
  16207. {
  16208. if (S_ISLNK (s.st_mode) != 0)
  16209. @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
  16210. }
  16211. else
  16212. {
  16213. - char *errstr = strerror (errno);
  16214. - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
  16215. + lt_fatal (__FILE__, __LINE__,
  16216. + "error accessing file \"%s\": %s",
  16217. + tmp_pathspec, nonnull (strerror (errno)));
  16218. }
  16219. }
  16220. XFREE (tmp_pathspec);
  16221. @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
  16222. tmp_pathspec = realpath (pathspec, buf);
  16223. if (tmp_pathspec == 0)
  16224. {
  16225. - lt_fatal ("Could not follow symlinks for %s", pathspec);
  16226. + lt_fatal (__FILE__, __LINE__,
  16227. + "could not follow symlinks for %s", pathspec);
  16228. }
  16229. return xstrdup (tmp_pathspec);
  16230. #endif
  16231. @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
  16232. return str;
  16233. }
  16234. +void
  16235. +lt_debugprintf (const char *file, int line, const char *fmt, ...)
  16236. +{
  16237. + va_list args;
  16238. + if (lt_debug)
  16239. + {
  16240. + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
  16241. + va_start (args, fmt);
  16242. + (void) vfprintf (stderr, fmt, args);
  16243. + va_end (args);
  16244. + }
  16245. +}
  16246. +
  16247. static void
  16248. -lt_error_core (int exit_status, const char *mode,
  16249. +lt_error_core (int exit_status, const char *file,
  16250. + int line, const char *mode,
  16251. const char *message, va_list ap)
  16252. {
  16253. - fprintf (stderr, "%s: %s: ", program_name, mode);
  16254. + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
  16255. vfprintf (stderr, message, ap);
  16256. fprintf (stderr, ".\n");
  16257. @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
  16258. }
  16259. void
  16260. -lt_fatal (const char *message, ...)
  16261. +lt_fatal (const char *file, int line, const char *message, ...)
  16262. {
  16263. va_list ap;
  16264. va_start (ap, message);
  16265. - lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
  16266. + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
  16267. va_end (ap);
  16268. }
  16269. +static const char *
  16270. +nonnull (const char *s)
  16271. +{
  16272. + return s ? s : "(null)";
  16273. +}
  16274. +
  16275. +static const char *
  16276. +nonempty (const char *s)
  16277. +{
  16278. + return (s && !*s) ? "(empty)" : nonnull (s);
  16279. +}
  16280. +
  16281. void
  16282. lt_setenv (const char *name, const char *value)
  16283. {
  16284. - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
  16285. - (name ? name : "<NULL>"),
  16286. - (value ? value : "<NULL>")));
  16287. + lt_debugprintf (__FILE__, __LINE__,
  16288. + "(lt_setenv) setting '%s' to '%s'\n",
  16289. + nonnull (name), nonnull (value));
  16290. {
  16291. #ifdef HAVE_SETENV
  16292. /* always make a copy, for consistency with !HAVE_SETENV */
  16293. @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
  16294. void
  16295. lt_update_exe_path (const char *name, const char *value)
  16296. {
  16297. - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
  16298. - (name ? name : "<NULL>"),
  16299. - (value ? value : "<NULL>")));
  16300. + lt_debugprintf (__FILE__, __LINE__,
  16301. + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
  16302. + nonnull (name), nonnull (value));
  16303. if (name && *name && value && *value)
  16304. {
  16305. @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
  16306. void
  16307. lt_update_lib_path (const char *name, const char *value)
  16308. {
  16309. - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
  16310. - (name ? name : "<NULL>"),
  16311. - (value ? value : "<NULL>")));
  16312. + lt_debugprintf (__FILE__, __LINE__,
  16313. + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
  16314. + nonnull (name), nonnull (value));
  16315. if (name && *name && value && *value)
  16316. {
  16317. @@ -4222,7 +5078,7 @@ EOF
  16318. func_win32_import_lib_p ()
  16319. {
  16320. $opt_debug
  16321. - case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
  16322. + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
  16323. *import*) : ;;
  16324. *) false ;;
  16325. esac
  16326. @@ -4401,9 +5257,9 @@ func_mode_link ()
  16327. ;;
  16328. *)
  16329. if test "$prev" = dlfiles; then
  16330. - dlfiles="$dlfiles $arg"
  16331. + func_append dlfiles " $arg"
  16332. else
  16333. - dlprefiles="$dlprefiles $arg"
  16334. + func_append dlprefiles " $arg"
  16335. fi
  16336. prev=
  16337. continue
  16338. @@ -4427,7 +5283,7 @@ func_mode_link ()
  16339. *-*-darwin*)
  16340. case "$deplibs " in
  16341. *" $qarg.ltframework "*) ;;
  16342. - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
  16343. + *) func_append deplibs " $qarg.ltframework" # this is fixed later
  16344. ;;
  16345. esac
  16346. ;;
  16347. @@ -4446,7 +5302,7 @@ func_mode_link ()
  16348. moreargs=
  16349. for fil in `cat "$save_arg"`
  16350. do
  16351. -# moreargs="$moreargs $fil"
  16352. +# func_append moreargs " $fil"
  16353. arg=$fil
  16354. # A libtool-controlled object.
  16355. @@ -4475,7 +5331,7 @@ func_mode_link ()
  16356. if test "$prev" = dlfiles; then
  16357. if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
  16358. - dlfiles="$dlfiles $pic_object"
  16359. + func_append dlfiles " $pic_object"
  16360. prev=
  16361. continue
  16362. else
  16363. @@ -4487,7 +5343,7 @@ func_mode_link ()
  16364. # CHECK ME: I think I busted this. -Ossama
  16365. if test "$prev" = dlprefiles; then
  16366. # Preload the old-style object.
  16367. - dlprefiles="$dlprefiles $pic_object"
  16368. + func_append dlprefiles " $pic_object"
  16369. prev=
  16370. fi
  16371. @@ -4557,12 +5413,12 @@ func_mode_link ()
  16372. if test "$prev" = rpath; then
  16373. case "$rpath " in
  16374. *" $arg "*) ;;
  16375. - *) rpath="$rpath $arg" ;;
  16376. + *) func_append rpath " $arg" ;;
  16377. esac
  16378. else
  16379. case "$xrpath " in
  16380. *" $arg "*) ;;
  16381. - *) xrpath="$xrpath $arg" ;;
  16382. + *) func_append xrpath " $arg" ;;
  16383. esac
  16384. fi
  16385. prev=
  16386. @@ -4574,28 +5430,28 @@ func_mode_link ()
  16387. continue
  16388. ;;
  16389. weak)
  16390. - weak_libs="$weak_libs $arg"
  16391. + func_append weak_libs " $arg"
  16392. prev=
  16393. continue
  16394. ;;
  16395. xcclinker)
  16396. - linker_flags="$linker_flags $qarg"
  16397. - compiler_flags="$compiler_flags $qarg"
  16398. + func_append linker_flags " $qarg"
  16399. + func_append compiler_flags " $qarg"
  16400. prev=
  16401. func_append compile_command " $qarg"
  16402. func_append finalize_command " $qarg"
  16403. continue
  16404. ;;
  16405. xcompiler)
  16406. - compiler_flags="$compiler_flags $qarg"
  16407. + func_append compiler_flags " $qarg"
  16408. prev=
  16409. func_append compile_command " $qarg"
  16410. func_append finalize_command " $qarg"
  16411. continue
  16412. ;;
  16413. xlinker)
  16414. - linker_flags="$linker_flags $qarg"
  16415. - compiler_flags="$compiler_flags $wl$qarg"
  16416. + func_append linker_flags " $qarg"
  16417. + func_append compiler_flags " $wl$qarg"
  16418. prev=
  16419. func_append compile_command " $wl$qarg"
  16420. func_append finalize_command " $wl$qarg"
  16421. @@ -4686,15 +5542,16 @@ func_mode_link ()
  16422. ;;
  16423. -L*)
  16424. - func_stripname '-L' '' "$arg"
  16425. - dir=$func_stripname_result
  16426. - if test -z "$dir"; then
  16427. + func_stripname "-L" '' "$arg"
  16428. + if test -z "$func_stripname_result"; then
  16429. if test "$#" -gt 0; then
  16430. func_fatal_error "require no space between \`-L' and \`$1'"
  16431. else
  16432. func_fatal_error "need path for \`-L' option"
  16433. fi
  16434. fi
  16435. + func_resolve_sysroot "$func_stripname_result"
  16436. + dir=$func_resolve_sysroot_result
  16437. # We need an absolute path.
  16438. case $dir in
  16439. [\\/]* | [A-Za-z]:[\\/]*) ;;
  16440. @@ -4706,10 +5563,16 @@ func_mode_link ()
  16441. ;;
  16442. esac
  16443. case "$deplibs " in
  16444. - *" -L$dir "*) ;;
  16445. + *" -L$dir "* | *" $arg "*)
  16446. + # Will only happen for absolute or sysroot arguments
  16447. + ;;
  16448. *)
  16449. - deplibs="$deplibs -L$dir"
  16450. - lib_search_path="$lib_search_path $dir"
  16451. + # Preserve sysroot, but never include relative directories
  16452. + case $dir in
  16453. + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
  16454. + *) func_append deplibs " -L$dir" ;;
  16455. + esac
  16456. + func_append lib_search_path " $dir"
  16457. ;;
  16458. esac
  16459. case $host in
  16460. @@ -4718,12 +5581,12 @@ func_mode_link ()
  16461. case :$dllsearchpath: in
  16462. *":$dir:"*) ;;
  16463. ::) dllsearchpath=$dir;;
  16464. - *) dllsearchpath="$dllsearchpath:$dir";;
  16465. + *) func_append dllsearchpath ":$dir";;
  16466. esac
  16467. case :$dllsearchpath: in
  16468. *":$testbindir:"*) ;;
  16469. ::) dllsearchpath=$testbindir;;
  16470. - *) dllsearchpath="$dllsearchpath:$testbindir";;
  16471. + *) func_append dllsearchpath ":$testbindir";;
  16472. esac
  16473. ;;
  16474. esac
  16475. @@ -4747,7 +5610,7 @@ func_mode_link ()
  16476. ;;
  16477. *-*-rhapsody* | *-*-darwin1.[012])
  16478. # Rhapsody C and math libraries are in the System framework
  16479. - deplibs="$deplibs System.ltframework"
  16480. + func_append deplibs " System.ltframework"
  16481. continue
  16482. ;;
  16483. *-*-sco3.2v5* | *-*-sco5v6*)
  16484. @@ -4758,9 +5621,6 @@ func_mode_link ()
  16485. # Compiler inserts libc in the correct place for threads to work
  16486. test "X$arg" = "X-lc" && continue
  16487. ;;
  16488. - *-*-linux*)
  16489. - test "X$arg" = "X-lc" && continue
  16490. - ;;
  16491. esac
  16492. elif test "X$arg" = "X-lc_r"; then
  16493. case $host in
  16494. @@ -4770,7 +5630,7 @@ func_mode_link ()
  16495. ;;
  16496. esac
  16497. fi
  16498. - deplibs="$deplibs $arg"
  16499. + func_append deplibs " $arg"
  16500. continue
  16501. ;;
  16502. @@ -4782,8 +5642,8 @@ func_mode_link ()
  16503. # Tru64 UNIX uses -model [arg] to determine the layout of C++
  16504. # classes, name mangling, and exception handling.
  16505. # Darwin uses the -arch flag to determine output architecture.
  16506. - -model|-arch|-isysroot)
  16507. - compiler_flags="$compiler_flags $arg"
  16508. + -model|-arch|-isysroot|--sysroot)
  16509. + func_append compiler_flags " $arg"
  16510. func_append compile_command " $arg"
  16511. func_append finalize_command " $arg"
  16512. prev=xcompiler
  16513. @@ -4791,12 +5651,12 @@ func_mode_link ()
  16514. ;;
  16515. -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
  16516. - compiler_flags="$compiler_flags $arg"
  16517. + func_append compiler_flags " $arg"
  16518. func_append compile_command " $arg"
  16519. func_append finalize_command " $arg"
  16520. case "$new_inherited_linker_flags " in
  16521. *" $arg "*) ;;
  16522. - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
  16523. + * ) func_append new_inherited_linker_flags " $arg" ;;
  16524. esac
  16525. continue
  16526. ;;
  16527. @@ -4863,13 +5723,17 @@ func_mode_link ()
  16528. # We need an absolute path.
  16529. case $dir in
  16530. [\\/]* | [A-Za-z]:[\\/]*) ;;
  16531. + =*)
  16532. + func_stripname '=' '' "$dir"
  16533. + dir=$lt_sysroot$func_stripname_result
  16534. + ;;
  16535. *)
  16536. func_fatal_error "only absolute run-paths are allowed"
  16537. ;;
  16538. esac
  16539. case "$xrpath " in
  16540. *" $dir "*) ;;
  16541. - *) xrpath="$xrpath $dir" ;;
  16542. + *) func_append xrpath " $dir" ;;
  16543. esac
  16544. continue
  16545. ;;
  16546. @@ -4922,8 +5786,8 @@ func_mode_link ()
  16547. for flag in $args; do
  16548. IFS="$save_ifs"
  16549. func_quote_for_eval "$flag"
  16550. - arg="$arg $func_quote_for_eval_result"
  16551. - compiler_flags="$compiler_flags $func_quote_for_eval_result"
  16552. + func_append arg " $func_quote_for_eval_result"
  16553. + func_append compiler_flags " $func_quote_for_eval_result"
  16554. done
  16555. IFS="$save_ifs"
  16556. func_stripname ' ' '' "$arg"
  16557. @@ -4938,9 +5802,9 @@ func_mode_link ()
  16558. for flag in $args; do
  16559. IFS="$save_ifs"
  16560. func_quote_for_eval "$flag"
  16561. - arg="$arg $wl$func_quote_for_eval_result"
  16562. - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
  16563. - linker_flags="$linker_flags $func_quote_for_eval_result"
  16564. + func_append arg " $wl$func_quote_for_eval_result"
  16565. + func_append compiler_flags " $wl$func_quote_for_eval_result"
  16566. + func_append linker_flags " $func_quote_for_eval_result"
  16567. done
  16568. IFS="$save_ifs"
  16569. func_stripname ' ' '' "$arg"
  16570. @@ -4968,24 +5832,27 @@ func_mode_link ()
  16571. arg="$func_quote_for_eval_result"
  16572. ;;
  16573. - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
  16574. - # -r[0-9][0-9]* specifies the processor on the SGI compiler
  16575. - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
  16576. - # +DA*, +DD* enable 64-bit mode on the HP compiler
  16577. - # -q* pass through compiler args for the IBM compiler
  16578. - # -m*, -t[45]*, -txscale* pass through architecture-specific
  16579. - # compiler args for GCC
  16580. - # -F/path gives path to uninstalled frameworks, gcc on darwin
  16581. - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
  16582. - # @file GCC response files
  16583. - # -tp=* Portland pgcc target processor selection
  16584. + # Flags to be passed through unchanged, with rationale:
  16585. + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
  16586. + # -r[0-9][0-9]* specify processor for the SGI compiler
  16587. + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
  16588. + # +DA*, +DD* enable 64-bit mode for the HP compiler
  16589. + # -q* compiler args for the IBM compiler
  16590. + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
  16591. + # -F/path path to uninstalled frameworks, gcc on darwin
  16592. + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
  16593. + # @file GCC response files
  16594. + # -tp=* Portland pgcc target processor selection
  16595. + # --sysroot=* for sysroot support
  16596. + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
  16597. -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
  16598. - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
  16599. + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
  16600. + -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
  16601. func_quote_for_eval "$arg"
  16602. arg="$func_quote_for_eval_result"
  16603. func_append compile_command " $arg"
  16604. func_append finalize_command " $arg"
  16605. - compiler_flags="$compiler_flags $arg"
  16606. + func_append compiler_flags " $arg"
  16607. continue
  16608. ;;
  16609. @@ -4997,7 +5864,7 @@ func_mode_link ()
  16610. *.$objext)
  16611. # A standard object.
  16612. - objs="$objs $arg"
  16613. + func_append objs " $arg"
  16614. ;;
  16615. *.lo)
  16616. @@ -5028,7 +5895,7 @@ func_mode_link ()
  16617. if test "$prev" = dlfiles; then
  16618. if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
  16619. - dlfiles="$dlfiles $pic_object"
  16620. + func_append dlfiles " $pic_object"
  16621. prev=
  16622. continue
  16623. else
  16624. @@ -5040,7 +5907,7 @@ func_mode_link ()
  16625. # CHECK ME: I think I busted this. -Ossama
  16626. if test "$prev" = dlprefiles; then
  16627. # Preload the old-style object.
  16628. - dlprefiles="$dlprefiles $pic_object"
  16629. + func_append dlprefiles " $pic_object"
  16630. prev=
  16631. fi
  16632. @@ -5085,24 +5952,25 @@ func_mode_link ()
  16633. *.$libext)
  16634. # An archive.
  16635. - deplibs="$deplibs $arg"
  16636. - old_deplibs="$old_deplibs $arg"
  16637. + func_append deplibs " $arg"
  16638. + func_append old_deplibs " $arg"
  16639. continue
  16640. ;;
  16641. *.la)
  16642. # A libtool-controlled library.
  16643. + func_resolve_sysroot "$arg"
  16644. if test "$prev" = dlfiles; then
  16645. # This library was specified with -dlopen.
  16646. - dlfiles="$dlfiles $arg"
  16647. + func_append dlfiles " $func_resolve_sysroot_result"
  16648. prev=
  16649. elif test "$prev" = dlprefiles; then
  16650. # The library was specified with -dlpreopen.
  16651. - dlprefiles="$dlprefiles $arg"
  16652. + func_append dlprefiles " $func_resolve_sysroot_result"
  16653. prev=
  16654. else
  16655. - deplibs="$deplibs $arg"
  16656. + func_append deplibs " $func_resolve_sysroot_result"
  16657. fi
  16658. continue
  16659. ;;
  16660. @@ -5127,7 +5995,7 @@ func_mode_link ()
  16661. func_fatal_help "the \`$prevarg' option requires an argument"
  16662. if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
  16663. - eval "arg=\"$export_dynamic_flag_spec\""
  16664. + eval arg=\"$export_dynamic_flag_spec\"
  16665. func_append compile_command " $arg"
  16666. func_append finalize_command " $arg"
  16667. fi
  16668. @@ -5144,11 +6012,13 @@ func_mode_link ()
  16669. else
  16670. shlib_search_path=
  16671. fi
  16672. - eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
  16673. - eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
  16674. + eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
  16675. + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
  16676. func_dirname "$output" "/" ""
  16677. output_objdir="$func_dirname_result$objdir"
  16678. + func_to_tool_file "$output_objdir/"
  16679. + tool_output_objdir=$func_to_tool_file_result
  16680. # Create the object directory.
  16681. func_mkdir_p "$output_objdir"
  16682. @@ -5169,12 +6039,12 @@ func_mode_link ()
  16683. # Find all interdependent deplibs by searching for libraries
  16684. # that are linked more than once (e.g. -la -lb -la)
  16685. for deplib in $deplibs; do
  16686. - if $opt_duplicate_deps ; then
  16687. + if $opt_preserve_dup_deps ; then
  16688. case "$libs " in
  16689. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  16690. + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
  16691. esac
  16692. fi
  16693. - libs="$libs $deplib"
  16694. + func_append libs " $deplib"
  16695. done
  16696. if test "$linkmode" = lib; then
  16697. @@ -5187,9 +6057,9 @@ func_mode_link ()
  16698. if $opt_duplicate_compiler_generated_deps; then
  16699. for pre_post_dep in $predeps $postdeps; do
  16700. case "$pre_post_deps " in
  16701. - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
  16702. + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
  16703. esac
  16704. - pre_post_deps="$pre_post_deps $pre_post_dep"
  16705. + func_append pre_post_deps " $pre_post_dep"
  16706. done
  16707. fi
  16708. pre_post_deps=
  16709. @@ -5256,8 +6126,9 @@ func_mode_link ()
  16710. for lib in $dlprefiles; do
  16711. # Ignore non-libtool-libs
  16712. dependency_libs=
  16713. + func_resolve_sysroot "$lib"
  16714. case $lib in
  16715. - *.la) func_source "$lib" ;;
  16716. + *.la) func_source "$func_resolve_sysroot_result" ;;
  16717. esac
  16718. # Collect preopened libtool deplibs, except any this library
  16719. @@ -5267,7 +6138,7 @@ func_mode_link ()
  16720. deplib_base=$func_basename_result
  16721. case " $weak_libs " in
  16722. *" $deplib_base "*) ;;
  16723. - *) deplibs="$deplibs $deplib" ;;
  16724. + *) func_append deplibs " $deplib" ;;
  16725. esac
  16726. done
  16727. done
  16728. @@ -5288,11 +6159,11 @@ func_mode_link ()
  16729. compile_deplibs="$deplib $compile_deplibs"
  16730. finalize_deplibs="$deplib $finalize_deplibs"
  16731. else
  16732. - compiler_flags="$compiler_flags $deplib"
  16733. + func_append compiler_flags " $deplib"
  16734. if test "$linkmode" = lib ; then
  16735. case "$new_inherited_linker_flags " in
  16736. *" $deplib "*) ;;
  16737. - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
  16738. + * ) func_append new_inherited_linker_flags " $deplib" ;;
  16739. esac
  16740. fi
  16741. fi
  16742. @@ -5377,7 +6248,7 @@ func_mode_link ()
  16743. if test "$linkmode" = lib ; then
  16744. case "$new_inherited_linker_flags " in
  16745. *" $deplib "*) ;;
  16746. - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
  16747. + * ) func_append new_inherited_linker_flags " $deplib" ;;
  16748. esac
  16749. fi
  16750. fi
  16751. @@ -5390,7 +6261,8 @@ func_mode_link ()
  16752. test "$pass" = conv && continue
  16753. newdependency_libs="$deplib $newdependency_libs"
  16754. func_stripname '-L' '' "$deplib"
  16755. - newlib_search_path="$newlib_search_path $func_stripname_result"
  16756. + func_resolve_sysroot "$func_stripname_result"
  16757. + func_append newlib_search_path " $func_resolve_sysroot_result"
  16758. ;;
  16759. prog)
  16760. if test "$pass" = conv; then
  16761. @@ -5404,7 +6276,8 @@ func_mode_link ()
  16762. finalize_deplibs="$deplib $finalize_deplibs"
  16763. fi
  16764. func_stripname '-L' '' "$deplib"
  16765. - newlib_search_path="$newlib_search_path $func_stripname_result"
  16766. + func_resolve_sysroot "$func_stripname_result"
  16767. + func_append newlib_search_path " $func_resolve_sysroot_result"
  16768. ;;
  16769. *)
  16770. func_warning "\`-L' is ignored for archives/objects"
  16771. @@ -5415,17 +6288,21 @@ func_mode_link ()
  16772. -R*)
  16773. if test "$pass" = link; then
  16774. func_stripname '-R' '' "$deplib"
  16775. - dir=$func_stripname_result
  16776. + func_resolve_sysroot "$func_stripname_result"
  16777. + dir=$func_resolve_sysroot_result
  16778. # Make sure the xrpath contains only unique directories.
  16779. case "$xrpath " in
  16780. *" $dir "*) ;;
  16781. - *) xrpath="$xrpath $dir" ;;
  16782. + *) func_append xrpath " $dir" ;;
  16783. esac
  16784. fi
  16785. deplibs="$deplib $deplibs"
  16786. continue
  16787. ;;
  16788. - *.la) lib="$deplib" ;;
  16789. + *.la)
  16790. + func_resolve_sysroot "$deplib"
  16791. + lib=$func_resolve_sysroot_result
  16792. + ;;
  16793. *.$libext)
  16794. if test "$pass" = conv; then
  16795. deplibs="$deplib $deplibs"
  16796. @@ -5488,11 +6365,11 @@ func_mode_link ()
  16797. if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
  16798. # If there is no dlopen support or we're linking statically,
  16799. # we need to preload.
  16800. - newdlprefiles="$newdlprefiles $deplib"
  16801. + func_append newdlprefiles " $deplib"
  16802. compile_deplibs="$deplib $compile_deplibs"
  16803. finalize_deplibs="$deplib $finalize_deplibs"
  16804. else
  16805. - newdlfiles="$newdlfiles $deplib"
  16806. + func_append newdlfiles " $deplib"
  16807. fi
  16808. fi
  16809. continue
  16810. @@ -5538,7 +6415,7 @@ func_mode_link ()
  16811. for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
  16812. case " $new_inherited_linker_flags " in
  16813. *" $tmp_inherited_linker_flag "*) ;;
  16814. - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
  16815. + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
  16816. esac
  16817. done
  16818. fi
  16819. @@ -5546,8 +6423,8 @@ func_mode_link ()
  16820. if test "$linkmode,$pass" = "lib,link" ||
  16821. test "$linkmode,$pass" = "prog,scan" ||
  16822. { test "$linkmode" != prog && test "$linkmode" != lib; }; then
  16823. - test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
  16824. - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
  16825. + test -n "$dlopen" && func_append dlfiles " $dlopen"
  16826. + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
  16827. fi
  16828. if test "$pass" = conv; then
  16829. @@ -5558,20 +6435,20 @@ func_mode_link ()
  16830. func_fatal_error "cannot find name of link library for \`$lib'"
  16831. fi
  16832. # It is a libtool convenience library, so add in its objects.
  16833. - convenience="$convenience $ladir/$objdir/$old_library"
  16834. - old_convenience="$old_convenience $ladir/$objdir/$old_library"
  16835. + func_append convenience " $ladir/$objdir/$old_library"
  16836. + func_append old_convenience " $ladir/$objdir/$old_library"
  16837. elif test "$linkmode" != prog && test "$linkmode" != lib; then
  16838. func_fatal_error "\`$lib' is not a convenience library"
  16839. fi
  16840. tmp_libs=
  16841. for deplib in $dependency_libs; do
  16842. deplibs="$deplib $deplibs"
  16843. - if $opt_duplicate_deps ; then
  16844. + if $opt_preserve_dup_deps ; then
  16845. case "$tmp_libs " in
  16846. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  16847. + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
  16848. esac
  16849. fi
  16850. - tmp_libs="$tmp_libs $deplib"
  16851. + func_append tmp_libs " $deplib"
  16852. done
  16853. continue
  16854. fi # $pass = conv
  16855. @@ -5579,9 +6456,15 @@ func_mode_link ()
  16856. # Get the name of the library we link against.
  16857. linklib=
  16858. - for l in $old_library $library_names; do
  16859. - linklib="$l"
  16860. - done
  16861. + if test -n "$old_library" &&
  16862. + { test "$prefer_static_libs" = yes ||
  16863. + test "$prefer_static_libs,$installed" = "built,no"; }; then
  16864. + linklib=$old_library
  16865. + else
  16866. + for l in $old_library $library_names; do
  16867. + linklib="$l"
  16868. + done
  16869. + fi
  16870. if test -z "$linklib"; then
  16871. func_fatal_error "cannot find name of link library for \`$lib'"
  16872. fi
  16873. @@ -5598,9 +6481,9 @@ func_mode_link ()
  16874. # statically, we need to preload. We also need to preload any
  16875. # dependent libraries so libltdl's deplib preloader doesn't
  16876. # bomb out in the load deplibs phase.
  16877. - dlprefiles="$dlprefiles $lib $dependency_libs"
  16878. + func_append dlprefiles " $lib $dependency_libs"
  16879. else
  16880. - newdlfiles="$newdlfiles $lib"
  16881. + func_append newdlfiles " $lib"
  16882. fi
  16883. continue
  16884. fi # $pass = dlopen
  16885. @@ -5622,14 +6505,14 @@ func_mode_link ()
  16886. # Find the relevant object directory and library name.
  16887. if test "X$installed" = Xyes; then
  16888. - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
  16889. + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
  16890. func_warning "library \`$lib' was moved."
  16891. dir="$ladir"
  16892. absdir="$abs_ladir"
  16893. libdir="$abs_ladir"
  16894. else
  16895. - dir="$libdir"
  16896. - absdir="$libdir"
  16897. + dir="$lt_sysroot$libdir"
  16898. + absdir="$lt_sysroot$libdir"
  16899. fi
  16900. test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
  16901. else
  16902. @@ -5637,12 +6520,12 @@ func_mode_link ()
  16903. dir="$ladir"
  16904. absdir="$abs_ladir"
  16905. # Remove this search path later
  16906. - notinst_path="$notinst_path $abs_ladir"
  16907. + func_append notinst_path " $abs_ladir"
  16908. else
  16909. dir="$ladir/$objdir"
  16910. absdir="$abs_ladir/$objdir"
  16911. # Remove this search path later
  16912. - notinst_path="$notinst_path $abs_ladir"
  16913. + func_append notinst_path " $abs_ladir"
  16914. fi
  16915. fi # $installed = yes
  16916. func_stripname 'lib' '.la' "$laname"
  16917. @@ -5653,20 +6536,46 @@ func_mode_link ()
  16918. if test -z "$libdir" && test "$linkmode" = prog; then
  16919. func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
  16920. fi
  16921. - # Prefer using a static library (so that no silly _DYNAMIC symbols
  16922. - # are required to link).
  16923. - if test -n "$old_library"; then
  16924. - newdlprefiles="$newdlprefiles $dir/$old_library"
  16925. - # Keep a list of preopened convenience libraries to check
  16926. - # that they are being used correctly in the link pass.
  16927. - test -z "$libdir" && \
  16928. - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
  16929. - # Otherwise, use the dlname, so that lt_dlopen finds it.
  16930. - elif test -n "$dlname"; then
  16931. - newdlprefiles="$newdlprefiles $dir/$dlname"
  16932. - else
  16933. - newdlprefiles="$newdlprefiles $dir/$linklib"
  16934. - fi
  16935. + case "$host" in
  16936. + # special handling for platforms with PE-DLLs.
  16937. + *cygwin* | *mingw* | *cegcc* )
  16938. + # Linker will automatically link against shared library if both
  16939. + # static and shared are present. Therefore, ensure we extract
  16940. + # symbols from the import library if a shared library is present
  16941. + # (otherwise, the dlopen module name will be incorrect). We do
  16942. + # this by putting the import library name into $newdlprefiles.
  16943. + # We recover the dlopen module name by 'saving' the la file
  16944. + # name in a special purpose variable, and (later) extracting the
  16945. + # dlname from the la file.
  16946. + if test -n "$dlname"; then
  16947. + func_tr_sh "$dir/$linklib"
  16948. + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
  16949. + func_append newdlprefiles " $dir/$linklib"
  16950. + else
  16951. + func_append newdlprefiles " $dir/$old_library"
  16952. + # Keep a list of preopened convenience libraries to check
  16953. + # that they are being used correctly in the link pass.
  16954. + test -z "$libdir" && \
  16955. + func_append dlpreconveniencelibs " $dir/$old_library"
  16956. + fi
  16957. + ;;
  16958. + * )
  16959. + # Prefer using a static library (so that no silly _DYNAMIC symbols
  16960. + # are required to link).
  16961. + if test -n "$old_library"; then
  16962. + func_append newdlprefiles " $dir/$old_library"
  16963. + # Keep a list of preopened convenience libraries to check
  16964. + # that they are being used correctly in the link pass.
  16965. + test -z "$libdir" && \
  16966. + func_append dlpreconveniencelibs " $dir/$old_library"
  16967. + # Otherwise, use the dlname, so that lt_dlopen finds it.
  16968. + elif test -n "$dlname"; then
  16969. + func_append newdlprefiles " $dir/$dlname"
  16970. + else
  16971. + func_append newdlprefiles " $dir/$linklib"
  16972. + fi
  16973. + ;;
  16974. + esac
  16975. fi # $pass = dlpreopen
  16976. if test -z "$libdir"; then
  16977. @@ -5684,7 +6593,7 @@ func_mode_link ()
  16978. if test "$linkmode" = prog && test "$pass" != link; then
  16979. - newlib_search_path="$newlib_search_path $ladir"
  16980. + func_append newlib_search_path " $ladir"
  16981. deplibs="$lib $deplibs"
  16982. linkalldeplibs=no
  16983. @@ -5697,7 +6606,8 @@ func_mode_link ()
  16984. for deplib in $dependency_libs; do
  16985. case $deplib in
  16986. -L*) func_stripname '-L' '' "$deplib"
  16987. - newlib_search_path="$newlib_search_path $func_stripname_result"
  16988. + func_resolve_sysroot "$func_stripname_result"
  16989. + func_append newlib_search_path " $func_resolve_sysroot_result"
  16990. ;;
  16991. esac
  16992. # Need to link against all dependency_libs?
  16993. @@ -5708,12 +6618,12 @@ func_mode_link ()
  16994. # or/and link against static libraries
  16995. newdependency_libs="$deplib $newdependency_libs"
  16996. fi
  16997. - if $opt_duplicate_deps ; then
  16998. + if $opt_preserve_dup_deps ; then
  16999. case "$tmp_libs " in
  17000. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  17001. + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
  17002. esac
  17003. fi
  17004. - tmp_libs="$tmp_libs $deplib"
  17005. + func_append tmp_libs " $deplib"
  17006. done # for deplib
  17007. continue
  17008. fi # $linkmode = prog...
  17009. @@ -5728,7 +6638,7 @@ func_mode_link ()
  17010. # Make sure the rpath contains only unique directories.
  17011. case "$temp_rpath:" in
  17012. *"$absdir:"*) ;;
  17013. - *) temp_rpath="$temp_rpath$absdir:" ;;
  17014. + *) func_append temp_rpath "$absdir:" ;;
  17015. esac
  17016. fi
  17017. @@ -5740,7 +6650,7 @@ func_mode_link ()
  17018. *)
  17019. case "$compile_rpath " in
  17020. *" $absdir "*) ;;
  17021. - *) compile_rpath="$compile_rpath $absdir"
  17022. + *) func_append compile_rpath " $absdir" ;;
  17023. esac
  17024. ;;
  17025. esac
  17026. @@ -5749,7 +6659,7 @@ func_mode_link ()
  17027. *)
  17028. case "$finalize_rpath " in
  17029. *" $libdir "*) ;;
  17030. - *) finalize_rpath="$finalize_rpath $libdir"
  17031. + *) func_append finalize_rpath " $libdir" ;;
  17032. esac
  17033. ;;
  17034. esac
  17035. @@ -5774,12 +6684,12 @@ func_mode_link ()
  17036. case $host in
  17037. *cygwin* | *mingw* | *cegcc*)
  17038. # No point in relinking DLLs because paths are not encoded
  17039. - notinst_deplibs="$notinst_deplibs $lib"
  17040. + func_append notinst_deplibs " $lib"
  17041. need_relink=no
  17042. ;;
  17043. *)
  17044. if test "$installed" = no; then
  17045. - notinst_deplibs="$notinst_deplibs $lib"
  17046. + func_append notinst_deplibs " $lib"
  17047. need_relink=yes
  17048. fi
  17049. ;;
  17050. @@ -5814,7 +6724,7 @@ func_mode_link ()
  17051. *)
  17052. case "$compile_rpath " in
  17053. *" $absdir "*) ;;
  17054. - *) compile_rpath="$compile_rpath $absdir"
  17055. + *) func_append compile_rpath " $absdir" ;;
  17056. esac
  17057. ;;
  17058. esac
  17059. @@ -5823,7 +6733,7 @@ func_mode_link ()
  17060. *)
  17061. case "$finalize_rpath " in
  17062. *" $libdir "*) ;;
  17063. - *) finalize_rpath="$finalize_rpath $libdir"
  17064. + *) func_append finalize_rpath " $libdir" ;;
  17065. esac
  17066. ;;
  17067. esac
  17068. @@ -5835,7 +6745,7 @@ func_mode_link ()
  17069. shift
  17070. realname="$1"
  17071. shift
  17072. - eval "libname=\"$libname_spec\""
  17073. + libname=`eval "\\$ECHO \"$libname_spec\""`
  17074. # use dlname if we got it. it's perfectly good, no?
  17075. if test -n "$dlname"; then
  17076. soname="$dlname"
  17077. @@ -5848,7 +6758,7 @@ func_mode_link ()
  17078. versuffix="-$major"
  17079. ;;
  17080. esac
  17081. - eval "soname=\"$soname_spec\""
  17082. + eval soname=\"$soname_spec\"
  17083. else
  17084. soname="$realname"
  17085. fi
  17086. @@ -5877,7 +6787,7 @@ func_mode_link ()
  17087. linklib=$newlib
  17088. fi # test -n "$old_archive_from_expsyms_cmds"
  17089. - if test "$linkmode" = prog || test "$mode" != relink; then
  17090. + if test "$linkmode" = prog || test "$opt_mode" != relink; then
  17091. add_shlibpath=
  17092. add_dir=
  17093. add=
  17094. @@ -5933,7 +6843,7 @@ func_mode_link ()
  17095. if test -n "$inst_prefix_dir"; then
  17096. case $libdir in
  17097. [\\/]*)
  17098. - add_dir="$add_dir -L$inst_prefix_dir$libdir"
  17099. + func_append add_dir " -L$inst_prefix_dir$libdir"
  17100. ;;
  17101. esac
  17102. fi
  17103. @@ -5955,7 +6865,7 @@ func_mode_link ()
  17104. if test -n "$add_shlibpath"; then
  17105. case :$compile_shlibpath: in
  17106. *":$add_shlibpath:"*) ;;
  17107. - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
  17108. + *) func_append compile_shlibpath "$add_shlibpath:" ;;
  17109. esac
  17110. fi
  17111. if test "$linkmode" = prog; then
  17112. @@ -5969,13 +6879,13 @@ func_mode_link ()
  17113. test "$hardcode_shlibpath_var" = yes; then
  17114. case :$finalize_shlibpath: in
  17115. *":$libdir:"*) ;;
  17116. - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
  17117. + *) func_append finalize_shlibpath "$libdir:" ;;
  17118. esac
  17119. fi
  17120. fi
  17121. fi
  17122. - if test "$linkmode" = prog || test "$mode" = relink; then
  17123. + if test "$linkmode" = prog || test "$opt_mode" = relink; then
  17124. add_shlibpath=
  17125. add_dir=
  17126. add=
  17127. @@ -5989,7 +6899,7 @@ func_mode_link ()
  17128. elif test "$hardcode_shlibpath_var" = yes; then
  17129. case :$finalize_shlibpath: in
  17130. *":$libdir:"*) ;;
  17131. - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
  17132. + *) func_append finalize_shlibpath "$libdir:" ;;
  17133. esac
  17134. add="-l$name"
  17135. elif test "$hardcode_automatic" = yes; then
  17136. @@ -6001,12 +6911,12 @@ func_mode_link ()
  17137. fi
  17138. else
  17139. # We cannot seem to hardcode it, guess we'll fake it.
  17140. - add_dir="-L$libdir"
  17141. + add_dir="-L$lt_sysroot$libdir"
  17142. # Try looking first in the location we're being installed to.
  17143. if test -n "$inst_prefix_dir"; then
  17144. case $libdir in
  17145. [\\/]*)
  17146. - add_dir="$add_dir -L$inst_prefix_dir$libdir"
  17147. + func_append add_dir " -L$inst_prefix_dir$libdir"
  17148. ;;
  17149. esac
  17150. fi
  17151. @@ -6083,27 +6993,33 @@ func_mode_link ()
  17152. temp_xrpath=$func_stripname_result
  17153. case " $xrpath " in
  17154. *" $temp_xrpath "*) ;;
  17155. - *) xrpath="$xrpath $temp_xrpath";;
  17156. + *) func_append xrpath " $temp_xrpath";;
  17157. esac;;
  17158. - *) temp_deplibs="$temp_deplibs $libdir";;
  17159. + *) func_append temp_deplibs " $libdir";;
  17160. esac
  17161. done
  17162. dependency_libs="$temp_deplibs"
  17163. fi
  17164. - newlib_search_path="$newlib_search_path $absdir"
  17165. + func_append newlib_search_path " $absdir"
  17166. # Link against this library
  17167. test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
  17168. # ... and its dependency_libs
  17169. tmp_libs=
  17170. for deplib in $dependency_libs; do
  17171. newdependency_libs="$deplib $newdependency_libs"
  17172. - if $opt_duplicate_deps ; then
  17173. + case $deplib in
  17174. + -L*) func_stripname '-L' '' "$deplib"
  17175. + func_resolve_sysroot "$func_stripname_result";;
  17176. + *) func_resolve_sysroot "$deplib" ;;
  17177. + esac
  17178. + if $opt_preserve_dup_deps ; then
  17179. case "$tmp_libs " in
  17180. - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
  17181. + *" $func_resolve_sysroot_result "*)
  17182. + func_append specialdeplibs " $func_resolve_sysroot_result" ;;
  17183. esac
  17184. fi
  17185. - tmp_libs="$tmp_libs $deplib"
  17186. + func_append tmp_libs " $func_resolve_sysroot_result"
  17187. done
  17188. if test "$link_all_deplibs" != no; then
  17189. @@ -6113,8 +7029,10 @@ func_mode_link ()
  17190. case $deplib in
  17191. -L*) path="$deplib" ;;
  17192. *.la)
  17193. + func_resolve_sysroot "$deplib"
  17194. + deplib=$func_resolve_sysroot_result
  17195. func_dirname "$deplib" "" "."
  17196. - dir="$func_dirname_result"
  17197. + dir=$func_dirname_result
  17198. # We need an absolute path.
  17199. case $dir in
  17200. [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
  17201. @@ -6130,7 +7048,7 @@ func_mode_link ()
  17202. case $host in
  17203. *-*-darwin*)
  17204. depdepl=
  17205. - deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
  17206. + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
  17207. if test -n "$deplibrary_names" ; then
  17208. for tmp in $deplibrary_names ; do
  17209. depdepl=$tmp
  17210. @@ -6141,8 +7059,8 @@ func_mode_link ()
  17211. if test -z "$darwin_install_name"; then
  17212. darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
  17213. fi
  17214. - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
  17215. - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
  17216. + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
  17217. + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
  17218. path=
  17219. fi
  17220. fi
  17221. @@ -6152,7 +7070,7 @@ func_mode_link ()
  17222. ;;
  17223. esac
  17224. else
  17225. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  17226. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  17227. test -z "$libdir" && \
  17228. func_fatal_error "\`$deplib' is not a valid libtool archive"
  17229. test "$absdir" != "$libdir" && \
  17230. @@ -6192,7 +7110,7 @@ func_mode_link ()
  17231. for dir in $newlib_search_path; do
  17232. case "$lib_search_path " in
  17233. *" $dir "*) ;;
  17234. - *) lib_search_path="$lib_search_path $dir" ;;
  17235. + *) func_append lib_search_path " $dir" ;;
  17236. esac
  17237. done
  17238. newlib_search_path=
  17239. @@ -6205,7 +7123,7 @@ func_mode_link ()
  17240. fi
  17241. for var in $vars dependency_libs; do
  17242. # Add libraries to $var in reverse order
  17243. - eval tmp_libs=\$$var
  17244. + eval tmp_libs=\"\$$var\"
  17245. new_libs=
  17246. for deplib in $tmp_libs; do
  17247. # FIXME: Pedantically, this is the right thing to do, so
  17248. @@ -6250,13 +7168,13 @@ func_mode_link ()
  17249. -L*)
  17250. case " $tmp_libs " in
  17251. *" $deplib "*) ;;
  17252. - *) tmp_libs="$tmp_libs $deplib" ;;
  17253. + *) func_append tmp_libs " $deplib" ;;
  17254. esac
  17255. ;;
  17256. - *) tmp_libs="$tmp_libs $deplib" ;;
  17257. + *) func_append tmp_libs " $deplib" ;;
  17258. esac
  17259. done
  17260. - eval $var=\$tmp_libs
  17261. + eval $var=\"$tmp_libs\"
  17262. done # for var
  17263. fi
  17264. # Last step: remove runtime libs from dependency_libs
  17265. @@ -6269,7 +7187,7 @@ func_mode_link ()
  17266. ;;
  17267. esac
  17268. if test -n "$i" ; then
  17269. - tmp_libs="$tmp_libs $i"
  17270. + func_append tmp_libs " $i"
  17271. fi
  17272. done
  17273. dependency_libs=$tmp_libs
  17274. @@ -6310,7 +7228,7 @@ func_mode_link ()
  17275. # Now set the variables for building old libraries.
  17276. build_libtool_libs=no
  17277. oldlibs="$output"
  17278. - objs="$objs$old_deplibs"
  17279. + func_append objs "$old_deplibs"
  17280. ;;
  17281. lib)
  17282. @@ -6319,8 +7237,8 @@ func_mode_link ()
  17283. lib*)
  17284. func_stripname 'lib' '.la' "$outputname"
  17285. name=$func_stripname_result
  17286. - eval "shared_ext=\"$shrext_cmds\""
  17287. - eval "libname=\"$libname_spec\""
  17288. + eval shared_ext=\"$shrext_cmds\"
  17289. + eval libname=\"$libname_spec\"
  17290. ;;
  17291. *)
  17292. test "$module" = no && \
  17293. @@ -6330,8 +7248,8 @@ func_mode_link ()
  17294. # Add the "lib" prefix for modules if required
  17295. func_stripname '' '.la' "$outputname"
  17296. name=$func_stripname_result
  17297. - eval "shared_ext=\"$shrext_cmds\""
  17298. - eval "libname=\"$libname_spec\""
  17299. + eval shared_ext=\"$shrext_cmds\"
  17300. + eval libname=\"$libname_spec\"
  17301. else
  17302. func_stripname '' '.la' "$outputname"
  17303. libname=$func_stripname_result
  17304. @@ -6346,7 +7264,7 @@ func_mode_link ()
  17305. echo
  17306. $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
  17307. $ECHO "*** objects $objs is not portable!"
  17308. - libobjs="$libobjs $objs"
  17309. + func_append libobjs " $objs"
  17310. fi
  17311. fi
  17312. @@ -6544,7 +7462,7 @@ func_mode_link ()
  17313. done
  17314. # Make executables depend on our current version.
  17315. - verstring="$verstring:${current}.0"
  17316. + func_append verstring ":${current}.0"
  17317. ;;
  17318. qnx)
  17319. @@ -6612,10 +7530,10 @@ func_mode_link ()
  17320. fi
  17321. func_generate_dlsyms "$libname" "$libname" "yes"
  17322. - libobjs="$libobjs $symfileobj"
  17323. + func_append libobjs " $symfileobj"
  17324. test "X$libobjs" = "X " && libobjs=
  17325. - if test "$mode" != relink; then
  17326. + if test "$opt_mode" != relink; then
  17327. # Remove our outputs, but don't remove object files since they
  17328. # may have been created when compiling PIC objects.
  17329. removelist=
  17330. @@ -6631,7 +7549,7 @@ func_mode_link ()
  17331. continue
  17332. fi
  17333. fi
  17334. - removelist="$removelist $p"
  17335. + func_append removelist " $p"
  17336. ;;
  17337. *) ;;
  17338. esac
  17339. @@ -6642,7 +7560,7 @@ func_mode_link ()
  17340. # Now set the variables for building old libraries.
  17341. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
  17342. - oldlibs="$oldlibs $output_objdir/$libname.$libext"
  17343. + func_append oldlibs " $output_objdir/$libname.$libext"
  17344. # Transform .lo files to .o files.
  17345. oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
  17346. @@ -6659,10 +7577,11 @@ func_mode_link ()
  17347. # If the user specified any rpath flags, then add them.
  17348. temp_xrpath=
  17349. for libdir in $xrpath; do
  17350. - temp_xrpath="$temp_xrpath -R$libdir"
  17351. + func_replace_sysroot "$libdir"
  17352. + func_append temp_xrpath " -R$func_replace_sysroot_result"
  17353. case "$finalize_rpath " in
  17354. *" $libdir "*) ;;
  17355. - *) finalize_rpath="$finalize_rpath $libdir" ;;
  17356. + *) func_append finalize_rpath " $libdir" ;;
  17357. esac
  17358. done
  17359. if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
  17360. @@ -6676,7 +7595,7 @@ func_mode_link ()
  17361. for lib in $old_dlfiles; do
  17362. case " $dlprefiles $dlfiles " in
  17363. *" $lib "*) ;;
  17364. - *) dlfiles="$dlfiles $lib" ;;
  17365. + *) func_append dlfiles " $lib" ;;
  17366. esac
  17367. done
  17368. @@ -6686,7 +7605,7 @@ func_mode_link ()
  17369. for lib in $old_dlprefiles; do
  17370. case "$dlprefiles " in
  17371. *" $lib "*) ;;
  17372. - *) dlprefiles="$dlprefiles $lib" ;;
  17373. + *) func_append dlprefiles " $lib" ;;
  17374. esac
  17375. done
  17376. @@ -6698,7 +7617,7 @@ func_mode_link ()
  17377. ;;
  17378. *-*-rhapsody* | *-*-darwin1.[012])
  17379. # Rhapsody C library is in the System framework
  17380. - deplibs="$deplibs System.ltframework"
  17381. + func_append deplibs " System.ltframework"
  17382. ;;
  17383. *-*-netbsd*)
  17384. # Don't link with libc until the a.out ld.so is fixed.
  17385. @@ -6715,7 +7634,7 @@ func_mode_link ()
  17386. *)
  17387. # Add libc to deplibs on all other systems if necessary.
  17388. if test "$build_libtool_need_lc" = "yes"; then
  17389. - deplibs="$deplibs -lc"
  17390. + func_append deplibs " -lc"
  17391. fi
  17392. ;;
  17393. esac
  17394. @@ -6764,18 +7683,18 @@ EOF
  17395. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  17396. case " $predeps $postdeps " in
  17397. *" $i "*)
  17398. - newdeplibs="$newdeplibs $i"
  17399. + func_append newdeplibs " $i"
  17400. i=""
  17401. ;;
  17402. esac
  17403. fi
  17404. if test -n "$i" ; then
  17405. - eval "libname=\"$libname_spec\""
  17406. - eval "deplib_matches=\"$library_names_spec\""
  17407. + libname=`eval "\\$ECHO \"$libname_spec\""`
  17408. + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
  17409. set dummy $deplib_matches; shift
  17410. deplib_match=$1
  17411. if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
  17412. - newdeplibs="$newdeplibs $i"
  17413. + func_append newdeplibs " $i"
  17414. else
  17415. droppeddeps=yes
  17416. echo
  17417. @@ -6789,7 +7708,7 @@ EOF
  17418. fi
  17419. ;;
  17420. *)
  17421. - newdeplibs="$newdeplibs $i"
  17422. + func_append newdeplibs " $i"
  17423. ;;
  17424. esac
  17425. done
  17426. @@ -6807,18 +7726,18 @@ EOF
  17427. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  17428. case " $predeps $postdeps " in
  17429. *" $i "*)
  17430. - newdeplibs="$newdeplibs $i"
  17431. + func_append newdeplibs " $i"
  17432. i=""
  17433. ;;
  17434. esac
  17435. fi
  17436. if test -n "$i" ; then
  17437. - eval "libname=\"$libname_spec\""
  17438. - eval "deplib_matches=\"$library_names_spec\""
  17439. + libname=`eval "\\$ECHO \"$libname_spec\""`
  17440. + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
  17441. set dummy $deplib_matches; shift
  17442. deplib_match=$1
  17443. if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
  17444. - newdeplibs="$newdeplibs $i"
  17445. + func_append newdeplibs " $i"
  17446. else
  17447. droppeddeps=yes
  17448. echo
  17449. @@ -6840,7 +7759,7 @@ EOF
  17450. fi
  17451. ;;
  17452. *)
  17453. - newdeplibs="$newdeplibs $i"
  17454. + func_append newdeplibs " $i"
  17455. ;;
  17456. esac
  17457. done
  17458. @@ -6857,15 +7776,27 @@ EOF
  17459. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  17460. case " $predeps $postdeps " in
  17461. *" $a_deplib "*)
  17462. - newdeplibs="$newdeplibs $a_deplib"
  17463. + func_append newdeplibs " $a_deplib"
  17464. a_deplib=""
  17465. ;;
  17466. esac
  17467. fi
  17468. if test -n "$a_deplib" ; then
  17469. - eval "libname=\"$libname_spec\""
  17470. + libname=`eval "\\$ECHO \"$libname_spec\""`
  17471. + if test -n "$file_magic_glob"; then
  17472. + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
  17473. + else
  17474. + libnameglob=$libname
  17475. + fi
  17476. + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
  17477. for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  17478. - potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
  17479. + if test "$want_nocaseglob" = yes; then
  17480. + shopt -s nocaseglob
  17481. + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
  17482. + $nocaseglob
  17483. + else
  17484. + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
  17485. + fi
  17486. for potent_lib in $potential_libs; do
  17487. # Follow soft links.
  17488. if ls -lLd "$potent_lib" 2>/dev/null |
  17489. @@ -6885,10 +7816,10 @@ EOF
  17490. *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
  17491. esac
  17492. done
  17493. - if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
  17494. + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
  17495. $SED -e 10q |
  17496. $EGREP "$file_magic_regex" > /dev/null; then
  17497. - newdeplibs="$newdeplibs $a_deplib"
  17498. + func_append newdeplibs " $a_deplib"
  17499. a_deplib=""
  17500. break 2
  17501. fi
  17502. @@ -6913,7 +7844,7 @@ EOF
  17503. ;;
  17504. *)
  17505. # Add a -L argument.
  17506. - newdeplibs="$newdeplibs $a_deplib"
  17507. + func_append newdeplibs " $a_deplib"
  17508. ;;
  17509. esac
  17510. done # Gone through all deplibs.
  17511. @@ -6929,20 +7860,20 @@ EOF
  17512. if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
  17513. case " $predeps $postdeps " in
  17514. *" $a_deplib "*)
  17515. - newdeplibs="$newdeplibs $a_deplib"
  17516. + func_append newdeplibs " $a_deplib"
  17517. a_deplib=""
  17518. ;;
  17519. esac
  17520. fi
  17521. if test -n "$a_deplib" ; then
  17522. - eval "libname=\"$libname_spec\""
  17523. + libname=`eval "\\$ECHO \"$libname_spec\""`
  17524. for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
  17525. potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
  17526. for potent_lib in $potential_libs; do
  17527. potlib="$potent_lib" # see symlink-check above in file_magic test
  17528. if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
  17529. $EGREP "$match_pattern_regex" > /dev/null; then
  17530. - newdeplibs="$newdeplibs $a_deplib"
  17531. + func_append newdeplibs " $a_deplib"
  17532. a_deplib=""
  17533. break 2
  17534. fi
  17535. @@ -6967,7 +7898,7 @@ EOF
  17536. ;;
  17537. *)
  17538. # Add a -L argument.
  17539. - newdeplibs="$newdeplibs $a_deplib"
  17540. + func_append newdeplibs " $a_deplib"
  17541. ;;
  17542. esac
  17543. done # Gone through all deplibs.
  17544. @@ -7071,7 +8002,7 @@ EOF
  17545. *)
  17546. case " $deplibs " in
  17547. *" -L$path/$objdir "*)
  17548. - new_libs="$new_libs -L$path/$objdir" ;;
  17549. + func_append new_libs " -L$path/$objdir" ;;
  17550. esac
  17551. ;;
  17552. esac
  17553. @@ -7081,10 +8012,10 @@ EOF
  17554. -L*)
  17555. case " $new_libs " in
  17556. *" $deplib "*) ;;
  17557. - *) new_libs="$new_libs $deplib" ;;
  17558. + *) func_append new_libs " $deplib" ;;
  17559. esac
  17560. ;;
  17561. - *) new_libs="$new_libs $deplib" ;;
  17562. + *) func_append new_libs " $deplib" ;;
  17563. esac
  17564. done
  17565. deplibs="$new_libs"
  17566. @@ -7101,10 +8032,12 @@ EOF
  17567. hardcode_libdirs=
  17568. dep_rpath=
  17569. rpath="$finalize_rpath"
  17570. - test "$mode" != relink && rpath="$compile_rpath$rpath"
  17571. + test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
  17572. for libdir in $rpath; do
  17573. if test -n "$hardcode_libdir_flag_spec"; then
  17574. if test -n "$hardcode_libdir_separator"; then
  17575. + func_replace_sysroot "$libdir"
  17576. + libdir=$func_replace_sysroot_result
  17577. if test -z "$hardcode_libdirs"; then
  17578. hardcode_libdirs="$libdir"
  17579. else
  17580. @@ -7113,18 +8046,18 @@ EOF
  17581. *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  17582. ;;
  17583. *)
  17584. - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
  17585. + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
  17586. ;;
  17587. esac
  17588. fi
  17589. else
  17590. - eval "flag=\"$hardcode_libdir_flag_spec\""
  17591. - dep_rpath="$dep_rpath $flag"
  17592. + eval flag=\"$hardcode_libdir_flag_spec\"
  17593. + func_append dep_rpath " $flag"
  17594. fi
  17595. elif test -n "$runpath_var"; then
  17596. case "$perm_rpath " in
  17597. *" $libdir "*) ;;
  17598. - *) perm_rpath="$perm_rpath $libdir" ;;
  17599. + *) func_apped perm_rpath " $libdir" ;;
  17600. esac
  17601. fi
  17602. done
  17603. @@ -7133,40 +8066,38 @@ EOF
  17604. test -n "$hardcode_libdirs"; then
  17605. libdir="$hardcode_libdirs"
  17606. if test -n "$hardcode_libdir_flag_spec_ld"; then
  17607. - eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
  17608. + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
  17609. else
  17610. - eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
  17611. + eval dep_rpath=\"$hardcode_libdir_flag_spec\"
  17612. fi
  17613. fi
  17614. if test -n "$runpath_var" && test -n "$perm_rpath"; then
  17615. # We should set the runpath_var.
  17616. rpath=
  17617. for dir in $perm_rpath; do
  17618. - rpath="$rpath$dir:"
  17619. + func_append rpath "$dir:"
  17620. done
  17621. - eval $runpath_var=\$rpath\$$runpath_var
  17622. - export $runpath_var
  17623. + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
  17624. fi
  17625. test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
  17626. fi
  17627. shlibpath="$finalize_shlibpath"
  17628. - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
  17629. + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
  17630. if test -n "$shlibpath"; then
  17631. - eval $shlibpath_var=\$shlibpath\$$shlibpath_var
  17632. - export $shlibpath_var
  17633. + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
  17634. fi
  17635. # Get the real and link names of the library.
  17636. - eval "shared_ext=\"$shrext_cmds\""
  17637. - eval "library_names=\"$library_names_spec\""
  17638. + eval shared_ext=\"$shrext_cmds\"
  17639. + eval library_names=\"$library_names_spec\"
  17640. set dummy $library_names
  17641. shift
  17642. realname="$1"
  17643. shift
  17644. if test -n "$soname_spec"; then
  17645. - eval "soname=\"$soname_spec\""
  17646. + eval soname=\"$soname_spec\"
  17647. else
  17648. soname="$realname"
  17649. fi
  17650. @@ -7178,7 +8109,7 @@ EOF
  17651. linknames=
  17652. for link
  17653. do
  17654. - linknames="$linknames $link"
  17655. + func_append linknames " $link"
  17656. done
  17657. # Use standard objects if they are pic
  17658. @@ -7189,7 +8120,7 @@ EOF
  17659. if test -n "$export_symbols" && test -n "$include_expsyms"; then
  17660. $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
  17661. export_symbols="$output_objdir/$libname.uexp"
  17662. - delfiles="$delfiles $export_symbols"
  17663. + func_append delfiles " $export_symbols"
  17664. fi
  17665. orig_export_symbols=
  17666. @@ -7220,13 +8151,45 @@ EOF
  17667. $opt_dry_run || $RM $export_symbols
  17668. cmds=$export_symbols_cmds
  17669. save_ifs="$IFS"; IFS='~'
  17670. - for cmd in $cmds; do
  17671. + for cmd1 in $cmds; do
  17672. IFS="$save_ifs"
  17673. - eval "cmd=\"$cmd\""
  17674. - func_len " $cmd"
  17675. - len=$func_len_result
  17676. - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  17677. + # Take the normal branch if the nm_file_list_spec branch
  17678. + # doesn't work or if tool conversion is not needed.
  17679. + case $nm_file_list_spec~$to_tool_file_cmd in
  17680. + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
  17681. + try_normal_branch=yes
  17682. + eval cmd=\"$cmd1\"
  17683. + func_len " $cmd"
  17684. + len=$func_len_result
  17685. + ;;
  17686. + *)
  17687. + try_normal_branch=no
  17688. + ;;
  17689. + esac
  17690. + if test "$try_normal_branch" = yes \
  17691. + && { test "$len" -lt "$max_cmd_len" \
  17692. + || test "$max_cmd_len" -le -1; }
  17693. + then
  17694. + func_show_eval "$cmd" 'exit $?'
  17695. + skipped_export=false
  17696. + elif test -n "$nm_file_list_spec"; then
  17697. + func_basename "$output"
  17698. + output_la=$func_basename_result
  17699. + save_libobjs=$libobjs
  17700. + save_output=$output
  17701. + output=${output_objdir}/${output_la}.nm
  17702. + func_to_tool_file "$output"
  17703. + libobjs=$nm_file_list_spec$func_to_tool_file_result
  17704. + func_append delfiles " $output"
  17705. + func_verbose "creating $NM input file list: $output"
  17706. + for obj in $save_libobjs; do
  17707. + func_to_tool_file "$obj"
  17708. + $ECHO "$func_to_tool_file_result"
  17709. + done > "$output"
  17710. + eval cmd=\"$cmd1\"
  17711. func_show_eval "$cmd" 'exit $?'
  17712. + output=$save_output
  17713. + libobjs=$save_libobjs
  17714. skipped_export=false
  17715. else
  17716. # The command line is too long to execute in one step.
  17717. @@ -7248,7 +8211,7 @@ EOF
  17718. if test -n "$export_symbols" && test -n "$include_expsyms"; then
  17719. tmp_export_symbols="$export_symbols"
  17720. test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
  17721. - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
  17722. + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
  17723. fi
  17724. if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
  17725. @@ -7260,7 +8223,7 @@ EOF
  17726. # global variables. join(1) would be nice here, but unfortunately
  17727. # isn't a blessed tool.
  17728. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
  17729. - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
  17730. + func_append delfiles " $export_symbols $output_objdir/$libname.filter"
  17731. export_symbols=$output_objdir/$libname.def
  17732. $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  17733. fi
  17734. @@ -7270,7 +8233,7 @@ EOF
  17735. case " $convenience " in
  17736. *" $test_deplib "*) ;;
  17737. *)
  17738. - tmp_deplibs="$tmp_deplibs $test_deplib"
  17739. + func_append tmp_deplibs " $test_deplib"
  17740. ;;
  17741. esac
  17742. done
  17743. @@ -7286,43 +8249,43 @@ EOF
  17744. fi
  17745. if test -n "$whole_archive_flag_spec"; then
  17746. save_libobjs=$libobjs
  17747. - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
  17748. + eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  17749. test "X$libobjs" = "X " && libobjs=
  17750. else
  17751. gentop="$output_objdir/${outputname}x"
  17752. - generated="$generated $gentop"
  17753. + func_append generated " $gentop"
  17754. func_extract_archives $gentop $convenience
  17755. - libobjs="$libobjs $func_extract_archives_result"
  17756. + func_append libobjs " $func_extract_archives_result"
  17757. test "X$libobjs" = "X " && libobjs=
  17758. fi
  17759. fi
  17760. if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
  17761. - eval "flag=\"$thread_safe_flag_spec\""
  17762. - linker_flags="$linker_flags $flag"
  17763. + eval flag=\"$thread_safe_flag_spec\"
  17764. + func_append linker_flags " $flag"
  17765. fi
  17766. # Make a backup of the uninstalled library when relinking
  17767. - if test "$mode" = relink; then
  17768. - $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
  17769. + if test "$opt_mode" = relink; then
  17770. + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
  17771. fi
  17772. # Do each of the archive commands.
  17773. if test "$module" = yes && test -n "$module_cmds" ; then
  17774. if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
  17775. - eval "test_cmds=\"$module_expsym_cmds\""
  17776. + eval test_cmds=\"$module_expsym_cmds\"
  17777. cmds=$module_expsym_cmds
  17778. else
  17779. - eval "test_cmds=\"$module_cmds\""
  17780. + eval test_cmds=\"$module_cmds\"
  17781. cmds=$module_cmds
  17782. fi
  17783. else
  17784. if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
  17785. - eval "test_cmds=\"$archive_expsym_cmds\""
  17786. + eval test_cmds=\"$archive_expsym_cmds\"
  17787. cmds=$archive_expsym_cmds
  17788. else
  17789. - eval "test_cmds=\"$archive_cmds\""
  17790. + eval test_cmds=\"$archive_cmds\"
  17791. cmds=$archive_cmds
  17792. fi
  17793. fi
  17794. @@ -7366,10 +8329,13 @@ EOF
  17795. echo 'INPUT (' > $output
  17796. for obj in $save_libobjs
  17797. do
  17798. - $ECHO "$obj" >> $output
  17799. + func_to_tool_file "$obj"
  17800. + $ECHO "$func_to_tool_file_result" >> $output
  17801. done
  17802. echo ')' >> $output
  17803. - delfiles="$delfiles $output"
  17804. + func_append delfiles " $output"
  17805. + func_to_tool_file "$output"
  17806. + output=$func_to_tool_file_result
  17807. elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
  17808. output=${output_objdir}/${output_la}.lnk
  17809. func_verbose "creating linker input file list: $output"
  17810. @@ -7383,15 +8349,17 @@ EOF
  17811. fi
  17812. for obj
  17813. do
  17814. - $ECHO "$obj" >> $output
  17815. + func_to_tool_file "$obj"
  17816. + $ECHO "$func_to_tool_file_result" >> $output
  17817. done
  17818. - delfiles="$delfiles $output"
  17819. - output=$firstobj\"$file_list_spec$output\"
  17820. + func_append delfiles " $output"
  17821. + func_to_tool_file "$output"
  17822. + output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
  17823. else
  17824. if test -n "$save_libobjs"; then
  17825. func_verbose "creating reloadable object files..."
  17826. output=$output_objdir/$output_la-${k}.$objext
  17827. - eval "test_cmds=\"$reload_cmds\""
  17828. + eval test_cmds=\"$reload_cmds\"
  17829. func_len " $test_cmds"
  17830. len0=$func_len_result
  17831. len=$len0
  17832. @@ -7411,12 +8379,12 @@ EOF
  17833. if test "$k" -eq 1 ; then
  17834. # The first file doesn't have a previous command to add.
  17835. reload_objs=$objlist
  17836. - eval "concat_cmds=\"$reload_cmds\""
  17837. + eval concat_cmds=\"$reload_cmds\"
  17838. else
  17839. # All subsequent reloadable object files will link in
  17840. # the last one created.
  17841. reload_objs="$objlist $last_robj"
  17842. - eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
  17843. + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
  17844. fi
  17845. last_robj=$output_objdir/$output_la-${k}.$objext
  17846. func_arith $k + 1
  17847. @@ -7433,11 +8401,11 @@ EOF
  17848. # files will link in the last one created.
  17849. test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  17850. reload_objs="$objlist $last_robj"
  17851. - eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
  17852. + eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
  17853. if test -n "$last_robj"; then
  17854. - eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
  17855. + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
  17856. fi
  17857. - delfiles="$delfiles $output"
  17858. + func_append delfiles " $output"
  17859. else
  17860. output=
  17861. @@ -7450,9 +8418,9 @@ EOF
  17862. libobjs=$output
  17863. # Append the command to create the export file.
  17864. test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  17865. - eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
  17866. + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
  17867. if test -n "$last_robj"; then
  17868. - eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
  17869. + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
  17870. fi
  17871. fi
  17872. @@ -7471,7 +8439,7 @@ EOF
  17873. lt_exit=$?
  17874. # Restore the uninstalled library and exit
  17875. - if test "$mode" = relink; then
  17876. + if test "$opt_mode" = relink; then
  17877. ( cd "$output_objdir" && \
  17878. $RM "${realname}T" && \
  17879. $MV "${realname}U" "$realname" )
  17880. @@ -7492,7 +8460,7 @@ EOF
  17881. if test -n "$export_symbols" && test -n "$include_expsyms"; then
  17882. tmp_export_symbols="$export_symbols"
  17883. test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
  17884. - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
  17885. + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
  17886. fi
  17887. if test -n "$orig_export_symbols"; then
  17888. @@ -7504,7 +8472,7 @@ EOF
  17889. # global variables. join(1) would be nice here, but unfortunately
  17890. # isn't a blessed tool.
  17891. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
  17892. - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
  17893. + func_append delfiles " $export_symbols $output_objdir/$libname.filter"
  17894. export_symbols=$output_objdir/$libname.def
  17895. $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
  17896. fi
  17897. @@ -7515,7 +8483,7 @@ EOF
  17898. output=$save_output
  17899. if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
  17900. - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
  17901. + eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
  17902. test "X$libobjs" = "X " && libobjs=
  17903. fi
  17904. # Expand the library linking commands again to reset the
  17905. @@ -7539,23 +8507,23 @@ EOF
  17906. if test -n "$delfiles"; then
  17907. # Append the command to remove temporary files to $cmds.
  17908. - eval "cmds=\"\$cmds~\$RM $delfiles\""
  17909. + eval cmds=\"\$cmds~\$RM $delfiles\"
  17910. fi
  17911. # Add any objects from preloaded convenience libraries
  17912. if test -n "$dlprefiles"; then
  17913. gentop="$output_objdir/${outputname}x"
  17914. - generated="$generated $gentop"
  17915. + func_append generated " $gentop"
  17916. func_extract_archives $gentop $dlprefiles
  17917. - libobjs="$libobjs $func_extract_archives_result"
  17918. + func_append libobjs " $func_extract_archives_result"
  17919. test "X$libobjs" = "X " && libobjs=
  17920. fi
  17921. save_ifs="$IFS"; IFS='~'
  17922. for cmd in $cmds; do
  17923. IFS="$save_ifs"
  17924. - eval "cmd=\"$cmd\""
  17925. + eval cmd=\"$cmd\"
  17926. $opt_silent || {
  17927. func_quote_for_expand "$cmd"
  17928. eval "func_echo $func_quote_for_expand_result"
  17929. @@ -7564,7 +8532,7 @@ EOF
  17930. lt_exit=$?
  17931. # Restore the uninstalled library and exit
  17932. - if test "$mode" = relink; then
  17933. + if test "$opt_mode" = relink; then
  17934. ( cd "$output_objdir" && \
  17935. $RM "${realname}T" && \
  17936. $MV "${realname}U" "$realname" )
  17937. @@ -7576,8 +8544,8 @@ EOF
  17938. IFS="$save_ifs"
  17939. # Restore the uninstalled library and exit
  17940. - if test "$mode" = relink; then
  17941. - $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
  17942. + if test "$opt_mode" = relink; then
  17943. + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
  17944. if test -n "$convenience"; then
  17945. if test -z "$whole_archive_flag_spec"; then
  17946. @@ -7656,17 +8624,20 @@ EOF
  17947. if test -n "$convenience"; then
  17948. if test -n "$whole_archive_flag_spec"; then
  17949. - eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
  17950. + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
  17951. reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
  17952. else
  17953. gentop="$output_objdir/${obj}x"
  17954. - generated="$generated $gentop"
  17955. + func_append generated " $gentop"
  17956. func_extract_archives $gentop $convenience
  17957. reload_conv_objs="$reload_objs $func_extract_archives_result"
  17958. fi
  17959. fi
  17960. + # If we're not building shared, we need to use non_pic_objs
  17961. + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
  17962. +
  17963. # Create the old-style object.
  17964. reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  17965. @@ -7690,7 +8661,7 @@ EOF
  17966. # Create an invalid libtool object if no PIC, so that we don't
  17967. # accidentally link it into a program.
  17968. # $show "echo timestamp > $libobj"
  17969. - # $opt_dry_run || echo timestamp > $libobj || exit $?
  17970. + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
  17971. exit $EXIT_SUCCESS
  17972. fi
  17973. @@ -7740,8 +8711,8 @@ EOF
  17974. if test "$tagname" = CXX ; then
  17975. case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
  17976. 10.[0123])
  17977. - compile_command="$compile_command ${wl}-bind_at_load"
  17978. - finalize_command="$finalize_command ${wl}-bind_at_load"
  17979. + func_append compile_command " ${wl}-bind_at_load"
  17980. + func_append finalize_command " ${wl}-bind_at_load"
  17981. ;;
  17982. esac
  17983. fi
  17984. @@ -7761,7 +8732,7 @@ EOF
  17985. *)
  17986. case " $compile_deplibs " in
  17987. *" -L$path/$objdir "*)
  17988. - new_libs="$new_libs -L$path/$objdir" ;;
  17989. + func_append new_libs " -L$path/$objdir" ;;
  17990. esac
  17991. ;;
  17992. esac
  17993. @@ -7771,17 +8742,17 @@ EOF
  17994. -L*)
  17995. case " $new_libs " in
  17996. *" $deplib "*) ;;
  17997. - *) new_libs="$new_libs $deplib" ;;
  17998. + *) func_append new_libs " $deplib" ;;
  17999. esac
  18000. ;;
  18001. - *) new_libs="$new_libs $deplib" ;;
  18002. + *) func_append new_libs " $deplib" ;;
  18003. esac
  18004. done
  18005. compile_deplibs="$new_libs"
  18006. - compile_command="$compile_command $compile_deplibs"
  18007. - finalize_command="$finalize_command $finalize_deplibs"
  18008. + func_append compile_command " $compile_deplibs"
  18009. + func_append finalize_command " $finalize_deplibs"
  18010. if test -n "$rpath$xrpath"; then
  18011. # If the user specified any rpath flags, then add them.
  18012. @@ -7789,7 +8760,7 @@ EOF
  18013. # This is the magic to use -rpath.
  18014. case "$finalize_rpath " in
  18015. *" $libdir "*) ;;
  18016. - *) finalize_rpath="$finalize_rpath $libdir" ;;
  18017. + *) func_append finalize_rpath " $libdir" ;;
  18018. esac
  18019. done
  18020. fi
  18021. @@ -7808,18 +8779,18 @@ EOF
  18022. *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  18023. ;;
  18024. *)
  18025. - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
  18026. + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
  18027. ;;
  18028. esac
  18029. fi
  18030. else
  18031. - eval "flag=\"$hardcode_libdir_flag_spec\""
  18032. - rpath="$rpath $flag"
  18033. + eval flag=\"$hardcode_libdir_flag_spec\"
  18034. + func_append rpath " $flag"
  18035. fi
  18036. elif test -n "$runpath_var"; then
  18037. case "$perm_rpath " in
  18038. *" $libdir "*) ;;
  18039. - *) perm_rpath="$perm_rpath $libdir" ;;
  18040. + *) func_append perm_rpath " $libdir" ;;
  18041. esac
  18042. fi
  18043. case $host in
  18044. @@ -7828,12 +8799,12 @@ EOF
  18045. case :$dllsearchpath: in
  18046. *":$libdir:"*) ;;
  18047. ::) dllsearchpath=$libdir;;
  18048. - *) dllsearchpath="$dllsearchpath:$libdir";;
  18049. + *) func_append dllsearchpath ":$libdir";;
  18050. esac
  18051. case :$dllsearchpath: in
  18052. *":$testbindir:"*) ;;
  18053. ::) dllsearchpath=$testbindir;;
  18054. - *) dllsearchpath="$dllsearchpath:$testbindir";;
  18055. + *) func_append dllsearchpath ":$testbindir";;
  18056. esac
  18057. ;;
  18058. esac
  18059. @@ -7842,7 +8813,7 @@ EOF
  18060. if test -n "$hardcode_libdir_separator" &&
  18061. test -n "$hardcode_libdirs"; then
  18062. libdir="$hardcode_libdirs"
  18063. - eval "rpath=\" $hardcode_libdir_flag_spec\""
  18064. + eval rpath=\" $hardcode_libdir_flag_spec\"
  18065. fi
  18066. compile_rpath="$rpath"
  18067. @@ -7859,18 +8830,18 @@ EOF
  18068. *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
  18069. ;;
  18070. *)
  18071. - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
  18072. + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
  18073. ;;
  18074. esac
  18075. fi
  18076. else
  18077. - eval "flag=\"$hardcode_libdir_flag_spec\""
  18078. - rpath="$rpath $flag"
  18079. + eval flag=\"$hardcode_libdir_flag_spec\"
  18080. + func_append rpath " $flag"
  18081. fi
  18082. elif test -n "$runpath_var"; then
  18083. case "$finalize_perm_rpath " in
  18084. *" $libdir "*) ;;
  18085. - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
  18086. + *) func_append finalize_perm_rpath " $libdir" ;;
  18087. esac
  18088. fi
  18089. done
  18090. @@ -7878,7 +8849,7 @@ EOF
  18091. if test -n "$hardcode_libdir_separator" &&
  18092. test -n "$hardcode_libdirs"; then
  18093. libdir="$hardcode_libdirs"
  18094. - eval "rpath=\" $hardcode_libdir_flag_spec\""
  18095. + eval rpath=\" $hardcode_libdir_flag_spec\"
  18096. fi
  18097. finalize_rpath="$rpath"
  18098. @@ -7921,6 +8892,12 @@ EOF
  18099. exit_status=0
  18100. func_show_eval "$link_command" 'exit_status=$?'
  18101. + if test -n "$postlink_cmds"; then
  18102. + func_to_tool_file "$output"
  18103. + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
  18104. + func_execute_cmds "$postlink_cmds" 'exit $?'
  18105. + fi
  18106. +
  18107. # Delete the generated files.
  18108. if test -f "$output_objdir/${outputname}S.${objext}"; then
  18109. func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
  18110. @@ -7943,7 +8920,7 @@ EOF
  18111. # We should set the runpath_var.
  18112. rpath=
  18113. for dir in $perm_rpath; do
  18114. - rpath="$rpath$dir:"
  18115. + func_append rpath "$dir:"
  18116. done
  18117. compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
  18118. fi
  18119. @@ -7951,7 +8928,7 @@ EOF
  18120. # We should set the runpath_var.
  18121. rpath=
  18122. for dir in $finalize_perm_rpath; do
  18123. - rpath="$rpath$dir:"
  18124. + func_append rpath "$dir:"
  18125. done
  18126. finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
  18127. fi
  18128. @@ -7966,6 +8943,13 @@ EOF
  18129. $opt_dry_run || $RM $output
  18130. # Link the executable and exit
  18131. func_show_eval "$link_command" 'exit $?'
  18132. +
  18133. + if test -n "$postlink_cmds"; then
  18134. + func_to_tool_file "$output"
  18135. + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
  18136. + func_execute_cmds "$postlink_cmds" 'exit $?'
  18137. + fi
  18138. +
  18139. exit $EXIT_SUCCESS
  18140. fi
  18141. @@ -7999,6 +8983,12 @@ EOF
  18142. func_show_eval "$link_command" 'exit $?'
  18143. + if test -n "$postlink_cmds"; then
  18144. + func_to_tool_file "$output_objdir/$outputname"
  18145. + 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'`
  18146. + func_execute_cmds "$postlink_cmds" 'exit $?'
  18147. + fi
  18148. +
  18149. # Now create the wrapper script.
  18150. func_verbose "creating $output"
  18151. @@ -8096,7 +9086,7 @@ EOF
  18152. else
  18153. oldobjs="$old_deplibs $non_pic_objects"
  18154. if test "$preload" = yes && test -f "$symfileobj"; then
  18155. - oldobjs="$oldobjs $symfileobj"
  18156. + func_append oldobjs " $symfileobj"
  18157. fi
  18158. fi
  18159. addlibs="$old_convenience"
  18160. @@ -8104,10 +9094,10 @@ EOF
  18161. if test -n "$addlibs"; then
  18162. gentop="$output_objdir/${outputname}x"
  18163. - generated="$generated $gentop"
  18164. + func_append generated " $gentop"
  18165. func_extract_archives $gentop $addlibs
  18166. - oldobjs="$oldobjs $func_extract_archives_result"
  18167. + func_append oldobjs " $func_extract_archives_result"
  18168. fi
  18169. # Do each command in the archive commands.
  18170. @@ -8118,10 +9108,10 @@ EOF
  18171. # Add any objects from preloaded convenience libraries
  18172. if test -n "$dlprefiles"; then
  18173. gentop="$output_objdir/${outputname}x"
  18174. - generated="$generated $gentop"
  18175. + func_append generated " $gentop"
  18176. func_extract_archives $gentop $dlprefiles
  18177. - oldobjs="$oldobjs $func_extract_archives_result"
  18178. + func_append oldobjs " $func_extract_archives_result"
  18179. fi
  18180. # POSIX demands no paths to be encoded in archives. We have
  18181. @@ -8139,7 +9129,7 @@ EOF
  18182. else
  18183. echo "copying selected object files to avoid basename conflicts..."
  18184. gentop="$output_objdir/${outputname}x"
  18185. - generated="$generated $gentop"
  18186. + func_append generated " $gentop"
  18187. func_mkdir_p "$gentop"
  18188. save_oldobjs=$oldobjs
  18189. oldobjs=
  18190. @@ -8163,18 +9153,28 @@ EOF
  18191. esac
  18192. done
  18193. func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
  18194. - oldobjs="$oldobjs $gentop/$newobj"
  18195. + func_append oldobjs " $gentop/$newobj"
  18196. ;;
  18197. - *) oldobjs="$oldobjs $obj" ;;
  18198. + *) func_append oldobjs " $obj" ;;
  18199. esac
  18200. done
  18201. fi
  18202. - eval "cmds=\"$old_archive_cmds\""
  18203. + eval cmds=\"$old_archive_cmds\"
  18204. func_len " $cmds"
  18205. len=$func_len_result
  18206. if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
  18207. cmds=$old_archive_cmds
  18208. + elif test -n "$archiver_list_spec"; then
  18209. + func_verbose "using command file archive linking..."
  18210. + for obj in $oldobjs
  18211. + do
  18212. + func_to_tool_file "$obj"
  18213. + $ECHO "$func_to_tool_file_result"
  18214. + done > $output_objdir/$libname.libcmd
  18215. + func_to_tool_file "$output_objdir/$libname.libcmd"
  18216. + oldobjs=" $archiver_list_spec$func_to_tool_file_result"
  18217. + cmds=$old_archive_cmds
  18218. else
  18219. # the command line is too long to link in one step, link in parts
  18220. func_verbose "using piecewise archive linking..."
  18221. @@ -8189,7 +9189,7 @@ EOF
  18222. do
  18223. last_oldobj=$obj
  18224. done
  18225. - eval "test_cmds=\"$old_archive_cmds\""
  18226. + eval test_cmds=\"$old_archive_cmds\"
  18227. func_len " $test_cmds"
  18228. len0=$func_len_result
  18229. len=$len0
  18230. @@ -8208,7 +9208,7 @@ EOF
  18231. RANLIB=$save_RANLIB
  18232. fi
  18233. test -z "$concat_cmds" || concat_cmds=$concat_cmds~
  18234. - eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
  18235. + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
  18236. objlist=
  18237. len=$len0
  18238. fi
  18239. @@ -8216,9 +9216,9 @@ EOF
  18240. RANLIB=$save_RANLIB
  18241. oldobjs=$objlist
  18242. if test "X$oldobjs" = "X" ; then
  18243. - eval "cmds=\"\$concat_cmds\""
  18244. + eval cmds=\"\$concat_cmds\"
  18245. else
  18246. - eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
  18247. + eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
  18248. fi
  18249. fi
  18250. fi
  18251. @@ -8268,12 +9268,23 @@ EOF
  18252. *.la)
  18253. func_basename "$deplib"
  18254. name="$func_basename_result"
  18255. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  18256. + func_resolve_sysroot "$deplib"
  18257. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
  18258. test -z "$libdir" && \
  18259. func_fatal_error "\`$deplib' is not a valid libtool archive"
  18260. - newdependency_libs="$newdependency_libs $libdir/$name"
  18261. + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
  18262. + ;;
  18263. + -L*)
  18264. + func_stripname -L '' "$deplib"
  18265. + func_replace_sysroot "$func_stripname_result"
  18266. + func_append newdependency_libs " -L$func_replace_sysroot_result"
  18267. ;;
  18268. - *) newdependency_libs="$newdependency_libs $deplib" ;;
  18269. + -R*)
  18270. + func_stripname -R '' "$deplib"
  18271. + func_replace_sysroot "$func_stripname_result"
  18272. + func_append newdependency_libs " -R$func_replace_sysroot_result"
  18273. + ;;
  18274. + *) func_append newdependency_libs " $deplib" ;;
  18275. esac
  18276. done
  18277. dependency_libs="$newdependency_libs"
  18278. @@ -8284,12 +9295,14 @@ EOF
  18279. *.la)
  18280. func_basename "$lib"
  18281. name="$func_basename_result"
  18282. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  18283. + func_resolve_sysroot "$lib"
  18284. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
  18285. +
  18286. test -z "$libdir" && \
  18287. func_fatal_error "\`$lib' is not a valid libtool archive"
  18288. - newdlfiles="$newdlfiles $libdir/$name"
  18289. + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
  18290. ;;
  18291. - *) newdlfiles="$newdlfiles $lib" ;;
  18292. + *) func_append newdlfiles " $lib" ;;
  18293. esac
  18294. done
  18295. dlfiles="$newdlfiles"
  18296. @@ -8303,10 +9316,11 @@ EOF
  18297. # the library:
  18298. func_basename "$lib"
  18299. name="$func_basename_result"
  18300. - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  18301. + func_resolve_sysroot "$lib"
  18302. + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
  18303. test -z "$libdir" && \
  18304. func_fatal_error "\`$lib' is not a valid libtool archive"
  18305. - newdlprefiles="$newdlprefiles $libdir/$name"
  18306. + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
  18307. ;;
  18308. esac
  18309. done
  18310. @@ -8318,7 +9332,7 @@ EOF
  18311. [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  18312. *) abs=`pwd`"/$lib" ;;
  18313. esac
  18314. - newdlfiles="$newdlfiles $abs"
  18315. + func_append newdlfiles " $abs"
  18316. done
  18317. dlfiles="$newdlfiles"
  18318. newdlprefiles=
  18319. @@ -8327,7 +9341,7 @@ EOF
  18320. [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
  18321. *) abs=`pwd`"/$lib" ;;
  18322. esac
  18323. - newdlprefiles="$newdlprefiles $abs"
  18324. + func_append newdlprefiles " $abs"
  18325. done
  18326. dlprefiles="$newdlprefiles"
  18327. fi
  18328. @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
  18329. exit $EXIT_SUCCESS
  18330. }
  18331. -{ test "$mode" = link || test "$mode" = relink; } &&
  18332. +{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
  18333. func_mode_link ${1+"$@"}
  18334. @@ -8432,9 +9446,9 @@ func_mode_uninstall ()
  18335. for arg
  18336. do
  18337. case $arg in
  18338. - -f) RM="$RM $arg"; rmforce=yes ;;
  18339. - -*) RM="$RM $arg" ;;
  18340. - *) files="$files $arg" ;;
  18341. + -f) func_append RM " $arg"; rmforce=yes ;;
  18342. + -*) func_append RM " $arg" ;;
  18343. + *) func_append files " $arg" ;;
  18344. esac
  18345. done
  18346. @@ -8443,24 +9457,23 @@ func_mode_uninstall ()
  18347. rmdirs=
  18348. - origobjdir="$objdir"
  18349. for file in $files; do
  18350. func_dirname "$file" "" "."
  18351. dir="$func_dirname_result"
  18352. if test "X$dir" = X.; then
  18353. - objdir="$origobjdir"
  18354. + odir="$objdir"
  18355. else
  18356. - objdir="$dir/$origobjdir"
  18357. + odir="$dir/$objdir"
  18358. fi
  18359. func_basename "$file"
  18360. name="$func_basename_result"
  18361. - test "$mode" = uninstall && objdir="$dir"
  18362. + test "$opt_mode" = uninstall && odir="$dir"
  18363. - # Remember objdir for removal later, being careful to avoid duplicates
  18364. - if test "$mode" = clean; then
  18365. + # Remember odir for removal later, being careful to avoid duplicates
  18366. + if test "$opt_mode" = clean; then
  18367. case " $rmdirs " in
  18368. - *" $objdir "*) ;;
  18369. - *) rmdirs="$rmdirs $objdir" ;;
  18370. + *" $odir "*) ;;
  18371. + *) func_append rmdirs " $odir" ;;
  18372. esac
  18373. fi
  18374. @@ -8486,18 +9499,17 @@ func_mode_uninstall ()
  18375. # Delete the libtool libraries and symlinks.
  18376. for n in $library_names; do
  18377. - rmfiles="$rmfiles $objdir/$n"
  18378. + func_append rmfiles " $odir/$n"
  18379. done
  18380. - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
  18381. + test -n "$old_library" && func_append rmfiles " $odir/$old_library"
  18382. - case "$mode" in
  18383. + case "$opt_mode" in
  18384. clean)
  18385. - case " $library_names " in
  18386. - # " " in the beginning catches empty $dlname
  18387. + case " $library_names " in
  18388. *" $dlname "*) ;;
  18389. - *) rmfiles="$rmfiles $objdir/$dlname" ;;
  18390. + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
  18391. esac
  18392. - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
  18393. + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
  18394. ;;
  18395. uninstall)
  18396. if test -n "$library_names"; then
  18397. @@ -8525,19 +9537,19 @@ func_mode_uninstall ()
  18398. # Add PIC object to the list of files to remove.
  18399. if test -n "$pic_object" &&
  18400. test "$pic_object" != none; then
  18401. - rmfiles="$rmfiles $dir/$pic_object"
  18402. + func_append rmfiles " $dir/$pic_object"
  18403. fi
  18404. # Add non-PIC object to the list of files to remove.
  18405. if test -n "$non_pic_object" &&
  18406. test "$non_pic_object" != none; then
  18407. - rmfiles="$rmfiles $dir/$non_pic_object"
  18408. + func_append rmfiles " $dir/$non_pic_object"
  18409. fi
  18410. fi
  18411. ;;
  18412. *)
  18413. - if test "$mode" = clean ; then
  18414. + if test "$opt_mode" = clean ; then
  18415. noexename=$name
  18416. case $file in
  18417. *.exe)
  18418. @@ -8547,7 +9559,7 @@ func_mode_uninstall ()
  18419. noexename=$func_stripname_result
  18420. # $file with .exe has already been added to rmfiles,
  18421. # add $file without .exe
  18422. - rmfiles="$rmfiles $file"
  18423. + func_append rmfiles " $file"
  18424. ;;
  18425. esac
  18426. # Do a test to see if this is a libtool program.
  18427. @@ -8556,7 +9568,7 @@ func_mode_uninstall ()
  18428. func_ltwrapper_scriptname "$file"
  18429. relink_command=
  18430. func_source $func_ltwrapper_scriptname_result
  18431. - rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
  18432. + func_append rmfiles " $func_ltwrapper_scriptname_result"
  18433. else
  18434. relink_command=
  18435. func_source $dir/$noexename
  18436. @@ -8564,12 +9576,12 @@ func_mode_uninstall ()
  18437. # note $name still contains .exe if it was in $file originally
  18438. # as does the version of $file that was added into $rmfiles
  18439. - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
  18440. + func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
  18441. if test "$fast_install" = yes && test -n "$relink_command"; then
  18442. - rmfiles="$rmfiles $objdir/lt-$name"
  18443. + func_append rmfiles " $odir/lt-$name"
  18444. fi
  18445. if test "X$noexename" != "X$name" ; then
  18446. - rmfiles="$rmfiles $objdir/lt-${noexename}.c"
  18447. + func_append rmfiles " $odir/lt-${noexename}.c"
  18448. fi
  18449. fi
  18450. fi
  18451. @@ -8577,7 +9589,6 @@ func_mode_uninstall ()
  18452. esac
  18453. func_show_eval "$RM $rmfiles" 'exit_status=1'
  18454. done
  18455. - objdir="$origobjdir"
  18456. # Try to remove the ${objdir}s in the directories where we deleted files
  18457. for dir in $rmdirs; do
  18458. @@ -8589,16 +9600,16 @@ func_mode_uninstall ()
  18459. exit $exit_status
  18460. }
  18461. -{ test "$mode" = uninstall || test "$mode" = clean; } &&
  18462. +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
  18463. func_mode_uninstall ${1+"$@"}
  18464. -test -z "$mode" && {
  18465. +test -z "$opt_mode" && {
  18466. help="$generic_help"
  18467. func_fatal_help "you must specify a MODE"
  18468. }
  18469. test -z "$exec_cmd" && \
  18470. - func_fatal_help "invalid operation mode \`$mode'"
  18471. + func_fatal_help "invalid operation mode \`$opt_mode'"
  18472. if test -n "$exec_cmd"; then
  18473. eval exec "$exec_cmd"
  18474. diff --git a/ltoptions.m4 b/ltoptions.m4
  18475. index 5ef12ced2a8..17cfd51c0b3 100644
  18476. --- a/ltoptions.m4
  18477. +++ b/ltoptions.m4
  18478. @@ -8,7 +8,7 @@
  18479. # unlimited permission to copy and/or distribute it, with or without
  18480. # modifications, as long as this notice is preserved.
  18481. -# serial 6 ltoptions.m4
  18482. +# serial 7 ltoptions.m4
  18483. # This is to help aclocal find these macros, as it can't see m4_define.
  18484. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
  18485. diff --git a/ltversion.m4 b/ltversion.m4
  18486. index bf87f77132d..9c7b5d41185 100644
  18487. --- a/ltversion.m4
  18488. +++ b/ltversion.m4
  18489. @@ -7,17 +7,17 @@
  18490. # unlimited permission to copy and/or distribute it, with or without
  18491. # modifications, as long as this notice is preserved.
  18492. -# Generated from ltversion.in.
  18493. +# @configure_input@
  18494. -# serial 3134 ltversion.m4
  18495. +# serial 3293 ltversion.m4
  18496. # This file is part of GNU Libtool
  18497. -m4_define([LT_PACKAGE_VERSION], [2.2.7a])
  18498. -m4_define([LT_PACKAGE_REVISION], [1.3134])
  18499. +m4_define([LT_PACKAGE_VERSION], [2.4])
  18500. +m4_define([LT_PACKAGE_REVISION], [1.3293])
  18501. AC_DEFUN([LTVERSION_VERSION],
  18502. -[macro_version='2.2.7a'
  18503. -macro_revision='1.3134'
  18504. +[macro_version='2.4'
  18505. +macro_revision='1.3293'
  18506. _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
  18507. _LT_DECL(, macro_revision, 0)
  18508. ])
  18509. diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
  18510. index bf92b5e0790..c573da90c5c 100644
  18511. --- a/lt~obsolete.m4
  18512. +++ b/lt~obsolete.m4
  18513. @@ -7,7 +7,7 @@
  18514. # unlimited permission to copy and/or distribute it, with or without
  18515. # modifications, as long as this notice is preserved.
  18516. -# serial 4 lt~obsolete.m4
  18517. +# serial 5 lt~obsolete.m4
  18518. # These exist entirely to fool aclocal when bootstrapping libtool.
  18519. #
  18520. diff --git a/opcodes/configure b/opcodes/configure
  18521. index 3513e408ce1..133948631e9 100755
  18522. --- a/opcodes/configure
  18523. +++ b/opcodes/configure
  18524. @@ -680,6 +680,9 @@ OTOOL
  18525. LIPO
  18526. NMEDIT
  18527. DSYMUTIL
  18528. +MANIFEST_TOOL
  18529. +ac_ct_AR
  18530. +DLLTOOL
  18531. OBJDUMP
  18532. LN_S
  18533. NM
  18534. @@ -798,6 +801,7 @@ enable_static
  18535. with_pic
  18536. enable_fast_install
  18537. with_gnu_ld
  18538. +with_libtool_sysroot
  18539. enable_libtool_lock
  18540. enable_checking
  18541. enable_targets
  18542. @@ -1464,6 +1468,8 @@ Optional Packages:
  18543. --with-pic try to use only PIC/non-PIC objects [default=use
  18544. both]
  18545. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  18546. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  18547. + (or the compiler's sysroot if not specified).
  18548. Some influential environment variables:
  18549. CC C compiler command
  18550. @@ -4751,8 +4757,8 @@ esac
  18551. -macro_version='2.2.7a'
  18552. -macro_revision='1.3134'
  18553. +macro_version='2.4'
  18554. +macro_revision='1.3293'
  18555. @@ -4792,7 +4798,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  18556. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  18557. $as_echo_n "checking how to print strings... " >&6; }
  18558. # Test print first, because it will be a builtin if present.
  18559. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  18560. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  18561. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  18562. ECHO='print -r --'
  18563. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  18564. @@ -5478,8 +5484,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  18565. # Try some XSI features
  18566. xsi_shell=no
  18567. ( _lt_dummy="a/b/c"
  18568. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  18569. - = c,a/b,, \
  18570. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  18571. + = c,a/b,b/c, \
  18572. && eval 'test $(( 1 + 1 )) -eq 2 \
  18573. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  18574. && xsi_shell=yes
  18575. @@ -5528,6 +5534,80 @@ esac
  18576. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  18577. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  18578. +if ${lt_cv_to_host_file_cmd+:} false; then :
  18579. + $as_echo_n "(cached) " >&6
  18580. +else
  18581. + case $host in
  18582. + *-*-mingw* )
  18583. + case $build in
  18584. + *-*-mingw* ) # actually msys
  18585. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  18586. + ;;
  18587. + *-*-cygwin* )
  18588. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  18589. + ;;
  18590. + * ) # otherwise, assume *nix
  18591. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  18592. + ;;
  18593. + esac
  18594. + ;;
  18595. + *-*-cygwin* )
  18596. + case $build in
  18597. + *-*-mingw* ) # actually msys
  18598. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  18599. + ;;
  18600. + *-*-cygwin* )
  18601. + lt_cv_to_host_file_cmd=func_convert_file_noop
  18602. + ;;
  18603. + * ) # otherwise, assume *nix
  18604. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  18605. + ;;
  18606. + esac
  18607. + ;;
  18608. + * ) # unhandled hosts (and "normal" native builds)
  18609. + lt_cv_to_host_file_cmd=func_convert_file_noop
  18610. + ;;
  18611. +esac
  18612. +
  18613. +fi
  18614. +
  18615. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  18616. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  18617. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  18618. +
  18619. +
  18620. +
  18621. +
  18622. +
  18623. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  18624. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  18625. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  18626. + $as_echo_n "(cached) " >&6
  18627. +else
  18628. + #assume ordinary cross tools, or native build.
  18629. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  18630. +case $host in
  18631. + *-*-mingw* )
  18632. + case $build in
  18633. + *-*-mingw* ) # actually msys
  18634. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  18635. + ;;
  18636. + esac
  18637. + ;;
  18638. +esac
  18639. +
  18640. +fi
  18641. +
  18642. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  18643. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  18644. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  18645. +
  18646. +
  18647. +
  18648. +
  18649. +
  18650. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  18651. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  18652. if ${lt_cv_ld_reload_flag+:} false; then :
  18653. @@ -5544,6 +5624,11 @@ case $reload_flag in
  18654. esac
  18655. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  18656. case $host_os in
  18657. + cygwin* | mingw* | pw32* | cegcc*)
  18658. + if test "$GCC" != yes; then
  18659. + reload_cmds=false
  18660. + fi
  18661. + ;;
  18662. darwin*)
  18663. if test "$GCC" = yes; then
  18664. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  18665. @@ -5712,7 +5797,8 @@ mingw* | pw32*)
  18666. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  18667. lt_cv_file_magic_cmd='func_win32_libid'
  18668. else
  18669. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  18670. + # Keep this pattern in sync with the one in func_win32_libid.
  18671. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  18672. lt_cv_file_magic_cmd='$OBJDUMP -f'
  18673. fi
  18674. ;;
  18675. @@ -5866,6 +5952,21 @@ esac
  18676. fi
  18677. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  18678. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  18679. +
  18680. +file_magic_glob=
  18681. +want_nocaseglob=no
  18682. +if test "$build" = "$host"; then
  18683. + case $host_os in
  18684. + mingw* | pw32*)
  18685. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  18686. + want_nocaseglob=yes
  18687. + else
  18688. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  18689. + fi
  18690. + ;;
  18691. + esac
  18692. +fi
  18693. +
  18694. file_magic_cmd=$lt_cv_file_magic_cmd
  18695. deplibs_check_method=$lt_cv_deplibs_check_method
  18696. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  18697. @@ -5881,6 +5982,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  18698. +
  18699. +
  18700. +
  18701. +
  18702. +
  18703. +
  18704. +
  18705. +
  18706. +
  18707. +
  18708. +if test -n "$ac_tool_prefix"; then
  18709. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  18710. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  18711. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  18712. +$as_echo_n "checking for $ac_word... " >&6; }
  18713. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  18714. + $as_echo_n "(cached) " >&6
  18715. +else
  18716. + if test -n "$DLLTOOL"; then
  18717. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  18718. +else
  18719. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  18720. +for as_dir in $PATH
  18721. +do
  18722. + IFS=$as_save_IFS
  18723. + test -z "$as_dir" && as_dir=.
  18724. + for ac_exec_ext in '' $ac_executable_extensions; do
  18725. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  18726. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  18727. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  18728. + break 2
  18729. + fi
  18730. +done
  18731. + done
  18732. +IFS=$as_save_IFS
  18733. +
  18734. +fi
  18735. +fi
  18736. +DLLTOOL=$ac_cv_prog_DLLTOOL
  18737. +if test -n "$DLLTOOL"; then
  18738. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  18739. +$as_echo "$DLLTOOL" >&6; }
  18740. +else
  18741. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  18742. +$as_echo "no" >&6; }
  18743. +fi
  18744. +
  18745. +
  18746. +fi
  18747. +if test -z "$ac_cv_prog_DLLTOOL"; then
  18748. + ac_ct_DLLTOOL=$DLLTOOL
  18749. + # Extract the first word of "dlltool", so it can be a program name with args.
  18750. +set dummy dlltool; ac_word=$2
  18751. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  18752. +$as_echo_n "checking for $ac_word... " >&6; }
  18753. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  18754. + $as_echo_n "(cached) " >&6
  18755. +else
  18756. + if test -n "$ac_ct_DLLTOOL"; then
  18757. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  18758. +else
  18759. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  18760. +for as_dir in $PATH
  18761. +do
  18762. + IFS=$as_save_IFS
  18763. + test -z "$as_dir" && as_dir=.
  18764. + for ac_exec_ext in '' $ac_executable_extensions; do
  18765. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  18766. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  18767. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  18768. + break 2
  18769. + fi
  18770. +done
  18771. + done
  18772. +IFS=$as_save_IFS
  18773. +
  18774. +fi
  18775. +fi
  18776. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  18777. +if test -n "$ac_ct_DLLTOOL"; then
  18778. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  18779. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  18780. +else
  18781. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  18782. +$as_echo "no" >&6; }
  18783. +fi
  18784. +
  18785. + if test "x$ac_ct_DLLTOOL" = x; then
  18786. + DLLTOOL="false"
  18787. + else
  18788. + case $cross_compiling:$ac_tool_warned in
  18789. +yes:)
  18790. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  18791. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  18792. +ac_tool_warned=yes ;;
  18793. +esac
  18794. + DLLTOOL=$ac_ct_DLLTOOL
  18795. + fi
  18796. +else
  18797. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  18798. +fi
  18799. +
  18800. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  18801. +
  18802. +
  18803. +
  18804. +
  18805. +
  18806. +
  18807. +
  18808. +
  18809. +
  18810. +
  18811. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  18812. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  18813. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  18814. + $as_echo_n "(cached) " >&6
  18815. +else
  18816. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  18817. +
  18818. +case $host_os in
  18819. +cygwin* | mingw* | pw32* | cegcc*)
  18820. + # two different shell functions defined in ltmain.sh
  18821. + # decide which to use based on capabilities of $DLLTOOL
  18822. + case `$DLLTOOL --help 2>&1` in
  18823. + *--identify-strict*)
  18824. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  18825. + ;;
  18826. + *)
  18827. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  18828. + ;;
  18829. + esac
  18830. + ;;
  18831. +*)
  18832. + # fallback: assume linklib IS sharedlib
  18833. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  18834. + ;;
  18835. +esac
  18836. +
  18837. +fi
  18838. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  18839. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  18840. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  18841. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  18842. +
  18843. +
  18844. +
  18845. +
  18846. +
  18847. +
  18848. +
  18849. plugin_option=
  18850. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  18851. for plugin in $plugin_names; do
  18852. @@ -5895,8 +6147,10 @@ for plugin in $plugin_names; do
  18853. done
  18854. if test -n "$ac_tool_prefix"; then
  18855. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  18856. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  18857. + for ac_prog in ar
  18858. + do
  18859. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  18860. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  18861. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  18862. $as_echo_n "checking for $ac_word... " >&6; }
  18863. if ${ac_cv_prog_AR+:} false; then :
  18864. @@ -5912,7 +6166,7 @@ do
  18865. test -z "$as_dir" && as_dir=.
  18866. for ac_exec_ext in '' $ac_executable_extensions; do
  18867. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  18868. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  18869. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  18870. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  18871. break 2
  18872. fi
  18873. @@ -5932,11 +6186,15 @@ $as_echo "no" >&6; }
  18874. fi
  18875. + test -n "$AR" && break
  18876. + done
  18877. fi
  18878. -if test -z "$ac_cv_prog_AR"; then
  18879. +if test -z "$AR"; then
  18880. ac_ct_AR=$AR
  18881. - # Extract the first word of "ar", so it can be a program name with args.
  18882. -set dummy ar; ac_word=$2
  18883. + for ac_prog in ar
  18884. +do
  18885. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  18886. +set dummy $ac_prog; ac_word=$2
  18887. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  18888. $as_echo_n "checking for $ac_word... " >&6; }
  18889. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  18890. @@ -5952,7 +6210,7 @@ do
  18891. test -z "$as_dir" && as_dir=.
  18892. for ac_exec_ext in '' $ac_executable_extensions; do
  18893. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  18894. - ac_cv_prog_ac_ct_AR="ar"
  18895. + ac_cv_prog_ac_ct_AR="$ac_prog"
  18896. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  18897. break 2
  18898. fi
  18899. @@ -5971,6 +6229,10 @@ else
  18900. $as_echo "no" >&6; }
  18901. fi
  18902. +
  18903. + test -n "$ac_ct_AR" && break
  18904. +done
  18905. +
  18906. if test "x$ac_ct_AR" = x; then
  18907. AR="false"
  18908. else
  18909. @@ -5982,25 +6244,20 @@ ac_tool_warned=yes ;;
  18910. esac
  18911. AR=$ac_ct_AR
  18912. fi
  18913. -else
  18914. - AR="$ac_cv_prog_AR"
  18915. fi
  18916. -test -z "$AR" && AR=ar
  18917. -if test -n "$plugin_option"; then
  18918. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  18919. - touch conftest.c
  18920. - $AR $plugin_option rc conftest.a conftest.c
  18921. - if test "$?" != 0; then
  18922. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  18923. + touch conftest.c
  18924. + $AR $plugin_option rc conftest.a conftest.c
  18925. + if test "$?" != 0; then
  18926. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  18927. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  18928. - else
  18929. - AR="$AR $plugin_option"
  18930. - fi
  18931. - rm -f conftest.*
  18932. + else
  18933. + AR="$AR $plugin_option"
  18934. fi
  18935. -fi
  18936. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  18937. + rm -f conftest.*
  18938. +: ${AR=ar}
  18939. +: ${AR_FLAGS=cru}
  18940. +
  18941. @@ -6011,6 +6268,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  18942. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  18943. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  18944. +if ${lt_cv_ar_at_file+:} false; then :
  18945. + $as_echo_n "(cached) " >&6
  18946. +else
  18947. + lt_cv_ar_at_file=no
  18948. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  18949. +/* end confdefs.h. */
  18950. +
  18951. +int
  18952. +main ()
  18953. +{
  18954. +
  18955. + ;
  18956. + return 0;
  18957. +}
  18958. +_ACEOF
  18959. +if ac_fn_c_try_compile "$LINENO"; then :
  18960. + echo conftest.$ac_objext > conftest.lst
  18961. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  18962. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  18963. + (eval $lt_ar_try) 2>&5
  18964. + ac_status=$?
  18965. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  18966. + test $ac_status = 0; }
  18967. + if test "$ac_status" -eq 0; then
  18968. + # Ensure the archiver fails upon bogus file names.
  18969. + rm -f conftest.$ac_objext libconftest.a
  18970. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  18971. + (eval $lt_ar_try) 2>&5
  18972. + ac_status=$?
  18973. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  18974. + test $ac_status = 0; }
  18975. + if test "$ac_status" -ne 0; then
  18976. + lt_cv_ar_at_file=@
  18977. + fi
  18978. + fi
  18979. + rm -f conftest.* libconftest.a
  18980. +
  18981. +fi
  18982. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  18983. +
  18984. +fi
  18985. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  18986. +$as_echo "$lt_cv_ar_at_file" >&6; }
  18987. +
  18988. +if test "x$lt_cv_ar_at_file" = xno; then
  18989. + archiver_list_spec=
  18990. +else
  18991. + archiver_list_spec=$lt_cv_ar_at_file
  18992. +fi
  18993. +
  18994. +
  18995. +
  18996. +
  18997. +
  18998. +
  18999. if test -n "$ac_tool_prefix"; then
  19000. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  19001. @@ -6351,8 +6665,8 @@ esac
  19002. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  19003. # Transform an extracted symbol line into symbol name and symbol address
  19004. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  19005. -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'"
  19006. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  19007. +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'"
  19008. # Handle CRLF in mingw tool chain
  19009. opt_cr=
  19010. @@ -6388,6 +6702,7 @@ for ac_symprfx in "" "_"; do
  19011. else
  19012. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  19013. fi
  19014. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  19015. # Check to see that the pipe works correctly.
  19016. pipe_works=no
  19017. @@ -6429,6 +6744,18 @@ _LT_EOF
  19018. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  19019. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  19020. cat <<_LT_EOF > conftest.$ac_ext
  19021. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  19022. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  19023. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  19024. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  19025. +# define LT_DLSYM_CONST
  19026. +#elif defined(__osf__)
  19027. +/* This system does not cope well with relocations in const data. */
  19028. +# define LT_DLSYM_CONST
  19029. +#else
  19030. +# define LT_DLSYM_CONST const
  19031. +#endif
  19032. +
  19033. #ifdef __cplusplus
  19034. extern "C" {
  19035. #endif
  19036. @@ -6440,7 +6767,7 @@ _LT_EOF
  19037. cat <<_LT_EOF >> conftest.$ac_ext
  19038. /* The mapping between symbol names and symbols. */
  19039. -const struct {
  19040. +LT_DLSYM_CONST struct {
  19041. const char *name;
  19042. void *address;
  19043. }
  19044. @@ -6466,8 +6793,8 @@ static const void *lt_preloaded_setup() {
  19045. _LT_EOF
  19046. # Now try linking the two files.
  19047. mv conftest.$ac_objext conftstm.$ac_objext
  19048. - lt_save_LIBS="$LIBS"
  19049. - lt_save_CFLAGS="$CFLAGS"
  19050. + lt_globsym_save_LIBS=$LIBS
  19051. + lt_globsym_save_CFLAGS=$CFLAGS
  19052. LIBS="conftstm.$ac_objext"
  19053. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  19054. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  19055. @@ -6477,8 +6804,8 @@ _LT_EOF
  19056. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  19057. pipe_works=yes
  19058. fi
  19059. - LIBS="$lt_save_LIBS"
  19060. - CFLAGS="$lt_save_CFLAGS"
  19061. + LIBS=$lt_globsym_save_LIBS
  19062. + CFLAGS=$lt_globsym_save_CFLAGS
  19063. else
  19064. echo "cannot find nm_test_func in $nlist" >&5
  19065. fi
  19066. @@ -6515,6 +6842,14 @@ else
  19067. $as_echo "ok" >&6; }
  19068. fi
  19069. +# Response file support.
  19070. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  19071. + nm_file_list_spec='@'
  19072. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  19073. + nm_file_list_spec='@'
  19074. +fi
  19075. +
  19076. +
  19077. @@ -6533,6 +6868,47 @@ fi
  19078. +
  19079. +
  19080. +
  19081. +
  19082. +
  19083. +
  19084. +
  19085. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  19086. +$as_echo_n "checking for sysroot... " >&6; }
  19087. +
  19088. +# Check whether --with-libtool-sysroot was given.
  19089. +if test "${with_libtool_sysroot+set}" = set; then :
  19090. + withval=$with_libtool_sysroot;
  19091. +else
  19092. + with_libtool_sysroot=no
  19093. +fi
  19094. +
  19095. +
  19096. +lt_sysroot=
  19097. +case ${with_libtool_sysroot} in #(
  19098. + yes)
  19099. + if test "$GCC" = yes; then
  19100. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  19101. + fi
  19102. + ;; #(
  19103. + /*)
  19104. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  19105. + ;; #(
  19106. + no|'')
  19107. + ;; #(
  19108. + *)
  19109. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  19110. +$as_echo "${with_libtool_sysroot}" >&6; }
  19111. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  19112. + ;;
  19113. +esac
  19114. +
  19115. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  19116. +$as_echo "${lt_sysroot:-no}" >&6; }
  19117. +
  19118. +
  19119. @@ -6742,6 +7118,123 @@ esac
  19120. need_locks="$enable_libtool_lock"
  19121. +if test -n "$ac_tool_prefix"; then
  19122. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  19123. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  19124. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  19125. +$as_echo_n "checking for $ac_word... " >&6; }
  19126. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  19127. + $as_echo_n "(cached) " >&6
  19128. +else
  19129. + if test -n "$MANIFEST_TOOL"; then
  19130. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  19131. +else
  19132. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  19133. +for as_dir in $PATH
  19134. +do
  19135. + IFS=$as_save_IFS
  19136. + test -z "$as_dir" && as_dir=.
  19137. + for ac_exec_ext in '' $ac_executable_extensions; do
  19138. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  19139. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  19140. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  19141. + break 2
  19142. + fi
  19143. +done
  19144. + done
  19145. +IFS=$as_save_IFS
  19146. +
  19147. +fi
  19148. +fi
  19149. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  19150. +if test -n "$MANIFEST_TOOL"; then
  19151. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  19152. +$as_echo "$MANIFEST_TOOL" >&6; }
  19153. +else
  19154. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  19155. +$as_echo "no" >&6; }
  19156. +fi
  19157. +
  19158. +
  19159. +fi
  19160. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  19161. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  19162. + # Extract the first word of "mt", so it can be a program name with args.
  19163. +set dummy mt; ac_word=$2
  19164. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  19165. +$as_echo_n "checking for $ac_word... " >&6; }
  19166. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  19167. + $as_echo_n "(cached) " >&6
  19168. +else
  19169. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  19170. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  19171. +else
  19172. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  19173. +for as_dir in $PATH
  19174. +do
  19175. + IFS=$as_save_IFS
  19176. + test -z "$as_dir" && as_dir=.
  19177. + for ac_exec_ext in '' $ac_executable_extensions; do
  19178. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  19179. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  19180. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  19181. + break 2
  19182. + fi
  19183. +done
  19184. + done
  19185. +IFS=$as_save_IFS
  19186. +
  19187. +fi
  19188. +fi
  19189. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  19190. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  19191. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  19192. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  19193. +else
  19194. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  19195. +$as_echo "no" >&6; }
  19196. +fi
  19197. +
  19198. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  19199. + MANIFEST_TOOL=":"
  19200. + else
  19201. + case $cross_compiling:$ac_tool_warned in
  19202. +yes:)
  19203. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  19204. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  19205. +ac_tool_warned=yes ;;
  19206. +esac
  19207. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  19208. + fi
  19209. +else
  19210. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  19211. +fi
  19212. +
  19213. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  19214. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  19215. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  19216. +if ${lt_cv_path_mainfest_tool+:} false; then :
  19217. + $as_echo_n "(cached) " >&6
  19218. +else
  19219. + lt_cv_path_mainfest_tool=no
  19220. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  19221. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  19222. + cat conftest.err >&5
  19223. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  19224. + lt_cv_path_mainfest_tool=yes
  19225. + fi
  19226. + rm -f conftest*
  19227. +fi
  19228. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  19229. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  19230. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  19231. + MANIFEST_TOOL=:
  19232. +fi
  19233. +
  19234. +
  19235. +
  19236. +
  19237. +
  19238. case $host_os in
  19239. rhapsody* | darwin*)
  19240. @@ -7305,6 +7798,8 @@ _LT_EOF
  19241. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  19242. echo "$AR cru libconftest.a conftest.o" >&5
  19243. $AR cru libconftest.a conftest.o 2>&5
  19244. + echo "$RANLIB libconftest.a" >&5
  19245. + $RANLIB libconftest.a 2>&5
  19246. cat > conftest.c << _LT_EOF
  19247. int main() { return 0;}
  19248. _LT_EOF
  19249. @@ -7470,7 +7965,8 @@ fi
  19250. LIBTOOL_DEPS="$ltmain"
  19251. # Always use our own libtool.
  19252. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  19253. +LIBTOOL='$(SHELL) $(top_builddir)'
  19254. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  19255. @@ -7559,7 +8055,7 @@ aix3*)
  19256. esac
  19257. # Global variables:
  19258. -ofile=libtool
  19259. +ofile=${host_alias}-libtool
  19260. can_build_shared=yes
  19261. # All known linkers require a `.a' archive for static linking (except MSVC,
  19262. @@ -7857,8 +8353,6 @@ fi
  19263. lt_prog_compiler_pic=
  19264. lt_prog_compiler_static=
  19265. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  19266. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  19267. if test "$GCC" = yes; then
  19268. lt_prog_compiler_wl='-Wl,'
  19269. @@ -8024,6 +8518,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  19270. lt_prog_compiler_pic='--shared'
  19271. lt_prog_compiler_static='--static'
  19272. ;;
  19273. + nagfor*)
  19274. + # NAG Fortran compiler
  19275. + lt_prog_compiler_wl='-Wl,-Wl,,'
  19276. + lt_prog_compiler_pic='-PIC'
  19277. + lt_prog_compiler_static='-Bstatic'
  19278. + ;;
  19279. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  19280. # Portland Group compilers (*not* the Pentium gcc compiler,
  19281. # which looks to be a dead project)
  19282. @@ -8086,7 +8586,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  19283. lt_prog_compiler_pic='-KPIC'
  19284. lt_prog_compiler_static='-Bstatic'
  19285. case $cc_basename in
  19286. - f77* | f90* | f95*)
  19287. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  19288. lt_prog_compiler_wl='-Qoption ld ';;
  19289. *)
  19290. lt_prog_compiler_wl='-Wl,';;
  19291. @@ -8143,13 +8643,17 @@ case $host_os in
  19292. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  19293. ;;
  19294. esac
  19295. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  19296. -$as_echo "$lt_prog_compiler_pic" >&6; }
  19297. -
  19298. -
  19299. -
  19300. -
  19301. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  19302. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  19303. +if ${lt_cv_prog_compiler_pic+:} false; then :
  19304. + $as_echo_n "(cached) " >&6
  19305. +else
  19306. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  19307. +fi
  19308. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  19309. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  19310. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  19311. #
  19312. # Check to make sure the PIC flag actually works.
  19313. @@ -8210,6 +8714,11 @@ fi
  19314. +
  19315. +
  19316. +
  19317. +
  19318. +
  19319. #
  19320. # Check to make sure the static flag actually works.
  19321. #
  19322. @@ -8560,7 +9069,8 @@ _LT_EOF
  19323. allow_undefined_flag=unsupported
  19324. always_export_symbols=no
  19325. enable_shared_with_static_runtimes=yes
  19326. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  19327. + 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'
  19328. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  19329. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  19330. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  19331. @@ -8659,12 +9169,12 @@ _LT_EOF
  19332. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  19333. hardcode_libdir_flag_spec=
  19334. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  19335. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  19336. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  19337. if test "x$supports_anon_versioning" = xyes; then
  19338. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  19339. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  19340. echo "local: *; };" >> $output_objdir/$libname.ver~
  19341. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  19342. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  19343. fi
  19344. ;;
  19345. esac
  19346. @@ -8678,8 +9188,8 @@ _LT_EOF
  19347. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  19348. wlarc=
  19349. else
  19350. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19351. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19352. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19353. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19354. fi
  19355. ;;
  19356. @@ -8697,8 +9207,8 @@ _LT_EOF
  19357. _LT_EOF
  19358. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  19359. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19360. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19361. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19362. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19363. else
  19364. ld_shlibs=no
  19365. fi
  19366. @@ -8744,8 +9254,8 @@ _LT_EOF
  19367. *)
  19368. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  19369. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19370. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19371. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  19372. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  19373. else
  19374. ld_shlibs=no
  19375. fi
  19376. @@ -8875,7 +9385,13 @@ _LT_EOF
  19377. allow_undefined_flag='-berok'
  19378. # Determine the default libpath from the value encoded in an
  19379. # empty executable.
  19380. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  19381. + if test "${lt_cv_aix_libpath+set}" = set; then
  19382. + aix_libpath=$lt_cv_aix_libpath
  19383. +else
  19384. + if ${lt_cv_aix_libpath_+:} false; then :
  19385. + $as_echo_n "(cached) " >&6
  19386. +else
  19387. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  19388. /* end confdefs.h. */
  19389. int
  19390. @@ -8888,22 +9404,29 @@ main ()
  19391. _ACEOF
  19392. if ac_fn_c_try_link "$LINENO"; then :
  19393. -lt_aix_libpath_sed='
  19394. - /Import File Strings/,/^$/ {
  19395. - /^0/ {
  19396. - s/^0 *\(.*\)$/\1/
  19397. - p
  19398. - }
  19399. - }'
  19400. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19401. -# Check for a 64-bit object if we didn't find anything.
  19402. -if test -z "$aix_libpath"; then
  19403. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19404. -fi
  19405. + lt_aix_libpath_sed='
  19406. + /Import File Strings/,/^$/ {
  19407. + /^0/ {
  19408. + s/^0 *\([^ ]*\) *$/\1/
  19409. + p
  19410. + }
  19411. + }'
  19412. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19413. + # Check for a 64-bit object if we didn't find anything.
  19414. + if test -z "$lt_cv_aix_libpath_"; then
  19415. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19416. + fi
  19417. fi
  19418. rm -f core conftest.err conftest.$ac_objext \
  19419. conftest$ac_exeext conftest.$ac_ext
  19420. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19421. + if test -z "$lt_cv_aix_libpath_"; then
  19422. + lt_cv_aix_libpath_="/usr/lib:/lib"
  19423. + fi
  19424. +
  19425. +fi
  19426. +
  19427. + aix_libpath=$lt_cv_aix_libpath_
  19428. +fi
  19429. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  19430. 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"
  19431. @@ -8915,7 +9438,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19432. else
  19433. # Determine the default libpath from the value encoded in an
  19434. # empty executable.
  19435. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  19436. + if test "${lt_cv_aix_libpath+set}" = set; then
  19437. + aix_libpath=$lt_cv_aix_libpath
  19438. +else
  19439. + if ${lt_cv_aix_libpath_+:} false; then :
  19440. + $as_echo_n "(cached) " >&6
  19441. +else
  19442. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  19443. /* end confdefs.h. */
  19444. int
  19445. @@ -8928,22 +9457,29 @@ main ()
  19446. _ACEOF
  19447. if ac_fn_c_try_link "$LINENO"; then :
  19448. -lt_aix_libpath_sed='
  19449. - /Import File Strings/,/^$/ {
  19450. - /^0/ {
  19451. - s/^0 *\(.*\)$/\1/
  19452. - p
  19453. - }
  19454. - }'
  19455. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19456. -# Check for a 64-bit object if we didn't find anything.
  19457. -if test -z "$aix_libpath"; then
  19458. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19459. -fi
  19460. + lt_aix_libpath_sed='
  19461. + /Import File Strings/,/^$/ {
  19462. + /^0/ {
  19463. + s/^0 *\([^ ]*\) *$/\1/
  19464. + p
  19465. + }
  19466. + }'
  19467. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19468. + # Check for a 64-bit object if we didn't find anything.
  19469. + if test -z "$lt_cv_aix_libpath_"; then
  19470. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  19471. + fi
  19472. fi
  19473. rm -f core conftest.err conftest.$ac_objext \
  19474. conftest$ac_exeext conftest.$ac_ext
  19475. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19476. + if test -z "$lt_cv_aix_libpath_"; then
  19477. + lt_cv_aix_libpath_="/usr/lib:/lib"
  19478. + fi
  19479. +
  19480. +fi
  19481. +
  19482. + aix_libpath=$lt_cv_aix_libpath_
  19483. +fi
  19484. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  19485. # Warning - without using the other run time loading flags,
  19486. @@ -8988,20 +9524,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19487. # Microsoft Visual C++.
  19488. # hardcode_libdir_flag_spec is actually meaningless, as there is
  19489. # no search path for DLLs.
  19490. - hardcode_libdir_flag_spec=' '
  19491. - allow_undefined_flag=unsupported
  19492. - # Tell ltmain to make .lib files, not .a files.
  19493. - libext=lib
  19494. - # Tell ltmain to make .dll files, not .so files.
  19495. - shrext_cmds=".dll"
  19496. - # FIXME: Setting linknames here is a bad hack.
  19497. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  19498. - # The linker will automatically build a .lib file if we build a DLL.
  19499. - old_archive_from_new_cmds='true'
  19500. - # FIXME: Should let the user specify the lib program.
  19501. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  19502. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  19503. - enable_shared_with_static_runtimes=yes
  19504. + case $cc_basename in
  19505. + cl*)
  19506. + # Native MSVC
  19507. + hardcode_libdir_flag_spec=' '
  19508. + allow_undefined_flag=unsupported
  19509. + always_export_symbols=yes
  19510. + file_list_spec='@'
  19511. + # Tell ltmain to make .lib files, not .a files.
  19512. + libext=lib
  19513. + # Tell ltmain to make .dll files, not .so files.
  19514. + shrext_cmds=".dll"
  19515. + # FIXME: Setting linknames here is a bad hack.
  19516. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  19517. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  19518. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  19519. + else
  19520. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  19521. + fi~
  19522. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  19523. + linknames='
  19524. + # The linker will not automatically build a static lib if we build a DLL.
  19525. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  19526. + enable_shared_with_static_runtimes=yes
  19527. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  19528. + # Don't use ranlib
  19529. + old_postinstall_cmds='chmod 644 $oldlib'
  19530. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  19531. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  19532. + case $lt_outputfile in
  19533. + *.exe|*.EXE) ;;
  19534. + *)
  19535. + lt_outputfile="$lt_outputfile.exe"
  19536. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  19537. + ;;
  19538. + esac~
  19539. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  19540. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  19541. + $RM "$lt_outputfile.manifest";
  19542. + fi'
  19543. + ;;
  19544. + *)
  19545. + # Assume MSVC wrapper
  19546. + hardcode_libdir_flag_spec=' '
  19547. + allow_undefined_flag=unsupported
  19548. + # Tell ltmain to make .lib files, not .a files.
  19549. + libext=lib
  19550. + # Tell ltmain to make .dll files, not .so files.
  19551. + shrext_cmds=".dll"
  19552. + # FIXME: Setting linknames here is a bad hack.
  19553. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  19554. + # The linker will automatically build a .lib file if we build a DLL.
  19555. + old_archive_from_new_cmds='true'
  19556. + # FIXME: Should let the user specify the lib program.
  19557. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  19558. + enable_shared_with_static_runtimes=yes
  19559. + ;;
  19560. + esac
  19561. ;;
  19562. darwin* | rhapsody*)
  19563. @@ -9062,7 +9641,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19564. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  19565. freebsd* | dragonfly*)
  19566. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  19567. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  19568. hardcode_libdir_flag_spec='-R$libdir'
  19569. hardcode_direct=yes
  19570. hardcode_shlibpath_var=no
  19571. @@ -9070,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19572. hpux9*)
  19573. if test "$GCC" = yes; then
  19574. - 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'
  19575. + 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'
  19576. else
  19577. 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'
  19578. fi
  19579. @@ -9086,7 +9665,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19580. hpux10*)
  19581. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  19582. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19583. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19584. else
  19585. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  19586. fi
  19587. @@ -9110,10 +9689,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  19588. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  19589. ;;
  19590. ia64*)
  19591. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  19592. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  19593. ;;
  19594. *)
  19595. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19596. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  19597. ;;
  19598. esac
  19599. else
  19600. @@ -9192,23 +9771,36 @@ fi
  19601. irix5* | irix6* | nonstopux*)
  19602. if test "$GCC" = yes; then
  19603. - 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'
  19604. + 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'
  19605. # Try to use the -exported_symbol ld option, if it does not
  19606. # work, assume that -exports_file does not work either and
  19607. # implicitly export all symbols.
  19608. - save_LDFLAGS="$LDFLAGS"
  19609. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  19610. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  19611. + # This should be the same for all languages, so no per-tag cache variable.
  19612. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  19613. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  19614. +if ${lt_cv_irix_exported_symbol+:} false; then :
  19615. + $as_echo_n "(cached) " >&6
  19616. +else
  19617. + save_LDFLAGS="$LDFLAGS"
  19618. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  19619. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  19620. /* end confdefs.h. */
  19621. -int foo(void) {}
  19622. +int foo (void) { return 0; }
  19623. _ACEOF
  19624. if ac_fn_c_try_link "$LINENO"; then :
  19625. - 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'
  19626. -
  19627. + lt_cv_irix_exported_symbol=yes
  19628. +else
  19629. + lt_cv_irix_exported_symbol=no
  19630. fi
  19631. rm -f core conftest.err conftest.$ac_objext \
  19632. conftest$ac_exeext conftest.$ac_ext
  19633. - LDFLAGS="$save_LDFLAGS"
  19634. + LDFLAGS="$save_LDFLAGS"
  19635. +fi
  19636. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  19637. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  19638. + if test "$lt_cv_irix_exported_symbol" = yes; then
  19639. + 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'
  19640. + fi
  19641. else
  19642. 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'
  19643. 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'
  19644. @@ -9293,7 +9885,7 @@ rm -f core conftest.err conftest.$ac_objext \
  19645. osf4* | osf5*) # as osf3* with the addition of -msym flag
  19646. if test "$GCC" = yes; then
  19647. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  19648. - 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'
  19649. + 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'
  19650. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  19651. else
  19652. allow_undefined_flag=' -expect_unresolved \*'
  19653. @@ -9312,9 +9904,9 @@ rm -f core conftest.err conftest.$ac_objext \
  19654. no_undefined_flag=' -z defs'
  19655. if test "$GCC" = yes; then
  19656. wlarc='${wl}'
  19657. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  19658. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  19659. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  19660. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  19661. + $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'
  19662. else
  19663. case `$CC -V 2>&1` in
  19664. *"Compilers 5.0"*)
  19665. @@ -9890,8 +10482,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  19666. need_version=no
  19667. need_lib_prefix=no
  19668. - case $GCC,$host_os in
  19669. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  19670. + case $GCC,$cc_basename in
  19671. + yes,*)
  19672. + # gcc
  19673. library_names_spec='$libname.dll.a'
  19674. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  19675. postinstall_cmds='base_file=`basename \${file}`~
  19676. @@ -9924,13 +10517,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  19677. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  19678. ;;
  19679. esac
  19680. + dynamic_linker='Win32 ld.exe'
  19681. + ;;
  19682. +
  19683. + *,cl*)
  19684. + # Native MSVC
  19685. + libname_spec='$name'
  19686. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  19687. + library_names_spec='${libname}.dll.lib'
  19688. +
  19689. + case $build_os in
  19690. + mingw*)
  19691. + sys_lib_search_path_spec=
  19692. + lt_save_ifs=$IFS
  19693. + IFS=';'
  19694. + for lt_path in $LIB
  19695. + do
  19696. + IFS=$lt_save_ifs
  19697. + # Let DOS variable expansion print the short 8.3 style file name.
  19698. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  19699. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  19700. + done
  19701. + IFS=$lt_save_ifs
  19702. + # Convert to MSYS style.
  19703. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  19704. + ;;
  19705. + cygwin*)
  19706. + # Convert to unix form, then to dos form, then back to unix form
  19707. + # but this time dos style (no spaces!) so that the unix form looks
  19708. + # like /cygdrive/c/PROGRA~1:/cygdr...
  19709. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  19710. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  19711. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  19712. + ;;
  19713. + *)
  19714. + sys_lib_search_path_spec="$LIB"
  19715. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  19716. + # It is most probably a Windows format PATH.
  19717. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  19718. + else
  19719. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  19720. + fi
  19721. + # FIXME: find the short name or the path components, as spaces are
  19722. + # common. (e.g. "Program Files" -> "PROGRA~1")
  19723. + ;;
  19724. + esac
  19725. +
  19726. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  19727. + postinstall_cmds='base_file=`basename \${file}`~
  19728. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  19729. + dldir=$destdir/`dirname \$dlpath`~
  19730. + test -d \$dldir || mkdir -p \$dldir~
  19731. + $install_prog $dir/$dlname \$dldir/$dlname'
  19732. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  19733. + dlpath=$dir/\$dldll~
  19734. + $RM \$dlpath'
  19735. + shlibpath_overrides_runpath=yes
  19736. + dynamic_linker='Win32 link.exe'
  19737. ;;
  19738. *)
  19739. + # Assume MSVC wrapper
  19740. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  19741. + dynamic_linker='Win32 ld.exe'
  19742. ;;
  19743. esac
  19744. - dynamic_linker='Win32 ld.exe'
  19745. # FIXME: first we should search . and the directory the executable is in
  19746. shlibpath_var=PATH
  19747. ;;
  19748. @@ -10012,7 +10663,7 @@ haiku*)
  19749. soname_spec='${libname}${release}${shared_ext}$major'
  19750. shlibpath_var=LIBRARY_PATH
  19751. shlibpath_overrides_runpath=yes
  19752. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  19753. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  19754. hardcode_into_libs=yes
  19755. ;;
  19756. @@ -10808,7 +11459,7 @@ else
  19757. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  19758. lt_status=$lt_dlunknown
  19759. cat > conftest.$ac_ext <<_LT_EOF
  19760. -#line 10811 "configure"
  19761. +#line $LINENO "configure"
  19762. #include "confdefs.h"
  19763. #if HAVE_DLFCN_H
  19764. @@ -10852,10 +11503,10 @@ else
  19765. /* When -fvisbility=hidden is used, assume the code has been annotated
  19766. correspondingly for the symbols needed. */
  19767. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  19768. -void fnord () __attribute__((visibility("default")));
  19769. +int fnord () __attribute__((visibility("default")));
  19770. #endif
  19771. -void fnord () { int i=42; }
  19772. +int fnord () { return 42; }
  19773. int main ()
  19774. {
  19775. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  19776. @@ -10914,7 +11565,7 @@ else
  19777. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  19778. lt_status=$lt_dlunknown
  19779. cat > conftest.$ac_ext <<_LT_EOF
  19780. -#line 10917 "configure"
  19781. +#line $LINENO "configure"
  19782. #include "confdefs.h"
  19783. #if HAVE_DLFCN_H
  19784. @@ -10958,10 +11609,10 @@ else
  19785. /* When -fvisbility=hidden is used, assume the code has been annotated
  19786. correspondingly for the symbols needed. */
  19787. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  19788. -void fnord () __attribute__((visibility("default")));
  19789. +int fnord () __attribute__((visibility("default")));
  19790. #endif
  19791. -void fnord () { int i=42; }
  19792. +int fnord () { return 42; }
  19793. int main ()
  19794. {
  19795. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  19796. @@ -13101,13 +13752,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  19797. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  19798. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  19799. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  19800. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  19801. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  19802. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  19803. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  19804. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  19805. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  19806. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  19807. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  19808. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  19809. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  19810. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  19811. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  19812. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  19813. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  19814. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  19815. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  19816. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  19817. @@ -13122,14 +13780,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  19818. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  19819. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  19820. 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"`'
  19821. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  19822. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  19823. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  19824. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  19825. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  19826. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  19827. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  19828. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  19829. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  19830. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  19831. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  19832. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  19833. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  19834. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  19835. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  19836. @@ -13162,12 +13823,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  19837. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  19838. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  19839. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  19840. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  19841. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  19842. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  19843. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  19844. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  19845. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  19846. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  19847. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  19848. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  19849. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  19850. @@ -13222,8 +13883,13 @@ reload_flag \
  19851. OBJDUMP \
  19852. deplibs_check_method \
  19853. file_magic_cmd \
  19854. +file_magic_glob \
  19855. +want_nocaseglob \
  19856. +DLLTOOL \
  19857. +sharedlib_from_linklib_cmd \
  19858. AR \
  19859. AR_FLAGS \
  19860. +archiver_list_spec \
  19861. STRIP \
  19862. RANLIB \
  19863. CC \
  19864. @@ -13233,12 +13899,14 @@ lt_cv_sys_global_symbol_pipe \
  19865. lt_cv_sys_global_symbol_to_cdecl \
  19866. lt_cv_sys_global_symbol_to_c_name_address \
  19867. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  19868. +nm_file_list_spec \
  19869. lt_prog_compiler_no_builtin_flag \
  19870. -lt_prog_compiler_wl \
  19871. lt_prog_compiler_pic \
  19872. +lt_prog_compiler_wl \
  19873. lt_prog_compiler_static \
  19874. lt_cv_prog_compiler_c_o \
  19875. need_locks \
  19876. +MANIFEST_TOOL \
  19877. DSYMUTIL \
  19878. NMEDIT \
  19879. LIPO \
  19880. @@ -13254,7 +13922,6 @@ no_undefined_flag \
  19881. hardcode_libdir_flag_spec \
  19882. hardcode_libdir_flag_spec_ld \
  19883. hardcode_libdir_separator \
  19884. -fix_srcfile_path \
  19885. exclude_expsyms \
  19886. include_expsyms \
  19887. file_list_spec \
  19888. @@ -13290,6 +13957,7 @@ module_cmds \
  19889. module_expsym_cmds \
  19890. export_symbols_cmds \
  19891. prelink_cmds \
  19892. +postlink_cmds \
  19893. postinstall_cmds \
  19894. postuninstall_cmds \
  19895. finish_cmds \
  19896. @@ -14055,7 +14723,8 @@ $as_echo X"$file" |
  19897. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  19898. #
  19899. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  19900. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  19901. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  19902. +# Inc.
  19903. # Written by Gordon Matzigkeit, 1996
  19904. #
  19905. # This file is part of GNU Libtool.
  19906. @@ -14158,19 +14827,42 @@ SP2NL=$lt_lt_SP2NL
  19907. # turn newlines into spaces.
  19908. NL2SP=$lt_lt_NL2SP
  19909. +# convert \$build file names to \$host format.
  19910. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  19911. +
  19912. +# convert \$build files to toolchain format.
  19913. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  19914. +
  19915. # An object symbol dumper.
  19916. OBJDUMP=$lt_OBJDUMP
  19917. # Method to check whether dependent libraries are shared objects.
  19918. deplibs_check_method=$lt_deplibs_check_method
  19919. -# Command to use when deplibs_check_method == "file_magic".
  19920. +# Command to use when deplibs_check_method = "file_magic".
  19921. file_magic_cmd=$lt_file_magic_cmd
  19922. +# How to find potential files when deplibs_check_method = "file_magic".
  19923. +file_magic_glob=$lt_file_magic_glob
  19924. +
  19925. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  19926. +want_nocaseglob=$lt_want_nocaseglob
  19927. +
  19928. +# DLL creation program.
  19929. +DLLTOOL=$lt_DLLTOOL
  19930. +
  19931. +# Command to associate shared and link libraries.
  19932. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  19933. +
  19934. # The archiver.
  19935. AR=$lt_AR
  19936. +
  19937. +# Flags to create an archive.
  19938. AR_FLAGS=$lt_AR_FLAGS
  19939. +# How to feed a file listing to the archiver.
  19940. +archiver_list_spec=$lt_archiver_list_spec
  19941. +
  19942. # A symbol stripping program.
  19943. STRIP=$lt_STRIP
  19944. @@ -14200,6 +14892,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  19945. # Transform the output of nm in a C name address pair when lib prefix is needed.
  19946. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  19947. +# Specify filename containing input files for \$NM.
  19948. +nm_file_list_spec=$lt_nm_file_list_spec
  19949. +
  19950. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  19951. +lt_sysroot=$lt_sysroot
  19952. +
  19953. # The name of the directory that contains temporary libtool files.
  19954. objdir=$objdir
  19955. @@ -14209,6 +14907,9 @@ MAGIC_CMD=$MAGIC_CMD
  19956. # Must we lock files when doing compilation?
  19957. need_locks=$lt_need_locks
  19958. +# Manifest tool.
  19959. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  19960. +
  19961. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  19962. DSYMUTIL=$lt_DSYMUTIL
  19963. @@ -14323,12 +15024,12 @@ with_gcc=$GCC
  19964. # Compiler flag to turn off builtin functions.
  19965. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  19966. -# How to pass a linker flag through the compiler.
  19967. -wl=$lt_lt_prog_compiler_wl
  19968. -
  19969. # Additional compiler flags for building library objects.
  19970. pic_flag=$lt_lt_prog_compiler_pic
  19971. +# How to pass a linker flag through the compiler.
  19972. +wl=$lt_lt_prog_compiler_wl
  19973. +
  19974. # Compiler flag to prevent dynamic linking.
  19975. link_static_flag=$lt_lt_prog_compiler_static
  19976. @@ -14415,9 +15116,6 @@ inherit_rpath=$inherit_rpath
  19977. # Whether libtool must link a program against all its dependency libraries.
  19978. link_all_deplibs=$link_all_deplibs
  19979. -# Fix the shell variable \$srcfile for the compiler.
  19980. -fix_srcfile_path=$lt_fix_srcfile_path
  19981. -
  19982. # Set to "yes" if exported symbols are required.
  19983. always_export_symbols=$always_export_symbols
  19984. @@ -14433,6 +15131,9 @@ include_expsyms=$lt_include_expsyms
  19985. # Commands necessary for linking programs (against libraries) with templates.
  19986. prelink_cmds=$lt_prelink_cmds
  19987. +# Commands necessary for finishing linking programs.
  19988. +postlink_cmds=$lt_postlink_cmds
  19989. +
  19990. # Specify filename containing input files.
  19991. file_list_spec=$lt_file_list_spec
  19992. @@ -14465,210 +15166,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  19993. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  19994. # text mode, it properly converts lines to CR/LF. This bash problem
  19995. # is reportedly fixed, but why not run on old versions too?
  19996. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  19997. - || (rm -f "$cfgfile"; exit 1)
  19998. -
  19999. - case $xsi_shell in
  20000. - yes)
  20001. - cat << \_LT_EOF >> "$cfgfile"
  20002. -
  20003. -# func_dirname file append nondir_replacement
  20004. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  20005. -# otherwise set result to NONDIR_REPLACEMENT.
  20006. -func_dirname ()
  20007. -{
  20008. - case ${1} in
  20009. - */*) func_dirname_result="${1%/*}${2}" ;;
  20010. - * ) func_dirname_result="${3}" ;;
  20011. - esac
  20012. -}
  20013. -
  20014. -# func_basename file
  20015. -func_basename ()
  20016. -{
  20017. - func_basename_result="${1##*/}"
  20018. -}
  20019. -
  20020. -# func_dirname_and_basename file append nondir_replacement
  20021. -# perform func_basename and func_dirname in a single function
  20022. -# call:
  20023. -# dirname: Compute the dirname of FILE. If nonempty,
  20024. -# add APPEND to the result, otherwise set result
  20025. -# to NONDIR_REPLACEMENT.
  20026. -# value returned in "$func_dirname_result"
  20027. -# basename: Compute filename of FILE.
  20028. -# value retuned in "$func_basename_result"
  20029. -# Implementation must be kept synchronized with func_dirname
  20030. -# and func_basename. For efficiency, we do not delegate to
  20031. -# those functions but instead duplicate the functionality here.
  20032. -func_dirname_and_basename ()
  20033. -{
  20034. - case ${1} in
  20035. - */*) func_dirname_result="${1%/*}${2}" ;;
  20036. - * ) func_dirname_result="${3}" ;;
  20037. - esac
  20038. - func_basename_result="${1##*/}"
  20039. -}
  20040. -
  20041. -# func_stripname prefix suffix name
  20042. -# strip PREFIX and SUFFIX off of NAME.
  20043. -# PREFIX and SUFFIX must not contain globbing or regex special
  20044. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  20045. -# dot (in which case that matches only a dot).
  20046. -func_stripname ()
  20047. -{
  20048. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  20049. - # positional parameters, so assign one to ordinary parameter first.
  20050. - func_stripname_result=${3}
  20051. - func_stripname_result=${func_stripname_result#"${1}"}
  20052. - func_stripname_result=${func_stripname_result%"${2}"}
  20053. -}
  20054. -
  20055. -# func_opt_split
  20056. -func_opt_split ()
  20057. -{
  20058. - func_opt_split_opt=${1%%=*}
  20059. - func_opt_split_arg=${1#*=}
  20060. -}
  20061. -
  20062. -# func_lo2o object
  20063. -func_lo2o ()
  20064. -{
  20065. - case ${1} in
  20066. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  20067. - *) func_lo2o_result=${1} ;;
  20068. - esac
  20069. -}
  20070. -
  20071. -# func_xform libobj-or-source
  20072. -func_xform ()
  20073. -{
  20074. - func_xform_result=${1%.*}.lo
  20075. -}
  20076. -
  20077. -# func_arith arithmetic-term...
  20078. -func_arith ()
  20079. -{
  20080. - func_arith_result=$(( $* ))
  20081. -}
  20082. -
  20083. -# func_len string
  20084. -# STRING may not start with a hyphen.
  20085. -func_len ()
  20086. -{
  20087. - func_len_result=${#1}
  20088. -}
  20089. -
  20090. -_LT_EOF
  20091. - ;;
  20092. - *) # Bourne compatible functions.
  20093. - cat << \_LT_EOF >> "$cfgfile"
  20094. -
  20095. -# func_dirname file append nondir_replacement
  20096. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  20097. -# otherwise set result to NONDIR_REPLACEMENT.
  20098. -func_dirname ()
  20099. -{
  20100. - # Extract subdirectory from the argument.
  20101. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  20102. - if test "X$func_dirname_result" = "X${1}"; then
  20103. - func_dirname_result="${3}"
  20104. - else
  20105. - func_dirname_result="$func_dirname_result${2}"
  20106. - fi
  20107. -}
  20108. -
  20109. -# func_basename file
  20110. -func_basename ()
  20111. -{
  20112. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  20113. -}
  20114. -
  20115. -
  20116. -# func_stripname prefix suffix name
  20117. -# strip PREFIX and SUFFIX off of NAME.
  20118. -# PREFIX and SUFFIX must not contain globbing or regex special
  20119. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  20120. -# dot (in which case that matches only a dot).
  20121. -# func_strip_suffix prefix name
  20122. -func_stripname ()
  20123. -{
  20124. - case ${2} in
  20125. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  20126. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  20127. - esac
  20128. -}
  20129. -
  20130. -# sed scripts:
  20131. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  20132. -my_sed_long_arg='1s/^-[^=]*=//'
  20133. -
  20134. -# func_opt_split
  20135. -func_opt_split ()
  20136. -{
  20137. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  20138. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  20139. -}
  20140. -
  20141. -# func_lo2o object
  20142. -func_lo2o ()
  20143. -{
  20144. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  20145. -}
  20146. -
  20147. -# func_xform libobj-or-source
  20148. -func_xform ()
  20149. -{
  20150. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  20151. -}
  20152. -
  20153. -# func_arith arithmetic-term...
  20154. -func_arith ()
  20155. -{
  20156. - func_arith_result=`expr "$@"`
  20157. -}
  20158. -
  20159. -# func_len string
  20160. -# STRING may not start with a hyphen.
  20161. -func_len ()
  20162. -{
  20163. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  20164. -}
  20165. -
  20166. -_LT_EOF
  20167. -esac
  20168. -
  20169. -case $lt_shell_append in
  20170. - yes)
  20171. - cat << \_LT_EOF >> "$cfgfile"
  20172. -
  20173. -# func_append var value
  20174. -# Append VALUE to the end of shell variable VAR.
  20175. -func_append ()
  20176. -{
  20177. - eval "$1+=\$2"
  20178. -}
  20179. -_LT_EOF
  20180. - ;;
  20181. - *)
  20182. - cat << \_LT_EOF >> "$cfgfile"
  20183. -
  20184. -# func_append var value
  20185. -# Append VALUE to the end of shell variable VAR.
  20186. -func_append ()
  20187. -{
  20188. - eval "$1=\$$1\$2"
  20189. -}
  20190. -
  20191. -_LT_EOF
  20192. - ;;
  20193. - esac
  20194. -
  20195. -
  20196. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  20197. - || (rm -f "$cfgfile"; exit 1)
  20198. -
  20199. - mv -f "$cfgfile" "$ofile" ||
  20200. + sed '$q' "$ltmain" >> "$cfgfile" \
  20201. + || (rm -f "$cfgfile"; exit 1)
  20202. +
  20203. + if test x"$xsi_shell" = xyes; then
  20204. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  20205. +func_dirname ()\
  20206. +{\
  20207. +\ case ${1} in\
  20208. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  20209. +\ * ) func_dirname_result="${3}" ;;\
  20210. +\ esac\
  20211. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  20212. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20213. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20214. +test 0 -eq $? || _lt_function_replace_fail=:
  20215. +
  20216. +
  20217. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  20218. +func_basename ()\
  20219. +{\
  20220. +\ func_basename_result="${1##*/}"\
  20221. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  20222. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20223. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20224. +test 0 -eq $? || _lt_function_replace_fail=:
  20225. +
  20226. +
  20227. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  20228. +func_dirname_and_basename ()\
  20229. +{\
  20230. +\ case ${1} in\
  20231. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  20232. +\ * ) func_dirname_result="${3}" ;;\
  20233. +\ esac\
  20234. +\ func_basename_result="${1##*/}"\
  20235. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  20236. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20237. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20238. +test 0 -eq $? || _lt_function_replace_fail=:
  20239. +
  20240. +
  20241. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  20242. +func_stripname ()\
  20243. +{\
  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. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  20250. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20251. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20252. +test 0 -eq $? || _lt_function_replace_fail=:
  20253. +
  20254. +
  20255. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  20256. +func_split_long_opt ()\
  20257. +{\
  20258. +\ func_split_long_opt_name=${1%%=*}\
  20259. +\ func_split_long_opt_arg=${1#*=}\
  20260. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  20261. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20262. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20263. +test 0 -eq $? || _lt_function_replace_fail=:
  20264. +
  20265. +
  20266. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  20267. +func_split_short_opt ()\
  20268. +{\
  20269. +\ func_split_short_opt_arg=${1#??}\
  20270. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  20271. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  20272. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20273. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20274. +test 0 -eq $? || _lt_function_replace_fail=:
  20275. +
  20276. +
  20277. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  20278. +func_lo2o ()\
  20279. +{\
  20280. +\ case ${1} in\
  20281. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  20282. +\ *) func_lo2o_result=${1} ;;\
  20283. +\ esac\
  20284. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  20285. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20286. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20287. +test 0 -eq $? || _lt_function_replace_fail=:
  20288. +
  20289. +
  20290. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  20291. +func_xform ()\
  20292. +{\
  20293. + func_xform_result=${1%.*}.lo\
  20294. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  20295. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20296. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20297. +test 0 -eq $? || _lt_function_replace_fail=:
  20298. +
  20299. +
  20300. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  20301. +func_arith ()\
  20302. +{\
  20303. + func_arith_result=$(( $* ))\
  20304. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  20305. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20306. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20307. +test 0 -eq $? || _lt_function_replace_fail=:
  20308. +
  20309. +
  20310. + sed -e '/^func_len ()$/,/^} # func_len /c\
  20311. +func_len ()\
  20312. +{\
  20313. + func_len_result=${#1}\
  20314. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  20315. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20316. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20317. +test 0 -eq $? || _lt_function_replace_fail=:
  20318. +
  20319. +fi
  20320. +
  20321. +if test x"$lt_shell_append" = xyes; then
  20322. + sed -e '/^func_append ()$/,/^} # func_append /c\
  20323. +func_append ()\
  20324. +{\
  20325. + eval "${1}+=\\${2}"\
  20326. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  20327. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20328. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20329. +test 0 -eq $? || _lt_function_replace_fail=:
  20330. +
  20331. +
  20332. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  20333. +func_append_quoted ()\
  20334. +{\
  20335. +\ func_quote_for_eval "${2}"\
  20336. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  20337. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  20338. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20339. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20340. +test 0 -eq $? || _lt_function_replace_fail=:
  20341. +
  20342. +
  20343. + # Save a `func_append' function call where possible by direct use of '+='
  20344. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  20345. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20346. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20347. + test 0 -eq $? || _lt_function_replace_fail=:
  20348. +else
  20349. + # Save a `func_append' function call even when '+=' is not available
  20350. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  20351. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  20352. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  20353. + test 0 -eq $? || _lt_function_replace_fail=:
  20354. +fi
  20355. +
  20356. +if test x"$_lt_function_replace_fail" = x":"; then
  20357. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  20358. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  20359. +fi
  20360. +
  20361. +
  20362. + mv -f "$cfgfile" "$ofile" ||
  20363. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  20364. chmod +x "$ofile"
  20365. diff --git a/zlib/configure b/zlib/configure
  20366. index 695819cd54b..14b5f28013a 100755
  20367. --- a/zlib/configure
  20368. +++ b/zlib/configure
  20369. @@ -646,8 +646,11 @@ OTOOL
  20370. LIPO
  20371. NMEDIT
  20372. DSYMUTIL
  20373. +MANIFEST_TOOL
  20374. RANLIB
  20375. +ac_ct_AR
  20376. AR
  20377. +DLLTOOL
  20378. OBJDUMP
  20379. LN_S
  20380. NM
  20381. @@ -774,6 +777,7 @@ enable_static
  20382. with_pic
  20383. enable_fast_install
  20384. with_gnu_ld
  20385. +with_libtool_sysroot
  20386. enable_libtool_lock
  20387. enable_host_shared
  20388. '
  20389. @@ -1428,6 +1432,8 @@ Optional Packages:
  20390. --with-pic try to use only PIC/non-PIC objects [default=use
  20391. both]
  20392. --with-gnu-ld assume the C compiler uses GNU ld [default=no]
  20393. + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
  20394. + (or the compiler's sysroot if not specified).
  20395. Some influential environment variables:
  20396. CC C compiler command
  20397. @@ -4147,8 +4153,8 @@ esac
  20398. -macro_version='2.2.7a'
  20399. -macro_revision='1.3134'
  20400. +macro_version='2.4'
  20401. +macro_revision='1.3293'
  20402. @@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  20403. { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
  20404. $as_echo_n "checking how to print strings... " >&6; }
  20405. # Test print first, because it will be a builtin if present.
  20406. -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
  20407. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  20408. test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  20409. ECHO='print -r --'
  20410. elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  20411. @@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
  20412. # Try some XSI features
  20413. xsi_shell=no
  20414. ( _lt_dummy="a/b/c"
  20415. - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
  20416. - = c,a/b,, \
  20417. + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
  20418. + = c,a/b,b/c, \
  20419. && eval 'test $(( 1 + 1 )) -eq 2 \
  20420. && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  20421. && xsi_shell=yes
  20422. @@ -5054,6 +5060,80 @@ esac
  20423. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
  20424. +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
  20425. +if ${lt_cv_to_host_file_cmd+:} false; then :
  20426. + $as_echo_n "(cached) " >&6
  20427. +else
  20428. + case $host in
  20429. + *-*-mingw* )
  20430. + case $build in
  20431. + *-*-mingw* ) # actually msys
  20432. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
  20433. + ;;
  20434. + *-*-cygwin* )
  20435. + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
  20436. + ;;
  20437. + * ) # otherwise, assume *nix
  20438. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
  20439. + ;;
  20440. + esac
  20441. + ;;
  20442. + *-*-cygwin* )
  20443. + case $build in
  20444. + *-*-mingw* ) # actually msys
  20445. + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
  20446. + ;;
  20447. + *-*-cygwin* )
  20448. + lt_cv_to_host_file_cmd=func_convert_file_noop
  20449. + ;;
  20450. + * ) # otherwise, assume *nix
  20451. + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
  20452. + ;;
  20453. + esac
  20454. + ;;
  20455. + * ) # unhandled hosts (and "normal" native builds)
  20456. + lt_cv_to_host_file_cmd=func_convert_file_noop
  20457. + ;;
  20458. +esac
  20459. +
  20460. +fi
  20461. +
  20462. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  20463. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
  20464. +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
  20465. +
  20466. +
  20467. +
  20468. +
  20469. +
  20470. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
  20471. +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
  20472. +if ${lt_cv_to_tool_file_cmd+:} false; then :
  20473. + $as_echo_n "(cached) " >&6
  20474. +else
  20475. + #assume ordinary cross tools, or native build.
  20476. +lt_cv_to_tool_file_cmd=func_convert_file_noop
  20477. +case $host in
  20478. + *-*-mingw* )
  20479. + case $build in
  20480. + *-*-mingw* ) # actually msys
  20481. + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
  20482. + ;;
  20483. + esac
  20484. + ;;
  20485. +esac
  20486. +
  20487. +fi
  20488. +
  20489. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  20490. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
  20491. +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
  20492. +
  20493. +
  20494. +
  20495. +
  20496. +
  20497. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
  20498. $as_echo_n "checking for $LD option to reload object files... " >&6; }
  20499. if ${lt_cv_ld_reload_flag+:} false; then :
  20500. @@ -5070,6 +5150,11 @@ case $reload_flag in
  20501. esac
  20502. reload_cmds='$LD$reload_flag -o $output$reload_objs'
  20503. case $host_os in
  20504. + cygwin* | mingw* | pw32* | cegcc*)
  20505. + if test "$GCC" != yes; then
  20506. + reload_cmds=false
  20507. + fi
  20508. + ;;
  20509. darwin*)
  20510. if test "$GCC" = yes; then
  20511. reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
  20512. @@ -5238,7 +5323,8 @@ mingw* | pw32*)
  20513. lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
  20514. lt_cv_file_magic_cmd='func_win32_libid'
  20515. else
  20516. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
  20517. + # Keep this pattern in sync with the one in func_win32_libid.
  20518. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
  20519. lt_cv_file_magic_cmd='$OBJDUMP -f'
  20520. fi
  20521. ;;
  20522. @@ -5392,6 +5478,21 @@ esac
  20523. fi
  20524. { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
  20525. $as_echo "$lt_cv_deplibs_check_method" >&6; }
  20526. +
  20527. +file_magic_glob=
  20528. +want_nocaseglob=no
  20529. +if test "$build" = "$host"; then
  20530. + case $host_os in
  20531. + mingw* | pw32*)
  20532. + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
  20533. + want_nocaseglob=yes
  20534. + else
  20535. + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
  20536. + fi
  20537. + ;;
  20538. + esac
  20539. +fi
  20540. +
  20541. file_magic_cmd=$lt_cv_file_magic_cmd
  20542. deplibs_check_method=$lt_cv_deplibs_check_method
  20543. test -z "$deplibs_check_method" && deplibs_check_method=unknown
  20544. @@ -5407,6 +5508,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
  20545. +
  20546. +
  20547. +
  20548. +
  20549. +
  20550. +
  20551. +
  20552. +
  20553. +
  20554. +
  20555. +if test -n "$ac_tool_prefix"; then
  20556. + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  20557. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  20558. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  20559. +$as_echo_n "checking for $ac_word... " >&6; }
  20560. +if ${ac_cv_prog_DLLTOOL+:} false; then :
  20561. + $as_echo_n "(cached) " >&6
  20562. +else
  20563. + if test -n "$DLLTOOL"; then
  20564. + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  20565. +else
  20566. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  20567. +for as_dir in $PATH
  20568. +do
  20569. + IFS=$as_save_IFS
  20570. + test -z "$as_dir" && as_dir=.
  20571. + for ac_exec_ext in '' $ac_executable_extensions; do
  20572. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  20573. + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  20574. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  20575. + break 2
  20576. + fi
  20577. +done
  20578. + done
  20579. +IFS=$as_save_IFS
  20580. +
  20581. +fi
  20582. +fi
  20583. +DLLTOOL=$ac_cv_prog_DLLTOOL
  20584. +if test -n "$DLLTOOL"; then
  20585. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
  20586. +$as_echo "$DLLTOOL" >&6; }
  20587. +else
  20588. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  20589. +$as_echo "no" >&6; }
  20590. +fi
  20591. +
  20592. +
  20593. +fi
  20594. +if test -z "$ac_cv_prog_DLLTOOL"; then
  20595. + ac_ct_DLLTOOL=$DLLTOOL
  20596. + # Extract the first word of "dlltool", so it can be a program name with args.
  20597. +set dummy dlltool; ac_word=$2
  20598. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  20599. +$as_echo_n "checking for $ac_word... " >&6; }
  20600. +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
  20601. + $as_echo_n "(cached) " >&6
  20602. +else
  20603. + if test -n "$ac_ct_DLLTOOL"; then
  20604. + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  20605. +else
  20606. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  20607. +for as_dir in $PATH
  20608. +do
  20609. + IFS=$as_save_IFS
  20610. + test -z "$as_dir" && as_dir=.
  20611. + for ac_exec_ext in '' $ac_executable_extensions; do
  20612. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  20613. + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  20614. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  20615. + break 2
  20616. + fi
  20617. +done
  20618. + done
  20619. +IFS=$as_save_IFS
  20620. +
  20621. +fi
  20622. +fi
  20623. +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  20624. +if test -n "$ac_ct_DLLTOOL"; then
  20625. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
  20626. +$as_echo "$ac_ct_DLLTOOL" >&6; }
  20627. +else
  20628. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  20629. +$as_echo "no" >&6; }
  20630. +fi
  20631. +
  20632. + if test "x$ac_ct_DLLTOOL" = x; then
  20633. + DLLTOOL="false"
  20634. + else
  20635. + case $cross_compiling:$ac_tool_warned in
  20636. +yes:)
  20637. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  20638. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  20639. +ac_tool_warned=yes ;;
  20640. +esac
  20641. + DLLTOOL=$ac_ct_DLLTOOL
  20642. + fi
  20643. +else
  20644. + DLLTOOL="$ac_cv_prog_DLLTOOL"
  20645. +fi
  20646. +
  20647. +test -z "$DLLTOOL" && DLLTOOL=dlltool
  20648. +
  20649. +
  20650. +
  20651. +
  20652. +
  20653. +
  20654. +
  20655. +
  20656. +
  20657. +
  20658. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
  20659. +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
  20660. +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
  20661. + $as_echo_n "(cached) " >&6
  20662. +else
  20663. + lt_cv_sharedlib_from_linklib_cmd='unknown'
  20664. +
  20665. +case $host_os in
  20666. +cygwin* | mingw* | pw32* | cegcc*)
  20667. + # two different shell functions defined in ltmain.sh
  20668. + # decide which to use based on capabilities of $DLLTOOL
  20669. + case `$DLLTOOL --help 2>&1` in
  20670. + *--identify-strict*)
  20671. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
  20672. + ;;
  20673. + *)
  20674. + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
  20675. + ;;
  20676. + esac
  20677. + ;;
  20678. +*)
  20679. + # fallback: assume linklib IS sharedlib
  20680. + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
  20681. + ;;
  20682. +esac
  20683. +
  20684. +fi
  20685. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
  20686. +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
  20687. +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
  20688. +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
  20689. +
  20690. +
  20691. +
  20692. +
  20693. +
  20694. +
  20695. +
  20696. +
  20697. plugin_option=
  20698. plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
  20699. for plugin in $plugin_names; do
  20700. @@ -5421,8 +5674,10 @@ for plugin in $plugin_names; do
  20701. done
  20702. if test -n "$ac_tool_prefix"; then
  20703. - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  20704. -set dummy ${ac_tool_prefix}ar; ac_word=$2
  20705. + for ac_prog in ar
  20706. + do
  20707. + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  20708. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  20709. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  20710. $as_echo_n "checking for $ac_word... " >&6; }
  20711. if ${ac_cv_prog_AR+:} false; then :
  20712. @@ -5438,7 +5693,7 @@ do
  20713. test -z "$as_dir" && as_dir=.
  20714. for ac_exec_ext in '' $ac_executable_extensions; do
  20715. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  20716. - ac_cv_prog_AR="${ac_tool_prefix}ar"
  20717. + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
  20718. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  20719. break 2
  20720. fi
  20721. @@ -5458,11 +5713,15 @@ $as_echo "no" >&6; }
  20722. fi
  20723. + test -n "$AR" && break
  20724. + done
  20725. fi
  20726. -if test -z "$ac_cv_prog_AR"; then
  20727. +if test -z "$AR"; then
  20728. ac_ct_AR=$AR
  20729. - # Extract the first word of "ar", so it can be a program name with args.
  20730. -set dummy ar; ac_word=$2
  20731. + for ac_prog in ar
  20732. +do
  20733. + # Extract the first word of "$ac_prog", so it can be a program name with args.
  20734. +set dummy $ac_prog; ac_word=$2
  20735. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  20736. $as_echo_n "checking for $ac_word... " >&6; }
  20737. if ${ac_cv_prog_ac_ct_AR+:} false; then :
  20738. @@ -5478,7 +5737,7 @@ do
  20739. test -z "$as_dir" && as_dir=.
  20740. for ac_exec_ext in '' $ac_executable_extensions; do
  20741. if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  20742. - ac_cv_prog_ac_ct_AR="ar"
  20743. + ac_cv_prog_ac_ct_AR="$ac_prog"
  20744. $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  20745. break 2
  20746. fi
  20747. @@ -5497,6 +5756,10 @@ else
  20748. $as_echo "no" >&6; }
  20749. fi
  20750. +
  20751. + test -n "$ac_ct_AR" && break
  20752. +done
  20753. +
  20754. if test "x$ac_ct_AR" = x; then
  20755. AR="false"
  20756. else
  20757. @@ -5508,25 +5771,19 @@ ac_tool_warned=yes ;;
  20758. esac
  20759. AR=$ac_ct_AR
  20760. fi
  20761. -else
  20762. - AR="$ac_cv_prog_AR"
  20763. fi
  20764. -test -z "$AR" && AR=ar
  20765. -if test -n "$plugin_option"; then
  20766. - if $AR --help 2>&1 | grep -q "\--plugin"; then
  20767. - touch conftest.c
  20768. - $AR $plugin_option rc conftest.a conftest.c
  20769. - if test "$?" != 0; then
  20770. - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  20771. + touch conftest.c
  20772. + $AR $plugin_option rc conftest.a conftest.c
  20773. + if test "$?" != 0; then
  20774. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
  20775. $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
  20776. - else
  20777. - AR="$AR $plugin_option"
  20778. - fi
  20779. - rm -f conftest.*
  20780. + else
  20781. + AR="$AR $plugin_option"
  20782. fi
  20783. -fi
  20784. -test -z "$AR_FLAGS" && AR_FLAGS=cru
  20785. + rm -f conftest.*
  20786. +: ${AR=ar}
  20787. +: ${AR_FLAGS=cru}
  20788. @@ -5538,6 +5795,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  20789. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
  20790. +$as_echo_n "checking for archiver @FILE support... " >&6; }
  20791. +if ${lt_cv_ar_at_file+:} false; then :
  20792. + $as_echo_n "(cached) " >&6
  20793. +else
  20794. + lt_cv_ar_at_file=no
  20795. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  20796. +/* end confdefs.h. */
  20797. +
  20798. +int
  20799. +main ()
  20800. +{
  20801. +
  20802. + ;
  20803. + return 0;
  20804. +}
  20805. +_ACEOF
  20806. +if ac_fn_c_try_compile "$LINENO"; then :
  20807. + echo conftest.$ac_objext > conftest.lst
  20808. + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
  20809. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  20810. + (eval $lt_ar_try) 2>&5
  20811. + ac_status=$?
  20812. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  20813. + test $ac_status = 0; }
  20814. + if test "$ac_status" -eq 0; then
  20815. + # Ensure the archiver fails upon bogus file names.
  20816. + rm -f conftest.$ac_objext libconftest.a
  20817. + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
  20818. + (eval $lt_ar_try) 2>&5
  20819. + ac_status=$?
  20820. + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  20821. + test $ac_status = 0; }
  20822. + if test "$ac_status" -ne 0; then
  20823. + lt_cv_ar_at_file=@
  20824. + fi
  20825. + fi
  20826. + rm -f conftest.* libconftest.a
  20827. +
  20828. +fi
  20829. +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  20830. +
  20831. +fi
  20832. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
  20833. +$as_echo "$lt_cv_ar_at_file" >&6; }
  20834. +
  20835. +if test "x$lt_cv_ar_at_file" = xno; then
  20836. + archiver_list_spec=
  20837. +else
  20838. + archiver_list_spec=$lt_cv_ar_at_file
  20839. +fi
  20840. +
  20841. +
  20842. +
  20843. +
  20844. +
  20845. +
  20846. +
  20847. if test -n "$ac_tool_prefix"; then
  20848. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  20849. set dummy ${ac_tool_prefix}strip; ac_word=$2
  20850. @@ -5877,8 +6192,8 @@ esac
  20851. lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  20852. # Transform an extracted symbol line into symbol name and symbol address
  20853. -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  20854. -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'"
  20855. +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
  20856. +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'"
  20857. # Handle CRLF in mingw tool chain
  20858. opt_cr=
  20859. @@ -5914,6 +6229,7 @@ for ac_symprfx in "" "_"; do
  20860. else
  20861. lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  20862. fi
  20863. + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
  20864. # Check to see that the pipe works correctly.
  20865. pipe_works=no
  20866. @@ -5955,6 +6271,18 @@ _LT_EOF
  20867. if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
  20868. if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
  20869. cat <<_LT_EOF > conftest.$ac_ext
  20870. +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
  20871. +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
  20872. +/* DATA imports from DLLs on WIN32 con't be const, because runtime
  20873. + relocations are performed -- see ld's documentation on pseudo-relocs. */
  20874. +# define LT_DLSYM_CONST
  20875. +#elif defined(__osf__)
  20876. +/* This system does not cope well with relocations in const data. */
  20877. +# define LT_DLSYM_CONST
  20878. +#else
  20879. +# define LT_DLSYM_CONST const
  20880. +#endif
  20881. +
  20882. #ifdef __cplusplus
  20883. extern "C" {
  20884. #endif
  20885. @@ -5966,7 +6294,7 @@ _LT_EOF
  20886. cat <<_LT_EOF >> conftest.$ac_ext
  20887. /* The mapping between symbol names and symbols. */
  20888. -const struct {
  20889. +LT_DLSYM_CONST struct {
  20890. const char *name;
  20891. void *address;
  20892. }
  20893. @@ -5992,8 +6320,8 @@ static const void *lt_preloaded_setup() {
  20894. _LT_EOF
  20895. # Now try linking the two files.
  20896. mv conftest.$ac_objext conftstm.$ac_objext
  20897. - lt_save_LIBS="$LIBS"
  20898. - lt_save_CFLAGS="$CFLAGS"
  20899. + lt_globsym_save_LIBS=$LIBS
  20900. + lt_globsym_save_CFLAGS=$CFLAGS
  20901. LIBS="conftstm.$ac_objext"
  20902. CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
  20903. if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
  20904. @@ -6003,8 +6331,8 @@ _LT_EOF
  20905. test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  20906. pipe_works=yes
  20907. fi
  20908. - LIBS="$lt_save_LIBS"
  20909. - CFLAGS="$lt_save_CFLAGS"
  20910. + LIBS=$lt_globsym_save_LIBS
  20911. + CFLAGS=$lt_globsym_save_CFLAGS
  20912. else
  20913. echo "cannot find nm_test_func in $nlist" >&5
  20914. fi
  20915. @@ -6041,6 +6369,17 @@ else
  20916. $as_echo "ok" >&6; }
  20917. fi
  20918. +# Response file support.
  20919. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
  20920. + nm_file_list_spec='@'
  20921. +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
  20922. + nm_file_list_spec='@'
  20923. +fi
  20924. +
  20925. +
  20926. +
  20927. +
  20928. +
  20929. @@ -6058,6 +6397,43 @@ fi
  20930. +
  20931. +
  20932. +
  20933. +
  20934. +
  20935. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
  20936. +$as_echo_n "checking for sysroot... " >&6; }
  20937. +
  20938. +# Check whether --with-libtool-sysroot was given.
  20939. +if test "${with_libtool_sysroot+set}" = set; then :
  20940. + withval=$with_libtool_sysroot;
  20941. +else
  20942. + with_libtool_sysroot=no
  20943. +fi
  20944. +
  20945. +
  20946. +lt_sysroot=
  20947. +case ${with_libtool_sysroot} in #(
  20948. + yes)
  20949. + if test "$GCC" = yes; then
  20950. + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  20951. + fi
  20952. + ;; #(
  20953. + /*)
  20954. + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
  20955. + ;; #(
  20956. + no|'')
  20957. + ;; #(
  20958. + *)
  20959. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
  20960. +$as_echo "${with_libtool_sysroot}" >&6; }
  20961. + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
  20962. + ;;
  20963. +esac
  20964. +
  20965. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
  20966. +$as_echo "${lt_sysroot:-no}" >&6; }
  20967. @@ -6272,6 +6648,123 @@ esac
  20968. need_locks="$enable_libtool_lock"
  20969. +if test -n "$ac_tool_prefix"; then
  20970. + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
  20971. +set dummy ${ac_tool_prefix}mt; ac_word=$2
  20972. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  20973. +$as_echo_n "checking for $ac_word... " >&6; }
  20974. +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
  20975. + $as_echo_n "(cached) " >&6
  20976. +else
  20977. + if test -n "$MANIFEST_TOOL"; then
  20978. + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
  20979. +else
  20980. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  20981. +for as_dir in $PATH
  20982. +do
  20983. + IFS=$as_save_IFS
  20984. + test -z "$as_dir" && as_dir=.
  20985. + for ac_exec_ext in '' $ac_executable_extensions; do
  20986. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  20987. + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
  20988. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  20989. + break 2
  20990. + fi
  20991. +done
  20992. + done
  20993. +IFS=$as_save_IFS
  20994. +
  20995. +fi
  20996. +fi
  20997. +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
  20998. +if test -n "$MANIFEST_TOOL"; then
  20999. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
  21000. +$as_echo "$MANIFEST_TOOL" >&6; }
  21001. +else
  21002. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  21003. +$as_echo "no" >&6; }
  21004. +fi
  21005. +
  21006. +
  21007. +fi
  21008. +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
  21009. + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
  21010. + # Extract the first word of "mt", so it can be a program name with args.
  21011. +set dummy mt; ac_word=$2
  21012. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  21013. +$as_echo_n "checking for $ac_word... " >&6; }
  21014. +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
  21015. + $as_echo_n "(cached) " >&6
  21016. +else
  21017. + if test -n "$ac_ct_MANIFEST_TOOL"; then
  21018. + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
  21019. +else
  21020. +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  21021. +for as_dir in $PATH
  21022. +do
  21023. + IFS=$as_save_IFS
  21024. + test -z "$as_dir" && as_dir=.
  21025. + for ac_exec_ext in '' $ac_executable_extensions; do
  21026. + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  21027. + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
  21028. + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  21029. + break 2
  21030. + fi
  21031. +done
  21032. + done
  21033. +IFS=$as_save_IFS
  21034. +
  21035. +fi
  21036. +fi
  21037. +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
  21038. +if test -n "$ac_ct_MANIFEST_TOOL"; then
  21039. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
  21040. +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
  21041. +else
  21042. + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  21043. +$as_echo "no" >&6; }
  21044. +fi
  21045. +
  21046. + if test "x$ac_ct_MANIFEST_TOOL" = x; then
  21047. + MANIFEST_TOOL=":"
  21048. + else
  21049. + case $cross_compiling:$ac_tool_warned in
  21050. +yes:)
  21051. +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
  21052. +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  21053. +ac_tool_warned=yes ;;
  21054. +esac
  21055. + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
  21056. + fi
  21057. +else
  21058. + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
  21059. +fi
  21060. +
  21061. +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
  21062. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
  21063. +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
  21064. +if ${lt_cv_path_mainfest_tool+:} false; then :
  21065. + $as_echo_n "(cached) " >&6
  21066. +else
  21067. + lt_cv_path_mainfest_tool=no
  21068. + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
  21069. + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
  21070. + cat conftest.err >&5
  21071. + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
  21072. + lt_cv_path_mainfest_tool=yes
  21073. + fi
  21074. + rm -f conftest*
  21075. +fi
  21076. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
  21077. +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
  21078. +if test "x$lt_cv_path_mainfest_tool" != xyes; then
  21079. + MANIFEST_TOOL=:
  21080. +fi
  21081. +
  21082. +
  21083. +
  21084. +
  21085. +
  21086. case $host_os in
  21087. rhapsody* | darwin*)
  21088. @@ -6838,6 +7331,8 @@ _LT_EOF
  21089. $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
  21090. echo "$AR cru libconftest.a conftest.o" >&5
  21091. $AR cru libconftest.a conftest.o 2>&5
  21092. + echo "$RANLIB libconftest.a" >&5
  21093. + $RANLIB libconftest.a 2>&5
  21094. cat > conftest.c << _LT_EOF
  21095. int main() { return 0;}
  21096. _LT_EOF
  21097. @@ -7300,7 +7795,8 @@ fi
  21098. LIBTOOL_DEPS="$ltmain"
  21099. # Always use our own libtool.
  21100. -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  21101. +LIBTOOL='$(SHELL) $(top_builddir)'
  21102. +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
  21103. @@ -7389,7 +7885,7 @@ aix3*)
  21104. esac
  21105. # Global variables:
  21106. -ofile=libtool
  21107. +ofile=${host_alias}-libtool
  21108. can_build_shared=yes
  21109. # All known linkers require a `.a' archive for static linking (except MSVC,
  21110. @@ -7687,8 +8183,6 @@ fi
  21111. lt_prog_compiler_pic=
  21112. lt_prog_compiler_static=
  21113. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  21114. -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  21115. if test "$GCC" = yes; then
  21116. lt_prog_compiler_wl='-Wl,'
  21117. @@ -7854,6 +8348,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  21118. lt_prog_compiler_pic='--shared'
  21119. lt_prog_compiler_static='--static'
  21120. ;;
  21121. + nagfor*)
  21122. + # NAG Fortran compiler
  21123. + lt_prog_compiler_wl='-Wl,-Wl,,'
  21124. + lt_prog_compiler_pic='-PIC'
  21125. + lt_prog_compiler_static='-Bstatic'
  21126. + ;;
  21127. pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
  21128. # Portland Group compilers (*not* the Pentium gcc compiler,
  21129. # which looks to be a dead project)
  21130. @@ -7916,7 +8416,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  21131. lt_prog_compiler_pic='-KPIC'
  21132. lt_prog_compiler_static='-Bstatic'
  21133. case $cc_basename in
  21134. - f77* | f90* | f95*)
  21135. + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
  21136. lt_prog_compiler_wl='-Qoption ld ';;
  21137. *)
  21138. lt_prog_compiler_wl='-Wl,';;
  21139. @@ -7973,13 +8473,17 @@ case $host_os in
  21140. lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  21141. ;;
  21142. esac
  21143. -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
  21144. -$as_echo "$lt_prog_compiler_pic" >&6; }
  21145. -
  21146. -
  21147. -
  21148. -
  21149. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
  21150. +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  21151. +if ${lt_cv_prog_compiler_pic+:} false; then :
  21152. + $as_echo_n "(cached) " >&6
  21153. +else
  21154. + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
  21155. +fi
  21156. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
  21157. +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
  21158. +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
  21159. #
  21160. # Check to make sure the PIC flag actually works.
  21161. @@ -8040,6 +8544,11 @@ fi
  21162. +
  21163. +
  21164. +
  21165. +
  21166. +
  21167. #
  21168. # Check to make sure the static flag actually works.
  21169. #
  21170. @@ -8390,7 +8899,8 @@ _LT_EOF
  21171. allow_undefined_flag=unsupported
  21172. always_export_symbols=no
  21173. enable_shared_with_static_runtimes=yes
  21174. - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  21175. + 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'
  21176. + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
  21177. if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
  21178. archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
  21179. @@ -8489,12 +8999,12 @@ _LT_EOF
  21180. whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
  21181. hardcode_libdir_flag_spec=
  21182. hardcode_libdir_flag_spec_ld='-rpath $libdir'
  21183. - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
  21184. + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
  21185. if test "x$supports_anon_versioning" = xyes; then
  21186. archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
  21187. cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
  21188. echo "local: *; };" >> $output_objdir/$libname.ver~
  21189. - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  21190. + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
  21191. fi
  21192. ;;
  21193. esac
  21194. @@ -8508,8 +9018,8 @@ _LT_EOF
  21195. archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  21196. wlarc=
  21197. else
  21198. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  21199. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  21200. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  21201. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  21202. fi
  21203. ;;
  21204. @@ -8527,8 +9037,8 @@ _LT_EOF
  21205. _LT_EOF
  21206. elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  21207. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  21208. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  21209. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  21210. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  21211. else
  21212. ld_shlibs=no
  21213. fi
  21214. @@ -8574,8 +9084,8 @@ _LT_EOF
  21215. *)
  21216. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
  21217. - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  21218. - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  21219. + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  21220. + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
  21221. else
  21222. ld_shlibs=no
  21223. fi
  21224. @@ -8705,7 +9215,13 @@ _LT_EOF
  21225. allow_undefined_flag='-berok'
  21226. # Determine the default libpath from the value encoded in an
  21227. # empty executable.
  21228. - if test x$gcc_no_link = xyes; then
  21229. + if test "${lt_cv_aix_libpath+set}" = set; then
  21230. + aix_libpath=$lt_cv_aix_libpath
  21231. +else
  21232. + if ${lt_cv_aix_libpath_+:} false; then :
  21233. + $as_echo_n "(cached) " >&6
  21234. +else
  21235. + if test x$gcc_no_link = xyes; then
  21236. as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
  21237. fi
  21238. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  21239. @@ -8721,22 +9237,29 @@ main ()
  21240. _ACEOF
  21241. if ac_fn_c_try_link "$LINENO"; then :
  21242. -lt_aix_libpath_sed='
  21243. - /Import File Strings/,/^$/ {
  21244. - /^0/ {
  21245. - s/^0 *\(.*\)$/\1/
  21246. - p
  21247. - }
  21248. - }'
  21249. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21250. -# Check for a 64-bit object if we didn't find anything.
  21251. -if test -z "$aix_libpath"; then
  21252. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21253. -fi
  21254. + lt_aix_libpath_sed='
  21255. + /Import File Strings/,/^$/ {
  21256. + /^0/ {
  21257. + s/^0 *\([^ ]*\) *$/\1/
  21258. + p
  21259. + }
  21260. + }'
  21261. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21262. + # Check for a 64-bit object if we didn't find anything.
  21263. + if test -z "$lt_cv_aix_libpath_"; then
  21264. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21265. + fi
  21266. fi
  21267. rm -f core conftest.err conftest.$ac_objext \
  21268. conftest$ac_exeext conftest.$ac_ext
  21269. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21270. + if test -z "$lt_cv_aix_libpath_"; then
  21271. + lt_cv_aix_libpath_="/usr/lib:/lib"
  21272. + fi
  21273. +
  21274. +fi
  21275. +
  21276. + aix_libpath=$lt_cv_aix_libpath_
  21277. +fi
  21278. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  21279. 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"
  21280. @@ -8748,7 +9271,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21281. else
  21282. # Determine the default libpath from the value encoded in an
  21283. # empty executable.
  21284. - if test x$gcc_no_link = xyes; then
  21285. + if test "${lt_cv_aix_libpath+set}" = set; then
  21286. + aix_libpath=$lt_cv_aix_libpath
  21287. +else
  21288. + if ${lt_cv_aix_libpath_+:} false; then :
  21289. + $as_echo_n "(cached) " >&6
  21290. +else
  21291. + if test x$gcc_no_link = xyes; then
  21292. as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
  21293. fi
  21294. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  21295. @@ -8764,22 +9293,29 @@ main ()
  21296. _ACEOF
  21297. if ac_fn_c_try_link "$LINENO"; then :
  21298. -lt_aix_libpath_sed='
  21299. - /Import File Strings/,/^$/ {
  21300. - /^0/ {
  21301. - s/^0 *\(.*\)$/\1/
  21302. - p
  21303. - }
  21304. - }'
  21305. -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21306. -# Check for a 64-bit object if we didn't find anything.
  21307. -if test -z "$aix_libpath"; then
  21308. - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21309. -fi
  21310. + lt_aix_libpath_sed='
  21311. + /Import File Strings/,/^$/ {
  21312. + /^0/ {
  21313. + s/^0 *\([^ ]*\) *$/\1/
  21314. + p
  21315. + }
  21316. + }'
  21317. + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21318. + # Check for a 64-bit object if we didn't find anything.
  21319. + if test -z "$lt_cv_aix_libpath_"; then
  21320. + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  21321. + fi
  21322. fi
  21323. rm -f core conftest.err conftest.$ac_objext \
  21324. conftest$ac_exeext conftest.$ac_ext
  21325. -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21326. + if test -z "$lt_cv_aix_libpath_"; then
  21327. + lt_cv_aix_libpath_="/usr/lib:/lib"
  21328. + fi
  21329. +
  21330. +fi
  21331. +
  21332. + aix_libpath=$lt_cv_aix_libpath_
  21333. +fi
  21334. hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
  21335. # Warning - without using the other run time loading flags,
  21336. @@ -8824,20 +9360,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21337. # Microsoft Visual C++.
  21338. # hardcode_libdir_flag_spec is actually meaningless, as there is
  21339. # no search path for DLLs.
  21340. - hardcode_libdir_flag_spec=' '
  21341. - allow_undefined_flag=unsupported
  21342. - # Tell ltmain to make .lib files, not .a files.
  21343. - libext=lib
  21344. - # Tell ltmain to make .dll files, not .so files.
  21345. - shrext_cmds=".dll"
  21346. - # FIXME: Setting linknames here is a bad hack.
  21347. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  21348. - # The linker will automatically build a .lib file if we build a DLL.
  21349. - old_archive_from_new_cmds='true'
  21350. - # FIXME: Should let the user specify the lib program.
  21351. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  21352. - fix_srcfile_path='`cygpath -w "$srcfile"`'
  21353. - enable_shared_with_static_runtimes=yes
  21354. + case $cc_basename in
  21355. + cl*)
  21356. + # Native MSVC
  21357. + hardcode_libdir_flag_spec=' '
  21358. + allow_undefined_flag=unsupported
  21359. + always_export_symbols=yes
  21360. + file_list_spec='@'
  21361. + # Tell ltmain to make .lib files, not .a files.
  21362. + libext=lib
  21363. + # Tell ltmain to make .dll files, not .so files.
  21364. + shrext_cmds=".dll"
  21365. + # FIXME: Setting linknames here is a bad hack.
  21366. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
  21367. + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
  21368. + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
  21369. + else
  21370. + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
  21371. + fi~
  21372. + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
  21373. + linknames='
  21374. + # The linker will not automatically build a static lib if we build a DLL.
  21375. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
  21376. + enable_shared_with_static_runtimes=yes
  21377. + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
  21378. + # Don't use ranlib
  21379. + old_postinstall_cmds='chmod 644 $oldlib'
  21380. + postlink_cmds='lt_outputfile="@OUTPUT@"~
  21381. + lt_tool_outputfile="@TOOL_OUTPUT@"~
  21382. + case $lt_outputfile in
  21383. + *.exe|*.EXE) ;;
  21384. + *)
  21385. + lt_outputfile="$lt_outputfile.exe"
  21386. + lt_tool_outputfile="$lt_tool_outputfile.exe"
  21387. + ;;
  21388. + esac~
  21389. + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
  21390. + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
  21391. + $RM "$lt_outputfile.manifest";
  21392. + fi'
  21393. + ;;
  21394. + *)
  21395. + # Assume MSVC wrapper
  21396. + hardcode_libdir_flag_spec=' '
  21397. + allow_undefined_flag=unsupported
  21398. + # Tell ltmain to make .lib files, not .a files.
  21399. + libext=lib
  21400. + # Tell ltmain to make .dll files, not .so files.
  21401. + shrext_cmds=".dll"
  21402. + # FIXME: Setting linknames here is a bad hack.
  21403. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
  21404. + # The linker will automatically build a .lib file if we build a DLL.
  21405. + old_archive_from_new_cmds='true'
  21406. + # FIXME: Should let the user specify the lib program.
  21407. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
  21408. + enable_shared_with_static_runtimes=yes
  21409. + ;;
  21410. + esac
  21411. ;;
  21412. darwin* | rhapsody*)
  21413. @@ -8898,7 +9477,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21414. # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
  21415. freebsd* | dragonfly*)
  21416. - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
  21417. + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
  21418. hardcode_libdir_flag_spec='-R$libdir'
  21419. hardcode_direct=yes
  21420. hardcode_shlibpath_var=no
  21421. @@ -8906,7 +9485,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21422. hpux9*)
  21423. if test "$GCC" = yes; then
  21424. - 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'
  21425. + 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'
  21426. else
  21427. 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'
  21428. fi
  21429. @@ -8922,7 +9501,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21430. hpux10*)
  21431. if test "$GCC" = yes && test "$with_gnu_ld" = no; then
  21432. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  21433. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  21434. else
  21435. archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
  21436. fi
  21437. @@ -8946,10 +9525,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  21438. archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  21439. ;;
  21440. ia64*)
  21441. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  21442. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  21443. ;;
  21444. *)
  21445. - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  21446. + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
  21447. ;;
  21448. esac
  21449. else
  21450. @@ -9028,26 +9607,39 @@ fi
  21451. irix5* | irix6* | nonstopux*)
  21452. if test "$GCC" = yes; then
  21453. - 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'
  21454. + 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'
  21455. # Try to use the -exported_symbol ld option, if it does not
  21456. # work, assume that -exports_file does not work either and
  21457. # implicitly export all symbols.
  21458. - save_LDFLAGS="$LDFLAGS"
  21459. - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  21460. - if test x$gcc_no_link = xyes; then
  21461. + # This should be the same for all languages, so no per-tag cache variable.
  21462. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
  21463. +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
  21464. +if ${lt_cv_irix_exported_symbol+:} false; then :
  21465. + $as_echo_n "(cached) " >&6
  21466. +else
  21467. + save_LDFLAGS="$LDFLAGS"
  21468. + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
  21469. + if test x$gcc_no_link = xyes; then
  21470. as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
  21471. fi
  21472. cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  21473. /* end confdefs.h. */
  21474. -int foo(void) {}
  21475. +int foo (void) { return 0; }
  21476. _ACEOF
  21477. if ac_fn_c_try_link "$LINENO"; then :
  21478. - 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'
  21479. -
  21480. + lt_cv_irix_exported_symbol=yes
  21481. +else
  21482. + lt_cv_irix_exported_symbol=no
  21483. fi
  21484. rm -f core conftest.err conftest.$ac_objext \
  21485. conftest$ac_exeext conftest.$ac_ext
  21486. - LDFLAGS="$save_LDFLAGS"
  21487. + LDFLAGS="$save_LDFLAGS"
  21488. +fi
  21489. +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
  21490. +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
  21491. + if test "$lt_cv_irix_exported_symbol" = yes; then
  21492. + 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'
  21493. + fi
  21494. else
  21495. 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'
  21496. 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'
  21497. @@ -9132,7 +9724,7 @@ rm -f core conftest.err conftest.$ac_objext \
  21498. osf4* | osf5*) # as osf3* with the addition of -msym flag
  21499. if test "$GCC" = yes; then
  21500. allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
  21501. - 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'
  21502. + 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'
  21503. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
  21504. else
  21505. allow_undefined_flag=' -expect_unresolved \*'
  21506. @@ -9151,9 +9743,9 @@ rm -f core conftest.err conftest.$ac_objext \
  21507. no_undefined_flag=' -z defs'
  21508. if test "$GCC" = yes; then
  21509. wlarc='${wl}'
  21510. - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  21511. + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
  21512. archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
  21513. - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
  21514. + $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'
  21515. else
  21516. case `$CC -V 2>&1` in
  21517. *"Compilers 5.0"*)
  21518. @@ -9729,8 +10321,9 @@ cygwin* | mingw* | pw32* | cegcc*)
  21519. need_version=no
  21520. need_lib_prefix=no
  21521. - case $GCC,$host_os in
  21522. - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
  21523. + case $GCC,$cc_basename in
  21524. + yes,*)
  21525. + # gcc
  21526. library_names_spec='$libname.dll.a'
  21527. # DLL is installed to $(libdir)/../bin by postinstall_cmds
  21528. postinstall_cmds='base_file=`basename \${file}`~
  21529. @@ -9763,13 +10356,71 @@ cygwin* | mingw* | pw32* | cegcc*)
  21530. library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  21531. ;;
  21532. esac
  21533. + dynamic_linker='Win32 ld.exe'
  21534. + ;;
  21535. +
  21536. + *,cl*)
  21537. + # Native MSVC
  21538. + libname_spec='$name'
  21539. + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
  21540. + library_names_spec='${libname}.dll.lib'
  21541. +
  21542. + case $build_os in
  21543. + mingw*)
  21544. + sys_lib_search_path_spec=
  21545. + lt_save_ifs=$IFS
  21546. + IFS=';'
  21547. + for lt_path in $LIB
  21548. + do
  21549. + IFS=$lt_save_ifs
  21550. + # Let DOS variable expansion print the short 8.3 style file name.
  21551. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
  21552. + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
  21553. + done
  21554. + IFS=$lt_save_ifs
  21555. + # Convert to MSYS style.
  21556. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
  21557. + ;;
  21558. + cygwin*)
  21559. + # Convert to unix form, then to dos form, then back to unix form
  21560. + # but this time dos style (no spaces!) so that the unix form looks
  21561. + # like /cygdrive/c/PROGRA~1:/cygdr...
  21562. + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
  21563. + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
  21564. + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  21565. + ;;
  21566. + *)
  21567. + sys_lib_search_path_spec="$LIB"
  21568. + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
  21569. + # It is most probably a Windows format PATH.
  21570. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
  21571. + else
  21572. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
  21573. + fi
  21574. + # FIXME: find the short name or the path components, as spaces are
  21575. + # common. (e.g. "Program Files" -> "PROGRA~1")
  21576. + ;;
  21577. + esac
  21578. +
  21579. + # DLL is installed to $(libdir)/../bin by postinstall_cmds
  21580. + postinstall_cmds='base_file=`basename \${file}`~
  21581. + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
  21582. + dldir=$destdir/`dirname \$dlpath`~
  21583. + test -d \$dldir || mkdir -p \$dldir~
  21584. + $install_prog $dir/$dlname \$dldir/$dlname'
  21585. + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
  21586. + dlpath=$dir/\$dldll~
  21587. + $RM \$dlpath'
  21588. + shlibpath_overrides_runpath=yes
  21589. + dynamic_linker='Win32 link.exe'
  21590. ;;
  21591. *)
  21592. + # Assume MSVC wrapper
  21593. library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
  21594. + dynamic_linker='Win32 ld.exe'
  21595. ;;
  21596. esac
  21597. - dynamic_linker='Win32 ld.exe'
  21598. # FIXME: first we should search . and the directory the executable is in
  21599. shlibpath_var=PATH
  21600. ;;
  21601. @@ -9851,7 +10502,7 @@ haiku*)
  21602. soname_spec='${libname}${release}${shared_ext}$major'
  21603. shlibpath_var=LIBRARY_PATH
  21604. shlibpath_overrides_runpath=yes
  21605. - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
  21606. + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
  21607. hardcode_into_libs=yes
  21608. ;;
  21609. @@ -10665,7 +11316,7 @@ else
  21610. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  21611. lt_status=$lt_dlunknown
  21612. cat > conftest.$ac_ext <<_LT_EOF
  21613. -#line 10668 "configure"
  21614. +#line $LINENO "configure"
  21615. #include "confdefs.h"
  21616. #if HAVE_DLFCN_H
  21617. @@ -10709,10 +11360,10 @@ else
  21618. /* When -fvisbility=hidden is used, assume the code has been annotated
  21619. correspondingly for the symbols needed. */
  21620. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  21621. -void fnord () __attribute__((visibility("default")));
  21622. +int fnord () __attribute__((visibility("default")));
  21623. #endif
  21624. -void fnord () { int i=42; }
  21625. +int fnord () { return 42; }
  21626. int main ()
  21627. {
  21628. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  21629. @@ -10771,7 +11422,7 @@ else
  21630. lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  21631. lt_status=$lt_dlunknown
  21632. cat > conftest.$ac_ext <<_LT_EOF
  21633. -#line 10774 "configure"
  21634. +#line $LINENO "configure"
  21635. #include "confdefs.h"
  21636. #if HAVE_DLFCN_H
  21637. @@ -10815,10 +11466,10 @@ else
  21638. /* When -fvisbility=hidden is used, assume the code has been annotated
  21639. correspondingly for the symbols needed. */
  21640. #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
  21641. -void fnord () __attribute__((visibility("default")));
  21642. +int fnord () __attribute__((visibility("default")));
  21643. #endif
  21644. -void fnord () { int i=42; }
  21645. +int fnord () { return 42; }
  21646. int main ()
  21647. {
  21648. void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
  21649. @@ -12288,13 +12939,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
  21650. lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
  21651. lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
  21652. lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
  21653. +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
  21654. +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
  21655. reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
  21656. reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
  21657. OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
  21658. deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
  21659. file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
  21660. +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
  21661. +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
  21662. +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
  21663. +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
  21664. AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
  21665. AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
  21666. +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
  21667. STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
  21668. RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
  21669. old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
  21670. @@ -12309,14 +12967,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
  21671. lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
  21672. lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
  21673. 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"`'
  21674. +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
  21675. +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
  21676. objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
  21677. MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
  21678. lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
  21679. -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  21680. lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
  21681. +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
  21682. lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
  21683. lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
  21684. need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
  21685. +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
  21686. DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
  21687. NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
  21688. LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
  21689. @@ -12349,12 +13010,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
  21690. hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
  21691. inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
  21692. link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
  21693. -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
  21694. always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
  21695. export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
  21696. exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
  21697. include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
  21698. prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
  21699. +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
  21700. file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
  21701. variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
  21702. need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
  21703. @@ -12409,8 +13070,13 @@ reload_flag \
  21704. OBJDUMP \
  21705. deplibs_check_method \
  21706. file_magic_cmd \
  21707. +file_magic_glob \
  21708. +want_nocaseglob \
  21709. +DLLTOOL \
  21710. +sharedlib_from_linklib_cmd \
  21711. AR \
  21712. AR_FLAGS \
  21713. +archiver_list_spec \
  21714. STRIP \
  21715. RANLIB \
  21716. CC \
  21717. @@ -12420,12 +13086,14 @@ lt_cv_sys_global_symbol_pipe \
  21718. lt_cv_sys_global_symbol_to_cdecl \
  21719. lt_cv_sys_global_symbol_to_c_name_address \
  21720. lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
  21721. +nm_file_list_spec \
  21722. lt_prog_compiler_no_builtin_flag \
  21723. -lt_prog_compiler_wl \
  21724. lt_prog_compiler_pic \
  21725. +lt_prog_compiler_wl \
  21726. lt_prog_compiler_static \
  21727. lt_cv_prog_compiler_c_o \
  21728. need_locks \
  21729. +MANIFEST_TOOL \
  21730. DSYMUTIL \
  21731. NMEDIT \
  21732. LIPO \
  21733. @@ -12441,7 +13109,6 @@ no_undefined_flag \
  21734. hardcode_libdir_flag_spec \
  21735. hardcode_libdir_flag_spec_ld \
  21736. hardcode_libdir_separator \
  21737. -fix_srcfile_path \
  21738. exclude_expsyms \
  21739. include_expsyms \
  21740. file_list_spec \
  21741. @@ -12477,6 +13144,7 @@ module_cmds \
  21742. module_expsym_cmds \
  21743. export_symbols_cmds \
  21744. prelink_cmds \
  21745. +postlink_cmds \
  21746. postinstall_cmds \
  21747. postuninstall_cmds \
  21748. finish_cmds \
  21749. @@ -13075,7 +13743,8 @@ $as_echo X"$file" |
  21750. # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  21751. #
  21752. # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
  21753. -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  21754. +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
  21755. +# Inc.
  21756. # Written by Gordon Matzigkeit, 1996
  21757. #
  21758. # This file is part of GNU Libtool.
  21759. @@ -13178,19 +13847,42 @@ SP2NL=$lt_lt_SP2NL
  21760. # turn newlines into spaces.
  21761. NL2SP=$lt_lt_NL2SP
  21762. +# convert \$build file names to \$host format.
  21763. +to_host_file_cmd=$lt_cv_to_host_file_cmd
  21764. +
  21765. +# convert \$build files to toolchain format.
  21766. +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
  21767. +
  21768. # An object symbol dumper.
  21769. OBJDUMP=$lt_OBJDUMP
  21770. # Method to check whether dependent libraries are shared objects.
  21771. deplibs_check_method=$lt_deplibs_check_method
  21772. -# Command to use when deplibs_check_method == "file_magic".
  21773. +# Command to use when deplibs_check_method = "file_magic".
  21774. file_magic_cmd=$lt_file_magic_cmd
  21775. +# How to find potential files when deplibs_check_method = "file_magic".
  21776. +file_magic_glob=$lt_file_magic_glob
  21777. +
  21778. +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
  21779. +want_nocaseglob=$lt_want_nocaseglob
  21780. +
  21781. +# DLL creation program.
  21782. +DLLTOOL=$lt_DLLTOOL
  21783. +
  21784. +# Command to associate shared and link libraries.
  21785. +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
  21786. +
  21787. # The archiver.
  21788. AR=$lt_AR
  21789. +
  21790. +# Flags to create an archive.
  21791. AR_FLAGS=$lt_AR_FLAGS
  21792. +# How to feed a file listing to the archiver.
  21793. +archiver_list_spec=$lt_archiver_list_spec
  21794. +
  21795. # A symbol stripping program.
  21796. STRIP=$lt_STRIP
  21797. @@ -13220,6 +13912,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  21798. # Transform the output of nm in a C name address pair when lib prefix is needed.
  21799. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
  21800. +# Specify filename containing input files for \$NM.
  21801. +nm_file_list_spec=$lt_nm_file_list_spec
  21802. +
  21803. +# The root where to search for dependent libraries,and in which our libraries should be installed.
  21804. +lt_sysroot=$lt_sysroot
  21805. +
  21806. # The name of the directory that contains temporary libtool files.
  21807. objdir=$objdir
  21808. @@ -13229,6 +13927,9 @@ MAGIC_CMD=$MAGIC_CMD
  21809. # Must we lock files when doing compilation?
  21810. need_locks=$lt_need_locks
  21811. +# Manifest tool.
  21812. +MANIFEST_TOOL=$lt_MANIFEST_TOOL
  21813. +
  21814. # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
  21815. DSYMUTIL=$lt_DSYMUTIL
  21816. @@ -13343,12 +14044,12 @@ with_gcc=$GCC
  21817. # Compiler flag to turn off builtin functions.
  21818. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  21819. -# How to pass a linker flag through the compiler.
  21820. -wl=$lt_lt_prog_compiler_wl
  21821. -
  21822. # Additional compiler flags for building library objects.
  21823. pic_flag=$lt_lt_prog_compiler_pic
  21824. +# How to pass a linker flag through the compiler.
  21825. +wl=$lt_lt_prog_compiler_wl
  21826. +
  21827. # Compiler flag to prevent dynamic linking.
  21828. link_static_flag=$lt_lt_prog_compiler_static
  21829. @@ -13435,9 +14136,6 @@ inherit_rpath=$inherit_rpath
  21830. # Whether libtool must link a program against all its dependency libraries.
  21831. link_all_deplibs=$link_all_deplibs
  21832. -# Fix the shell variable \$srcfile for the compiler.
  21833. -fix_srcfile_path=$lt_fix_srcfile_path
  21834. -
  21835. # Set to "yes" if exported symbols are required.
  21836. always_export_symbols=$always_export_symbols
  21837. @@ -13453,6 +14151,9 @@ include_expsyms=$lt_include_expsyms
  21838. # Commands necessary for linking programs (against libraries) with templates.
  21839. prelink_cmds=$lt_prelink_cmds
  21840. +# Commands necessary for finishing linking programs.
  21841. +postlink_cmds=$lt_postlink_cmds
  21842. +
  21843. # Specify filename containing input files.
  21844. file_list_spec=$lt_file_list_spec
  21845. @@ -13485,210 +14186,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
  21846. # if finds mixed CR/LF and LF-only lines. Since sed operates in
  21847. # text mode, it properly converts lines to CR/LF. This bash problem
  21848. # is reportedly fixed, but why not run on old versions too?
  21849. - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  21850. - || (rm -f "$cfgfile"; exit 1)
  21851. -
  21852. - case $xsi_shell in
  21853. - yes)
  21854. - cat << \_LT_EOF >> "$cfgfile"
  21855. -
  21856. -# func_dirname file append nondir_replacement
  21857. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  21858. -# otherwise set result to NONDIR_REPLACEMENT.
  21859. -func_dirname ()
  21860. -{
  21861. - case ${1} in
  21862. - */*) func_dirname_result="${1%/*}${2}" ;;
  21863. - * ) func_dirname_result="${3}" ;;
  21864. - esac
  21865. -}
  21866. -
  21867. -# func_basename file
  21868. -func_basename ()
  21869. -{
  21870. - func_basename_result="${1##*/}"
  21871. -}
  21872. -
  21873. -# func_dirname_and_basename file append nondir_replacement
  21874. -# perform func_basename and func_dirname in a single function
  21875. -# call:
  21876. -# dirname: Compute the dirname of FILE. If nonempty,
  21877. -# add APPEND to the result, otherwise set result
  21878. -# to NONDIR_REPLACEMENT.
  21879. -# value returned in "$func_dirname_result"
  21880. -# basename: Compute filename of FILE.
  21881. -# value retuned in "$func_basename_result"
  21882. -# Implementation must be kept synchronized with func_dirname
  21883. -# and func_basename. For efficiency, we do not delegate to
  21884. -# those functions but instead duplicate the functionality here.
  21885. -func_dirname_and_basename ()
  21886. -{
  21887. - case ${1} in
  21888. - */*) func_dirname_result="${1%/*}${2}" ;;
  21889. - * ) func_dirname_result="${3}" ;;
  21890. - esac
  21891. - func_basename_result="${1##*/}"
  21892. -}
  21893. -
  21894. -# func_stripname prefix suffix name
  21895. -# strip PREFIX and SUFFIX off of NAME.
  21896. -# PREFIX and SUFFIX must not contain globbing or regex special
  21897. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  21898. -# dot (in which case that matches only a dot).
  21899. -func_stripname ()
  21900. -{
  21901. - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
  21902. - # positional parameters, so assign one to ordinary parameter first.
  21903. - func_stripname_result=${3}
  21904. - func_stripname_result=${func_stripname_result#"${1}"}
  21905. - func_stripname_result=${func_stripname_result%"${2}"}
  21906. -}
  21907. -
  21908. -# func_opt_split
  21909. -func_opt_split ()
  21910. -{
  21911. - func_opt_split_opt=${1%%=*}
  21912. - func_opt_split_arg=${1#*=}
  21913. -}
  21914. -
  21915. -# func_lo2o object
  21916. -func_lo2o ()
  21917. -{
  21918. - case ${1} in
  21919. - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
  21920. - *) func_lo2o_result=${1} ;;
  21921. - esac
  21922. -}
  21923. -
  21924. -# func_xform libobj-or-source
  21925. -func_xform ()
  21926. -{
  21927. - func_xform_result=${1%.*}.lo
  21928. -}
  21929. -
  21930. -# func_arith arithmetic-term...
  21931. -func_arith ()
  21932. -{
  21933. - func_arith_result=$(( $* ))
  21934. -}
  21935. -
  21936. -# func_len string
  21937. -# STRING may not start with a hyphen.
  21938. -func_len ()
  21939. -{
  21940. - func_len_result=${#1}
  21941. -}
  21942. -
  21943. -_LT_EOF
  21944. - ;;
  21945. - *) # Bourne compatible functions.
  21946. - cat << \_LT_EOF >> "$cfgfile"
  21947. -
  21948. -# func_dirname file append nondir_replacement
  21949. -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
  21950. -# otherwise set result to NONDIR_REPLACEMENT.
  21951. -func_dirname ()
  21952. -{
  21953. - # Extract subdirectory from the argument.
  21954. - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
  21955. - if test "X$func_dirname_result" = "X${1}"; then
  21956. - func_dirname_result="${3}"
  21957. - else
  21958. - func_dirname_result="$func_dirname_result${2}"
  21959. - fi
  21960. -}
  21961. -
  21962. -# func_basename file
  21963. -func_basename ()
  21964. -{
  21965. - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
  21966. -}
  21967. -
  21968. -
  21969. -# func_stripname prefix suffix name
  21970. -# strip PREFIX and SUFFIX off of NAME.
  21971. -# PREFIX and SUFFIX must not contain globbing or regex special
  21972. -# characters, hashes, percent signs, but SUFFIX may contain a leading
  21973. -# dot (in which case that matches only a dot).
  21974. -# func_strip_suffix prefix name
  21975. -func_stripname ()
  21976. -{
  21977. - case ${2} in
  21978. - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
  21979. - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
  21980. - esac
  21981. -}
  21982. -
  21983. -# sed scripts:
  21984. -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
  21985. -my_sed_long_arg='1s/^-[^=]*=//'
  21986. -
  21987. -# func_opt_split
  21988. -func_opt_split ()
  21989. -{
  21990. - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
  21991. - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
  21992. -}
  21993. -
  21994. -# func_lo2o object
  21995. -func_lo2o ()
  21996. -{
  21997. - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
  21998. -}
  21999. -
  22000. -# func_xform libobj-or-source
  22001. -func_xform ()
  22002. -{
  22003. - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
  22004. -}
  22005. -
  22006. -# func_arith arithmetic-term...
  22007. -func_arith ()
  22008. -{
  22009. - func_arith_result=`expr "$@"`
  22010. -}
  22011. -
  22012. -# func_len string
  22013. -# STRING may not start with a hyphen.
  22014. -func_len ()
  22015. -{
  22016. - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
  22017. -}
  22018. -
  22019. -_LT_EOF
  22020. -esac
  22021. -
  22022. -case $lt_shell_append in
  22023. - yes)
  22024. - cat << \_LT_EOF >> "$cfgfile"
  22025. -
  22026. -# func_append var value
  22027. -# Append VALUE to the end of shell variable VAR.
  22028. -func_append ()
  22029. -{
  22030. - eval "$1+=\$2"
  22031. -}
  22032. -_LT_EOF
  22033. - ;;
  22034. - *)
  22035. - cat << \_LT_EOF >> "$cfgfile"
  22036. -
  22037. -# func_append var value
  22038. -# Append VALUE to the end of shell variable VAR.
  22039. -func_append ()
  22040. -{
  22041. - eval "$1=\$$1\$2"
  22042. -}
  22043. -
  22044. -_LT_EOF
  22045. - ;;
  22046. - esac
  22047. -
  22048. -
  22049. - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  22050. - || (rm -f "$cfgfile"; exit 1)
  22051. -
  22052. - mv -f "$cfgfile" "$ofile" ||
  22053. + sed '$q' "$ltmain" >> "$cfgfile" \
  22054. + || (rm -f "$cfgfile"; exit 1)
  22055. +
  22056. + if test x"$xsi_shell" = xyes; then
  22057. + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
  22058. +func_dirname ()\
  22059. +{\
  22060. +\ case ${1} in\
  22061. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  22062. +\ * ) func_dirname_result="${3}" ;;\
  22063. +\ esac\
  22064. +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
  22065. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22066. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22067. +test 0 -eq $? || _lt_function_replace_fail=:
  22068. +
  22069. +
  22070. + sed -e '/^func_basename ()$/,/^} # func_basename /c\
  22071. +func_basename ()\
  22072. +{\
  22073. +\ func_basename_result="${1##*/}"\
  22074. +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
  22075. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22076. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22077. +test 0 -eq $? || _lt_function_replace_fail=:
  22078. +
  22079. +
  22080. + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
  22081. +func_dirname_and_basename ()\
  22082. +{\
  22083. +\ case ${1} in\
  22084. +\ */*) func_dirname_result="${1%/*}${2}" ;;\
  22085. +\ * ) func_dirname_result="${3}" ;;\
  22086. +\ esac\
  22087. +\ func_basename_result="${1##*/}"\
  22088. +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
  22089. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22090. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22091. +test 0 -eq $? || _lt_function_replace_fail=:
  22092. +
  22093. +
  22094. + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
  22095. +func_stripname ()\
  22096. +{\
  22097. +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
  22098. +\ # positional parameters, so assign one to ordinary parameter first.\
  22099. +\ func_stripname_result=${3}\
  22100. +\ func_stripname_result=${func_stripname_result#"${1}"}\
  22101. +\ func_stripname_result=${func_stripname_result%"${2}"}\
  22102. +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
  22103. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22104. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22105. +test 0 -eq $? || _lt_function_replace_fail=:
  22106. +
  22107. +
  22108. + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
  22109. +func_split_long_opt ()\
  22110. +{\
  22111. +\ func_split_long_opt_name=${1%%=*}\
  22112. +\ func_split_long_opt_arg=${1#*=}\
  22113. +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
  22114. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22115. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22116. +test 0 -eq $? || _lt_function_replace_fail=:
  22117. +
  22118. +
  22119. + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
  22120. +func_split_short_opt ()\
  22121. +{\
  22122. +\ func_split_short_opt_arg=${1#??}\
  22123. +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
  22124. +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
  22125. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22126. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22127. +test 0 -eq $? || _lt_function_replace_fail=:
  22128. +
  22129. +
  22130. + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
  22131. +func_lo2o ()\
  22132. +{\
  22133. +\ case ${1} in\
  22134. +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
  22135. +\ *) func_lo2o_result=${1} ;;\
  22136. +\ esac\
  22137. +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
  22138. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22139. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22140. +test 0 -eq $? || _lt_function_replace_fail=:
  22141. +
  22142. +
  22143. + sed -e '/^func_xform ()$/,/^} # func_xform /c\
  22144. +func_xform ()\
  22145. +{\
  22146. + func_xform_result=${1%.*}.lo\
  22147. +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
  22148. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22149. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22150. +test 0 -eq $? || _lt_function_replace_fail=:
  22151. +
  22152. +
  22153. + sed -e '/^func_arith ()$/,/^} # func_arith /c\
  22154. +func_arith ()\
  22155. +{\
  22156. + func_arith_result=$(( $* ))\
  22157. +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
  22158. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22159. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22160. +test 0 -eq $? || _lt_function_replace_fail=:
  22161. +
  22162. +
  22163. + sed -e '/^func_len ()$/,/^} # func_len /c\
  22164. +func_len ()\
  22165. +{\
  22166. + func_len_result=${#1}\
  22167. +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
  22168. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22169. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22170. +test 0 -eq $? || _lt_function_replace_fail=:
  22171. +
  22172. +fi
  22173. +
  22174. +if test x"$lt_shell_append" = xyes; then
  22175. + sed -e '/^func_append ()$/,/^} # func_append /c\
  22176. +func_append ()\
  22177. +{\
  22178. + eval "${1}+=\\${2}"\
  22179. +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
  22180. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22181. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22182. +test 0 -eq $? || _lt_function_replace_fail=:
  22183. +
  22184. +
  22185. + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
  22186. +func_append_quoted ()\
  22187. +{\
  22188. +\ func_quote_for_eval "${2}"\
  22189. +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
  22190. +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
  22191. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22192. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22193. +test 0 -eq $? || _lt_function_replace_fail=:
  22194. +
  22195. +
  22196. + # Save a `func_append' function call where possible by direct use of '+='
  22197. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
  22198. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22199. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22200. + test 0 -eq $? || _lt_function_replace_fail=:
  22201. +else
  22202. + # Save a `func_append' function call even when '+=' is not available
  22203. + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
  22204. + && mv -f "$cfgfile.tmp" "$cfgfile" \
  22205. + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
  22206. + test 0 -eq $? || _lt_function_replace_fail=:
  22207. +fi
  22208. +
  22209. +if test x"$_lt_function_replace_fail" = x":"; then
  22210. + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
  22211. +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
  22212. +fi
  22213. +
  22214. +
  22215. + mv -f "$cfgfile" "$ofile" ||
  22216. (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  22217. chmod +x "$ofile"