12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025102610271028102910301031103210331034103510361037103810391040104110421043104410451046104710481049105010511052105310541055105610571058105910601061106210631064106510661067106810691070107110721073107410751076107710781079108010811082108310841085108610871088108910901091109210931094109510961097109810991100110111021103110411051106110711081109111011111112111311141115111611171118111911201121112211231124112511261127112811291130113111321133113411351136113711381139114011411142114311441145114611471148114911501151115211531154115511561157115811591160116111621163116411651166116711681169117011711172117311741175117611771178117911801181118211831184118511861187118811891190119111921193119411951196119711981199120012011202120312041205120612071208120912101211121212131214121512161217121812191220122112221223122412251226122712281229123012311232123312341235123612371238123912401241124212431244124512461247124812491250125112521253125412551256125712581259126012611262126312641265126612671268126912701271127212731274127512761277127812791280128112821283128412851286128712881289129012911292129312941295129612971298129913001301130213031304130513061307130813091310131113121313131413151316131713181319132013211322132313241325132613271328132913301331133213331334133513361337133813391340134113421343134413451346134713481349135013511352135313541355135613571358135913601361136213631364136513661367136813691370137113721373137413751376137713781379138013811382138313841385138613871388138913901391139213931394139513961397139813991400140114021403140414051406140714081409141014111412141314141415141614171418141914201421142214231424142514261427142814291430143114321433143414351436143714381439144014411442144314441445144614471448144914501451145214531454145514561457145814591460146114621463146414651466146714681469147014711472147314741475147614771478147914801481148214831484148514861487148814891490149114921493149414951496149714981499150015011502150315041505150615071508150915101511151215131514151515161517151815191520152115221523152415251526152715281529153015311532153315341535153615371538153915401541154215431544154515461547154815491550155115521553155415551556155715581559156015611562156315641565156615671568156915701571157215731574157515761577157815791580158115821583158415851586158715881589159015911592159315941595159615971598159916001601160216031604160516061607160816091610161116121613161416151616161716181619162016211622162316241625162616271628162916301631163216331634163516361637163816391640164116421643164416451646164716481649165016511652165316541655165616571658165916601661166216631664166516661667166816691670167116721673167416751676167716781679168016811682168316841685168616871688168916901691169216931694169516961697169816991700170117021703170417051706170717081709171017111712171317141715171617171718171917201721172217231724172517261727172817291730173117321733173417351736173717381739174017411742174317441745174617471748174917501751175217531754175517561757175817591760176117621763176417651766176717681769177017711772177317741775177617771778177917801781178217831784178517861787178817891790179117921793179417951796179717981799180018011802180318041805180618071808180918101811181218131814181518161817181818191820182118221823182418251826182718281829183018311832183318341835183618371838183918401841184218431844184518461847184818491850185118521853185418551856185718581859186018611862186318641865186618671868186918701871187218731874187518761877187818791880188118821883188418851886188718881889189018911892189318941895189618971898189919001901190219031904190519061907190819091910191119121913191419151916191719181919192019211922192319241925192619271928192919301931193219331934193519361937193819391940194119421943194419451946194719481949195019511952195319541955195619571958195919601961196219631964196519661967196819691970197119721973197419751976197719781979198019811982198319841985198619871988198919901991199219931994199519961997199819992000200120022003200420052006200720082009201020112012201320142015201620172018201920202021202220232024202520262027202820292030203120322033203420352036203720382039204020412042204320442045204620472048204920502051205220532054205520562057205820592060206120622063206420652066206720682069207020712072207320742075207620772078207920802081208220832084208520862087208820892090209120922093209420952096209720982099210021012102210321042105210621072108210921102111211221132114211521162117211821192120212121222123212421252126212721282129213021312132213321342135213621372138213921402141214221432144214521462147214821492150215121522153215421552156215721582159216021612162216321642165216621672168216921702171217221732174217521762177217821792180218121822183218421852186218721882189219021912192219321942195219621972198219922002201220222032204220522062207220822092210221122122213221422152216221722182219222022212222222322242225222622272228222922302231223222332234223522362237223822392240224122422243224422452246224722482249225022512252225322542255225622572258225922602261226222632264226522662267226822692270227122722273227422752276227722782279228022812282228322842285228622872288228922902291229222932294229522962297229822992300230123022303230423052306230723082309231023112312231323142315231623172318231923202321232223232324232523262327232823292330233123322333233423352336233723382339234023412342234323442345234623472348234923502351235223532354235523562357235823592360236123622363236423652366236723682369237023712372237323742375237623772378237923802381238223832384238523862387238823892390239123922393239423952396239723982399240024012402240324042405240624072408240924102411241224132414241524162417241824192420242124222423242424252426242724282429243024312432243324342435243624372438243924402441244224432444244524462447244824492450245124522453245424552456245724582459246024612462246324642465246624672468246924702471247224732474247524762477247824792480248124822483248424852486248724882489249024912492249324942495249624972498249925002501250225032504250525062507250825092510251125122513251425152516251725182519252025212522252325242525252625272528252925302531253225332534253525362537253825392540254125422543254425452546254725482549255025512552255325542555255625572558255925602561256225632564256525662567256825692570257125722573257425752576257725782579258025812582258325842585258625872588258925902591259225932594259525962597259825992600260126022603260426052606260726082609261026112612261326142615261626172618261926202621262226232624262526262627262826292630263126322633263426352636263726382639264026412642264326442645264626472648264926502651265226532654265526562657265826592660266126622663266426652666266726682669267026712672267326742675267626772678267926802681268226832684268526862687268826892690269126922693269426952696269726982699270027012702270327042705270627072708270927102711271227132714271527162717271827192720272127222723272427252726272727282729273027312732273327342735273627372738273927402741274227432744274527462747274827492750275127522753275427552756275727582759276027612762276327642765276627672768276927702771277227732774277527762777277827792780278127822783278427852786278727882789279027912792279327942795279627972798279928002801280228032804280528062807280828092810281128122813281428152816281728182819282028212822282328242825282628272828282928302831283228332834283528362837283828392840284128422843284428452846284728482849285028512852285328542855285628572858285928602861286228632864286528662867286828692870287128722873287428752876287728782879288028812882288328842885288628872888288928902891289228932894289528962897289828992900290129022903290429052906290729082909291029112912291329142915291629172918291929202921292229232924292529262927292829292930293129322933293429352936293729382939294029412942294329442945294629472948294929502951295229532954295529562957295829592960296129622963296429652966296729682969297029712972297329742975297629772978297929802981298229832984298529862987298829892990299129922993299429952996299729982999300030013002300330043005300630073008300930103011301230133014301530163017301830193020302130223023302430253026302730283029303030313032303330343035303630373038303930403041304230433044304530463047304830493050305130523053305430553056305730583059306030613062306330643065306630673068306930703071307230733074307530763077307830793080308130823083308430853086308730883089309030913092309330943095309630973098309931003101310231033104310531063107310831093110311131123113311431153116311731183119312031213122312331243125312631273128312931303131313231333134313531363137313831393140314131423143314431453146314731483149315031513152315331543155315631573158315931603161316231633164316531663167316831693170317131723173317431753176317731783179318031813182318331843185318631873188318931903191319231933194319531963197319831993200320132023203320432053206320732083209321032113212321332143215321632173218321932203221322232233224322532263227322832293230323132323233323432353236323732383239324032413242324332443245324632473248324932503251325232533254325532563257325832593260326132623263326432653266326732683269327032713272327332743275327632773278327932803281328232833284328532863287328832893290329132923293329432953296329732983299330033013302330333043305330633073308330933103311331233133314331533163317331833193320332133223323332433253326332733283329333033313332333333343335333633373338333933403341334233433344334533463347334833493350335133523353335433553356335733583359336033613362336333643365336633673368336933703371337233733374337533763377337833793380338133823383338433853386338733883389339033913392339333943395339633973398339934003401340234033404340534063407340834093410341134123413341434153416341734183419342034213422342334243425342634273428342934303431343234333434343534363437343834393440344134423443344434453446344734483449345034513452345334543455345634573458345934603461346234633464346534663467346834693470347134723473347434753476347734783479348034813482348334843485348634873488348934903491349234933494349534963497349834993500350135023503350435053506350735083509351035113512351335143515351635173518351935203521352235233524352535263527352835293530353135323533353435353536353735383539354035413542354335443545354635473548354935503551355235533554355535563557355835593560356135623563356435653566356735683569357035713572357335743575357635773578357935803581358235833584358535863587358835893590359135923593359435953596359735983599360036013602360336043605360636073608360936103611361236133614361536163617361836193620362136223623362436253626362736283629363036313632363336343635363636373638363936403641364236433644364536463647364836493650365136523653365436553656365736583659366036613662366336643665366636673668366936703671367236733674367536763677367836793680368136823683368436853686368736883689369036913692369336943695369636973698369937003701370237033704370537063707370837093710371137123713371437153716371737183719372037213722372337243725372637273728372937303731373237333734373537363737373837393740374137423743374437453746374737483749375037513752375337543755375637573758375937603761376237633764376537663767376837693770377137723773377437753776377737783779378037813782378337843785378637873788378937903791379237933794379537963797379837993800380138023803380438053806380738083809381038113812381338143815381638173818381938203821382238233824382538263827382838293830383138323833383438353836383738383839384038413842384338443845384638473848384938503851385238533854385538563857385838593860386138623863386438653866386738683869387038713872387338743875387638773878387938803881388238833884388538863887388838893890389138923893389438953896389738983899390039013902390339043905390639073908390939103911391239133914391539163917391839193920392139223923392439253926392739283929393039313932393339343935393639373938393939403941394239433944394539463947394839493950395139523953395439553956395739583959396039613962396339643965396639673968396939703971397239733974397539763977397839793980398139823983398439853986398739883989399039913992399339943995399639973998399940004001400240034004400540064007400840094010401140124013401440154016401740184019402040214022402340244025402640274028402940304031403240334034403540364037403840394040404140424043404440454046404740484049405040514052405340544055405640574058405940604061406240634064406540664067406840694070407140724073407440754076407740784079408040814082408340844085408640874088408940904091409240934094409540964097409840994100410141024103410441054106410741084109411041114112411341144115411641174118411941204121412241234124412541264127412841294130413141324133413441354136413741384139414041414142414341444145414641474148414941504151415241534154415541564157415841594160416141624163416441654166416741684169417041714172417341744175417641774178417941804181418241834184418541864187418841894190419141924193419441954196419741984199420042014202420342044205420642074208420942104211421242134214421542164217421842194220422142224223422442254226422742284229423042314232423342344235423642374238423942404241424242434244424542464247424842494250425142524253425442554256425742584259426042614262426342644265426642674268426942704271427242734274427542764277427842794280428142824283428442854286428742884289429042914292429342944295429642974298429943004301430243034304430543064307430843094310431143124313431443154316431743184319432043214322432343244325432643274328432943304331433243334334433543364337433843394340434143424343434443454346434743484349435043514352435343544355435643574358435943604361436243634364436543664367436843694370437143724373437443754376437743784379438043814382438343844385438643874388438943904391439243934394439543964397439843994400440144024403440444054406440744084409441044114412441344144415441644174418441944204421442244234424442544264427442844294430443144324433443444354436443744384439444044414442444344444445444644474448444944504451445244534454445544564457445844594460446144624463446444654466446744684469447044714472447344744475447644774478447944804481448244834484448544864487448844894490449144924493449444954496449744984499450045014502450345044505450645074508450945104511451245134514451545164517451845194520452145224523452445254526452745284529453045314532453345344535453645374538453945404541454245434544454545464547454845494550455145524553455445554556455745584559456045614562456345644565456645674568456945704571457245734574457545764577457845794580458145824583458445854586458745884589459045914592459345944595459645974598459946004601460246034604460546064607460846094610461146124613461446154616461746184619462046214622462346244625462646274628462946304631463246334634463546364637463846394640464146424643464446454646464746484649465046514652465346544655465646574658465946604661466246634664466546664667466846694670467146724673467446754676467746784679468046814682468346844685468646874688468946904691469246934694469546964697469846994700470147024703470447054706470747084709471047114712471347144715471647174718471947204721472247234724472547264727472847294730473147324733473447354736473747384739474047414742474347444745474647474748474947504751475247534754475547564757475847594760476147624763476447654766476747684769477047714772477347744775477647774778477947804781478247834784478547864787478847894790479147924793479447954796479747984799480048014802480348044805480648074808480948104811481248134814481548164817481848194820482148224823482448254826482748284829483048314832483348344835483648374838483948404841484248434844484548464847484848494850485148524853485448554856485748584859486048614862486348644865486648674868486948704871487248734874487548764877487848794880488148824883488448854886488748884889489048914892489348944895489648974898489949004901490249034904490549064907490849094910491149124913491449154916491749184919492049214922492349244925492649274928492949304931493249334934493549364937493849394940494149424943494449454946494749484949495049514952495349544955495649574958495949604961496249634964496549664967496849694970497149724973497449754976497749784979498049814982498349844985498649874988498949904991499249934994499549964997499849995000500150025003500450055006500750085009501050115012501350145015501650175018501950205021502250235024502550265027502850295030503150325033503450355036503750385039504050415042504350445045504650475048504950505051505250535054505550565057505850595060506150625063506450655066506750685069507050715072507350745075507650775078507950805081508250835084508550865087508850895090509150925093509450955096509750985099510051015102510351045105510651075108510951105111511251135114511551165117511851195120512151225123512451255126512751285129513051315132513351345135513651375138513951405141514251435144514551465147514851495150515151525153515451555156515751585159516051615162516351645165516651675168516951705171517251735174517551765177517851795180518151825183518451855186518751885189519051915192519351945195519651975198519952005201520252035204520552065207520852095210521152125213521452155216521752185219522052215222522352245225522652275228522952305231523252335234523552365237523852395240524152425243524452455246524752485249525052515252525352545255525652575258525952605261526252635264526552665267526852695270527152725273527452755276527752785279528052815282528352845285528652875288528952905291529252935294529552965297529852995300530153025303530453055306530753085309531053115312531353145315531653175318531953205321532253235324532553265327532853295330533153325333533453355336533753385339534053415342534353445345534653475348534953505351535253535354535553565357535853595360536153625363536453655366536753685369537053715372537353745375537653775378537953805381538253835384538553865387538853895390539153925393539453955396539753985399540054015402540354045405540654075408540954105411541254135414541554165417541854195420542154225423542454255426542754285429543054315432543354345435543654375438543954405441544254435444544554465447544854495450545154525453545454555456545754585459546054615462546354645465546654675468546954705471547254735474547554765477547854795480548154825483548454855486548754885489549054915492549354945495549654975498549955005501550255035504550555065507550855095510551155125513551455155516551755185519552055215522552355245525552655275528552955305531553255335534553555365537553855395540554155425543554455455546554755485549555055515552555355545555555655575558555955605561556255635564556555665567556855695570557155725573557455755576557755785579558055815582558355845585558655875588558955905591559255935594559555965597559855995600560156025603560456055606560756085609561056115612561356145615561656175618561956205621562256235624562556265627562856295630563156325633563456355636563756385639564056415642564356445645564656475648564956505651565256535654565556565657565856595660566156625663566456655666566756685669567056715672567356745675567656775678567956805681568256835684568556865687568856895690569156925693569456955696569756985699570057015702570357045705570657075708570957105711571257135714571557165717571857195720572157225723572457255726572757285729573057315732573357345735573657375738573957405741574257435744574557465747574857495750575157525753575457555756575757585759576057615762576357645765576657675768576957705771577257735774577557765777577857795780578157825783578457855786578757885789579057915792579357945795579657975798579958005801580258035804580558065807580858095810581158125813581458155816581758185819582058215822582358245825582658275828582958305831583258335834583558365837583858395840584158425843584458455846584758485849585058515852585358545855585658575858585958605861586258635864586558665867586858695870587158725873587458755876587758785879588058815882588358845885588658875888588958905891589258935894589558965897589858995900590159025903590459055906590759085909591059115912591359145915591659175918591959205921592259235924592559265927592859295930593159325933593459355936593759385939594059415942594359445945594659475948594959505951595259535954595559565957595859595960596159625963596459655966596759685969597059715972597359745975597659775978597959805981598259835984598559865987598859895990599159925993599459955996599759985999600060016002600360046005600660076008600960106011601260136014601560166017601860196020602160226023602460256026602760286029603060316032603360346035603660376038603960406041604260436044604560466047604860496050605160526053605460556056605760586059606060616062606360646065606660676068606960706071607260736074607560766077607860796080608160826083608460856086608760886089609060916092609360946095609660976098609961006101610261036104610561066107610861096110611161126113611461156116611761186119612061216122612361246125612661276128612961306131613261336134613561366137613861396140614161426143614461456146614761486149615061516152615361546155615661576158615961606161616261636164616561666167616861696170617161726173617461756176617761786179618061816182618361846185618661876188618961906191619261936194619561966197619861996200620162026203620462056206620762086209621062116212621362146215621662176218621962206221622262236224622562266227622862296230623162326233623462356236623762386239624062416242624362446245624662476248624962506251625262536254625562566257625862596260626162626263626462656266626762686269627062716272627362746275627662776278627962806281628262836284628562866287628862896290629162926293629462956296629762986299630063016302630363046305630663076308630963106311631263136314631563166317631863196320632163226323632463256326632763286329633063316332633363346335633663376338633963406341634263436344634563466347634863496350635163526353635463556356635763586359636063616362636363646365636663676368636963706371637263736374637563766377637863796380638163826383638463856386638763886389639063916392639363946395639663976398639964006401640264036404640564066407640864096410641164126413641464156416641764186419642064216422642364246425642664276428642964306431643264336434643564366437643864396440644164426443644464456446644764486449645064516452645364546455645664576458645964606461646264636464646564666467646864696470647164726473647464756476647764786479648064816482648364846485648664876488648964906491649264936494649564966497649864996500650165026503650465056506650765086509651065116512651365146515651665176518651965206521652265236524652565266527652865296530653165326533653465356536653765386539654065416542654365446545654665476548654965506551655265536554655565566557655865596560656165626563656465656566656765686569657065716572657365746575657665776578657965806581658265836584658565866587658865896590659165926593659465956596659765986599660066016602660366046605660666076608660966106611661266136614661566166617661866196620662166226623662466256626662766286629663066316632663366346635663666376638663966406641664266436644664566466647664866496650665166526653665466556656665766586659666066616662666366646665666666676668666966706671667266736674667566766677667866796680668166826683668466856686668766886689669066916692669366946695669666976698669967006701670267036704670567066707670867096710671167126713671467156716671767186719672067216722672367246725672667276728672967306731673267336734673567366737673867396740674167426743674467456746674767486749675067516752675367546755675667576758675967606761676267636764676567666767676867696770677167726773677467756776677767786779678067816782678367846785678667876788678967906791679267936794679567966797679867996800680168026803680468056806680768086809681068116812681368146815681668176818681968206821682268236824682568266827682868296830683168326833683468356836683768386839684068416842684368446845684668476848684968506851685268536854685568566857685868596860686168626863686468656866686768686869687068716872687368746875687668776878687968806881688268836884688568866887688868896890689168926893689468956896689768986899690069016902690369046905690669076908690969106911691269136914691569166917691869196920692169226923692469256926692769286929693069316932693369346935693669376938693969406941694269436944694569466947694869496950695169526953695469556956695769586959696069616962696369646965696669676968696969706971697269736974697569766977697869796980698169826983698469856986698769886989699069916992699369946995699669976998699970007001700270037004700570067007700870097010701170127013701470157016701770187019702070217022702370247025702670277028702970307031703270337034703570367037703870397040704170427043704470457046704770487049705070517052705370547055705670577058705970607061706270637064706570667067706870697070707170727073707470757076707770787079708070817082708370847085708670877088708970907091709270937094709570967097709870997100710171027103710471057106710771087109711071117112711371147115711671177118711971207121712271237124712571267127712871297130713171327133713471357136713771387139714071417142714371447145714671477148714971507151715271537154715571567157715871597160716171627163716471657166716771687169717071717172717371747175717671777178717971807181718271837184718571867187718871897190719171927193719471957196719771987199720072017202720372047205720672077208720972107211721272137214721572167217721872197220722172227223722472257226722772287229723072317232723372347235723672377238723972407241724272437244724572467247724872497250725172527253725472557256725772587259726072617262726372647265726672677268726972707271727272737274727572767277727872797280728172827283728472857286728772887289729072917292729372947295729672977298729973007301730273037304730573067307730873097310731173127313731473157316731773187319732073217322732373247325732673277328732973307331733273337334733573367337733873397340734173427343734473457346734773487349735073517352735373547355735673577358735973607361736273637364736573667367736873697370737173727373737473757376737773787379738073817382738373847385738673877388738973907391739273937394739573967397739873997400740174027403740474057406740774087409741074117412741374147415741674177418741974207421742274237424742574267427742874297430743174327433743474357436743774387439744074417442744374447445744674477448744974507451745274537454745574567457745874597460746174627463746474657466746774687469747074717472747374747475747674777478747974807481748274837484748574867487748874897490749174927493749474957496749774987499750075017502750375047505750675077508750975107511751275137514751575167517751875197520752175227523752475257526752775287529753075317532753375347535753675377538753975407541754275437544754575467547754875497550755175527553755475557556755775587559756075617562756375647565756675677568756975707571757275737574757575767577757875797580758175827583758475857586758775887589759075917592759375947595759675977598759976007601760276037604760576067607760876097610761176127613761476157616761776187619762076217622762376247625762676277628762976307631763276337634763576367637763876397640764176427643764476457646764776487649765076517652765376547655765676577658765976607661766276637664766576667667766876697670767176727673767476757676767776787679768076817682768376847685768676877688768976907691769276937694769576967697769876997700770177027703770477057706770777087709771077117712771377147715771677177718771977207721772277237724772577267727772877297730773177327733773477357736773777387739774077417742774377447745774677477748774977507751775277537754775577567757775877597760776177627763776477657766776777687769777077717772777377747775777677777778777977807781778277837784778577867787778877897790779177927793779477957796779777987799780078017802780378047805780678077808780978107811781278137814781578167817781878197820782178227823782478257826782778287829783078317832783378347835783678377838783978407841784278437844784578467847784878497850785178527853785478557856785778587859786078617862786378647865786678677868786978707871787278737874787578767877787878797880788178827883788478857886788778887889789078917892789378947895789678977898789979007901790279037904790579067907790879097910791179127913791479157916791779187919792079217922792379247925792679277928792979307931793279337934793579367937793879397940794179427943794479457946794779487949795079517952795379547955795679577958795979607961796279637964796579667967796879697970797179727973797479757976797779787979798079817982798379847985798679877988798979907991799279937994799579967997799879998000800180028003800480058006800780088009801080118012801380148015801680178018801980208021802280238024802580268027802880298030803180328033803480358036803780388039804080418042804380448045804680478048804980508051805280538054805580568057805880598060806180628063806480658066806780688069807080718072807380748075807680778078807980808081808280838084808580868087808880898090809180928093809480958096809780988099810081018102810381048105810681078108810981108111811281138114811581168117811881198120812181228123812481258126812781288129813081318132813381348135813681378138813981408141814281438144814581468147814881498150815181528153815481558156815781588159816081618162816381648165816681678168816981708171817281738174817581768177817881798180818181828183818481858186818781888189819081918192819381948195819681978198819982008201820282038204820582068207820882098210821182128213821482158216821782188219822082218222822382248225822682278228822982308231823282338234823582368237823882398240824182428243824482458246824782488249825082518252825382548255825682578258825982608261826282638264826582668267826882698270827182728273827482758276827782788279828082818282828382848285828682878288828982908291829282938294829582968297829882998300830183028303830483058306830783088309831083118312831383148315831683178318831983208321832283238324832583268327832883298330833183328333833483358336833783388339834083418342834383448345834683478348834983508351835283538354835583568357835883598360836183628363836483658366836783688369837083718372837383748375837683778378837983808381838283838384838583868387838883898390839183928393839483958396839783988399840084018402840384048405840684078408840984108411841284138414841584168417841884198420842184228423842484258426842784288429843084318432843384348435843684378438843984408441844284438444844584468447844884498450845184528453845484558456845784588459846084618462846384648465846684678468846984708471847284738474847584768477847884798480848184828483848484858486848784888489849084918492849384948495849684978498849985008501850285038504850585068507850885098510851185128513851485158516851785188519852085218522852385248525852685278528852985308531853285338534853585368537853885398540854185428543854485458546854785488549855085518552855385548555855685578558855985608561856285638564856585668567856885698570857185728573857485758576857785788579858085818582858385848585858685878588858985908591859285938594859585968597859885998600860186028603860486058606860786088609861086118612861386148615861686178618861986208621862286238624862586268627862886298630863186328633863486358636863786388639864086418642864386448645864686478648864986508651865286538654865586568657865886598660866186628663866486658666866786688669867086718672867386748675867686778678867986808681868286838684868586868687868886898690869186928693869486958696869786988699870087018702870387048705870687078708870987108711871287138714871587168717871887198720872187228723872487258726872787288729873087318732873387348735873687378738873987408741874287438744874587468747874887498750875187528753875487558756875787588759876087618762876387648765876687678768876987708771877287738774877587768777877887798780878187828783878487858786878787888789879087918792879387948795879687978798879988008801880288038804880588068807880888098810881188128813881488158816881788188819882088218822882388248825882688278828882988308831883288338834883588368837883888398840884188428843884488458846884788488849885088518852885388548855885688578858885988608861886288638864886588668867886888698870887188728873887488758876887788788879888088818882888388848885888688878888888988908891889288938894889588968897889888998900890189028903890489058906890789088909891089118912891389148915891689178918891989208921892289238924892589268927892889298930893189328933893489358936893789388939894089418942894389448945894689478948894989508951895289538954895589568957895889598960896189628963896489658966896789688969897089718972897389748975897689778978897989808981898289838984898589868987898889898990899189928993899489958996899789988999900090019002900390049005900690079008900990109011901290139014901590169017901890199020902190229023902490259026902790289029903090319032903390349035903690379038903990409041904290439044904590469047904890499050905190529053905490559056905790589059906090619062906390649065906690679068906990709071907290739074907590769077907890799080908190829083908490859086908790889089909090919092909390949095909690979098909991009101910291039104910591069107910891099110911191129113911491159116911791189119912091219122912391249125912691279128912991309131913291339134913591369137913891399140914191429143914491459146914791489149915091519152915391549155915691579158915991609161916291639164916591669167916891699170917191729173917491759176917791789179918091819182918391849185918691879188918991909191919291939194919591969197919891999200920192029203920492059206920792089209921092119212921392149215921692179218921992209221922292239224922592269227922892299230923192329233923492359236923792389239924092419242924392449245924692479248924992509251925292539254925592569257925892599260926192629263926492659266926792689269927092719272927392749275927692779278927992809281928292839284928592869287928892899290929192929293929492959296929792989299930093019302930393049305930693079308930993109311931293139314931593169317931893199320932193229323932493259326932793289329933093319332933393349335933693379338933993409341934293439344934593469347934893499350935193529353935493559356935793589359936093619362936393649365936693679368936993709371937293739374937593769377937893799380938193829383938493859386938793889389939093919392939393949395939693979398939994009401940294039404940594069407940894099410941194129413941494159416941794189419942094219422942394249425942694279428942994309431943294339434943594369437943894399440944194429443944494459446944794489449945094519452945394549455945694579458945994609461946294639464946594669467946894699470947194729473947494759476947794789479948094819482948394849485948694879488948994909491949294939494949594969497949894999500950195029503950495059506950795089509951095119512951395149515951695179518951995209521952295239524952595269527952895299530953195329533953495359536953795389539954095419542954395449545954695479548954995509551955295539554955595569557955895599560956195629563956495659566956795689569957095719572957395749575957695779578957995809581958295839584958595869587958895899590959195929593959495959596959795989599960096019602960396049605960696079608960996109611961296139614961596169617961896199620962196229623962496259626962796289629963096319632963396349635963696379638963996409641964296439644964596469647964896499650965196529653965496559656965796589659966096619662966396649665966696679668966996709671967296739674967596769677967896799680968196829683968496859686968796889689969096919692969396949695969696979698969997009701970297039704970597069707970897099710971197129713971497159716971797189719972097219722972397249725972697279728972997309731973297339734973597369737973897399740974197429743974497459746974797489749975097519752975397549755975697579758975997609761976297639764976597669767976897699770977197729773977497759776977797789779978097819782978397849785978697879788978997909791979297939794979597969797979897999800980198029803980498059806980798089809981098119812981398149815981698179818981998209821982298239824982598269827982898299830983198329833983498359836983798389839984098419842984398449845984698479848984998509851985298539854985598569857985898599860986198629863986498659866986798689869987098719872987398749875987698779878987998809881988298839884988598869887988898899890989198929893989498959896989798989899990099019902990399049905990699079908990999109911991299139914991599169917991899199920992199229923992499259926992799289929993099319932993399349935993699379938993999409941994299439944994599469947994899499950995199529953995499559956995799589959996099619962996399649965996699679968996999709971997299739974997599769977997899799980998199829983998499859986998799889989999099919992999399949995999699979998999910000100011000210003100041000510006100071000810009100101001110012100131001410015100161001710018100191002010021100221002310024100251002610027100281002910030100311003210033100341003510036100371003810039100401004110042100431004410045100461004710048100491005010051100521005310054100551005610057100581005910060100611006210063100641006510066100671006810069100701007110072100731007410075100761007710078100791008010081100821008310084100851008610087100881008910090100911009210093100941009510096100971009810099101001010110102101031010410105101061010710108101091011010111101121011310114101151011610117101181011910120101211012210123101241012510126101271012810129101301013110132101331013410135101361013710138101391014010141101421014310144101451014610147101481014910150101511015210153101541015510156101571015810159101601016110162101631016410165101661016710168101691017010171101721017310174101751017610177101781017910180101811018210183101841018510186101871018810189101901019110192101931019410195101961019710198101991020010201102021020310204102051020610207102081020910210102111021210213102141021510216102171021810219102201022110222102231022410225102261022710228102291023010231102321023310234102351023610237102381023910240102411024210243102441024510246102471024810249102501025110252102531025410255102561025710258102591026010261102621026310264102651026610267102681026910270102711027210273102741027510276102771027810279102801028110282102831028410285102861028710288102891029010291102921029310294102951029610297102981029910300103011030210303103041030510306103071030810309103101031110312103131031410315103161031710318103191032010321103221032310324103251032610327103281032910330103311033210333103341033510336103371033810339103401034110342103431034410345103461034710348103491035010351103521035310354103551035610357103581035910360103611036210363103641036510366103671036810369103701037110372103731037410375103761037710378103791038010381103821038310384103851038610387103881038910390103911039210393103941039510396103971039810399104001040110402104031040410405104061040710408104091041010411104121041310414104151041610417104181041910420104211042210423104241042510426104271042810429104301043110432104331043410435104361043710438104391044010441104421044310444104451044610447104481044910450104511045210453104541045510456104571045810459104601046110462104631046410465104661046710468104691047010471104721047310474104751047610477104781047910480104811048210483104841048510486104871048810489104901049110492104931049410495104961049710498104991050010501105021050310504105051050610507105081050910510105111051210513105141051510516105171051810519105201052110522105231052410525105261052710528105291053010531105321053310534105351053610537105381053910540105411054210543105441054510546105471054810549105501055110552105531055410555105561055710558105591056010561105621056310564105651056610567105681056910570105711057210573105741057510576105771057810579105801058110582105831058410585105861058710588105891059010591105921059310594105951059610597105981059910600106011060210603106041060510606106071060810609106101061110612106131061410615106161061710618106191062010621106221062310624106251062610627106281062910630106311063210633106341063510636106371063810639106401064110642106431064410645106461064710648106491065010651106521065310654106551065610657106581065910660106611066210663106641066510666106671066810669106701067110672106731067410675106761067710678106791068010681106821068310684106851068610687106881068910690106911069210693106941069510696106971069810699107001070110702107031070410705107061070710708107091071010711107121071310714107151071610717107181071910720107211072210723107241072510726107271072810729107301073110732107331073410735107361073710738107391074010741107421074310744107451074610747107481074910750107511075210753107541075510756107571075810759107601076110762107631076410765107661076710768107691077010771107721077310774107751077610777107781077910780107811078210783107841078510786107871078810789107901079110792107931079410795107961079710798107991080010801108021080310804108051080610807108081080910810108111081210813108141081510816108171081810819108201082110822108231082410825108261082710828108291083010831108321083310834108351083610837108381083910840108411084210843108441084510846108471084810849108501085110852108531085410855108561085710858108591086010861108621086310864108651086610867108681086910870108711087210873108741087510876108771087810879108801088110882108831088410885108861088710888108891089010891108921089310894108951089610897108981089910900109011090210903109041090510906109071090810909109101091110912109131091410915109161091710918109191092010921109221092310924109251092610927109281092910930109311093210933109341093510936109371093810939109401094110942109431094410945109461094710948109491095010951109521095310954109551095610957109581095910960109611096210963109641096510966109671096810969109701097110972109731097410975109761097710978109791098010981109821098310984109851098610987109881098910990109911099210993109941099510996109971099810999110001100111002110031100411005110061100711008110091101011011110121101311014110151101611017110181101911020110211102211023110241102511026110271102811029110301103111032110331103411035110361103711038110391104011041110421104311044110451104611047110481104911050110511105211053110541105511056110571105811059110601106111062110631106411065110661106711068110691107011071110721107311074110751107611077110781107911080110811108211083110841108511086110871108811089110901109111092110931109411095110961109711098110991110011101111021110311104111051110611107111081110911110111111111211113111141111511116111171111811119111201112111122111231112411125111261112711128111291113011131111321113311134111351113611137111381113911140111411114211143111441114511146111471114811149111501115111152111531115411155111561115711158111591116011161111621116311164111651116611167111681116911170111711117211173111741117511176111771117811179111801118111182111831118411185111861118711188111891119011191111921119311194111951119611197111981119911200112011120211203112041120511206112071120811209112101121111212112131121411215112161121711218112191122011221112221122311224112251122611227112281122911230112311123211233112341123511236112371123811239112401124111242112431124411245112461124711248112491125011251112521125311254112551125611257112581125911260112611126211263112641126511266112671126811269112701127111272112731127411275112761127711278112791128011281112821128311284112851128611287112881128911290112911129211293112941129511296112971129811299113001130111302113031130411305113061130711308113091131011311113121131311314113151131611317113181131911320113211132211323113241132511326113271132811329113301133111332113331133411335113361133711338113391134011341113421134311344113451134611347113481134911350113511135211353113541135511356113571135811359113601136111362113631136411365113661136711368113691137011371113721137311374113751137611377113781137911380113811138211383113841138511386113871138811389113901139111392113931139411395113961139711398113991140011401114021140311404114051140611407114081140911410114111141211413114141141511416114171141811419114201142111422114231142411425114261142711428114291143011431114321143311434114351143611437114381143911440114411144211443114441144511446114471144811449114501145111452114531145411455114561145711458114591146011461114621146311464114651146611467114681146911470114711147211473114741147511476114771147811479114801148111482114831148411485114861148711488114891149011491114921149311494114951149611497114981149911500115011150211503115041150511506115071150811509115101151111512115131151411515115161151711518115191152011521115221152311524115251152611527115281152911530115311153211533115341153511536115371153811539115401154111542115431154411545115461154711548115491155011551115521155311554115551155611557115581155911560115611156211563115641156511566115671156811569115701157111572115731157411575115761157711578115791158011581115821158311584115851158611587115881158911590115911159211593115941159511596115971159811599116001160111602116031160411605116061160711608116091161011611116121161311614116151161611617116181161911620116211162211623116241162511626116271162811629116301163111632116331163411635116361163711638116391164011641116421164311644116451164611647116481164911650116511165211653116541165511656116571165811659116601166111662116631166411665116661166711668116691167011671116721167311674116751167611677116781167911680116811168211683116841168511686116871168811689116901169111692116931169411695116961169711698116991170011701117021170311704117051170611707117081170911710117111171211713117141171511716117171171811719117201172111722117231172411725117261172711728117291173011731117321173311734117351173611737117381173911740117411174211743117441174511746117471174811749117501175111752117531175411755117561175711758117591176011761117621176311764117651176611767117681176911770117711177211773117741177511776117771177811779117801178111782117831178411785117861178711788117891179011791117921179311794117951179611797117981179911800118011180211803118041180511806118071180811809118101181111812118131181411815118161181711818118191182011821118221182311824118251182611827118281182911830118311183211833118341183511836118371183811839118401184111842118431184411845118461184711848118491185011851118521185311854118551185611857118581185911860118611186211863118641186511866118671186811869118701187111872118731187411875118761187711878118791188011881118821188311884118851188611887118881188911890118911189211893118941189511896118971189811899119001190111902119031190411905119061190711908119091191011911119121191311914119151191611917119181191911920119211192211923119241192511926119271192811929119301193111932119331193411935119361193711938119391194011941119421194311944119451194611947119481194911950119511195211953119541195511956119571195811959119601196111962119631196411965119661196711968119691197011971119721197311974119751197611977119781197911980119811198211983119841198511986119871198811989119901199111992119931199411995119961199711998119991200012001120021200312004120051200612007120081200912010120111201212013120141201512016120171201812019120201202112022120231202412025120261202712028120291203012031120321203312034120351203612037120381203912040120411204212043120441204512046120471204812049120501205112052120531205412055120561205712058120591206012061120621206312064120651206612067120681206912070120711207212073120741207512076120771207812079120801208112082120831208412085120861208712088120891209012091120921209312094120951209612097120981209912100121011210212103121041210512106121071210812109121101211112112121131211412115121161211712118121191212012121121221212312124121251212612127121281212912130121311213212133121341213512136121371213812139121401214112142121431214412145121461214712148121491215012151121521215312154121551215612157121581215912160121611216212163121641216512166121671216812169121701217112172121731217412175121761217712178121791218012181121821218312184121851218612187121881218912190121911219212193121941219512196121971219812199122001220112202122031220412205122061220712208122091221012211122121221312214122151221612217122181221912220122211222212223122241222512226122271222812229122301223112232122331223412235122361223712238122391224012241122421224312244122451224612247122481224912250122511225212253122541225512256122571225812259122601226112262122631226412265122661226712268122691227012271122721227312274122751227612277122781227912280122811228212283122841228512286122871228812289122901229112292122931229412295122961229712298122991230012301123021230312304123051230612307123081230912310123111231212313123141231512316123171231812319123201232112322123231232412325123261232712328123291233012331123321233312334123351233612337123381233912340123411234212343123441234512346123471234812349123501235112352123531235412355123561235712358123591236012361123621236312364123651236612367123681236912370123711237212373123741237512376123771237812379123801238112382123831238412385123861238712388123891239012391123921239312394123951239612397123981239912400124011240212403124041240512406124071240812409124101241112412124131241412415124161241712418124191242012421124221242312424124251242612427124281242912430124311243212433124341243512436124371243812439124401244112442124431244412445124461244712448124491245012451124521245312454124551245612457124581245912460124611246212463124641246512466124671246812469124701247112472124731247412475124761247712478124791248012481124821248312484124851248612487124881248912490124911249212493124941249512496124971249812499125001250112502125031250412505125061250712508125091251012511125121251312514125151251612517125181251912520125211252212523125241252512526125271252812529125301253112532125331253412535125361253712538125391254012541125421254312544125451254612547125481254912550125511255212553125541255512556125571255812559125601256112562125631256412565125661256712568125691257012571125721257312574125751257612577125781257912580125811258212583125841258512586125871258812589125901259112592125931259412595125961259712598125991260012601126021260312604126051260612607126081260912610126111261212613126141261512616126171261812619126201262112622126231262412625126261262712628126291263012631126321263312634126351263612637126381263912640126411264212643126441264512646126471264812649126501265112652126531265412655126561265712658126591266012661126621266312664126651266612667126681266912670126711267212673126741267512676126771267812679126801268112682126831268412685126861268712688126891269012691126921269312694126951269612697126981269912700127011270212703127041270512706127071270812709127101271112712127131271412715127161271712718127191272012721127221272312724127251272612727127281272912730127311273212733127341273512736127371273812739127401274112742127431274412745127461274712748127491275012751127521275312754127551275612757127581275912760127611276212763127641276512766127671276812769127701277112772127731277412775127761277712778127791278012781127821278312784127851278612787127881278912790127911279212793127941279512796127971279812799128001280112802128031280412805128061280712808128091281012811128121281312814128151281612817128181281912820128211282212823128241282512826128271282812829128301283112832128331283412835128361283712838128391284012841128421284312844128451284612847128481284912850128511285212853128541285512856128571285812859128601286112862128631286412865128661286712868128691287012871128721287312874128751287612877128781287912880128811288212883128841288512886128871288812889128901289112892128931289412895128961289712898128991290012901129021290312904129051290612907129081290912910129111291212913129141291512916129171291812919129201292112922129231292412925129261292712928129291293012931129321293312934129351293612937129381293912940129411294212943129441294512946129471294812949129501295112952129531295412955129561295712958129591296012961129621296312964129651296612967129681296912970129711297212973129741297512976129771297812979129801298112982129831298412985129861298712988129891299012991129921299312994129951299612997129981299913000130011300213003130041300513006130071300813009130101301113012130131301413015130161301713018130191302013021130221302313024130251302613027130281302913030130311303213033130341303513036130371303813039130401304113042130431304413045130461304713048130491305013051130521305313054130551305613057130581305913060130611306213063130641306513066130671306813069130701307113072130731307413075130761307713078130791308013081130821308313084130851308613087130881308913090130911309213093130941309513096130971309813099131001310113102131031310413105131061310713108131091311013111131121311313114131151311613117131181311913120131211312213123131241312513126131271312813129131301313113132131331313413135131361313713138131391314013141131421314313144131451314613147131481314913150131511315213153131541315513156131571315813159131601316113162131631316413165131661316713168131691317013171131721317313174131751317613177131781317913180131811318213183131841318513186131871318813189131901319113192131931319413195131961319713198131991320013201132021320313204132051320613207132081320913210132111321213213132141321513216132171321813219132201322113222132231322413225132261322713228132291323013231132321323313234132351323613237132381323913240132411324213243132441324513246132471324813249132501325113252132531325413255132561325713258132591326013261132621326313264132651326613267132681326913270132711327213273132741327513276132771327813279132801328113282132831328413285132861328713288132891329013291132921329313294132951329613297132981329913300133011330213303133041330513306133071330813309133101331113312133131331413315133161331713318133191332013321133221332313324133251332613327133281332913330133311333213333133341333513336133371333813339133401334113342133431334413345133461334713348133491335013351133521335313354133551335613357133581335913360133611336213363133641336513366133671336813369133701337113372133731337413375133761337713378133791338013381133821338313384133851338613387133881338913390133911339213393133941339513396133971339813399134001340113402134031340413405134061340713408134091341013411134121341313414134151341613417134181341913420134211342213423134241342513426134271342813429134301343113432134331343413435134361343713438134391344013441134421344313444134451344613447134481344913450134511345213453134541345513456134571345813459134601346113462134631346413465134661346713468134691347013471134721347313474134751347613477134781347913480134811348213483134841348513486134871348813489134901349113492134931349413495134961349713498134991350013501135021350313504135051350613507135081350913510135111351213513135141351513516135171351813519135201352113522135231352413525135261352713528135291353013531135321353313534135351353613537135381353913540135411354213543135441354513546135471354813549135501355113552135531355413555135561355713558135591356013561135621356313564135651356613567135681356913570135711357213573135741357513576135771357813579135801358113582135831358413585135861358713588135891359013591135921359313594135951359613597135981359913600136011360213603136041360513606136071360813609136101361113612136131361413615136161361713618136191362013621136221362313624136251362613627136281362913630136311363213633136341363513636136371363813639136401364113642136431364413645136461364713648136491365013651136521365313654136551365613657136581365913660136611366213663136641366513666136671366813669136701367113672136731367413675136761367713678136791368013681136821368313684136851368613687136881368913690136911369213693136941369513696136971369813699137001370113702137031370413705137061370713708137091371013711137121371313714137151371613717137181371913720137211372213723137241372513726137271372813729137301373113732137331373413735137361373713738137391374013741137421374313744137451374613747137481374913750137511375213753137541375513756137571375813759137601376113762137631376413765137661376713768137691377013771137721377313774137751377613777137781377913780137811378213783137841378513786137871378813789137901379113792137931379413795137961379713798137991380013801138021380313804138051380613807138081380913810138111381213813138141381513816138171381813819138201382113822138231382413825138261382713828138291383013831138321383313834138351383613837138381383913840138411384213843138441384513846138471384813849138501385113852138531385413855138561385713858138591386013861138621386313864138651386613867138681386913870138711387213873138741387513876138771387813879138801388113882138831388413885138861388713888138891389013891138921389313894138951389613897138981389913900139011390213903139041390513906139071390813909139101391113912139131391413915139161391713918139191392013921139221392313924139251392613927139281392913930139311393213933139341393513936139371393813939139401394113942139431394413945139461394713948139491395013951139521395313954139551395613957139581395913960139611396213963139641396513966139671396813969139701397113972139731397413975139761397713978139791398013981139821398313984139851398613987139881398913990139911399213993139941399513996139971399813999140001400114002140031400414005140061400714008140091401014011140121401314014140151401614017140181401914020140211402214023140241402514026140271402814029140301403114032140331403414035140361403714038140391404014041140421404314044140451404614047140481404914050140511405214053140541405514056140571405814059140601406114062140631406414065140661406714068140691407014071140721407314074140751407614077140781407914080140811408214083140841408514086140871408814089140901409114092140931409414095140961409714098140991410014101141021410314104141051410614107141081410914110141111411214113141141411514116141171411814119141201412114122141231412414125141261412714128141291413014131141321413314134141351413614137141381413914140141411414214143141441414514146141471414814149141501415114152141531415414155141561415714158141591416014161141621416314164141651416614167141681416914170141711417214173141741417514176141771417814179141801418114182141831418414185141861418714188141891419014191141921419314194141951419614197141981419914200142011420214203142041420514206142071420814209142101421114212142131421414215142161421714218142191422014221142221422314224142251422614227142281422914230142311423214233142341423514236142371423814239142401424114242142431424414245142461424714248142491425014251142521425314254142551425614257142581425914260142611426214263142641426514266142671426814269142701427114272142731427414275142761427714278142791428014281142821428314284142851428614287142881428914290142911429214293142941429514296142971429814299143001430114302143031430414305143061430714308143091431014311143121431314314143151431614317143181431914320143211432214323143241432514326143271432814329143301433114332143331433414335143361433714338143391434014341143421434314344143451434614347143481434914350143511435214353143541435514356143571435814359143601436114362143631436414365143661436714368143691437014371143721437314374143751437614377143781437914380143811438214383143841438514386143871438814389143901439114392143931439414395143961439714398143991440014401144021440314404144051440614407144081440914410144111441214413144141441514416144171441814419144201442114422144231442414425144261442714428144291443014431144321443314434144351443614437144381443914440144411444214443144441444514446144471444814449144501445114452144531445414455144561445714458144591446014461144621446314464144651446614467144681446914470144711447214473144741447514476144771447814479144801448114482144831448414485144861448714488144891449014491144921449314494144951449614497144981449914500145011450214503145041450514506145071450814509145101451114512145131451414515145161451714518145191452014521145221452314524145251452614527145281452914530145311453214533145341453514536145371453814539145401454114542145431454414545145461454714548145491455014551145521455314554145551455614557145581455914560145611456214563145641456514566145671456814569145701457114572145731457414575145761457714578145791458014581145821458314584145851458614587145881458914590145911459214593145941459514596145971459814599146001460114602146031460414605146061460714608146091461014611146121461314614146151461614617146181461914620146211462214623146241462514626146271462814629146301463114632146331463414635146361463714638146391464014641146421464314644146451464614647146481464914650146511465214653146541465514656146571465814659146601466114662146631466414665146661466714668146691467014671146721467314674146751467614677146781467914680146811468214683146841468514686146871468814689146901469114692146931469414695146961469714698146991470014701147021470314704147051470614707147081470914710147111471214713147141471514716147171471814719147201472114722147231472414725147261472714728147291473014731147321473314734147351473614737147381473914740147411474214743147441474514746147471474814749147501475114752147531475414755147561475714758147591476014761147621476314764147651476614767147681476914770147711477214773147741477514776147771477814779147801478114782147831478414785147861478714788147891479014791147921479314794147951479614797147981479914800148011480214803148041480514806148071480814809148101481114812148131481414815148161481714818148191482014821148221482314824148251482614827148281482914830148311483214833148341483514836148371483814839148401484114842148431484414845148461484714848148491485014851148521485314854148551485614857148581485914860148611486214863148641486514866148671486814869148701487114872148731487414875148761487714878148791488014881148821488314884148851488614887148881488914890148911489214893148941489514896148971489814899149001490114902149031490414905149061490714908149091491014911149121491314914149151491614917149181491914920149211492214923149241492514926149271492814929149301493114932149331493414935149361493714938149391494014941149421494314944149451494614947149481494914950149511495214953149541495514956149571495814959149601496114962149631496414965149661496714968149691497014971149721497314974149751497614977149781497914980149811498214983149841498514986149871498814989149901499114992149931499414995149961499714998149991500015001150021500315004150051500615007150081500915010150111501215013150141501515016150171501815019150201502115022150231502415025150261502715028150291503015031150321503315034150351503615037150381503915040150411504215043150441504515046150471504815049150501505115052150531505415055150561505715058150591506015061150621506315064150651506615067150681506915070150711507215073150741507515076150771507815079150801508115082150831508415085150861508715088150891509015091150921509315094150951509615097150981509915100151011510215103151041510515106151071510815109151101511115112151131511415115151161511715118151191512015121151221512315124151251512615127151281512915130151311513215133151341513515136151371513815139151401514115142151431514415145151461514715148151491515015151151521515315154151551515615157151581515915160151611516215163151641516515166151671516815169151701517115172151731517415175151761517715178151791518015181151821518315184151851518615187151881518915190151911519215193151941519515196151971519815199152001520115202152031520415205152061520715208152091521015211152121521315214152151521615217152181521915220152211522215223152241522515226152271522815229152301523115232152331523415235152361523715238152391524015241152421524315244152451524615247152481524915250152511525215253152541525515256152571525815259152601526115262152631526415265152661526715268152691527015271152721527315274152751527615277152781527915280152811528215283152841528515286152871528815289152901529115292152931529415295152961529715298152991530015301153021530315304153051530615307153081530915310153111531215313153141531515316153171531815319153201532115322153231532415325153261532715328153291533015331153321533315334153351533615337153381533915340153411534215343153441534515346153471534815349153501535115352153531535415355153561535715358153591536015361153621536315364153651536615367153681536915370153711537215373153741537515376153771537815379153801538115382153831538415385153861538715388153891539015391153921539315394153951539615397153981539915400154011540215403154041540515406154071540815409154101541115412154131541415415154161541715418154191542015421154221542315424154251542615427154281542915430154311543215433154341543515436154371543815439154401544115442154431544415445154461544715448154491545015451154521545315454154551545615457154581545915460154611546215463154641546515466154671546815469154701547115472154731547415475154761547715478154791548015481154821548315484154851548615487154881548915490154911549215493154941549515496154971549815499155001550115502155031550415505155061550715508155091551015511155121551315514155151551615517155181551915520155211552215523155241552515526155271552815529155301553115532155331553415535155361553715538155391554015541155421554315544155451554615547155481554915550155511555215553155541555515556155571555815559155601556115562155631556415565155661556715568155691557015571155721557315574155751557615577155781557915580155811558215583155841558515586155871558815589155901559115592155931559415595155961559715598155991560015601156021560315604156051560615607156081560915610156111561215613156141561515616156171561815619156201562115622156231562415625156261562715628156291563015631156321563315634156351563615637156381563915640156411564215643156441564515646156471564815649156501565115652156531565415655156561565715658156591566015661156621566315664156651566615667156681566915670156711567215673156741567515676156771567815679156801568115682156831568415685156861568715688156891569015691156921569315694156951569615697156981569915700157011570215703157041570515706157071570815709157101571115712157131571415715157161571715718157191572015721157221572315724157251572615727157281572915730157311573215733157341573515736157371573815739157401574115742157431574415745157461574715748157491575015751157521575315754157551575615757157581575915760157611576215763157641576515766157671576815769157701577115772157731577415775157761577715778157791578015781157821578315784157851578615787157881578915790157911579215793157941579515796157971579815799158001580115802158031580415805158061580715808158091581015811158121581315814158151581615817158181581915820158211582215823158241582515826158271582815829158301583115832158331583415835158361583715838158391584015841158421584315844158451584615847158481584915850158511585215853158541585515856158571585815859158601586115862158631586415865158661586715868158691587015871158721587315874158751587615877158781587915880158811588215883158841588515886158871588815889158901589115892158931589415895158961589715898158991590015901159021590315904159051590615907159081590915910159111591215913159141591515916159171591815919159201592115922159231592415925159261592715928159291593015931159321593315934159351593615937159381593915940159411594215943159441594515946159471594815949159501595115952159531595415955159561595715958159591596015961159621596315964159651596615967159681596915970159711597215973159741597515976159771597815979159801598115982159831598415985159861598715988159891599015991159921599315994159951599615997159981599916000160011600216003160041600516006160071600816009160101601116012160131601416015160161601716018160191602016021160221602316024160251602616027160281602916030160311603216033160341603516036160371603816039160401604116042160431604416045160461604716048160491605016051160521605316054160551605616057160581605916060160611606216063160641606516066160671606816069160701607116072160731607416075160761607716078160791608016081160821608316084160851608616087160881608916090160911609216093160941609516096160971609816099161001610116102161031610416105161061610716108161091611016111161121611316114161151611616117161181611916120161211612216123161241612516126161271612816129161301613116132161331613416135161361613716138161391614016141161421614316144161451614616147161481614916150161511615216153161541615516156161571615816159161601616116162161631616416165161661616716168161691617016171161721617316174161751617616177161781617916180161811618216183161841618516186161871618816189161901619116192161931619416195161961619716198161991620016201162021620316204162051620616207162081620916210162111621216213162141621516216162171621816219162201622116222162231622416225162261622716228162291623016231162321623316234162351623616237162381623916240162411624216243162441624516246162471624816249162501625116252162531625416255162561625716258162591626016261162621626316264162651626616267162681626916270162711627216273162741627516276162771627816279162801628116282162831628416285162861628716288162891629016291162921629316294162951629616297162981629916300163011630216303163041630516306163071630816309163101631116312163131631416315163161631716318163191632016321163221632316324163251632616327163281632916330163311633216333163341633516336163371633816339163401634116342163431634416345163461634716348163491635016351163521635316354163551635616357163581635916360163611636216363163641636516366163671636816369163701637116372163731637416375163761637716378163791638016381163821638316384163851638616387163881638916390163911639216393163941639516396163971639816399164001640116402164031640416405164061640716408164091641016411164121641316414164151641616417164181641916420164211642216423164241642516426164271642816429164301643116432164331643416435164361643716438164391644016441164421644316444164451644616447164481644916450164511645216453164541645516456164571645816459164601646116462164631646416465164661646716468164691647016471164721647316474164751647616477164781647916480164811648216483164841648516486164871648816489164901649116492164931649416495164961649716498164991650016501165021650316504165051650616507165081650916510165111651216513165141651516516165171651816519165201652116522165231652416525165261652716528165291653016531165321653316534165351653616537165381653916540165411654216543165441654516546165471654816549165501655116552165531655416555165561655716558165591656016561165621656316564165651656616567165681656916570165711657216573165741657516576165771657816579165801658116582165831658416585165861658716588165891659016591165921659316594165951659616597165981659916600166011660216603166041660516606166071660816609166101661116612166131661416615166161661716618166191662016621166221662316624166251662616627166281662916630166311663216633166341663516636166371663816639166401664116642166431664416645166461664716648166491665016651166521665316654166551665616657166581665916660166611666216663166641666516666166671666816669166701667116672166731667416675166761667716678166791668016681166821668316684166851668616687166881668916690166911669216693166941669516696166971669816699167001670116702167031670416705167061670716708167091671016711167121671316714167151671616717167181671916720167211672216723167241672516726167271672816729167301673116732167331673416735167361673716738167391674016741167421674316744167451674616747167481674916750167511675216753167541675516756167571675816759167601676116762167631676416765167661676716768167691677016771167721677316774167751677616777167781677916780167811678216783167841678516786167871678816789167901679116792167931679416795167961679716798167991680016801168021680316804168051680616807168081680916810168111681216813168141681516816168171681816819168201682116822168231682416825168261682716828168291683016831168321683316834168351683616837168381683916840168411684216843168441684516846168471684816849168501685116852168531685416855168561685716858168591686016861168621686316864168651686616867168681686916870168711687216873168741687516876168771687816879168801688116882168831688416885168861688716888168891689016891168921689316894168951689616897168981689916900169011690216903169041690516906169071690816909169101691116912169131691416915169161691716918169191692016921169221692316924169251692616927169281692916930169311693216933169341693516936169371693816939169401694116942169431694416945169461694716948169491695016951169521695316954169551695616957169581695916960169611696216963169641696516966169671696816969169701697116972169731697416975169761697716978169791698016981169821698316984169851698616987169881698916990169911699216993169941699516996169971699816999170001700117002170031700417005170061700717008170091701017011170121701317014170151701617017170181701917020170211702217023170241702517026170271702817029170301703117032170331703417035170361703717038170391704017041170421704317044170451704617047170481704917050170511705217053170541705517056170571705817059170601706117062170631706417065170661706717068170691707017071170721707317074170751707617077170781707917080170811708217083170841708517086170871708817089170901709117092170931709417095170961709717098170991710017101171021710317104171051710617107171081710917110171111711217113171141711517116171171711817119171201712117122171231712417125171261712717128171291713017131171321713317134171351713617137171381713917140171411714217143171441714517146171471714817149171501715117152171531715417155171561715717158171591716017161171621716317164171651716617167171681716917170171711717217173171741717517176171771717817179171801718117182171831718417185171861718717188171891719017191171921719317194171951719617197171981719917200172011720217203172041720517206172071720817209172101721117212172131721417215172161721717218172191722017221172221722317224172251722617227172281722917230172311723217233172341723517236172371723817239172401724117242172431724417245172461724717248172491725017251172521725317254172551725617257172581725917260172611726217263172641726517266172671726817269172701727117272172731727417275172761727717278172791728017281172821728317284172851728617287172881728917290172911729217293172941729517296172971729817299173001730117302173031730417305173061730717308173091731017311173121731317314173151731617317173181731917320173211732217323173241732517326173271732817329173301733117332173331733417335173361733717338173391734017341173421734317344173451734617347173481734917350173511735217353173541735517356173571735817359173601736117362173631736417365173661736717368173691737017371173721737317374173751737617377173781737917380173811738217383173841738517386173871738817389173901739117392173931739417395173961739717398173991740017401174021740317404174051740617407174081740917410174111741217413174141741517416174171741817419174201742117422174231742417425174261742717428174291743017431174321743317434174351743617437174381743917440174411744217443174441744517446174471744817449174501745117452174531745417455174561745717458174591746017461174621746317464174651746617467174681746917470174711747217473174741747517476174771747817479174801748117482174831748417485174861748717488174891749017491174921749317494174951749617497174981749917500175011750217503175041750517506175071750817509175101751117512175131751417515175161751717518175191752017521175221752317524175251752617527175281752917530175311753217533175341753517536175371753817539175401754117542175431754417545175461754717548175491755017551175521755317554175551755617557175581755917560175611756217563175641756517566175671756817569175701757117572175731757417575175761757717578175791758017581175821758317584175851758617587175881758917590175911759217593175941759517596175971759817599176001760117602176031760417605176061760717608176091761017611176121761317614176151761617617176181761917620176211762217623176241762517626176271762817629176301763117632176331763417635176361763717638176391764017641176421764317644176451764617647176481764917650176511765217653176541765517656176571765817659176601766117662176631766417665176661766717668176691767017671176721767317674176751767617677176781767917680176811768217683176841768517686176871768817689176901769117692176931769417695176961769717698176991770017701177021770317704177051770617707177081770917710177111771217713177141771517716177171771817719177201772117722177231772417725177261772717728177291773017731177321773317734177351773617737177381773917740177411774217743177441774517746177471774817749177501775117752177531775417755177561775717758177591776017761177621776317764177651776617767177681776917770177711777217773177741777517776177771777817779177801778117782177831778417785177861778717788177891779017791177921779317794177951779617797177981779917800178011780217803178041780517806178071780817809178101781117812178131781417815178161781717818178191782017821178221782317824178251782617827178281782917830178311783217833178341783517836178371783817839178401784117842178431784417845178461784717848178491785017851178521785317854178551785617857178581785917860178611786217863178641786517866178671786817869178701787117872178731787417875178761787717878178791788017881178821788317884178851788617887178881788917890178911789217893178941789517896178971789817899179001790117902179031790417905179061790717908179091791017911179121791317914179151791617917179181791917920179211792217923179241792517926179271792817929179301793117932179331793417935179361793717938179391794017941179421794317944179451794617947179481794917950179511795217953179541795517956179571795817959179601796117962179631796417965179661796717968179691797017971179721797317974179751797617977179781797917980179811798217983179841798517986179871798817989179901799117992179931799417995179961799717998179991800018001180021800318004180051800618007180081800918010180111801218013180141801518016180171801818019180201802118022180231802418025180261802718028180291803018031180321803318034180351803618037180381803918040180411804218043180441804518046180471804818049180501805118052180531805418055180561805718058180591806018061180621806318064180651806618067180681806918070180711807218073180741807518076180771807818079180801808118082180831808418085180861808718088180891809018091180921809318094180951809618097180981809918100181011810218103181041810518106181071810818109181101811118112181131811418115181161811718118181191812018121181221812318124181251812618127181281812918130181311813218133181341813518136181371813818139181401814118142181431814418145181461814718148181491815018151181521815318154181551815618157181581815918160181611816218163181641816518166181671816818169181701817118172181731817418175181761817718178181791818018181181821818318184181851818618187181881818918190181911819218193181941819518196181971819818199182001820118202182031820418205182061820718208182091821018211182121821318214182151821618217182181821918220182211822218223182241822518226182271822818229182301823118232182331823418235182361823718238182391824018241182421824318244182451824618247182481824918250182511825218253182541825518256182571825818259182601826118262182631826418265182661826718268182691827018271182721827318274182751827618277182781827918280182811828218283182841828518286182871828818289182901829118292182931829418295182961829718298182991830018301183021830318304183051830618307183081830918310183111831218313183141831518316183171831818319183201832118322183231832418325183261832718328183291833018331183321833318334183351833618337183381833918340183411834218343183441834518346183471834818349183501835118352183531835418355183561835718358183591836018361183621836318364183651836618367183681836918370183711837218373183741837518376183771837818379183801838118382183831838418385183861838718388183891839018391183921839318394183951839618397183981839918400184011840218403184041840518406184071840818409184101841118412184131841418415184161841718418184191842018421184221842318424184251842618427184281842918430184311843218433184341843518436184371843818439184401844118442184431844418445184461844718448184491845018451184521845318454184551845618457184581845918460184611846218463184641846518466184671846818469184701847118472184731847418475184761847718478184791848018481184821848318484184851848618487184881848918490184911849218493184941849518496184971849818499185001850118502185031850418505185061850718508185091851018511185121851318514185151851618517185181851918520185211852218523185241852518526185271852818529185301853118532185331853418535185361853718538185391854018541185421854318544185451854618547185481854918550185511855218553185541855518556185571855818559185601856118562185631856418565185661856718568185691857018571185721857318574185751857618577185781857918580185811858218583185841858518586185871858818589185901859118592185931859418595185961859718598185991860018601186021860318604186051860618607186081860918610186111861218613186141861518616186171861818619186201862118622186231862418625186261862718628186291863018631186321863318634186351863618637186381863918640186411864218643186441864518646186471864818649186501865118652186531865418655186561865718658186591866018661186621866318664186651866618667186681866918670186711867218673186741867518676186771867818679186801868118682186831868418685186861868718688186891869018691186921869318694186951869618697186981869918700187011870218703187041870518706187071870818709187101871118712187131871418715187161871718718187191872018721187221872318724187251872618727187281872918730187311873218733187341873518736187371873818739187401874118742187431874418745187461874718748187491875018751187521875318754187551875618757187581875918760187611876218763187641876518766187671876818769187701877118772187731877418775187761877718778187791878018781187821878318784187851878618787187881878918790187911879218793187941879518796187971879818799188001880118802188031880418805188061880718808188091881018811188121881318814188151881618817188181881918820188211882218823188241882518826188271882818829188301883118832188331883418835188361883718838188391884018841188421884318844188451884618847188481884918850188511885218853188541885518856188571885818859188601886118862188631886418865188661886718868188691887018871188721887318874188751887618877188781887918880188811888218883188841888518886188871888818889188901889118892188931889418895188961889718898188991890018901189021890318904189051890618907189081890918910189111891218913189141891518916189171891818919189201892118922189231892418925189261892718928189291893018931189321893318934189351893618937189381893918940189411894218943189441894518946189471894818949189501895118952189531895418955189561895718958189591896018961189621896318964189651896618967189681896918970189711897218973189741897518976189771897818979189801898118982189831898418985189861898718988189891899018991189921899318994189951899618997189981899919000190011900219003190041900519006190071900819009190101901119012190131901419015190161901719018190191902019021190221902319024190251902619027190281902919030190311903219033190341903519036190371903819039190401904119042190431904419045190461904719048190491905019051190521905319054190551905619057190581905919060190611906219063190641906519066190671906819069190701907119072190731907419075190761907719078190791908019081190821908319084190851908619087190881908919090190911909219093190941909519096190971909819099191001910119102191031910419105191061910719108191091911019111191121911319114191151911619117191181911919120191211912219123191241912519126191271912819129191301913119132191331913419135191361913719138191391914019141191421914319144191451914619147191481914919150191511915219153191541915519156191571915819159191601916119162191631916419165191661916719168191691917019171191721917319174191751917619177191781917919180191811918219183191841918519186191871918819189191901919119192191931919419195191961919719198191991920019201192021920319204192051920619207192081920919210192111921219213192141921519216192171921819219192201922119222192231922419225192261922719228192291923019231192321923319234192351923619237192381923919240192411924219243192441924519246192471924819249192501925119252192531925419255192561925719258192591926019261192621926319264192651926619267192681926919270192711927219273192741927519276192771927819279192801928119282192831928419285192861928719288192891929019291192921929319294192951929619297192981929919300193011930219303193041930519306193071930819309193101931119312193131931419315193161931719318193191932019321193221932319324193251932619327193281932919330193311933219333193341933519336193371933819339193401934119342193431934419345193461934719348193491935019351193521935319354193551935619357193581935919360193611936219363193641936519366193671936819369193701937119372193731937419375193761937719378193791938019381193821938319384193851938619387193881938919390193911939219393193941939519396193971939819399194001940119402194031940419405194061940719408194091941019411194121941319414194151941619417194181941919420194211942219423194241942519426194271942819429194301943119432194331943419435194361943719438194391944019441194421944319444194451944619447194481944919450194511945219453194541945519456194571945819459194601946119462194631946419465194661946719468194691947019471194721947319474194751947619477194781947919480194811948219483194841948519486194871948819489194901949119492194931949419495194961949719498194991950019501195021950319504195051950619507195081950919510195111951219513195141951519516195171951819519195201952119522195231952419525195261952719528195291953019531195321953319534195351953619537195381953919540195411954219543195441954519546195471954819549195501955119552195531955419555195561955719558195591956019561195621956319564195651956619567195681956919570195711957219573195741957519576195771957819579195801958119582195831958419585195861958719588195891959019591195921959319594195951959619597195981959919600196011960219603196041960519606196071960819609196101961119612196131961419615196161961719618196191962019621196221962319624196251962619627196281962919630196311963219633196341963519636196371963819639196401964119642196431964419645196461964719648196491965019651196521965319654196551965619657196581965919660196611966219663196641966519666196671966819669196701967119672196731967419675196761967719678196791968019681196821968319684196851968619687196881968919690196911969219693196941969519696196971969819699197001970119702197031970419705197061970719708197091971019711197121971319714197151971619717197181971919720197211972219723197241972519726197271972819729197301973119732197331973419735197361973719738197391974019741197421974319744197451974619747197481974919750197511975219753197541975519756197571975819759197601976119762197631976419765197661976719768197691977019771197721977319774197751977619777197781977919780197811978219783197841978519786197871978819789197901979119792197931979419795197961979719798197991980019801198021980319804198051980619807198081980919810198111981219813198141981519816198171981819819198201982119822198231982419825198261982719828198291983019831198321983319834198351983619837198381983919840198411984219843198441984519846198471984819849198501985119852198531985419855198561985719858198591986019861198621986319864198651986619867198681986919870198711987219873198741987519876198771987819879198801988119882198831988419885198861988719888198891989019891198921989319894198951989619897198981989919900199011990219903199041990519906199071990819909199101991119912199131991419915199161991719918199191992019921199221992319924199251992619927199281992919930199311993219933199341993519936199371993819939199401994119942199431994419945199461994719948199491995019951199521995319954199551995619957199581995919960199611996219963199641996519966199671996819969199701997119972199731997419975199761997719978199791998019981199821998319984199851998619987199881998919990199911999219993199941999519996199971999819999200002000120002200032000420005200062000720008200092001020011200122001320014200152001620017200182001920020200212002220023200242002520026200272002820029200302003120032200332003420035200362003720038200392004020041200422004320044200452004620047200482004920050200512005220053200542005520056200572005820059200602006120062200632006420065200662006720068200692007020071200722007320074200752007620077200782007920080200812008220083200842008520086200872008820089200902009120092200932009420095200962009720098200992010020101201022010320104201052010620107201082010920110201112011220113201142011520116201172011820119201202012120122201232012420125201262012720128201292013020131201322013320134201352013620137201382013920140201412014220143201442014520146201472014820149201502015120152201532015420155201562015720158201592016020161201622016320164201652016620167201682016920170201712017220173201742017520176201772017820179201802018120182201832018420185201862018720188201892019020191201922019320194201952019620197201982019920200202012020220203202042020520206202072020820209202102021120212202132021420215202162021720218202192022020221202222022320224202252022620227202282022920230202312023220233202342023520236202372023820239202402024120242202432024420245202462024720248202492025020251202522025320254202552025620257202582025920260202612026220263202642026520266202672026820269202702027120272202732027420275202762027720278202792028020281202822028320284202852028620287202882028920290202912029220293202942029520296202972029820299203002030120302203032030420305203062030720308203092031020311203122031320314203152031620317203182031920320203212032220323203242032520326203272032820329203302033120332203332033420335203362033720338203392034020341203422034320344203452034620347203482034920350203512035220353203542035520356203572035820359203602036120362203632036420365203662036720368203692037020371203722037320374203752037620377203782037920380203812038220383203842038520386203872038820389203902039120392203932039420395203962039720398203992040020401204022040320404204052040620407204082040920410204112041220413204142041520416204172041820419204202042120422204232042420425204262042720428204292043020431204322043320434204352043620437204382043920440204412044220443204442044520446204472044820449204502045120452204532045420455204562045720458204592046020461204622046320464204652046620467204682046920470204712047220473204742047520476204772047820479204802048120482204832048420485204862048720488204892049020491204922049320494204952049620497204982049920500205012050220503205042050520506205072050820509205102051120512205132051420515205162051720518205192052020521205222052320524205252052620527205282052920530205312053220533205342053520536205372053820539205402054120542205432054420545205462054720548205492055020551205522055320554205552055620557205582055920560205612056220563205642056520566205672056820569205702057120572205732057420575205762057720578205792058020581205822058320584205852058620587205882058920590205912059220593205942059520596205972059820599206002060120602206032060420605206062060720608206092061020611206122061320614206152061620617206182061920620206212062220623206242062520626206272062820629206302063120632206332063420635206362063720638206392064020641206422064320644206452064620647206482064920650206512065220653206542065520656206572065820659206602066120662206632066420665206662066720668206692067020671206722067320674206752067620677206782067920680206812068220683206842068520686206872068820689206902069120692206932069420695206962069720698206992070020701207022070320704207052070620707207082070920710207112071220713207142071520716207172071820719207202072120722207232072420725207262072720728207292073020731207322073320734207352073620737207382073920740207412074220743207442074520746207472074820749207502075120752207532075420755207562075720758207592076020761207622076320764207652076620767207682076920770207712077220773207742077520776207772077820779207802078120782207832078420785207862078720788207892079020791207922079320794207952079620797207982079920800208012080220803208042080520806208072080820809208102081120812208132081420815208162081720818208192082020821208222082320824208252082620827208282082920830208312083220833208342083520836208372083820839208402084120842208432084420845208462084720848208492085020851208522085320854208552085620857208582085920860208612086220863208642086520866208672086820869208702087120872208732087420875208762087720878208792088020881208822088320884208852088620887208882088920890208912089220893208942089520896208972089820899209002090120902209032090420905209062090720908209092091020911209122091320914209152091620917209182091920920209212092220923209242092520926209272092820929209302093120932209332093420935209362093720938209392094020941209422094320944209452094620947209482094920950209512095220953209542095520956209572095820959209602096120962209632096420965209662096720968209692097020971209722097320974209752097620977209782097920980209812098220983209842098520986209872098820989209902099120992209932099420995209962099720998209992100021001210022100321004210052100621007210082100921010210112101221013210142101521016210172101821019210202102121022210232102421025210262102721028210292103021031210322103321034210352103621037210382103921040210412104221043210442104521046210472104821049210502105121052210532105421055210562105721058210592106021061210622106321064210652106621067210682106921070210712107221073210742107521076210772107821079210802108121082210832108421085210862108721088210892109021091210922109321094210952109621097210982109921100211012110221103211042110521106211072110821109211102111121112211132111421115211162111721118211192112021121211222112321124211252112621127211282112921130211312113221133211342113521136211372113821139211402114121142211432114421145211462114721148211492115021151211522115321154211552115621157211582115921160211612116221163211642116521166211672116821169211702117121172211732117421175211762117721178211792118021181211822118321184211852118621187211882118921190211912119221193211942119521196211972119821199212002120121202212032120421205212062120721208212092121021211212122121321214212152121621217212182121921220212212122221223212242122521226212272122821229212302123121232212332123421235212362123721238212392124021241212422124321244212452124621247212482124921250212512125221253212542125521256212572125821259212602126121262212632126421265212662126721268212692127021271212722127321274212752127621277212782127921280212812128221283212842128521286212872128821289212902129121292212932129421295212962129721298212992130021301213022130321304213052130621307213082130921310213112131221313213142131521316213172131821319213202132121322213232132421325213262132721328213292133021331213322133321334213352133621337213382133921340213412134221343213442134521346213472134821349213502135121352213532135421355213562135721358213592136021361213622136321364213652136621367213682136921370213712137221373213742137521376213772137821379213802138121382213832138421385213862138721388213892139021391213922139321394213952139621397213982139921400214012140221403214042140521406214072140821409214102141121412214132141421415214162141721418214192142021421214222142321424214252142621427214282142921430214312143221433214342143521436214372143821439214402144121442214432144421445214462144721448214492145021451214522145321454214552145621457214582145921460214612146221463214642146521466214672146821469214702147121472214732147421475214762147721478214792148021481214822148321484214852148621487214882148921490214912149221493214942149521496214972149821499215002150121502215032150421505215062150721508215092151021511215122151321514215152151621517215182151921520215212152221523215242152521526215272152821529215302153121532215332153421535215362153721538215392154021541215422154321544215452154621547215482154921550215512155221553215542155521556215572155821559215602156121562215632156421565215662156721568215692157021571215722157321574215752157621577215782157921580215812158221583215842158521586215872158821589215902159121592215932159421595215962159721598215992160021601216022160321604216052160621607216082160921610216112161221613216142161521616216172161821619216202162121622216232162421625216262162721628216292163021631216322163321634216352163621637216382163921640216412164221643216442164521646216472164821649216502165121652216532165421655216562165721658216592166021661216622166321664216652166621667216682166921670216712167221673216742167521676216772167821679216802168121682216832168421685216862168721688216892169021691216922169321694216952169621697216982169921700217012170221703217042170521706217072170821709217102171121712217132171421715217162171721718217192172021721217222172321724217252172621727217282172921730217312173221733217342173521736217372173821739217402174121742217432174421745217462174721748217492175021751217522175321754217552175621757217582175921760217612176221763217642176521766217672176821769217702177121772217732177421775217762177721778217792178021781217822178321784217852178621787217882178921790217912179221793217942179521796217972179821799218002180121802218032180421805218062180721808218092181021811218122181321814218152181621817218182181921820218212182221823218242182521826218272182821829218302183121832218332183421835218362183721838218392184021841218422184321844218452184621847218482184921850218512185221853218542185521856218572185821859218602186121862218632186421865218662186721868218692187021871218722187321874218752187621877218782187921880218812188221883218842188521886218872188821889218902189121892218932189421895218962189721898218992190021901219022190321904219052190621907219082190921910219112191221913219142191521916219172191821919219202192121922219232192421925219262192721928219292193021931219322193321934219352193621937219382193921940219412194221943219442194521946219472194821949219502195121952219532195421955219562195721958219592196021961219622196321964219652196621967219682196921970219712197221973219742197521976219772197821979219802198121982219832198421985219862198721988219892199021991219922199321994219952199621997219982199922000220012200222003220042200522006220072200822009220102201122012220132201422015220162201722018220192202022021220222202322024220252202622027220282202922030220312203222033220342203522036220372203822039220402204122042220432204422045220462204722048220492205022051220522205322054220552205622057220582205922060220612206222063220642206522066220672206822069220702207122072220732207422075220762207722078220792208022081220822208322084220852208622087220882208922090220912209222093220942209522096220972209822099221002210122102221032210422105221062210722108221092211022111221122211322114221152211622117221182211922120221212212222123221242212522126221272212822129221302213122132221332213422135221362213722138221392214022141221422214322144221452214622147221482214922150221512215222153221542215522156221572215822159221602216122162221632216422165221662216722168221692217022171221722217322174221752217622177221782217922180221812218222183221842218522186221872218822189221902219122192221932219422195221962219722198221992220022201222022220322204222052220622207222082220922210222112221222213222142221522216222172221822219222202222122222222232222422225222262222722228222292223022231222322223322234222352223622237222382223922240222412224222243222442224522246222472224822249222502225122252222532225422255222562225722258222592226022261222622226322264222652226622267222682226922270222712227222273222742227522276222772227822279222802228122282222832228422285222862228722288222892229022291222922229322294222952229622297222982229922300223012230222303223042230522306223072230822309223102231122312223132231422315223162231722318223192232022321223222232322324223252232622327223282232922330223312233222333223342233522336223372233822339223402234122342223432234422345223462234722348223492235022351223522235322354223552235622357223582235922360223612236222363223642236522366223672236822369223702237122372223732237422375223762237722378223792238022381223822238322384223852238622387223882238922390223912239222393223942239522396223972239822399224002240122402224032240422405224062240722408224092241022411224122241322414224152241622417224182241922420224212242222423224242242522426224272242822429224302243122432224332243422435224362243722438224392244022441224422244322444224452244622447224482244922450224512245222453224542245522456224572245822459224602246122462224632246422465224662246722468224692247022471224722247322474224752247622477224782247922480224812248222483224842248522486224872248822489224902249122492224932249422495224962249722498224992250022501225022250322504225052250622507225082250922510225112251222513225142251522516225172251822519225202252122522225232252422525225262252722528225292253022531225322253322534225352253622537225382253922540225412254222543225442254522546225472254822549225502255122552225532255422555225562255722558225592256022561225622256322564225652256622567225682256922570225712257222573225742257522576225772257822579225802258122582225832258422585225862258722588225892259022591225922259322594225952259622597225982259922600226012260222603226042260522606226072260822609226102261122612226132261422615226162261722618226192262022621226222262322624226252262622627226282262922630226312263222633226342263522636226372263822639226402264122642226432264422645226462264722648226492265022651226522265322654226552265622657226582265922660226612266222663226642266522666226672266822669226702267122672226732267422675226762267722678226792268022681226822268322684226852268622687226882268922690226912269222693226942269522696226972269822699227002270122702227032270422705227062270722708227092271022711227122271322714227152271622717227182271922720227212272222723227242272522726227272272822729227302273122732227332273422735227362273722738227392274022741227422274322744227452274622747227482274922750227512275222753227542275522756227572275822759227602276122762227632276422765227662276722768227692277022771227722277322774227752277622777227782277922780227812278222783227842278522786227872278822789227902279122792227932279422795227962279722798227992280022801228022280322804228052280622807228082280922810228112281222813228142281522816228172281822819228202282122822228232282422825228262282722828228292283022831228322283322834228352283622837228382283922840228412284222843228442284522846228472284822849228502285122852228532285422855228562285722858228592286022861228622286322864228652286622867228682286922870228712287222873228742287522876228772287822879228802288122882228832288422885228862288722888228892289022891228922289322894228952289622897228982289922900229012290222903229042290522906229072290822909229102291122912229132291422915229162291722918229192292022921229222292322924229252292622927229282292922930229312293222933229342293522936229372293822939229402294122942229432294422945229462294722948229492295022951229522295322954229552295622957229582295922960229612296222963229642296522966229672296822969229702297122972229732297422975229762297722978229792298022981229822298322984229852298622987229882298922990229912299222993229942299522996229972299822999230002300123002230032300423005230062300723008230092301023011230122301323014230152301623017230182301923020230212302223023230242302523026230272302823029230302303123032230332303423035230362303723038230392304023041230422304323044230452304623047230482304923050230512305223053230542305523056230572305823059230602306123062230632306423065230662306723068230692307023071230722307323074230752307623077230782307923080230812308223083230842308523086230872308823089230902309123092230932309423095230962309723098230992310023101231022310323104231052310623107231082310923110231112311223113231142311523116231172311823119231202312123122231232312423125231262312723128231292313023131231322313323134231352313623137231382313923140231412314223143231442314523146231472314823149231502315123152231532315423155231562315723158231592316023161231622316323164231652316623167231682316923170231712317223173231742317523176231772317823179231802318123182231832318423185231862318723188231892319023191231922319323194231952319623197231982319923200232012320223203232042320523206232072320823209232102321123212232132321423215232162321723218232192322023221232222322323224232252322623227232282322923230232312323223233232342323523236232372323823239232402324123242232432324423245232462324723248232492325023251232522325323254232552325623257232582325923260232612326223263232642326523266232672326823269232702327123272232732327423275232762327723278232792328023281232822328323284232852328623287232882328923290232912329223293232942329523296232972329823299233002330123302233032330423305233062330723308233092331023311233122331323314233152331623317233182331923320233212332223323233242332523326233272332823329233302333123332233332333423335233362333723338233392334023341233422334323344233452334623347233482334923350233512335223353233542335523356233572335823359233602336123362233632336423365233662336723368233692337023371233722337323374233752337623377233782337923380233812338223383 |
- From fd34d57c9e2a0bff1283a6707062ed4a42476b10 Mon Sep 17 00:00:00 2001
- From: Khem Raj <raj.khem@gmail.com>
- Date: Sun, 14 Feb 2016 17:04:07 +0000
- Subject: [PATCH] Use libtool 2.4
- get libtool sysroot support
- Upstream-Status: Pending
- Signed-off-by: Khem Raj <raj.khem@gmail.com>
- ---
- bfd/configure | 1340 +++++++++++++++-----
- bfd/configure.ac | 2 +-
- binutils/configure | 1338 +++++++++++++++-----
- gas/configure | 1338 +++++++++++++++-----
- gprof/configure | 1338 +++++++++++++++-----
- ld/configure | 1713 +++++++++++++++++++-------
- libctf/configure | 1337 +++++++++++++++-----
- libtool.m4 | 1100 +++++++++++------
- ltmain.sh | 2925 +++++++++++++++++++++++++++++---------------
- ltoptions.m4 | 2 +-
- ltversion.m4 | 12 +-
- lt~obsolete.m4 | 2 +-
- opcodes/configure | 1338 +++++++++++++++-----
- zlib/configure | 1338 +++++++++++++++-----
- 14 files changed, 10995 insertions(+), 4128 deletions(-)
- diff --git a/bfd/configure b/bfd/configure
- index daa51244369..79d0c4b4623 100755
- --- a/bfd/configure
- +++ b/bfd/configure
- @@ -705,6 +705,9 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- +ac_ct_AR
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -823,6 +826,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_plugins
- enable_largefile
- @@ -1507,6 +1511,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
- --with-mmap try using mmap for BFD input files if available
- --with-separate-debug-dir=DIR
- Look for global separate debug info in DIR
- @@ -4988,8 +4994,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -5029,7 +5035,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -5715,8 +5721,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -5765,6 +5771,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -5781,6 +5861,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -5949,7 +6034,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -6103,6 +6189,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -6118,6 +6219,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -6132,8 +6384,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -6149,7 +6403,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6169,11 +6423,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -6189,7 +6447,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6208,6 +6466,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -6219,25 +6481,20 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
- +
-
-
-
- @@ -6248,6 +6505,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
- +
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
- +
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
- +
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
- +
- +
- +
- +
- +
- +
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- @@ -6588,8 +6902,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -6625,6 +6939,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -6666,6 +6981,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -6677,7 +7004,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -6703,8 +7030,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -6714,8 +7041,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -6752,6 +7079,14 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
-
-
-
- @@ -6770,6 +7105,47 @@ fi
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
- +
- +
-
-
-
- @@ -6979,6 +7355,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -7542,6 +8035,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -7706,7 +8201,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -7795,7 +8291,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -8093,8 +8589,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -8260,6 +8754,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -8322,7 +8822,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -8379,13 +8879,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -8446,6 +8950,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -8796,7 +9305,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -8895,12 +9405,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -8914,8 +9424,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -8933,8 +9443,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8980,8 +9490,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -9111,7 +9621,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9124,22 +9640,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -9151,7 +9674,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9164,22 +9693,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -9224,20 +9760,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -9298,7 +9877,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -9306,7 +9885,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -9322,7 +9901,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -9346,10 +9925,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -9428,23 +10007,36 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -9529,7 +10121,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -9548,9 +10140,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -10126,8 +10718,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -10160,13 +10753,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -10248,7 +10899,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -11044,7 +11695,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 11047 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11088,10 +11739,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -11150,7 +11801,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 11153 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11194,10 +11845,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -13114,7 +13765,7 @@ SHARED_LDFLAGS=
- if test "$enable_shared" = "yes"; then
- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
- if test -n "$x"; then
- - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
- + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
- fi
- fi
-
- @@ -15762,13 +16413,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -15783,14 +16441,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -15823,12 +16484,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -15883,8 +16544,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -15894,12 +16560,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -15915,7 +16583,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -15951,6 +16618,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -16720,7 +17388,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -16823,19 +17492,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -16865,6 +17557,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -16874,6 +17572,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -16988,12 +17689,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -17080,9 +17781,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -17098,6 +17796,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -17130,210 +17831,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- diff --git a/bfd/configure.ac b/bfd/configure.ac
- index 07a75ed1626..288374c504c 100644
- --- a/bfd/configure.ac
- +++ b/bfd/configure.ac
- @@ -304,7 +304,7 @@ changequote(,)dnl
- x=`sed -n -e 's/^[ ]*PICFLAG[ ]*=[ ]*//p' < ../libiberty/Makefile | sed -n '$p'`
- changequote([,])dnl
- if test -n "$x"; then
- - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty"
- + SHARED_LIBADD="`pwd`/../libiberty/pic/libiberty.a"
- fi
- fi
-
- diff --git a/binutils/configure b/binutils/configure
- index bf6461dab1e..8e6f6d30b4d 100755
- --- a/binutils/configure
- +++ b/binutils/configure
- @@ -696,8 +696,11 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- RANLIB
- +ac_ct_AR
- AR
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -814,6 +817,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_plugins
- enable_largefile
- @@ -1509,6 +1513,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
- --with-debuginfod Enable debuginfo lookups with debuginfod
- (auto/yes/no)
- --with-system-zlib use installed libz
- @@ -4844,8 +4850,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -4885,7 +4891,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -5571,8 +5577,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -5621,6 +5627,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -5637,6 +5717,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -5805,7 +5890,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -5959,6 +6045,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -5974,6 +6075,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -5988,8 +6240,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -6005,7 +6259,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6025,11 +6279,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -6045,7 +6303,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6064,6 +6322,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -6075,29 +6337,81 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
-
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
-
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
-
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
-
-
-
- @@ -6444,8 +6758,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -6481,6 +6795,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -6522,6 +6837,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -6533,7 +6860,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -6559,8 +6886,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -6570,8 +6897,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -6608,6 +6935,19 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
- +
- +
- +
- +
- +
-
-
-
- @@ -6624,6 +6964,42 @@ fi
-
-
-
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
- @@ -6835,6 +7211,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -7398,6 +7891,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -7593,7 +8088,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -7682,7 +8178,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -7980,8 +8476,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -8147,6 +8641,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -8209,7 +8709,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -8266,13 +8766,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -8333,6 +8837,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -8683,7 +9192,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -8782,12 +9292,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -8801,8 +9311,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -8820,8 +9330,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8867,8 +9377,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8998,7 +9508,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9011,22 +9527,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -9038,7 +9561,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9051,22 +9580,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -9111,20 +9647,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -9185,7 +9764,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -9193,7 +9772,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -9209,7 +9788,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -9233,10 +9812,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -9315,23 +9894,36 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -9416,7 +10008,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -9435,9 +10027,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -10013,8 +10605,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -10047,13 +10640,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -10135,7 +10786,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -10931,7 +11582,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10934 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10975,10 +11626,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -11037,7 +11688,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 11040 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11081,10 +11732,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -15455,13 +16106,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -15476,14 +16134,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -15516,12 +16177,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -15576,8 +16237,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -15587,12 +16253,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -15608,7 +16276,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -15644,6 +16311,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -16410,7 +17078,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -16513,19 +17182,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -16555,6 +17247,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -16564,6 +17262,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -16678,12 +17379,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -16770,9 +17471,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -16788,6 +17486,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -16820,210 +17521,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- diff --git a/gas/configure b/gas/configure
- index 789d1b38b33..7ac563a13ad 100755
- --- a/gas/configure
- +++ b/gas/configure
- @@ -681,8 +681,11 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- RANLIB
- +ac_ct_AR
- AR
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -799,6 +802,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_plugins
- enable_largefile
- @@ -1490,6 +1494,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
- --with-cpu=CPU default cpu variant is CPU (currently only supported
- on ARC)
- --with-system-zlib use installed libz
- @@ -4569,8 +4575,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -4610,7 +4616,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -5296,8 +5302,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -5346,6 +5352,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -5362,6 +5442,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -5530,7 +5615,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -5684,6 +5770,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -5699,6 +5800,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -5713,8 +5965,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -5730,7 +5984,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5750,11 +6004,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -5770,7 +6028,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5789,6 +6047,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -5800,29 +6062,81 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
-
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
-
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
-
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
-
-
-
- @@ -6169,8 +6483,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -6206,6 +6520,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -6247,6 +6562,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -6258,7 +6585,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -6284,8 +6611,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -6295,8 +6622,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -6333,6 +6660,19 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
- +
- +
- +
- +
- +
-
-
-
- @@ -6349,6 +6689,42 @@ fi
-
-
-
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
- @@ -6560,6 +6936,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -7123,6 +7616,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -7318,7 +7813,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -7407,7 +7903,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -7705,8 +8201,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -7872,6 +8366,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -7934,7 +8434,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -7991,13 +8491,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -8058,6 +8562,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -8408,7 +8917,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -8507,12 +9017,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -8526,8 +9036,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -8545,8 +9055,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8592,8 +9102,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8723,7 +9233,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -8736,22 +9252,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -8763,7 +9286,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -8776,22 +9305,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -8836,20 +9372,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -8910,7 +9489,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -8918,7 +9497,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -8934,7 +9513,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -8958,10 +9537,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -9040,23 +9619,36 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -9141,7 +9733,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -9160,9 +9752,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -9738,8 +10330,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -9772,13 +10365,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -9860,7 +10511,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -10656,7 +11307,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10659 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10700,10 +11351,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -10762,7 +11413,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10765 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10806,10 +11457,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -14785,13 +15436,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -14806,14 +15464,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -14846,12 +15507,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -14906,8 +15567,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -14917,12 +15583,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -14938,7 +15606,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -14974,6 +15641,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -15747,7 +16415,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -15850,19 +16519,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -15892,6 +16584,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -15901,6 +16599,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -16015,12 +16716,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -16107,9 +16808,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -16125,6 +16823,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -16157,210 +16858,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- diff --git a/gprof/configure b/gprof/configure
- index 5703bba4462..e1ac86ec797 100755
- --- a/gprof/configure
- +++ b/gprof/configure
- @@ -663,8 +663,11 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- RANLIB
- +ac_ct_AR
- AR
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -781,6 +784,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_plugins
- enable_largefile
- @@ -1443,6 +1447,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
-
- Some influential environment variables:
- CC C compiler command
- @@ -4471,8 +4477,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -4512,7 +4518,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -5198,8 +5204,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -5248,6 +5254,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -5264,6 +5344,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -5432,7 +5517,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -5586,6 +5672,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -5601,6 +5702,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -5615,8 +5867,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -5632,7 +5886,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5652,11 +5906,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -5672,7 +5930,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5691,6 +5949,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -5702,25 +5964,19 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
-
-
-
- @@ -5732,6 +5988,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
- +
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
- +
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
- +
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
- +
- +
- +
- +
- +
- +
- +
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- @@ -6071,8 +6385,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -6108,6 +6422,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -6149,6 +6464,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -6160,7 +6487,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -6186,8 +6513,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -6197,8 +6524,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -6235,6 +6562,18 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
- +
- +
- +
- +
-
-
-
- @@ -6251,6 +6590,43 @@ fi
-
-
-
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
- @@ -6462,6 +6838,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -7025,6 +7518,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -7220,7 +7715,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -7309,7 +7805,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -7607,8 +8103,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -7774,6 +8268,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -7836,7 +8336,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -7893,13 +8393,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -7960,6 +8464,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -8310,7 +8819,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -8409,12 +8919,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -8428,8 +8938,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -8447,8 +8957,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8494,8 +9004,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8625,7 +9135,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -8638,22 +9154,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -8665,7 +9188,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -8678,22 +9207,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -8738,20 +9274,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -8812,7 +9391,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -8820,7 +9399,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -8836,7 +9415,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -8860,10 +9439,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -8942,23 +9521,36 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -9043,7 +9635,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -9062,9 +9654,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -9640,8 +10232,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -9674,13 +10267,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -9762,7 +10413,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -10558,7 +11209,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10561 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10602,10 +11253,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -10664,7 +11315,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10667 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10708,10 +11359,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -12731,13 +13382,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -12752,14 +13410,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -12792,12 +13453,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -12852,8 +13513,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -12863,12 +13529,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -12884,7 +13552,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -12920,6 +13587,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -13685,7 +14353,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -13788,19 +14457,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -13830,6 +14522,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -13839,6 +14537,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -13953,12 +14654,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -14045,9 +14746,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -14063,6 +14761,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -14095,210 +14796,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- diff --git a/ld/configure b/ld/configure
- index 2aeb3317b65..5ef46d31558 100755
- --- a/ld/configure
- +++ b/ld/configure
- @@ -693,8 +693,11 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- RANLIB
- +ac_ct_AR
- AR
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -821,6 +824,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_plugins
- enable_largefile
- @@ -1528,6 +1532,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
- --with-lib-path=dir1:dir2... set default LIB_PATH
- --with-sysroot=DIR Search for usr/lib et al within DIR.
- --with-system-zlib use installed libz
- @@ -5327,8 +5333,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -5368,7 +5374,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -6054,8 +6060,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -6104,6 +6110,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -6120,6 +6200,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -6288,7 +6373,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -6442,6 +6528,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -6457,6 +6558,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -6471,8 +6723,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -6488,7 +6742,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6508,11 +6762,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -6528,7 +6786,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6547,6 +6805,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -6558,25 +6820,19 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
-
-
-
- @@ -6588,6 +6844,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
- +
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
- +
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
- +
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
- +
- +
- +
- +
- +
- +
- +
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- @@ -6927,8 +7241,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -6964,6 +7278,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -7005,6 +7320,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -7016,7 +7343,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -7042,8 +7369,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -7053,8 +7380,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -7091,6 +7418,17 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
- +
- +
- +
-
-
-
- @@ -7107,6 +7445,44 @@ fi
-
-
-
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
- @@ -7318,6 +7694,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -7881,6 +8374,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -7949,6 +8444,16 @@ done
-
-
-
- +func_stripname_cnf ()
- +{
- + case ${2} in
- + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- + esac
- +} # func_stripname_cnf
- +
- +
- +
-
-
- # Set options
- @@ -8077,7 +8582,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -8166,7 +8672,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -8464,8 +8970,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -8631,6 +9135,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -8693,7 +9203,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -8750,13 +9260,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -8817,6 +9331,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -9167,7 +9686,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -9266,12 +9786,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -9285,8 +9805,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -9304,8 +9824,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -9351,8 +9871,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -9482,7 +10002,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9495,22 +10021,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -9522,7 +10055,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9535,22 +10074,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -9594,21 +10140,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- - # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + # no search path for DLLs.
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -9669,7 +10258,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -9677,7 +10266,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -9693,7 +10282,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -9717,10 +10306,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -9799,23 +10388,36 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -9900,7 +10502,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -9919,9 +10521,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -10497,8 +11099,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -10531,13 +11134,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -10619,7 +11280,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -11415,7 +12076,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 11415 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11459,10 +12120,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -11521,7 +12182,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 11521 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11565,10 +12226,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -11960,6 +12621,7 @@ $RM -r conftest*
-
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- + lt_save_CFLAGS=$CFLAGS
- lt_save_LD=$LD
- lt_save_GCC=$GCC
- GCC=$GXX
- @@ -11977,6 +12639,7 @@ $RM -r conftest*
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- + CFLAGS=$CXXFLAGS
- compiler=$CC
- compiler_CXX=$CC
- for cc_temp in $compiler""; do
- @@ -12259,7 +12922,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- allow_undefined_flag_CXX='-berok'
- # Determine the default libpath from the value encoded in an empty
- # executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath__CXX+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -12272,22 +12941,29 @@ main ()
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath__CXX"; then
- + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath__CXX"; then
- + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath__CXX
- +fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- @@ -12300,7 +12976,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath__CXX+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -12313,22 +12995,29 @@ main ()
- _ACEOF
- if ac_fn_cxx_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath__CXX"; then
- + lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath__CXX"; then
- + lt_cv_aix_libpath__CXX="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath__CXX
- +fi
-
- hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -12371,29 +13060,75 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- - # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
- - # as there is no search path for DLLs.
- - hardcode_libdir_flag_spec_CXX='-L$libdir'
- - export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
- - allow_undefined_flag_CXX=unsupported
- - always_export_symbols_CXX=no
- - enable_shared_with_static_runtimes_CXX=yes
- -
- - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- - 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'
- - # If the export-symbols file already is a .def file (1st line
- - # is EXPORTS), use it as is; otherwise, prepend...
- - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- - cp $export_symbols $output_objdir/$soname.def;
- - else
- - echo EXPORTS > $output_objdir/$soname.def;
- - cat $export_symbols >> $output_objdir/$soname.def;
- - fi~
- - $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'
- - else
- - ld_shlibs_CXX=no
- - fi
- - ;;
- + case $GXX,$cc_basename in
- + ,cl* | no,cl*)
- + # Native MSVC
- + # hardcode_libdir_flag_spec is actually meaningless, as there is
- + # no search path for DLLs.
- + hardcode_libdir_flag_spec_CXX=' '
- + allow_undefined_flag_CXX=unsupported
- + always_export_symbols_CXX=yes
- + file_list_spec_CXX='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
- + enable_shared_with_static_runtimes_CXX=yes
- + # Don't use ranlib
- + old_postinstall_cmds_CXX='chmod 644 $oldlib'
- + postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + func_to_tool_file "$lt_outputfile"~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # g++
- + # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
- + # as there is no search path for DLLs.
- + hardcode_libdir_flag_spec_CXX='-L$libdir'
- + export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
- + allow_undefined_flag_CXX=unsupported
- + always_export_symbols_CXX=no
- + enable_shared_with_static_runtimes_CXX=yes
- +
- + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- + 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'
- + # If the export-symbols file already is a .def file (1st line
- + # is EXPORTS), use it as is; otherwise, prepend...
- + archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + cp $export_symbols $output_objdir/$soname.def;
- + else
- + echo EXPORTS > $output_objdir/$soname.def;
- + cat $export_symbols >> $output_objdir/$soname.def;
- + fi~
- + $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'
- + else
- + ld_shlibs_CXX=no
- + fi
- + ;;
- + esac
- + ;;
- darwin* | rhapsody*)
-
-
- @@ -12499,7 +13234,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- ;;
- *)
- if test "$GXX" = yes; then
- - 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'
- + 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'
- else
- # FIXME: insert proper C++ library support
- ld_shlibs_CXX=no
- @@ -12570,10 +13305,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- + archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- *)
- - 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'
- + 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'
- ;;
- esac
- fi
- @@ -12614,9 +13349,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- - 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'
- + 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'
- else
- - 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'
- + 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'
- fi
- fi
- link_all_deplibs_CXX=yes
- @@ -12686,20 +13421,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- prelink_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
- + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
- old_archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
- + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
- archive_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- archive_expsym_cmds_CXX='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- - $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'
- + $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'
- ;;
- *) # Version 6 and above use weak symbols
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- @@ -12894,7 +13629,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 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'
- ;;
- *)
- - 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'
- + 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'
- ;;
- esac
-
- @@ -12940,7 +13675,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- solaris*)
- case $cc_basename in
- - CC*)
- + CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- archive_cmds_need_lc_CXX=yes
- no_undefined_flag_CXX=' -zdefs'
- @@ -12981,9 +13716,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
- if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- + archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- @@ -13118,6 +13853,13 @@ private:
- };
- _LT_EOF
-
- +
- +_lt_libdeps_save_CFLAGS=$CFLAGS
- +case "$CC $CFLAGS " in #(
- +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
- +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
- +esac
- +
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- @@ -13131,7 +13873,7 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- pre_test_object_deps_done=no
-
- for p in `eval "$output_verbose_link_cmd"`; do
- - case $p in
- + case ${prev}${p} in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- @@ -13140,13 +13882,22 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- test $p = "-R"; then
- prev=$p
- continue
- - else
- - prev=
- fi
-
- + # Expand the sysroot to ease extracting the directories later.
- + if test -z "$prev"; then
- + case $p in
- + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- + esac
- + fi
- + case $p in
- + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- + esac
- if test "$pre_test_object_deps_done" = no; then
- - case $p in
- - -L* | -R*)
- + case ${prev} in
- + -L | -R)
- # Internal compiler library paths should come after those
- # provided the user. The postdeps already come after the
- # user supplied libs so there is no need to process them.
- @@ -13166,8 +13917,10 @@ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
- postdeps_CXX="${postdeps_CXX} ${prev}${p}"
- fi
- fi
- + prev=
- ;;
-
- + *.lto.$objext) ;; # Ignore GCC LTO objects
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- @@ -13203,6 +13956,7 @@ else
- fi
-
- $RM -f confest.$objext
- +CFLAGS=$_lt_libdeps_save_CFLAGS
-
- # PORTME: override above test on systems where it is broken
- case $host_os in
- @@ -13238,7 +13992,7 @@ linux*)
-
- solaris*)
- case $cc_basename in
- - CC*)
- + CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- @@ -13303,8 +14057,6 @@ fi
- lt_prog_compiler_pic_CXX=
- lt_prog_compiler_static_CXX=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
- @@ -13409,6 +14161,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- ;;
- esac
- ;;
- + mingw* | cygwin* | os2* | pw32* | cegcc*)
- + # This hack is so that the source file can tell whether it is being
- + # built for inclusion in a dll (and should export symbols for example).
- + lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
- + ;;
- dgux*)
- case $cc_basename in
- ec++*)
- @@ -13561,7 +14318,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- ;;
- solaris*)
- case $cc_basename in
- - CC*)
- + CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- lt_prog_compiler_pic_CXX='-KPIC'
- lt_prog_compiler_static_CXX='-Bstatic'
- @@ -13626,10 +14383,17 @@ case $host_os in
- lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
- -$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
- +$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
- +lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -13687,6 +14451,8 @@ fi
-
-
-
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -13864,6 +14630,7 @@ fi
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- + exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- case $host_os in
- aix[4-9]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- @@ -13878,15 +14645,20 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
- ;;
- pw32*)
- export_symbols_cmds_CXX="$ltdll_cmds"
- - ;;
- + ;;
- cygwin* | mingw* | cegcc*)
- - 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'
- - ;;
- + case $cc_basename in
- + cl*) ;;
- + *)
- + 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'
- + exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
- + ;;
- + esac
- + ;;
- *)
- export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- - ;;
- + ;;
- esac
- - exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
- $as_echo "$ld_shlibs_CXX" >&6; }
- @@ -14149,8 +14921,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -14182,13 +14955,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -14269,7 +15100,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -14728,6 +15559,7 @@ fi
- fi # test -n "$compiler"
-
- CC=$lt_save_CC
- + CFLAGS=$lt_save_CFLAGS
- LDCXX=$LD
- LD=$lt_save_LD
- GCC=$lt_save_GCC
- @@ -17770,13 +18602,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -17791,14 +18630,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -17831,12 +18673,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -17875,8 +18717,8 @@ old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote
- compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
- GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
- archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
- @@ -17903,12 +18745,12 @@ hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_
- hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
- inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
- always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
- include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
- prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
- file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
- hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
- compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
- @@ -17946,8 +18788,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -17957,12 +18804,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -17978,7 +18827,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -18000,8 +18848,8 @@ LD_CXX \
- reload_flag_CXX \
- compiler_CXX \
- lt_prog_compiler_no_builtin_flag_CXX \
- -lt_prog_compiler_wl_CXX \
- lt_prog_compiler_pic_CXX \
- +lt_prog_compiler_wl_CXX \
- lt_prog_compiler_static_CXX \
- lt_cv_prog_compiler_c_o_CXX \
- export_dynamic_flag_spec_CXX \
- @@ -18013,7 +18861,6 @@ no_undefined_flag_CXX \
- hardcode_libdir_flag_spec_CXX \
- hardcode_libdir_flag_spec_ld_CXX \
- hardcode_libdir_separator_CXX \
- -fix_srcfile_path_CXX \
- exclude_expsyms_CXX \
- include_expsyms_CXX \
- file_list_spec_CXX \
- @@ -18047,6 +18894,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -18061,7 +18909,8 @@ archive_expsym_cmds_CXX \
- module_cmds_CXX \
- module_expsym_cmds_CXX \
- export_symbols_cmds_CXX \
- -prelink_cmds_CXX; do
- +prelink_cmds_CXX \
- +postlink_cmds_CXX; do
- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[\\\\\\\`\\"\\\$]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- @@ -18826,7 +19675,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -18929,19 +19779,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -18971,6 +19844,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -18980,6 +19859,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -19094,12 +19976,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -19186,9 +20068,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -19204,6 +20083,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -19250,210 +20132,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- @@ -19481,12 +20322,12 @@ with_gcc=$GCC_CXX
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl_CXX
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic_CXX
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl_CXX
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static_CXX
-
- @@ -19573,9 +20414,6 @@ inherit_rpath=$inherit_rpath_CXX
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs_CXX
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path_CXX
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols_CXX
-
- @@ -19591,6 +20429,9 @@ include_expsyms=$lt_include_expsyms_CXX
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds_CXX
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds_CXX
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec_CXX
-
- diff --git a/libctf/configure b/libctf/configure
- index 82bcf13a606..a7fb723a145 100755
- --- a/libctf/configure
- +++ b/libctf/configure
- @@ -666,6 +666,8 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -797,6 +799,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_largefile
- enable_werror_always
- @@ -1460,6 +1463,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
- --with-system-zlib use installed libz
-
- Some influential environment variables:
- @@ -5529,8 +5534,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -5570,7 +5575,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -6256,8 +6261,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -6306,6 +6311,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -6322,6 +6401,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -6490,7 +6574,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -6644,6 +6729,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -6659,6 +6759,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -6673,8 +6924,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -6690,7 +6943,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6710,11 +6963,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -6730,7 +6987,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -6749,6 +7006,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -6760,25 +7021,19 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
-
-
-
- @@ -6790,6 +7045,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
- +
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
- +
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
- +
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
- +
- +
- +
- +
- +
- +
- +
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- @@ -7129,8 +7442,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -7166,6 +7479,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -7207,6 +7521,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -7218,7 +7544,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -7244,8 +7570,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -7255,8 +7581,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -7293,6 +7619,14 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
-
-
-
- @@ -7311,6 +7645,47 @@ fi
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
- +
- +
-
-
-
- @@ -7520,6 +7895,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -8083,6 +8575,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -8248,7 +8742,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -8337,7 +8832,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -8635,8 +9130,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -8802,6 +9295,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -8864,7 +9363,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -8921,13 +9420,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -8988,6 +9491,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -9338,7 +9846,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -9437,12 +9946,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -9456,8 +9965,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -9475,8 +9984,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -9522,8 +10031,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -9653,7 +10162,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9666,22 +10181,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -9693,7 +10215,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -9706,22 +10234,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -9766,20 +10301,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -9840,7 +10418,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -9848,7 +10426,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -9864,7 +10442,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -9888,10 +10466,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -9970,23 +10548,36 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -10071,7 +10662,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -10090,9 +10681,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -10668,8 +11259,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -10702,13 +11294,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -10790,7 +11440,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -11586,7 +12236,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 11589 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11630,10 +12280,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -11692,7 +12342,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 11695 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -11736,10 +12386,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -14286,13 +14936,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -14307,14 +14964,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -14347,12 +15007,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -14407,8 +15067,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -14418,12 +15083,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -14439,7 +15106,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -14475,6 +15141,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -15231,7 +15898,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -15334,19 +16002,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -15376,6 +16067,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -15385,6 +16082,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -15499,12 +16199,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -15591,9 +16291,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -15609,6 +16306,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -15641,210 +16341,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- diff --git a/libtool.m4 b/libtool.m4
- index 9a13f3b117a..5be47564443 100644
- --- a/libtool.m4
- +++ b/libtool.m4
- @@ -1,7 +1,8 @@
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is free software; the Free Software Foundation gives
- @@ -10,7 +11,8 @@
-
- m4_define([_LT_COPYING], [dnl
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -37,7 +39,7 @@ m4_define([_LT_COPYING], [dnl
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ])
-
- -# serial 56 LT_INIT
- +# serial 57 LT_INIT
-
-
- # LT_PREREQ(VERSION)
- @@ -92,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
- AC_SUBST(LIBTOOL)dnl
-
- _LT_SETUP
- @@ -166,10 +169,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
- dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_CHECK_SHELL_FEATURES])dnl
- +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
- m4_require([_LT_CMD_RELOAD])dnl
- m4_require([_LT_CHECK_MAGIC_METHOD])dnl
- +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
- m4_require([_LT_CMD_OLD_ARCHIVE])dnl
- m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
- +m4_require([_LT_WITH_SYSROOT])dnl
-
- _LT_CONFIG_LIBTOOL_INIT([
- # See if we are running on zsh, and set the options which allow our
- @@ -199,7 +205,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -632,7 +638,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
- m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
- configured by $[0], generated by m4_PACKAGE_STRING.
-
- -Copyright (C) 2009 Free Software Foundation, Inc.
- +Copyright (C) 2010 Free Software Foundation, Inc.
- This config.lt script is free software; the Free Software Foundation
- gives unlimited permision to copy, distribute and modify it."
-
- @@ -746,15 +752,12 @@ _LT_EOF
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
-
- - _LT_PROG_XSI_SHELLFNS
- + _LT_PROG_REPLACE_SHELLFNS
-
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
- ],
- @@ -980,6 +983,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
- + echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
- + $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -1069,30 +1074,41 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
- fi
- ])
-
- -# _LT_SYS_MODULE_PATH_AIX
- -# -----------------------
- +# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
- +# ----------------------------------
- # Links a minimal program and checks the executable
- # for the system default hardcoded library path. In most cases,
- # this is /usr/lib:/lib, but when the MPI compilers are used
- # the location of the communication and MPI libs are included too.
- # If we don't find anything, use the default library path according
- # to the aix ld manual.
- +# Store the results from the different compilers for each TAGNAME.
- +# Allow to override them for all tags through lt_cv_aix_libpath.
- m4_defun([_LT_SYS_MODULE_PATH_AIX],
- [m4_require([_LT_DECL_SED])dnl
- -AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM])],[
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi],[])
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- +if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
- + [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
- + lt_aix_libpath_sed='[
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }]'
- + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi],[])
- + if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
- + fi
- + ])
- + aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
- +fi
- ])# _LT_SYS_MODULE_PATH_AIX
-
-
- @@ -1117,7 +1133,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
- AC_MSG_CHECKING([how to print strings])
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -1161,6 +1177,39 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
- ])# _LT_PROG_ECHO_BACKSLASH
-
-
- +# _LT_WITH_SYSROOT
- +# ----------------
- +AC_DEFUN([_LT_WITH_SYSROOT],
- +[AC_MSG_CHECKING([for sysroot])
- +AC_ARG_WITH([libtool-sysroot],
- +[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).],
- +[], [with_libtool_sysroot=no])
- +
- +dnl lt_sysroot will always be passed unquoted. We quote it here
- +dnl in case the user passed a directory name.
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + AC_MSG_RESULT([${with_libtool_sysroot}])
- + AC_MSG_ERROR([The sysroot must be an absolute path.])
- + ;;
- +esac
- +
- + AC_MSG_RESULT([${lt_sysroot:-no}])
- +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
- +[dependent libraries, and in which our libraries should be installed.])])
- +
- # _LT_ENABLE_LOCK
- # ---------------
- m4_defun([_LT_ENABLE_LOCK],
- @@ -1320,6 +1369,51 @@ need_locks="$enable_libtool_lock"
- ])# _LT_ENABLE_LOCK
-
-
- +# _LT_PROG_AR
- +# -----------
- +m4_defun([_LT_PROG_AR],
- +[AC_CHECK_TOOLS(AR, [ar], false)
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + AC_MSG_WARN([Failed: $AR $plugin_option rc])
- + else
- + AR="$AR $plugin_option"
- + fi
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
- +_LT_DECL([], [AR], [1], [The archiver])
- +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
- +
- +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
- + [lt_cv_ar_at_file=no
- + AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
- + [echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
- + AC_TRY_EVAL([lt_ar_try])
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + AC_TRY_EVAL([lt_ar_try])
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
- + ])
- + ])
- +
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
- +_LT_DECL([], [archiver_list_spec], [1],
- + [How to feed a file listing to the archiver])
- +])# _LT_PROG_AR
- +
- +
- # _LT_CMD_OLD_ARCHIVE
- # -------------------
- m4_defun([_LT_CMD_OLD_ARCHIVE],
- @@ -1336,23 +1430,7 @@ for plugin in $plugin_names; do
- fi
- done
-
- -AC_CHECK_TOOL(AR, ar, false)
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - AC_MSG_WARN([Failed: $AR $plugin_option rc])
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- - fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- -_LT_DECL([], [AR], [1], [The archiver])
- -_LT_DECL([], [AR_FLAGS], [1])
- +_LT_PROG_AR
-
- AC_CHECK_TOOL(STRIP, strip, :)
- test -z "$STRIP" && STRIP=:
- @@ -1653,7 +1731,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -[#line __oline__ "configure"
- +[#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -1697,10 +1775,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -2240,8 +2318,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -2274,13 +2353,71 @@ m4_if([$1], [],[
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -2362,7 +2499,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -2970,6 +3107,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -3036,7 +3178,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -3187,6 +3330,21 @@ tpf*)
- ;;
- esac
- ])
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -3194,7 +3352,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
- _LT_DECL([], [deplibs_check_method], [1],
- [Method to check whether dependent libraries are shared objects])
- _LT_DECL([], [file_magic_cmd], [1],
- - [Command to use when deplibs_check_method == "file_magic"])
- + [Command to use when deplibs_check_method = "file_magic"])
- +_LT_DECL([], [file_magic_glob], [1],
- + [How to find potential files when deplibs_check_method = "file_magic"])
- +_LT_DECL([], [want_nocaseglob], [1],
- + [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
- ])# _LT_CHECK_MAGIC_METHOD
-
-
- @@ -3297,6 +3459,67 @@ dnl aclocal-1.4 backwards compatibility:
- dnl AC_DEFUN([AM_PROG_NM], [])
- dnl AC_DEFUN([AC_PROG_NM], [])
-
- +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
- +# --------------------------------
- +# how to determine the name of the shared library
- +# associated with a specific link library.
- +# -- PORTME fill in with the dynamic library characteristics
- +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
- +[m4_require([_LT_DECL_EGREP])
- +m4_require([_LT_DECL_OBJDUMP])
- +m4_require([_LT_DECL_DLLTOOL])
- +AC_CACHE_CHECK([how to associate runtime and link libraries],
- +lt_cv_sharedlib_from_linklib_cmd,
- +[lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +])
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
- + [Command to associate shared and link libraries])
- +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
- +
- +
- +# _LT_PATH_MANIFEST_TOOL
- +# ----------------------
- +# locate the manifest tool
- +m4_defun([_LT_PATH_MANIFEST_TOOL],
- +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
- + [lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&AS_MESSAGE_LOG_FD
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*])
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
- +])# _LT_PATH_MANIFEST_TOOL
- +
-
- # LT_LIB_M
- # --------
- @@ -3423,8 +3646,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -3460,6 +3683,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -3493,6 +3717,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT@&t@_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT@&t@_DLSYM_CONST
- +#else
- +# define LT@&t@_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -3504,7 +3740,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT@&t@_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -3530,15 +3766,15 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
- fi
- @@ -3571,6 +3807,13 @@ else
- AC_MSG_RESULT(ok)
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
- [Take the output of nm and produce a listing of raw symbols and C names])
- _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
- @@ -3581,6 +3824,8 @@ _LT_DECL([global_symbol_to_c_name_address],
- _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
- [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
- [Transform the output of nm in a C name address pair when lib prefix is needed])
- +_LT_DECL([], [nm_file_list_spec], [1],
- + [Specify filename containing input files for $NM])
- ]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
- @@ -3592,7 +3837,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)=
-
- -AC_MSG_CHECKING([for $compiler option to produce PIC])
- m4_if([$1], [CXX], [
- # C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
- @@ -3698,6 +3942,12 @@ m4_if([$1], [CXX], [
- ;;
- esac
- ;;
- + mingw* | cygwin* | os2* | pw32* | cegcc*)
- + # This hack is so that the source file can tell whether it is being
- + # built for inclusion in a dll (and should export symbols for example).
- + m4_if([$1], [GCJ], [],
- + [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
- + ;;
- dgux*)
- case $cc_basename in
- ec++*)
- @@ -3850,7 +4100,7 @@ m4_if([$1], [CXX], [
- ;;
- solaris*)
- case $cc_basename in
- - CC*)
- + CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- @@ -4073,6 +4323,12 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
- + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -4135,7 +4391,7 @@ m4_if([$1], [CXX], [
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
- *)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- @@ -4192,9 +4448,11 @@ case $host_os in
- _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
- ;;
- esac
- -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
- -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- - [How to pass a linker flag through the compiler])
- +
- +AC_CACHE_CHECK([for $compiler option to produce PIC],
- + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
- + [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
- +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -4213,6 +4471,8 @@ fi
- _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
- [Additional compiler flags for building library objects])
-
- +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
- + [How to pass a linker flag through the compiler])
- #
- # Check to make sure the static flag actually works.
- #
- @@ -4233,6 +4493,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
- m4_defun([_LT_LINKER_SHLIBS],
- [AC_REQUIRE([LT_PATH_LD])dnl
- AC_REQUIRE([LT_PATH_NM])dnl
- +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_EGREP])dnl
- m4_require([_LT_DECL_SED])dnl
- @@ -4241,6 +4502,7 @@ m4_require([_LT_TAG_COMPILER])dnl
- AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- m4_if([$1], [CXX], [
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- case $host_os in
- aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- @@ -4255,15 +4517,20 @@ m4_if([$1], [CXX], [
- ;;
- pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
- - ;;
- + ;;
- cygwin* | mingw* | cegcc*)
- - _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'
- - ;;
- + case $cc_basename in
- + cl*) ;;
- + *)
- + _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'
- + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
- + ;;
- + esac
- + ;;
- *)
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
- - ;;
- + ;;
- esac
- - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ], [
- runpath_var=
- _LT_TAGVAR(allow_undefined_flag, $1)=
- @@ -4431,7 +4698,8 @@ _LT_EOF
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- - _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'
- + _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'
- + _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _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'
- @@ -4530,12 +4798,12 @@ _LT_EOF
- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -4549,8 +4817,8 @@ _LT_EOF
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - _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'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + _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'
- fi
- ;;
-
- @@ -4568,8 +4836,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - _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'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + _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'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- @@ -4615,8 +4883,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - _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'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + _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'
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
- @@ -4746,7 +5014,7 @@ _LT_EOF
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - _LT_SYS_MODULE_PATH_AIX
- + _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _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"
- else
- @@ -4757,7 +5025,7 @@ _LT_EOF
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - _LT_SYS_MODULE_PATH_AIX
- + _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- @@ -4801,20 +5069,63 @@ _LT_EOF
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- - # FIXME: Should let the user specify the lib program.
- - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- + _LT_TAGVAR(always_export_symbols, $1)=yes
- + _LT_TAGVAR(file_list_spec, $1)='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- + _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'
- + # Don't use ranlib
- + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- + # FIXME: Should let the user specify the lib program.
- + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -4848,7 +5159,7 @@ _LT_EOF
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- @@ -4856,7 +5167,7 @@ _LT_EOF
-
- hpux9*)
- if test "$GCC" = yes; then
- - _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'
- + _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'
- else
- _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'
- fi
- @@ -4872,7 +5183,7 @@ _LT_EOF
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -4896,10 +5207,10 @@ _LT_EOF
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -4946,16 +5257,31 @@ _LT_EOF
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - _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'
- + _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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - AC_LINK_IFELSE([AC_LANG_SOURCE([int foo(void) {}])],
- - _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'
- - )
- - LDFLAGS="$save_LDFLAGS"
- + # This should be the same for all languages, so no per-tag cache variable.
- + AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
- + [lt_cv_irix_exported_symbol],
- + [save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + AC_LINK_IFELSE(
- + [AC_LANG_SOURCE(
- + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
- + [C++], [[int foo (void) { return 0; }]],
- + [Fortran 77], [[
- + subroutine foo
- + end]],
- + [Fortran], [[
- + subroutine foo
- + end]])])],
- + [lt_cv_irix_exported_symbol=yes],
- + [lt_cv_irix_exported_symbol=no])
- + LDFLAGS="$save_LDFLAGS"])
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + _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'
- + fi
- else
- _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'
- _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'
- @@ -5040,7 +5366,7 @@ _LT_EOF
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- - _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'
- + _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'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- @@ -5059,9 +5385,9 @@ _LT_EOF
- _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -5333,8 +5659,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
- to runtime path list])
- _LT_TAGDECL([], [link_all_deplibs], [0],
- [Whether libtool must link a program against all its dependency libraries])
- -_LT_TAGDECL([], [fix_srcfile_path], [1],
- - [Fix the shell variable $srcfile for the compiler])
- _LT_TAGDECL([], [always_export_symbols], [0],
- [Set to "yes" if exported symbols are required])
- _LT_TAGDECL([], [export_symbols_cmds], [2],
- @@ -5345,6 +5669,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
- [Symbols that must always be exported])
- _LT_TAGDECL([], [prelink_cmds], [2],
- [Commands necessary for linking programs (against libraries) with templates])
- +_LT_TAGDECL([], [postlink_cmds], [2],
- + [Commands necessary for finishing linking programs])
- _LT_TAGDECL([], [file_list_spec], [1],
- [Specify filename containing input files])
- dnl FIXME: Not yet implemented
- @@ -5446,6 +5772,7 @@ CC="$lt_save_CC"
- m4_defun([_LT_LANG_CXX_CONFIG],
- [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- m4_require([_LT_DECL_EGREP])dnl
- +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
- @@ -5507,6 +5834,7 @@ if test "$_lt_caught_CXX_error" != yes; then
-
- # Allow CC to be a program name with arguments.
- lt_save_CC=$CC
- + lt_save_CFLAGS=$CFLAGS
- lt_save_LD=$LD
- lt_save_GCC=$GCC
- GCC=$GXX
- @@ -5524,6 +5852,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- fi
- test -z "${LDCXX+set}" || LD=$LDCXX
- CC=${CXX-"c++"}
- + CFLAGS=$CXXFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
- @@ -5687,7 +6016,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
- # Determine the default libpath from the value encoded in an empty
- # executable.
- - _LT_SYS_MODULE_PATH_AIX
- + _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
- _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"
- @@ -5699,7 +6028,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - _LT_SYS_MODULE_PATH_AIX
- + _LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- # -berok will link without error, but may produce a broken library.
- @@ -5741,29 +6070,75 @@ if test "$_lt_caught_CXX_error" != yes; then
- ;;
-
- cygwin* | mingw* | pw32* | cegcc*)
- - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- - # as there is no search path for DLLs.
- - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- - _LT_TAGVAR(always_export_symbols, $1)=no
- - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- -
- - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- - _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'
- - # If the export-symbols file already is a .def file (1st line
- - # is EXPORTS), use it as is; otherwise, prepend...
- - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- - cp $export_symbols $output_objdir/$soname.def;
- - else
- - echo EXPORTS > $output_objdir/$soname.def;
- - cat $export_symbols >> $output_objdir/$soname.def;
- - fi~
- - $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'
- - else
- - _LT_TAGVAR(ld_shlibs, $1)=no
- - fi
- - ;;
- + case $GXX,$cc_basename in
- + ,cl* | no,cl*)
- + # Native MSVC
- + # hardcode_libdir_flag_spec is actually meaningless, as there is
- + # no search path for DLLs.
- + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
- + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- + _LT_TAGVAR(always_export_symbols, $1)=yes
- + _LT_TAGVAR(file_list_spec, $1)='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- + # Don't use ranlib
- + _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
- + _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + func_to_tool_file "$lt_outputfile"~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # g++
- + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- + # as there is no search path for DLLs.
- + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- + _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- + _LT_TAGVAR(always_export_symbols, $1)=no
- + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- +
- + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- + _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'
- + # If the export-symbols file already is a .def file (1st line
- + # is EXPORTS), use it as is; otherwise, prepend...
- + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + cp $export_symbols $output_objdir/$soname.def;
- + else
- + echo EXPORTS > $output_objdir/$soname.def;
- + cat $export_symbols >> $output_objdir/$soname.def;
- + fi~
- + $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'
- + else
- + _LT_TAGVAR(ld_shlibs, $1)=no
- + fi
- + ;;
- + esac
- + ;;
- darwin* | rhapsody*)
- _LT_DARWIN_LINKER_FEATURES($1)
- ;;
- @@ -5838,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- ;;
- *)
- if test "$GXX" = yes; then
- - _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'
- + _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'
- else
- # FIXME: insert proper C++ library support
- _LT_TAGVAR(ld_shlibs, $1)=no
- @@ -5909,10 +6284,10 @@ if test "$_lt_caught_CXX_error" != yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- ;;
- ia64*)
- - _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'
- + _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'
- ;;
- *)
- - _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'
- + _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'
- ;;
- esac
- fi
- @@ -5953,9 +6328,9 @@ if test "$_lt_caught_CXX_error" != yes; then
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- - _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'
- + _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'
- else
- - _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'
- + _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'
- fi
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- @@ -6025,20 +6400,20 @@ if test "$_lt_caught_CXX_error" != yes; then
- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- - compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
- + compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
- + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- - $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'
- + $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'
- ;;
- *) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- @@ -6233,7 +6608,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- _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'
- ;;
- *)
- - _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'
- + _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'
- ;;
- esac
-
- @@ -6279,7 +6654,7 @@ if test "$_lt_caught_CXX_error" != yes; then
-
- solaris*)
- case $cc_basename in
- - CC*)
- + CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- @@ -6320,9 +6695,9 @@ if test "$_lt_caught_CXX_error" != yes; then
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
- if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- + _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'
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- + $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- @@ -6451,6 +6826,7 @@ if test "$_lt_caught_CXX_error" != yes; then
- fi # test -n "$compiler"
-
- CC=$lt_save_CC
- + CFLAGS=$lt_save_CFLAGS
- LDCXX=$LD
- LD=$lt_save_LD
- GCC=$lt_save_GCC
- @@ -6465,6 +6841,29 @@ AC_LANG_POP
- ])# _LT_LANG_CXX_CONFIG
-
-
- +# _LT_FUNC_STRIPNAME_CNF
- +# ----------------------
- +# func_stripname_cnf prefix suffix name
- +# strip PREFIX and SUFFIX off of NAME.
- +# PREFIX and SUFFIX must not contain globbing or regex special
- +# characters, hashes, percent signs, but SUFFIX may contain a leading
- +# dot (in which case that matches only a dot).
- +#
- +# This function is identical to the (non-XSI) version of func_stripname,
- +# except this one can be used by m4 code that may be executed by configure,
- +# rather than the libtool script.
- +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
- +AC_REQUIRE([_LT_DECL_SED])
- +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
- +func_stripname_cnf ()
- +{
- + case ${2} in
- + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- + esac
- +} # func_stripname_cnf
- +])# _LT_FUNC_STRIPNAME_CNF
- +
- # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
- # ---------------------------------
- # Figure out "hidden" library dependencies from verbose
- @@ -6473,6 +6872,7 @@ AC_LANG_POP
- # objects, libraries and library flags.
- m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
- [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
- +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
- # Dependencies to place before and after the object being linked:
- _LT_TAGVAR(predep_objects, $1)=
- _LT_TAGVAR(postdep_objects, $1)=
- @@ -6523,6 +6923,13 @@ public class foo {
- };
- _LT_EOF
- ])
- +
- +_lt_libdeps_save_CFLAGS=$CFLAGS
- +case "$CC $CFLAGS " in #(
- +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
- +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
- +esac
- +
- dnl Parse the compiler output and extract the necessary
- dnl objects, libraries and library flags.
- if AC_TRY_EVAL(ac_compile); then
- @@ -6534,7 +6941,7 @@ if AC_TRY_EVAL(ac_compile); then
- pre_test_object_deps_done=no
-
- for p in `eval "$output_verbose_link_cmd"`; do
- - case $p in
- + case ${prev}${p} in
-
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- @@ -6543,13 +6950,22 @@ if AC_TRY_EVAL(ac_compile); then
- test $p = "-R"; then
- prev=$p
- continue
- - else
- - prev=
- fi
-
- + # Expand the sysroot to ease extracting the directories later.
- + if test -z "$prev"; then
- + case $p in
- + -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
- + -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
- + -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
- + esac
- + fi
- + case $p in
- + =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
- + esac
- if test "$pre_test_object_deps_done" = no; then
- - case $p in
- - -L* | -R*)
- + case ${prev} in
- + -L | -R)
- # Internal compiler library paths should come after those
- # provided the user. The postdeps already come after the
- # user supplied libs so there is no need to process them.
- @@ -6569,8 +6985,10 @@ if AC_TRY_EVAL(ac_compile); then
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
- fi
- fi
- + prev=
- ;;
-
- + *.lto.$objext) ;; # Ignore GCC LTO objects
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
- @@ -6606,6 +7024,7 @@ else
- fi
-
- $RM -f confest.$objext
- +CFLAGS=$_lt_libdeps_save_CFLAGS
-
- # PORTME: override above test on systems where it is broken
- m4_if([$1], [CXX],
- @@ -6642,7 +7061,7 @@ linux*)
-
- solaris*)
- case $cc_basename in
- - CC*)
- + CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- @@ -6755,7 +7174,9 @@ if test "$_lt_disable_F77" != yes; then
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- + lt_save_CFLAGS=$CFLAGS
- CC=${F77-"f77"}
- + CFLAGS=$FFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
- @@ -6809,6 +7230,7 @@ if test "$_lt_disable_F77" != yes; then
-
- GCC=$lt_save_GCC
- CC="$lt_save_CC"
- + CFLAGS="$lt_save_CFLAGS"
- fi # test "$_lt_disable_F77" != yes
-
- AC_LANG_POP
- @@ -6885,7 +7307,9 @@ if test "$_lt_disable_FC" != yes; then
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- lt_save_GCC=$GCC
- + lt_save_CFLAGS=$CFLAGS
- CC=${FC-"f95"}
- + CFLAGS=$FCFLAGS
- compiler=$CC
- GCC=$ac_cv_fc_compiler_gnu
-
- @@ -6941,7 +7365,8 @@ if test "$_lt_disable_FC" != yes; then
- fi # test -n "$compiler"
-
- GCC=$lt_save_GCC
- - CC="$lt_save_CC"
- + CC=$lt_save_CC
- + CFLAGS=$lt_save_CFLAGS
- fi # test "$_lt_disable_FC" != yes
-
- AC_LANG_POP
- @@ -6978,10 +7403,12 @@ _LT_COMPILER_BOILERPLATE
- _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- -lt_save_CC="$CC"
- +lt_save_CC=$CC
- +lt_save_CFLAGS=$CFLAGS
- lt_save_GCC=$GCC
- GCC=yes
- CC=${GCJ-"gcj"}
- +CFLAGS=$GCJFLAGS
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_TAGVAR(LD, $1)="$LD"
- @@ -7012,7 +7439,8 @@ fi
- AC_LANG_RESTORE
-
- GCC=$lt_save_GCC
- -CC="$lt_save_CC"
- +CC=$lt_save_CC
- +CFLAGS=$lt_save_CFLAGS
- ])# _LT_LANG_GCJ_CONFIG
-
-
- @@ -7047,9 +7475,11 @@ _LT_LINKER_BOILERPLATE
-
- # Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
- +lt_save_CFLAGS=$CFLAGS
- lt_save_GCC=$GCC
- GCC=
- CC=${RC-"windres"}
- +CFLAGS=
- compiler=$CC
- _LT_TAGVAR(compiler, $1)=$CC
- _LT_CC_BASENAME([$compiler])
- @@ -7062,7 +7492,8 @@ fi
-
- GCC=$lt_save_GCC
- AC_LANG_RESTORE
- -CC="$lt_save_CC"
- +CC=$lt_save_CC
- +CFLAGS=$lt_save_CFLAGS
- ])# _LT_LANG_RC_CONFIG
-
-
- @@ -7121,6 +7552,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
- AC_SUBST([OBJDUMP])
- ])
-
- +# _LT_DECL_DLLTOOL
- +# ----------------
- +# Ensure DLLTOOL variable is set.
- +m4_defun([_LT_DECL_DLLTOOL],
- +[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
- +AC_SUBST([DLLTOOL])
- +])
-
- # _LT_DECL_SED
- # ------------
- @@ -7214,8 +7654,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -7254,206 +7694,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
- ])# _LT_CHECK_SHELL_FEATURES
-
-
- -# _LT_PROG_XSI_SHELLFNS
- -# ---------------------
- -# Bourne and XSI compatible variants of some useful shell functions.
- -m4_defun([_LT_PROG_XSI_SHELLFNS],
- -[case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $[*] ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
- +# ------------------------------------------------------
- +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
- +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
- +m4_defun([_LT_PROG_FUNCTION_REPLACE],
- +[dnl {
- +sed -e '/^$1 ()$/,/^} # $1 /c\
- +$1 ()\
- +{\
- +m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
- +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +])
-
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
-
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- +# _LT_PROG_REPLACE_SHELLFNS
- +# -------------------------
- +# Replace existing portable implementations of several shell functions with
- +# equivalent extended shell implementations where those features are available..
- +m4_defun([_LT_PROG_REPLACE_SHELLFNS],
- +[if test x"$xsi_shell" = xyes; then
- + _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- + case ${1} in
- + */*) func_dirname_result="${1%/*}${2}" ;;
- + * ) func_dirname_result="${3}" ;;
- + esac])
- +
- + _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- + func_basename_result="${1##*/}"])
- +
- + _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- + case ${1} in
- + */*) func_dirname_result="${1%/*}${2}" ;;
- + * ) func_dirname_result="${3}" ;;
- + esac
- + func_basename_result="${1##*/}"])
-
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- + _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- + # positional parameters, so assign one to ordinary parameter first.
- + func_stripname_result=${3}
- + func_stripname_result=${func_stripname_result#"${1}"}
- + func_stripname_result=${func_stripname_result%"${2}"}])
-
- -dnl func_dirname_and_basename
- -dnl A portable version of this function is already defined in general.m4sh
- -dnl so there is no need for it here.
- + _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- + func_split_long_opt_name=${1%%=*}
- + func_split_long_opt_arg=${1#*=}])
-
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- + _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- + func_split_short_opt_arg=${1#??}
- + func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[[^=]]*=//'
- + _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- + case ${1} in
- + *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- + *) func_lo2o_result=${1} ;;
- + esac])
-
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- + _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- + _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
- -}
- + _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
- +fi
-
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$[@]"`
- -}
- +if test x"$lt_shell_append" = xyes; then
- + _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- + _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- + func_quote_for_eval "${2}"
- +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- + eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- -_LT_EOF
- -esac
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
-
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- +if test x"$_lt_function_replace_fail" = x":"; then
- + AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
- +fi
- +])
-
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$[1]+=\$[2]"
- -}
- -_LT_EOF
- +# _LT_PATH_CONVERSION_FUNCTIONS
- +# -----------------------------
- +# Determine which file name conversion functions should be used by
- +# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
- +# for certain cross-compile configurations and native mingw.
- +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
- +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
- +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
- +AC_MSG_CHECKING([how to convert $build file names to $host format])
- +AC_CACHE_VAL(lt_cv_to_host_file_cmd,
- +[case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$[1]=\$$[1]\$[2]"
- -}
- -
- -_LT_EOF
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- ;;
- - esac
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +])
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
- +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
- + [0], [convert $build file names to $host format])dnl
- +
- +AC_MSG_CHECKING([how to convert $build file names to toolchain format])
- +AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
- +[#assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- ])
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
- +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
- + [0], [convert $build files to toolchain format])dnl
- +])# _LT_PATH_CONVERSION_FUNCTIONS
- diff --git a/ltmain.sh b/ltmain.sh
- index 9503ec85d70..70e856e0659 100644
- --- a/ltmain.sh
- +++ b/ltmain.sh
- @@ -1,10 +1,9 @@
- -# Generated from ltmain.m4sh.
-
- -# libtool (GNU libtool 1.3134 2009-11-29) 2.2.7a
- +# libtool (GNU libtool) 2.4
- # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
- -# 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
- # This is free software; see the source for copying conditions. There is NO
- # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- @@ -38,7 +37,6 @@
- # -n, --dry-run display commands without modifying any files
- # --features display basic configuration information and exit
- # --mode=MODE use operation mode MODE
- -# --no-finish let install mode avoid finish commands
- # --preserve-dup-deps don't remove duplicate dependency libraries
- # --quiet, --silent don't print informational messages
- # --no-quiet, --no-silent
- @@ -71,17 +69,19 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
- -# $progname: (GNU libtool 1.3134 2009-11-29) 2.2.7a
- +# $progname: (GNU libtool) 2.4
- # automake: $automake_version
- # autoconf: $autoconf_version
- #
- # Report bugs to <bug-libtool@gnu.org>.
- +# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
- +# General help using GNU software: <http://www.gnu.org/gethelp/>.
-
- PROGRAM=libtool
- PACKAGE=libtool
- -VERSION=2.2.7a
- -TIMESTAMP=" 1.3134 2009-11-29"
- -package_revision=1.3134
- +VERSION=2.4
- +TIMESTAMP=""
- +package_revision=1.3293
-
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- @@ -106,9 +106,6 @@ _LTECHO_EOF'
- }
-
- # NLS nuisances: We save the old values to restore during execute mode.
- -# Only set LANG and LC_ALL to C if already set.
- -# These must not be set unconditionally because not all systems understand
- -# e.g. LANG=C (notably SCO).
- lt_user_locale=
- lt_safe_locale=
- for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- @@ -121,15 +118,13 @@ do
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
- fi"
- done
- +LC_ALL=C
- +LANGUAGE=C
- +export LANGUAGE LC_ALL
-
- $lt_unset CDPATH
-
-
- -
- -
- -
- -
- -
- # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
- # is ksh but when the shell is invoked as "sh" and the current value of
- # the _XPG environment variable is not equal to 1 (one), the special
- @@ -140,7 +135,7 @@ progpath="$0"
-
-
- : ${CP="cp -f"}
- -: ${ECHO=$as_echo}
- +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${EGREP="/bin/grep -E"}
- : ${FGREP="/bin/grep -F"}
- : ${GREP="/bin/grep"}
- @@ -149,7 +144,7 @@ progpath="$0"
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
- -: ${SED="/mount/endor/wildenhu/local-x86_64/bin/sed"}
- +: ${SED="/bin/sed"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
-
- @@ -169,6 +164,27 @@ IFS=" $lt_nl"
- dirname="s,/[^/]*$,,"
- basename="s,^.*/,,"
-
- +# func_dirname file append nondir_replacement
- +# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- +# otherwise set result to NONDIR_REPLACEMENT.
- +func_dirname ()
- +{
- + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- + if test "X$func_dirname_result" = "X${1}"; then
- + func_dirname_result="${3}"
- + else
- + func_dirname_result="$func_dirname_result${2}"
- + fi
- +} # func_dirname may be replaced by extended shell implementation
- +
- +
- +# func_basename file
- +func_basename ()
- +{
- + func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- +} # func_basename may be replaced by extended shell implementation
- +
- +
- # func_dirname_and_basename file append nondir_replacement
- # perform func_basename and func_dirname in a single function
- # call:
- @@ -183,17 +199,31 @@ basename="s,^.*/,,"
- # those functions but instead duplicate the functionality here.
- func_dirname_and_basename ()
- {
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
- -}
- + # Extract subdirectory from the argument.
- + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- + if test "X$func_dirname_result" = "X${1}"; then
- + func_dirname_result="${3}"
- + else
- + func_dirname_result="$func_dirname_result${2}"
- + fi
- + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
- +} # func_dirname_and_basename may be replaced by extended shell implementation
- +
- +
- +# func_stripname prefix suffix name
- +# strip PREFIX and SUFFIX off of NAME.
- +# PREFIX and SUFFIX must not contain globbing or regex special
- +# characters, hashes, percent signs, but SUFFIX may contain a leading
- +# dot (in which case that matches only a dot).
- +# func_strip_suffix prefix name
- +func_stripname ()
- +{
- + case ${2} in
- + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- + esac
- +} # func_stripname may be replaced by extended shell implementation
-
- -# Generated shell functions inserted here.
-
- # These SED scripts presuppose an absolute path with a trailing slash.
- pathcar='s,^/\([^/]*\).*$,\1,'
- @@ -376,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
- # Same as above, but do not quote variable references.
- double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
- +# Sed substitution that turns a string into a regex matching for the
- +# string literally.
- +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
- +
- +# Sed substitution that converts a w32 file name or path
- +# which contains forward slashes, into one that contains
- +# (escaped) backslashes. A very naive implementation.
- +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- +
- # Re-`\' parameter expansions in output of double_quote_subst that were
- # `\'-ed in input to the same. If an odd number of `\' preceded a '$'
- # in input to double_quote_subst, that '$' was protected from expansion.
- @@ -404,7 +443,7 @@ opt_warning=:
- # name if it has been set yet.
- func_echo ()
- {
- - $ECHO "$progname${mode+: }$mode: $*"
- + $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
- }
-
- # func_verbose arg...
- @@ -430,14 +469,14 @@ func_echo_all ()
- # Echo program name prefixed message to standard error.
- func_error ()
- {
- - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
- + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
- }
-
- # func_warning arg...
- # Echo program name prefixed warning message to standard error.
- func_warning ()
- {
- - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
- + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
- # bash bug again:
- :
- @@ -656,19 +695,35 @@ func_show_eval_locale ()
- fi
- }
-
- -
- -
- +# func_tr_sh
- +# Turn $1 into a string suitable for a shell variable name.
- +# Result is stored in $func_tr_sh_result. All characters
- +# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
- +# if $1 begins with a digit, a '_' is prepended as well.
- +func_tr_sh ()
- +{
- + case $1 in
- + [0-9]* | *[!a-zA-Z0-9_]*)
- + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- + ;;
- + * )
- + func_tr_sh_result=$1
- + ;;
- + esac
- +}
-
-
- # func_version
- # Echo version message to standard output and exit.
- func_version ()
- {
- + $opt_debug
- +
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- - s/\n# //
- + s/\n# / /
- b more
- }
- :go
- @@ -685,7 +740,9 @@ func_version ()
- # Echo short help message to standard output and exit.
- func_usage ()
- {
- - $SED -n '/^# Usage:/,/^# *-h/ {
- + $opt_debug
- +
- + $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- @@ -701,7 +758,10 @@ func_usage ()
- # unless 'noexit' is passed as argument.
- func_help ()
- {
- + $opt_debug
- +
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- + :print
- s/^# //
- s/^# *$//
- s*\$progname*'$progname'*
- @@ -714,7 +774,11 @@ func_help ()
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
- p
- - }' < "$progpath"
- + d
- + }
- + /^# .* home page:/b print
- + /^# General help using/b print
- + ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- @@ -726,12 +790,39 @@ func_help ()
- # exit_cmd.
- func_missing_arg ()
- {
- - func_error "missing argument for $1"
- + $opt_debug
- +
- + func_error "missing argument for $1."
- exit_cmd=exit
- }
-
- -exit_cmd=:
-
- +# func_split_short_opt shortopt
- +# Set func_split_short_opt_name and func_split_short_opt_arg shell
- +# variables after splitting SHORTOPT after the 2nd character.
- +func_split_short_opt ()
- +{
- + my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- + my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
- +
- + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
- +} # func_split_short_opt may be replaced by extended shell implementation
- +
- +
- +# func_split_long_opt longopt
- +# Set func_split_long_opt_name and func_split_long_opt_arg shell
- +# variables after splitting LONGOPT at the `=' sign.
- +func_split_long_opt ()
- +{
- + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- + my_sed_long_arg='1s/^--[^=]*=//'
- +
- + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
- +} # func_split_long_opt may be replaced by extended shell implementation
- +
- +exit_cmd=:
-
-
-
- @@ -741,26 +832,64 @@ magic="%%%MAGIC variable%%%"
- magic_exe="%%%MAGIC EXE variable%%%"
-
- # Global variables.
- -# $mode is unset
- nonopt=
- -execute_dlfiles=
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- extracted_archives=
- extracted_serial=0
-
- -opt_dry_run=false
- -opt_finish=:
- -opt_duplicate_deps=false
- -opt_silent=false
- -opt_debug=:
- -
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end. This prevents here-documents from being
- # left over by shells.
- exec_cmd=
-
- +# func_append var value
- +# Append VALUE to the end of shell variable VAR.
- +func_append ()
- +{
- + eval "${1}=\$${1}\${2}"
- +} # func_append may be replaced by extended shell implementation
- +
- +# func_append_quoted var value
- +# Quote VALUE and append to the end of shell variable VAR, separated
- +# by a space.
- +func_append_quoted ()
- +{
- + func_quote_for_eval "${2}"
- + eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
- +} # func_append_quoted may be replaced by extended shell implementation
- +
- +
- +# func_arith arithmetic-term...
- +func_arith ()
- +{
- + func_arith_result=`expr "${@}"`
- +} # func_arith may be replaced by extended shell implementation
- +
- +
- +# func_len string
- +# STRING may not start with a hyphen.
- +func_len ()
- +{
- + func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
- +} # func_len may be replaced by extended shell implementation
- +
- +
- +# func_lo2o object
- +func_lo2o ()
- +{
- + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- +} # func_lo2o may be replaced by extended shell implementation
- +
- +
- +# func_xform libobj-or-source
- +func_xform ()
- +{
- + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- +} # func_xform may be replaced by extended shell implementation
- +
- +
- # func_fatal_configuration arg...
- # Echo program name prefixed message to standard error, followed by
- # a configuration failure hint, and exit.
- @@ -850,130 +979,204 @@ func_enable_tag ()
- esac
- }
-
- -# Parse options once, thoroughly. This comes as soon as possible in
- -# the script to make things like `libtool --version' happen quickly.
- +# func_check_version_match
- +# Ensure that we are using m4 macros, and libtool script from the same
- +# release of libtool.
- +func_check_version_match ()
- {
- + if test "$package_revision" != "$macro_revision"; then
- + if test "$VERSION" != "$macro_version"; then
- + if test -z "$macro_version"; then
- + cat >&2 <<_LT_EOF
- +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
- +$progname: definition of this LT_INIT comes from an older release.
- +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
- +$progname: and run autoconf again.
- +_LT_EOF
- + else
- + cat >&2 <<_LT_EOF
- +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
- +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
- +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
- +$progname: and run autoconf again.
- +_LT_EOF
- + fi
- + else
- + cat >&2 <<_LT_EOF
- +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
- +$progname: but the definition of this LT_INIT comes from revision $macro_revision.
- +$progname: You should recreate aclocal.m4 with macros from revision $package_revision
- +$progname: of $PACKAGE $VERSION and run autoconf again.
- +_LT_EOF
- + fi
-
- - # Shorthand for --mode=foo, only valid as the first argument
- - case $1 in
- - clean|clea|cle|cl)
- - shift; set dummy --mode clean ${1+"$@"}; shift
- - ;;
- - compile|compil|compi|comp|com|co|c)
- - shift; set dummy --mode compile ${1+"$@"}; shift
- - ;;
- - execute|execut|execu|exec|exe|ex|e)
- - shift; set dummy --mode execute ${1+"$@"}; shift
- - ;;
- - finish|finis|fini|fin|fi|f)
- - shift; set dummy --mode finish ${1+"$@"}; shift
- - ;;
- - install|instal|insta|inst|ins|in|i)
- - shift; set dummy --mode install ${1+"$@"}; shift
- - ;;
- - link|lin|li|l)
- - shift; set dummy --mode link ${1+"$@"}; shift
- - ;;
- - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- - shift; set dummy --mode uninstall ${1+"$@"}; shift
- - ;;
- - esac
- + exit $EXIT_MISMATCH
- + fi
- +}
- +
- +
- +# Shorthand for --mode=foo, only valid as the first argument
- +case $1 in
- +clean|clea|cle|cl)
- + shift; set dummy --mode clean ${1+"$@"}; shift
- + ;;
- +compile|compil|compi|comp|com|co|c)
- + shift; set dummy --mode compile ${1+"$@"}; shift
- + ;;
- +execute|execut|execu|exec|exe|ex|e)
- + shift; set dummy --mode execute ${1+"$@"}; shift
- + ;;
- +finish|finis|fini|fin|fi|f)
- + shift; set dummy --mode finish ${1+"$@"}; shift
- + ;;
- +install|instal|insta|inst|ins|in|i)
- + shift; set dummy --mode install ${1+"$@"}; shift
- + ;;
- +link|lin|li|l)
- + shift; set dummy --mode link ${1+"$@"}; shift
- + ;;
- +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- + shift; set dummy --mode uninstall ${1+"$@"}; shift
- + ;;
- +esac
-
- - # Parse non-mode specific arguments:
- - while test "$#" -gt 0; do
- +
- +
- +# Option defaults:
- +opt_debug=:
- +opt_dry_run=false
- +opt_config=false
- +opt_preserve_dup_deps=false
- +opt_features=false
- +opt_finish=false
- +opt_help=false
- +opt_help_all=false
- +opt_silent=:
- +opt_verbose=:
- +opt_silent=false
- +opt_verbose=false
- +
- +
- +# Parse options once, thoroughly. This comes as soon as possible in the
- +# script to make things like `--version' happen as quickly as we can.
- +{
- + # this just eases exit handling
- + while test $# -gt 0; do
- opt="$1"
- shift
- -
- case $opt in
- - --config) func_config ;;
- -
- - --debug) preserve_args="$preserve_args $opt"
- + --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- - opt_debug='set -x'
- $opt_debug
- ;;
- -
- - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break
- - execute_dlfiles="$execute_dlfiles $1"
- - shift
- + --dry-run|--dryrun|-n)
- + opt_dry_run=:
- ;;
- -
- - --dry-run | -n) opt_dry_run=: ;;
- - --features) func_features ;;
- - --finish) mode="finish" ;;
- - --no-finish) opt_finish=false ;;
- -
- - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break
- - case $1 in
- - # Valid mode arguments:
- - clean) ;;
- - compile) ;;
- - execute) ;;
- - finish) ;;
- - install) ;;
- - link) ;;
- - relink) ;;
- - uninstall) ;;
- -
- - # Catch anything else as an error
- - *) func_error "invalid argument for $opt"
- - exit_cmd=exit
- - break
- - ;;
- - esac
- -
- - mode="$1"
- + --config)
- + opt_config=:
- +func_config
- + ;;
- + --dlopen|-dlopen)
- + optarg="$1"
- + opt_dlopen="${opt_dlopen+$opt_dlopen
- +}$optarg"
- shift
- ;;
- -
- --preserve-dup-deps)
- - opt_duplicate_deps=: ;;
- -
- - --quiet|--silent) preserve_args="$preserve_args $opt"
- - opt_silent=:
- - opt_verbose=false
- + opt_preserve_dup_deps=:
- ;;
- -
- - --no-quiet|--no-silent)
- - preserve_args="$preserve_args $opt"
- - opt_silent=false
- + --features)
- + opt_features=:
- +func_features
- ;;
- -
- - --verbose| -v) preserve_args="$preserve_args $opt"
- + --finish)
- + opt_finish=:
- +set dummy --mode finish ${1+"$@"}; shift
- + ;;
- + --help)
- + opt_help=:
- + ;;
- + --help-all)
- + opt_help_all=:
- +opt_help=': help-all'
- + ;;
- + --mode)
- + test $# = 0 && func_missing_arg $opt && break
- + optarg="$1"
- + opt_mode="$optarg"
- +case $optarg in
- + # Valid mode arguments:
- + clean|compile|execute|finish|install|link|relink|uninstall) ;;
- +
- + # Catch anything else as an error
- + *) func_error "invalid argument for $opt"
- + exit_cmd=exit
- + break
- + ;;
- +esac
- + shift
- + ;;
- + --no-silent|--no-quiet)
- opt_silent=false
- - opt_verbose=:
- +func_append preserve_args " $opt"
- ;;
- -
- - --no-verbose) preserve_args="$preserve_args $opt"
- + --no-verbose)
- opt_verbose=false
- +func_append preserve_args " $opt"
- ;;
- -
- - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
- - preserve_args="$preserve_args $opt $1"
- - func_enable_tag "$1" # tagname is set here
- + --silent|--quiet)
- + opt_silent=:
- +func_append preserve_args " $opt"
- + opt_verbose=false
- + ;;
- + --verbose|-v)
- + opt_verbose=:
- +func_append preserve_args " $opt"
- +opt_silent=false
- + ;;
- + --tag)
- + test $# = 0 && func_missing_arg $opt && break
- + optarg="$1"
- + opt_tag="$optarg"
- +func_append preserve_args " $opt $optarg"
- +func_enable_tag "$optarg"
- shift
- ;;
-
- + -\?|-h) func_usage ;;
- + --help) func_help ;;
- + --version) func_version ;;
- +
- # Separate optargs to long options:
- - -dlopen=*|--mode=*|--tag=*)
- - func_opt_split "$opt"
- - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
- + --*=*)
- + func_split_long_opt "$opt"
- + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- shift
- ;;
-
- - -\?|-h) func_usage ;;
- - --help) opt_help=: ;;
- - --help-all) opt_help=': help-all' ;;
- - --version) func_version ;;
- -
- - -*) func_fatal_help "unrecognized option \`$opt'" ;;
- -
- - *) nonopt="$opt"
- - break
- + # Separate non-argument short options:
- + -\?*|-h*|-n*|-v*)
- + func_split_short_opt "$opt"
- + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- + shift
- ;;
- +
- + --) break ;;
- + -*) func_fatal_help "unrecognized option \`$opt'" ;;
- + *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
-
- + # Validate options:
- +
- + # save first non-option argument
- + if test "$#" -gt 0; then
- + nonopt="$opt"
- + shift
- + fi
- +
- + # preserve --debug
- + test "$opt_debug" = : || func_append preserve_args " --debug"
-
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* )
- @@ -981,82 +1184,44 @@ func_enable_tag ()
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
- + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
-
- - # Having warned about all mis-specified options, bail out if
- - # anything was wrong.
- - $exit_cmd $EXIT_FAILURE
- -}
- + $opt_help || {
- + # Sanity checks first:
- + func_check_version_match
-
- -# func_check_version_match
- -# Ensure that we are using m4 macros, and libtool script from the same
- -# release of libtool.
- -func_check_version_match ()
- -{
- - if test "$package_revision" != "$macro_revision"; then
- - if test "$VERSION" != "$macro_version"; then
- - if test -z "$macro_version"; then
- - cat >&2 <<_LT_EOF
- -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
- -$progname: definition of this LT_INIT comes from an older release.
- -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
- -$progname: and run autoconf again.
- -_LT_EOF
- - else
- - cat >&2 <<_LT_EOF
- -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
- -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
- -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
- -$progname: and run autoconf again.
- -_LT_EOF
- - fi
- - else
- - cat >&2 <<_LT_EOF
- -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
- -$progname: but the definition of this LT_INIT comes from revision $macro_revision.
- -$progname: You should recreate aclocal.m4 with macros from revision $package_revision
- -$progname: of $PACKAGE $VERSION and run autoconf again.
- -_LT_EOF
- + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- + func_fatal_configuration "not configured to build any kind of library"
- fi
-
- - exit $EXIT_MISMATCH
- - fi
- -}
- -
- + # Darwin sucks
- + eval std_shrext=\"$shrext_cmds\"
-
- -## ----------- ##
- -## Main. ##
- -## ----------- ##
- -
- -$opt_help || {
- - # Sanity checks first:
- - func_check_version_match
- -
- - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- - func_fatal_configuration "not configured to build any kind of library"
- - fi
- + # Only execute mode is allowed to have -dlopen flags.
- + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- + func_error "unrecognized option \`-dlopen'"
- + $ECHO "$help" 1>&2
- + exit $EXIT_FAILURE
- + fi
-
- - test -z "$mode" && func_fatal_error "error: you must specify a MODE."
- + # Change the help message to a mode-specific one.
- + generic_help="$help"
- + help="Try \`$progname --help --mode=$opt_mode' for more information."
- + }
-
-
- - # Darwin sucks
- - eval "std_shrext=\"$shrext_cmds\""
- + # Bail if the options were screwed
- + $exit_cmd $EXIT_FAILURE
- +}
-
-
- - # Only execute mode is allowed to have -dlopen flags.
- - if test -n "$execute_dlfiles" && test "$mode" != execute; then
- - func_error "unrecognized option \`-dlopen'"
- - $ECHO "$help" 1>&2
- - exit $EXIT_FAILURE
- - fi
-
- - # Change the help message to a mode-specific one.
- - generic_help="$help"
- - help="Try \`$progname --help --mode=$mode' for more information."
- -}
-
- +## ----------- ##
- +## Main. ##
- +## ----------- ##
-
- # func_lalib_p file
- # True iff FILE is a libtool `.la' library or `.lo' object file.
- @@ -1121,12 +1286,9 @@ func_ltwrapper_executable_p ()
- # temporary ltwrapper_script.
- func_ltwrapper_scriptname ()
- {
- - func_ltwrapper_scriptname_result=""
- - if func_ltwrapper_executable_p "$1"; then
- - func_dirname_and_basename "$1" "" "."
- - func_stripname '' '.exe' "$func_basename_result"
- - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- - fi
- + func_dirname_and_basename "$1" "" "."
- + func_stripname '' '.exe' "$func_basename_result"
- + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
- }
-
- # func_ltwrapper_p file
- @@ -1149,7 +1311,7 @@ func_execute_cmds ()
- save_ifs=$IFS; IFS='~'
- for cmd in $1; do
- IFS=$save_ifs
- - eval "cmd=\"$cmd\""
- + eval cmd=\"$cmd\"
- func_show_eval "$cmd" "${2-:}"
- done
- IFS=$save_ifs
- @@ -1172,6 +1334,37 @@ func_source ()
- }
-
-
- +# func_resolve_sysroot PATH
- +# Replace a leading = in PATH with a sysroot. Store the result into
- +# func_resolve_sysroot_result
- +func_resolve_sysroot ()
- +{
- + func_resolve_sysroot_result=$1
- + case $func_resolve_sysroot_result in
- + =*)
- + func_stripname '=' '' "$func_resolve_sysroot_result"
- + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
- + ;;
- + esac
- +}
- +
- +# func_replace_sysroot PATH
- +# If PATH begins with the sysroot, replace it with = and
- +# store the result into func_replace_sysroot_result.
- +func_replace_sysroot ()
- +{
- + case "$lt_sysroot:$1" in
- + ?*:"$lt_sysroot"*)
- + func_stripname "$lt_sysroot" '' "$1"
- + func_replace_sysroot_result="=$func_stripname_result"
- + ;;
- + *)
- + # Including no sysroot.
- + func_replace_sysroot_result=$1
- + ;;
- + esac
- +}
- +
- # func_infer_tag arg
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
- @@ -1184,8 +1377,7 @@ func_infer_tag ()
- if test -n "$available_tags" && test -z "$tagname"; then
- CC_quoted=
- for arg in $CC; do
- - func_quote_for_eval "$arg"
- - CC_quoted="$CC_quoted $func_quote_for_eval_result"
- + func_append_quoted CC_quoted "$arg"
- done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
- @@ -1204,8 +1396,7 @@ func_infer_tag ()
- CC_quoted=
- for arg in $CC; do
- # Double-quote args containing other shell metacharacters.
- - func_quote_for_eval "$arg"
- - CC_quoted="$CC_quoted $func_quote_for_eval_result"
- + func_append_quoted CC_quoted "$arg"
- done
- CC_expanded=`func_echo_all $CC`
- CC_quoted_expanded=`func_echo_all $CC_quoted`
- @@ -1274,6 +1465,486 @@ EOF
- }
- }
-
- +
- +##################################################
- +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
- +##################################################
- +
- +# func_convert_core_file_wine_to_w32 ARG
- +# Helper function used by file name conversion functions when $build is *nix,
- +# and $host is mingw, cygwin, or some other w32 environment. Relies on a
- +# correctly configured wine environment available, with the winepath program
- +# in $build's $PATH.
- +#
- +# ARG is the $build file name to be converted to w32 format.
- +# Result is available in $func_convert_core_file_wine_to_w32_result, and will
- +# be empty on error (or when ARG is empty)
- +func_convert_core_file_wine_to_w32 ()
- +{
- + $opt_debug
- + func_convert_core_file_wine_to_w32_result="$1"
- + if test -n "$1"; then
- + # Unfortunately, winepath does not exit with a non-zero error code, so we
- + # are forced to check the contents of stdout. On the other hand, if the
- + # command is not found, the shell will set an exit code of 127 and print
- + # *an error message* to stdout. So we must check for both error code of
- + # zero AND non-empty stdout, which explains the odd construction:
- + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
- + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- + $SED -e "$lt_sed_naive_backslashify"`
- + else
- + func_convert_core_file_wine_to_w32_result=
- + fi
- + fi
- +}
- +# end: func_convert_core_file_wine_to_w32
- +
- +
- +# func_convert_core_path_wine_to_w32 ARG
- +# Helper function used by path conversion functions when $build is *nix, and
- +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
- +# configured wine environment available, with the winepath program in $build's
- +# $PATH. Assumes ARG has no leading or trailing path separator characters.
- +#
- +# ARG is path to be converted from $build format to win32.
- +# Result is available in $func_convert_core_path_wine_to_w32_result.
- +# Unconvertible file (directory) names in ARG are skipped; if no directory names
- +# are convertible, then the result may be empty.
- +func_convert_core_path_wine_to_w32 ()
- +{
- + $opt_debug
- + # unfortunately, winepath doesn't convert paths, only file names
- + func_convert_core_path_wine_to_w32_result=""
- + if test -n "$1"; then
- + oldIFS=$IFS
- + IFS=:
- + for func_convert_core_path_wine_to_w32_f in $1; do
- + IFS=$oldIFS
- + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- + if test -n "$func_convert_core_file_wine_to_w32_result" ; then
- + if test -z "$func_convert_core_path_wine_to_w32_result"; then
- + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
- + else
- + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
- + fi
- + fi
- + done
- + IFS=$oldIFS
- + fi
- +}
- +# end: func_convert_core_path_wine_to_w32
- +
- +
- +# func_cygpath ARGS...
- +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
- +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
- +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
- +# (2), returns the Cygwin file name or path in func_cygpath_result (input
- +# file name or path is assumed to be in w32 format, as previously converted
- +# from $build's *nix or MSYS format). In case (3), returns the w32 file name
- +# or path in func_cygpath_result (input file name or path is assumed to be in
- +# Cygwin format). Returns an empty string on error.
- +#
- +# ARGS are passed to cygpath, with the last one being the file name or path to
- +# be converted.
- +#
- +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
- +# environment variable; do not put it in $PATH.
- +func_cygpath ()
- +{
- + $opt_debug
- + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
- + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
- + if test "$?" -ne 0; then
- + # on failure, ensure result is empty
- + func_cygpath_result=
- + fi
- + else
- + func_cygpath_result=
- + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
- + fi
- +}
- +#end: func_cygpath
- +
- +
- +# func_convert_core_msys_to_w32 ARG
- +# Convert file name or path ARG from MSYS format to w32 format. Return
- +# result in func_convert_core_msys_to_w32_result.
- +func_convert_core_msys_to_w32 ()
- +{
- + $opt_debug
- + # awkward: cmd appends spaces to result
- + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
- +}
- +#end: func_convert_core_msys_to_w32
- +
- +
- +# func_convert_file_check ARG1 ARG2
- +# Verify that ARG1 (a file name in $build format) was converted to $host
- +# format in ARG2. Otherwise, emit an error message, but continue (resetting
- +# func_to_host_file_result to ARG1).
- +func_convert_file_check ()
- +{
- + $opt_debug
- + if test -z "$2" && test -n "$1" ; then
- + func_error "Could not determine host file name corresponding to"
- + func_error " \`$1'"
- + func_error "Continuing, but uninstalled executables may not work."
- + # Fallback:
- + func_to_host_file_result="$1"
- + fi
- +}
- +# end func_convert_file_check
- +
- +
- +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
- +# Verify that FROM_PATH (a path in $build format) was converted to $host
- +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
- +# func_to_host_file_result to a simplistic fallback value (see below).
- +func_convert_path_check ()
- +{
- + $opt_debug
- + if test -z "$4" && test -n "$3"; then
- + func_error "Could not determine the host path corresponding to"
- + func_error " \`$3'"
- + func_error "Continuing, but uninstalled executables may not work."
- + # Fallback. This is a deliberately simplistic "conversion" and
- + # should not be "improved". See libtool.info.
- + if test "x$1" != "x$2"; then
- + lt_replace_pathsep_chars="s|$1|$2|g"
- + func_to_host_path_result=`echo "$3" |
- + $SED -e "$lt_replace_pathsep_chars"`
- + else
- + func_to_host_path_result="$3"
- + fi
- + fi
- +}
- +# end func_convert_path_check
- +
- +
- +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
- +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
- +# and appending REPL if ORIG matches BACKPAT.
- +func_convert_path_front_back_pathsep ()
- +{
- + $opt_debug
- + case $4 in
- + $1 ) func_to_host_path_result="$3$func_to_host_path_result"
- + ;;
- + esac
- + case $4 in
- + $2 ) func_append func_to_host_path_result "$3"
- + ;;
- + esac
- +}
- +# end func_convert_path_front_back_pathsep
- +
- +
- +##################################################
- +# $build to $host FILE NAME CONVERSION FUNCTIONS #
- +##################################################
- +# invoked via `$to_host_file_cmd ARG'
- +#
- +# In each case, ARG is the path to be converted from $build to $host format.
- +# Result will be available in $func_to_host_file_result.
- +
- +
- +# func_to_host_file ARG
- +# Converts the file name ARG from $build format to $host format. Return result
- +# in func_to_host_file_result.
- +func_to_host_file ()
- +{
- + $opt_debug
- + $to_host_file_cmd "$1"
- +}
- +# end func_to_host_file
- +
- +
- +# func_to_tool_file ARG LAZY
- +# converts the file name ARG from $build format to toolchain format. Return
- +# result in func_to_tool_file_result. If the conversion in use is listed
- +# in (the comma separated) LAZY, no conversion takes place.
- +func_to_tool_file ()
- +{
- + $opt_debug
- + case ,$2, in
- + *,"$to_tool_file_cmd",*)
- + func_to_tool_file_result=$1
- + ;;
- + *)
- + $to_tool_file_cmd "$1"
- + func_to_tool_file_result=$func_to_host_file_result
- + ;;
- + esac
- +}
- +# end func_to_tool_file
- +
- +
- +# func_convert_file_noop ARG
- +# Copy ARG to func_to_host_file_result.
- +func_convert_file_noop ()
- +{
- + func_to_host_file_result="$1"
- +}
- +# end func_convert_file_noop
- +
- +
- +# func_convert_file_msys_to_w32 ARG
- +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
- +# conversion to w32 is not available inside the cwrapper. Returns result in
- +# func_to_host_file_result.
- +func_convert_file_msys_to_w32 ()
- +{
- + $opt_debug
- + func_to_host_file_result="$1"
- + if test -n "$1"; then
- + func_convert_core_msys_to_w32 "$1"
- + func_to_host_file_result="$func_convert_core_msys_to_w32_result"
- + fi
- + func_convert_file_check "$1" "$func_to_host_file_result"
- +}
- +# end func_convert_file_msys_to_w32
- +
- +
- +# func_convert_file_cygwin_to_w32 ARG
- +# Convert file name ARG from Cygwin to w32 format. Returns result in
- +# func_to_host_file_result.
- +func_convert_file_cygwin_to_w32 ()
- +{
- + $opt_debug
- + func_to_host_file_result="$1"
- + if test -n "$1"; then
- + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
- + # LT_CYGPATH in this case.
- + func_to_host_file_result=`cygpath -m "$1"`
- + fi
- + func_convert_file_check "$1" "$func_to_host_file_result"
- +}
- +# end func_convert_file_cygwin_to_w32
- +
- +
- +# func_convert_file_nix_to_w32 ARG
- +# Convert file name ARG from *nix to w32 format. Requires a wine environment
- +# and a working winepath. Returns result in func_to_host_file_result.
- +func_convert_file_nix_to_w32 ()
- +{
- + $opt_debug
- + func_to_host_file_result="$1"
- + if test -n "$1"; then
- + func_convert_core_file_wine_to_w32 "$1"
- + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
- + fi
- + func_convert_file_check "$1" "$func_to_host_file_result"
- +}
- +# end func_convert_file_nix_to_w32
- +
- +
- +# func_convert_file_msys_to_cygwin ARG
- +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
- +# Returns result in func_to_host_file_result.
- +func_convert_file_msys_to_cygwin ()
- +{
- + $opt_debug
- + func_to_host_file_result="$1"
- + if test -n "$1"; then
- + func_convert_core_msys_to_w32 "$1"
- + func_cygpath -u "$func_convert_core_msys_to_w32_result"
- + func_to_host_file_result="$func_cygpath_result"
- + fi
- + func_convert_file_check "$1" "$func_to_host_file_result"
- +}
- +# end func_convert_file_msys_to_cygwin
- +
- +
- +# func_convert_file_nix_to_cygwin ARG
- +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed
- +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result
- +# in func_to_host_file_result.
- +func_convert_file_nix_to_cygwin ()
- +{
- + $opt_debug
- + func_to_host_file_result="$1"
- + if test -n "$1"; then
- + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
- + func_convert_core_file_wine_to_w32 "$1"
- + func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- + func_to_host_file_result="$func_cygpath_result"
- + fi
- + func_convert_file_check "$1" "$func_to_host_file_result"
- +}
- +# end func_convert_file_nix_to_cygwin
- +
- +
- +#############################################
- +# $build to $host PATH CONVERSION FUNCTIONS #
- +#############################################
- +# invoked via `$to_host_path_cmd ARG'
- +#
- +# In each case, ARG is the path to be converted from $build to $host format.
- +# The result will be available in $func_to_host_path_result.
- +#
- +# Path separators are also converted from $build format to $host format. If
- +# ARG begins or ends with a path separator character, it is preserved (but
- +# converted to $host format) on output.
- +#
- +# All path conversion functions are named using the following convention:
- +# file name conversion function : func_convert_file_X_to_Y ()
- +# path conversion function : func_convert_path_X_to_Y ()
- +# where, for any given $build/$host combination the 'X_to_Y' value is the
- +# same. If conversion functions are added for new $build/$host combinations,
- +# the two new functions must follow this pattern, or func_init_to_host_path_cmd
- +# will break.
- +
- +
- +# func_init_to_host_path_cmd
- +# Ensures that function "pointer" variable $to_host_path_cmd is set to the
- +# appropriate value, based on the value of $to_host_file_cmd.
- +to_host_path_cmd=
- +func_init_to_host_path_cmd ()
- +{
- + $opt_debug
- + if test -z "$to_host_path_cmd"; then
- + func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- + to_host_path_cmd="func_convert_path_${func_stripname_result}"
- + fi
- +}
- +
- +
- +# func_to_host_path ARG
- +# Converts the path ARG from $build format to $host format. Return result
- +# in func_to_host_path_result.
- +func_to_host_path ()
- +{
- + $opt_debug
- + func_init_to_host_path_cmd
- + $to_host_path_cmd "$1"
- +}
- +# end func_to_host_path
- +
- +
- +# func_convert_path_noop ARG
- +# Copy ARG to func_to_host_path_result.
- +func_convert_path_noop ()
- +{
- + func_to_host_path_result="$1"
- +}
- +# end func_convert_path_noop
- +
- +
- +# func_convert_path_msys_to_w32 ARG
- +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
- +# conversion to w32 is not available inside the cwrapper. Returns result in
- +# func_to_host_path_result.
- +func_convert_path_msys_to_w32 ()
- +{
- + $opt_debug
- + func_to_host_path_result="$1"
- + if test -n "$1"; then
- + # Remove leading and trailing path separator characters from ARG. MSYS
- + # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
- + # and winepath ignores them completely.
- + func_stripname : : "$1"
- + func_to_host_path_tmp1=$func_stripname_result
- + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- + func_to_host_path_result="$func_convert_core_msys_to_w32_result"
- + func_convert_path_check : ";" \
- + "$func_to_host_path_tmp1" "$func_to_host_path_result"
- + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- + fi
- +}
- +# end func_convert_path_msys_to_w32
- +
- +
- +# func_convert_path_cygwin_to_w32 ARG
- +# Convert path ARG from Cygwin to w32 format. Returns result in
- +# func_to_host_file_result.
- +func_convert_path_cygwin_to_w32 ()
- +{
- + $opt_debug
- + func_to_host_path_result="$1"
- + if test -n "$1"; then
- + # See func_convert_path_msys_to_w32:
- + func_stripname : : "$1"
- + func_to_host_path_tmp1=$func_stripname_result
- + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
- + func_convert_path_check : ";" \
- + "$func_to_host_path_tmp1" "$func_to_host_path_result"
- + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- + fi
- +}
- +# end func_convert_path_cygwin_to_w32
- +
- +
- +# func_convert_path_nix_to_w32 ARG
- +# Convert path ARG from *nix to w32 format. Requires a wine environment and
- +# a working winepath. Returns result in func_to_host_file_result.
- +func_convert_path_nix_to_w32 ()
- +{
- + $opt_debug
- + func_to_host_path_result="$1"
- + if test -n "$1"; then
- + # See func_convert_path_msys_to_w32:
- + func_stripname : : "$1"
- + func_to_host_path_tmp1=$func_stripname_result
- + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
- + func_convert_path_check : ";" \
- + "$func_to_host_path_tmp1" "$func_to_host_path_result"
- + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
- + fi
- +}
- +# end func_convert_path_nix_to_w32
- +
- +
- +# func_convert_path_msys_to_cygwin ARG
- +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set.
- +# Returns result in func_to_host_file_result.
- +func_convert_path_msys_to_cygwin ()
- +{
- + $opt_debug
- + func_to_host_path_result="$1"
- + if test -n "$1"; then
- + # See func_convert_path_msys_to_w32:
- + func_stripname : : "$1"
- + func_to_host_path_tmp1=$func_stripname_result
- + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- + func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- + func_to_host_path_result="$func_cygpath_result"
- + func_convert_path_check : : \
- + "$func_to_host_path_tmp1" "$func_to_host_path_result"
- + func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- + fi
- +}
- +# end func_convert_path_msys_to_cygwin
- +
- +
- +# func_convert_path_nix_to_cygwin ARG
- +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a
- +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in
- +# func_to_host_file_result.
- +func_convert_path_nix_to_cygwin ()
- +{
- + $opt_debug
- + func_to_host_path_result="$1"
- + if test -n "$1"; then
- + # Remove leading and trailing path separator characters from
- + # ARG. msys behavior is inconsistent here, cygpath turns them
- + # into '.;' and ';.', and winepath ignores them completely.
- + func_stripname : : "$1"
- + func_to_host_path_tmp1=$func_stripname_result
- + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- + func_to_host_path_result="$func_cygpath_result"
- + func_convert_path_check : : \
- + "$func_to_host_path_tmp1" "$func_to_host_path_result"
- + func_convert_path_front_back_pathsep ":*" "*:" : "$1"
- + fi
- +}
- +# end func_convert_path_nix_to_cygwin
- +
- +
- # func_mode_compile arg...
- func_mode_compile ()
- {
- @@ -1314,12 +1985,12 @@ func_mode_compile ()
- ;;
-
- -pie | -fpie | -fPIE)
- - pie_flag="$pie_flag $arg"
- + func_append pie_flag " $arg"
- continue
- ;;
-
- -shared | -static | -prefer-pic | -prefer-non-pic)
- - later="$later $arg"
- + func_append later " $arg"
- continue
- ;;
-
- @@ -1340,15 +2011,14 @@ func_mode_compile ()
- save_ifs="$IFS"; IFS=','
- for arg in $args; do
- IFS="$save_ifs"
- - func_quote_for_eval "$arg"
- - lastarg="$lastarg $func_quote_for_eval_result"
- + func_append_quoted lastarg "$arg"
- done
- IFS="$save_ifs"
- func_stripname ' ' '' "$lastarg"
- lastarg=$func_stripname_result
-
- # Add the arguments to base_compile.
- - base_compile="$base_compile $lastarg"
- + func_append base_compile " $lastarg"
- continue
- ;;
-
- @@ -1364,8 +2034,7 @@ func_mode_compile ()
- esac # case $arg_mode
-
- # Aesthetically quote the previous argument.
- - func_quote_for_eval "$lastarg"
- - base_compile="$base_compile $func_quote_for_eval_result"
- + func_append_quoted base_compile "$lastarg"
- done # for arg
-
- case $arg_mode in
- @@ -1496,17 +2165,16 @@ compiler."
- $opt_dry_run || $RM $removelist
- exit $EXIT_FAILURE
- fi
- - removelist="$removelist $output_obj"
- + func_append removelist " $output_obj"
- $ECHO "$srcfile" > "$lockfile"
- fi
-
- $opt_dry_run || $RM $removelist
- - removelist="$removelist $lockfile"
- + func_append removelist " $lockfile"
- trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
- - if test -n "$fix_srcfile_path"; then
- - eval "srcfile=\"$fix_srcfile_path\""
- - fi
- + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
- + srcfile=$func_to_tool_file_result
- func_quote_for_eval "$srcfile"
- qsrcfile=$func_quote_for_eval_result
-
- @@ -1526,7 +2194,7 @@ compiler."
-
- if test -z "$output_obj"; then
- # Place PIC objects in $objdir
- - command="$command -o $lobj"
- + func_append command " -o $lobj"
- fi
-
- func_show_eval_locale "$command" \
- @@ -1573,11 +2241,11 @@ compiler."
- command="$base_compile $qsrcfile $pic_flag"
- fi
- if test "$compiler_c_o" = yes; then
- - command="$command -o $obj"
- + func_append command " -o $obj"
- fi
-
- # Suppress compiler output if we already did a PIC compilation.
- - command="$command$suppress_output"
- + func_append command "$suppress_output"
- func_show_eval_locale "$command" \
- '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
- @@ -1622,13 +2290,13 @@ compiler."
- }
-
- $opt_help || {
- - test "$mode" = compile && func_mode_compile ${1+"$@"}
- + test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
- }
-
- func_mode_help ()
- {
- # We need to display help for each of the modes.
- - case $mode in
- + case $opt_mode in
- "")
- # Generic help is extracted from the usage comments
- # at the start of this file.
- @@ -1659,8 +2327,8 @@ This mode accepts the following additional options:
-
- -o OUTPUT-FILE set the output file name to OUTPUT-FILE
- -no-suppress do not suppress compiler output for multiple passes
- - -prefer-pic try to building PIC objects only
- - -prefer-non-pic try to building non-PIC objects only
- + -prefer-pic try to build PIC objects only
- + -prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
- -Wc,FLAG pass FLAG directly to the compiler
- @@ -1804,7 +2472,7 @@ Otherwise, only FILE itself is deleted using RM."
- ;;
-
- *)
- - func_fatal_help "invalid operation mode \`$mode'"
- + func_fatal_help "invalid operation mode \`$opt_mode'"
- ;;
- esac
-
- @@ -1819,13 +2487,13 @@ if $opt_help; then
- else
- {
- func_help noexit
- - for mode in compile link execute install finish uninstall clean; do
- + for opt_mode in compile link execute install finish uninstall clean; do
- func_mode_help
- done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
- {
- func_help noexit
- - for mode in compile link execute install finish uninstall clean; do
- + for opt_mode in compile link execute install finish uninstall clean; do
- echo
- func_mode_help
- done
- @@ -1854,13 +2522,16 @@ func_mode_execute ()
- func_fatal_help "you must specify a COMMAND"
-
- # Handle -dlopen flags immediately.
- - for file in $execute_dlfiles; do
- + for file in $opt_dlopen; do
- test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
-
- dir=
- case $file in
- *.la)
- + func_resolve_sysroot "$file"
- + file=$func_resolve_sysroot_result
- +
- # Check to see that this really is a libtool archive.
- func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$lib' is not a valid libtool archive"
- @@ -1882,7 +2553,7 @@ func_mode_execute ()
- dir="$func_dirname_result"
-
- if test -f "$dir/$objdir/$dlname"; then
- - dir="$dir/$objdir"
- + func_append dir "/$objdir"
- else
- if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
- @@ -1907,10 +2578,10 @@ func_mode_execute ()
- test -n "$absdir" && dir="$absdir"
-
- # Now add the directory to shlibpath_var.
- - if eval test -z \"\$$shlibpath_var\"; then
- - eval $shlibpath_var=\$dir
- + if eval "test -z \"\$$shlibpath_var\""; then
- + eval "$shlibpath_var=\"\$dir\""
- else
- - eval $shlibpath_var=\$dir:\$$shlibpath_var
- + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
- fi
- done
-
- @@ -1939,8 +2610,7 @@ func_mode_execute ()
- ;;
- esac
- # Quote arguments (to preserve shell metacharacters).
- - func_quote_for_eval "$file"
- - args="$args $func_quote_for_eval_result"
- + func_append_quoted args "$file"
- done
-
- if test "X$opt_dry_run" = Xfalse; then
- @@ -1972,22 +2642,59 @@ func_mode_execute ()
- fi
- }
-
- -test "$mode" = execute && func_mode_execute ${1+"$@"}
- +test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
- # func_mode_finish arg...
- func_mode_finish ()
- {
- $opt_debug
- - libdirs="$nonopt"
- + libs=
- + libdirs=
- admincmds=
-
- - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- - for dir
- - do
- - libdirs="$libdirs $dir"
- - done
- + for opt in "$nonopt" ${1+"$@"}
- + do
- + if test -d "$opt"; then
- + func_append libdirs " $opt"
-
- + elif test -f "$opt"; then
- + if func_lalib_unsafe_p "$opt"; then
- + func_append libs " $opt"
- + else
- + func_warning "\`$opt' is not a valid libtool archive"
- + fi
- +
- + else
- + func_fatal_error "invalid argument \`$opt'"
- + fi
- + done
- +
- + if test -n "$libs"; then
- + if test -n "$lt_sysroot"; then
- + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
- + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
- + else
- + sysroot_cmd=
- + fi
- +
- + # Remove sysroot references
- + if $opt_dry_run; then
- + for lib in $libs; do
- + echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
- + done
- + else
- + tmpdir=`func_mktempdir`
- + for lib in $libs; do
- + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
- + > $tmpdir/tmp-la
- + mv -f $tmpdir/tmp-la $lib
- + done
- + ${RM}r "$tmpdir"
- + fi
- + fi
- +
- + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- for libdir in $libdirs; do
- if test -n "$finish_cmds"; then
- # Do each command in the finish commands.
- @@ -1997,7 +2704,7 @@ func_mode_finish ()
- if test -n "$finish_eval"; then
- # Do the single finish_eval.
- eval cmds=\"$finish_eval\"
- - $opt_dry_run || eval "$cmds" || admincmds="$admincmds
- + $opt_dry_run || eval "$cmds" || func_append admincmds "
- $cmds"
- fi
- done
- @@ -2006,53 +2713,55 @@ func_mode_finish ()
- # Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
-
- - echo "----------------------------------------------------------------------"
- - echo "Libraries have been installed in:"
- - for libdir in $libdirs; do
- - $ECHO " $libdir"
- - done
- - echo
- - echo "If you ever happen to want to link against installed libraries"
- - echo "in a given directory, LIBDIR, you must either use libtool, and"
- - echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- - echo "flag during linking and do at least one of the following:"
- - if test -n "$shlibpath_var"; then
- - echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- - echo " during execution"
- - fi
- - if test -n "$runpath_var"; then
- - echo " - add LIBDIR to the \`$runpath_var' environment variable"
- - echo " during linking"
- - fi
- - if test -n "$hardcode_libdir_flag_spec"; then
- - libdir=LIBDIR
- - eval "flag=\"$hardcode_libdir_flag_spec\""
- + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
- + echo "----------------------------------------------------------------------"
- + echo "Libraries have been installed in:"
- + for libdir in $libdirs; do
- + $ECHO " $libdir"
- + done
- + echo
- + echo "If you ever happen to want to link against installed libraries"
- + echo "in a given directory, LIBDIR, you must either use libtool, and"
- + echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- + echo "flag during linking and do at least one of the following:"
- + if test -n "$shlibpath_var"; then
- + echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- + echo " during execution"
- + fi
- + if test -n "$runpath_var"; then
- + echo " - add LIBDIR to the \`$runpath_var' environment variable"
- + echo " during linking"
- + fi
- + if test -n "$hardcode_libdir_flag_spec"; then
- + libdir=LIBDIR
- + eval flag=\"$hardcode_libdir_flag_spec\"
-
- - $ECHO " - use the \`$flag' linker flag"
- - fi
- - if test -n "$admincmds"; then
- - $ECHO " - have your system administrator run these commands:$admincmds"
- - fi
- - if test -f /etc/ld.so.conf; then
- - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- - fi
- - echo
- + $ECHO " - use the \`$flag' linker flag"
- + fi
- + if test -n "$admincmds"; then
- + $ECHO " - have your system administrator run these commands:$admincmds"
- + fi
- + if test -f /etc/ld.so.conf; then
- + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- + fi
- + echo
-
- - echo "See any operating system documentation about shared libraries for"
- - case $host in
- - solaris2.[6789]|solaris2.1[0-9])
- - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- - echo "pages."
- - ;;
- - *)
- - echo "more information, such as the ld(1) and ld.so(8) manual pages."
- - ;;
- - esac
- - echo "----------------------------------------------------------------------"
- + echo "See any operating system documentation about shared libraries for"
- + case $host in
- + solaris2.[6789]|solaris2.1[0-9])
- + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
- + echo "pages."
- + ;;
- + *)
- + echo "more information, such as the ld(1) and ld.so(8) manual pages."
- + ;;
- + esac
- + echo "----------------------------------------------------------------------"
- + fi
- exit $EXIT_SUCCESS
- }
-
- -test "$mode" = finish && func_mode_finish ${1+"$@"}
- +test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
- # func_mode_install arg...
- @@ -2077,7 +2786,7 @@ func_mode_install ()
- # The real first argument should be the name of the installation program.
- # Aesthetically quote it.
- func_quote_for_eval "$arg"
- - install_prog="$install_prog$func_quote_for_eval_result"
- + func_append install_prog "$func_quote_for_eval_result"
- install_shared_prog=$install_prog
- case " $install_prog " in
- *[\\\ /]cp\ *) install_cp=: ;;
- @@ -2097,7 +2806,7 @@ func_mode_install ()
- do
- arg2=
- if test -n "$dest"; then
- - files="$files $dest"
- + func_append files " $dest"
- dest=$arg
- continue
- fi
- @@ -2135,11 +2844,11 @@ func_mode_install ()
-
- # Aesthetically quote the argument.
- func_quote_for_eval "$arg"
- - install_prog="$install_prog $func_quote_for_eval_result"
- + func_append install_prog " $func_quote_for_eval_result"
- if test -n "$arg2"; then
- func_quote_for_eval "$arg2"
- fi
- - install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
- + func_append install_shared_prog " $func_quote_for_eval_result"
- done
-
- test -z "$install_prog" && \
- @@ -2151,7 +2860,7 @@ func_mode_install ()
- if test -n "$install_override_mode" && $no_mode; then
- if $install_cp; then :; else
- func_quote_for_eval "$install_override_mode"
- - install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
- + func_append install_shared_prog " -m $func_quote_for_eval_result"
- fi
- fi
-
- @@ -2209,10 +2918,13 @@ func_mode_install ()
- case $file in
- *.$libext)
- # Do the static libraries later.
- - staticlibs="$staticlibs $file"
- + func_append staticlibs " $file"
- ;;
-
- *.la)
- + func_resolve_sysroot "$file"
- + file=$func_resolve_sysroot_result
- +
- # Check to see that this really is a libtool archive.
- func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$file' is not a valid libtool archive"
- @@ -2226,23 +2938,30 @@ func_mode_install ()
- if test "X$destdir" = "X$libdir"; then
- case "$current_libdirs " in
- *" $libdir "*) ;;
- - *) current_libdirs="$current_libdirs $libdir" ;;
- + *) func_append current_libdirs " $libdir" ;;
- esac
- else
- # Note the libdir as a future libdir.
- case "$future_libdirs " in
- *" $libdir "*) ;;
- - *) future_libdirs="$future_libdirs $libdir" ;;
- + *) func_append future_libdirs " $libdir" ;;
- esac
- fi
-
- func_dirname "$file" "/" ""
- dir="$func_dirname_result"
- - dir="$dir$objdir"
- + func_append dir "$objdir"
-
- if test -n "$relink_command"; then
- + # Strip any trailing slash from the destination.
- + func_stripname '' '/' "$libdir"
- + destlibdir=$func_stripname_result
- +
- + func_stripname '' '/' "$destdir"
- + s_destdir=$func_stripname_result
- +
- # Determine the prefix the user has applied to our future dir.
- - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
- + inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"`
-
- # Don't allow the user to place us outside of our expected
- # location b/c this prevents finding dependent libraries that
- @@ -2315,7 +3034,7 @@ func_mode_install ()
- func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
- # Maybe install the static library, too.
- - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- + test -n "$old_library" && func_append staticlibs " $dir/$old_library"
- ;;
-
- *.lo)
- @@ -2503,7 +3222,7 @@ func_mode_install ()
- test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
-
- - if test -n "$current_libdirs" && $opt_finish; then
- + if test -n "$current_libdirs"; then
- # Maybe just do a dry run.
- $opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
- @@ -2512,7 +3231,7 @@ func_mode_install ()
- fi
- }
-
- -test "$mode" = install && func_mode_install ${1+"$@"}
- +test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
- # func_generate_dlsyms outputname originator pic_p
- @@ -2559,6 +3278,18 @@ extern \"C\" {
- #pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
- #endif
-
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- /* External symbol declarations for the compiler. */\
- "
-
- @@ -2570,21 +3301,22 @@ extern \"C\" {
- # Add our own program objects to the symbol list.
- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
- for progfile in $progfiles; do
- - func_verbose "extracting global C symbols from \`$progfile'"
- - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
- + func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
- + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
- done
-
- if test -n "$exclude_expsyms"; then
- $opt_dry_run || {
- - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
- - $MV "$nlist"T "$nlist"
- + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
- + eval '$MV "$nlist"T "$nlist"'
- }
- fi
-
- if test -n "$export_symbols_regex"; then
- $opt_dry_run || {
- - $EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T
- - $MV "$nlist"T "$nlist"
- + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
- + eval '$MV "$nlist"T "$nlist"'
- }
- fi
-
- @@ -2593,23 +3325,23 @@ extern \"C\" {
- export_symbols="$output_objdir/$outputname.exp"
- $opt_dry_run || {
- $RM $export_symbols
- - ${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' < "$nlist" > "$export_symbols"
- + eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- - echo EXPORTS > "$output_objdir/$outputname.def"
- - cat "$export_symbols" >> "$output_objdir/$outputname.def"
- + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
- ;;
- esac
- }
- else
- $opt_dry_run || {
- - ${SED} -e 's/\([].[*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/' < "$export_symbols" > "$output_objdir/$outputname.exp"
- - $GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T
- - $MV "$nlist"T "$nlist"
- + eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
- + eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
- + eval '$MV "$nlist"T "$nlist"'
- case $host in
- *cygwin* | *mingw* | *cegcc* )
- - echo EXPORTS > "$output_objdir/$outputname.def"
- - cat "$nlist" >> "$output_objdir/$outputname.def"
- + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
- + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
- ;;
- esac
- }
- @@ -2620,10 +3352,52 @@ extern \"C\" {
- func_verbose "extracting global C symbols from \`$dlprefile'"
- func_basename "$dlprefile"
- name="$func_basename_result"
- - $opt_dry_run || {
- - $ECHO ": $name " >> "$nlist"
- - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- - }
- + case $host in
- + *cygwin* | *mingw* | *cegcc* )
- + # if an import library, we need to obtain dlname
- + if func_win32_import_lib_p "$dlprefile"; then
- + func_tr_sh "$dlprefile"
- + eval "curr_lafile=\$libfile_$func_tr_sh_result"
- + dlprefile_dlbasename=""
- + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
- + # Use subshell, to avoid clobbering current variable values
- + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- + if test -n "$dlprefile_dlname" ; then
- + func_basename "$dlprefile_dlname"
- + dlprefile_dlbasename="$func_basename_result"
- + else
- + # no lafile. user explicitly requested -dlpreopen <import library>.
- + $sharedlib_from_linklib_cmd "$dlprefile"
- + dlprefile_dlbasename=$sharedlib_from_linklib_result
- + fi
- + fi
- + $opt_dry_run || {
- + if test -n "$dlprefile_dlbasename" ; then
- + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
- + else
- + func_warning "Could not compute DLL name from $name"
- + eval '$ECHO ": $name " >> "$nlist"'
- + fi
- + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
- + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
- + }
- + else # not an import lib
- + $opt_dry_run || {
- + eval '$ECHO ": $name " >> "$nlist"'
- + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- + }
- + fi
- + ;;
- + *)
- + $opt_dry_run || {
- + eval '$ECHO ": $name " >> "$nlist"'
- + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
- + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
- + }
- + ;;
- + esac
- done
-
- $opt_dry_run || {
- @@ -2661,26 +3435,9 @@ typedef struct {
- const char *name;
- void *address;
- } lt_dlsymlist;
- -"
- - case $host in
- - *cygwin* | *mingw* | *cegcc* )
- - echo >> "$output_objdir/$my_dlsyms" "\
- -/* DATA imports from DLLs on WIN32 con't be const, because
- - runtime relocations are performed -- see ld's documentation
- - on pseudo-relocs. */"
- - lt_dlsym_const= ;;
- - *osf5*)
- - echo >> "$output_objdir/$my_dlsyms" "\
- -/* This system does not cope well with relocations in const data */"
- - lt_dlsym_const= ;;
- - *)
- - lt_dlsym_const=const ;;
- - esac
- -
- - echo >> "$output_objdir/$my_dlsyms" "\
- -extern $lt_dlsym_const lt_dlsymlist
- +extern LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];
- -$lt_dlsym_const lt_dlsymlist
- +LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[] =
- {\
- { \"$my_originator\", (void *) 0 },"
- @@ -2736,7 +3493,7 @@ static const void *lt_preloaded_setup() {
- for arg in $LTCFLAGS; do
- case $arg in
- -pie | -fpie | -fPIE) ;;
- - *) symtab_cflags="$symtab_cflags $arg" ;;
- + *) func_append symtab_cflags " $arg" ;;
- esac
- done
-
- @@ -2796,9 +3553,11 @@ func_win32_libid ()
- win32_libid_type="x86 archive import"
- ;;
- *ar\ archive*) # could be an import, or static
- - if $OBJDUMP -f "$1" | $SED -e '10q' 2>/dev/null |
- - $EGREP 'file format (pe-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- - win32_nmres=`$NM -f posix -A "$1" |
- + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
- + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
- + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- + func_to_tool_file "$1" func_convert_file_msys_to_w32
- + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- $SED -n -e '
- 1,100{
- / I /{
- @@ -2827,6 +3586,131 @@ func_win32_libid ()
- $ECHO "$win32_libid_type"
- }
-
- +# func_cygming_dll_for_implib ARG
- +#
- +# Platform-specific function to extract the
- +# name of the DLL associated with the specified
- +# import library ARG.
- +# Invoked by eval'ing the libtool variable
- +# $sharedlib_from_linklib_cmd
- +# Result is available in the variable
- +# $sharedlib_from_linklib_result
- +func_cygming_dll_for_implib ()
- +{
- + $opt_debug
- + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
- +}
- +
- +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
- +#
- +# The is the core of a fallback implementation of a
- +# platform-specific function to extract the name of the
- +# DLL associated with the specified import library LIBNAME.
- +#
- +# SECTION_NAME is either .idata$6 or .idata$7, depending
- +# on the platform and compiler that created the implib.
- +#
- +# Echos the name of the DLL associated with the
- +# specified import library.
- +func_cygming_dll_for_implib_fallback_core ()
- +{
- + $opt_debug
- + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
- + $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
- + $SED '/^Contents of section '"$match_literal"':/{
- + # Place marker at beginning of archive member dllname section
- + s/.*/====MARK====/
- + p
- + d
- + }
- + # These lines can sometimes be longer than 43 characters, but
- + # are always uninteresting
- + /:[ ]*file format pe[i]\{,1\}-/d
- + /^In archive [^:]*:/d
- + # Ensure marker is printed
- + /^====MARK====/p
- + # Remove all lines with less than 43 characters
- + /^.\{43\}/!d
- + # From remaining lines, remove first 43 characters
- + s/^.\{43\}//' |
- + $SED -n '
- + # Join marker and all lines until next marker into a single line
- + /^====MARK====/ b para
- + H
- + $ b para
- + b
- + :para
- + x
- + s/\n//g
- + # Remove the marker
- + s/^====MARK====//
- + # Remove trailing dots and whitespace
- + s/[\. \t]*$//
- + # Print
- + /./p' |
- + # we now have a list, one entry per line, of the stringified
- + # contents of the appropriate section of all members of the
- + # archive which possess that section. Heuristic: eliminate
- + # all those which have a first or second character that is
- + # a '.' (that is, objdump's representation of an unprintable
- + # character.) This should work for all archives with less than
- + # 0x302f exports -- but will fail for DLLs whose name actually
- + # begins with a literal '.' or a single character followed by
- + # a '.'.
- + #
- + # Of those that remain, print the first one.
- + $SED -e '/^\./d;/^.\./d;q'
- +}
- +
- +# func_cygming_gnu_implib_p ARG
- +# This predicate returns with zero status (TRUE) if
- +# ARG is a GNU/binutils-style import library. Returns
- +# with nonzero status (FALSE) otherwise.
- +func_cygming_gnu_implib_p ()
- +{
- + $opt_debug
- + func_to_tool_file "$1" func_convert_file_msys_to_w32
- + 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)$'`
- + test -n "$func_cygming_gnu_implib_tmp"
- +}
- +
- +# func_cygming_ms_implib_p ARG
- +# This predicate returns with zero status (TRUE) if
- +# ARG is an MS-style import library. Returns
- +# with nonzero status (FALSE) otherwise.
- +func_cygming_ms_implib_p ()
- +{
- + $opt_debug
- + func_to_tool_file "$1" func_convert_file_msys_to_w32
- + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- + test -n "$func_cygming_ms_implib_tmp"
- +}
- +
- +# func_cygming_dll_for_implib_fallback ARG
- +# Platform-specific function to extract the
- +# name of the DLL associated with the specified
- +# import library ARG.
- +#
- +# This fallback implementation is for use when $DLLTOOL
- +# does not support the --identify-strict option.
- +# Invoked by eval'ing the libtool variable
- +# $sharedlib_from_linklib_cmd
- +# Result is available in the variable
- +# $sharedlib_from_linklib_result
- +func_cygming_dll_for_implib_fallback ()
- +{
- + $opt_debug
- + if func_cygming_gnu_implib_p "$1" ; then
- + # binutils import library
- + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- + elif func_cygming_ms_implib_p "$1" ; then
- + # ms-generated import library
- + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
- + else
- + # unknown
- + sharedlib_from_linklib_result=""
- + fi
- +}
-
-
- # func_extract_an_archive dir oldlib
- @@ -2917,7 +3801,7 @@ func_extract_archives ()
- darwin_file=
- darwin_files=
- for darwin_file in $darwin_filelist; do
- - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
- + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
- $LIPO -create -output "$darwin_file" $darwin_files
- done # $darwin_filelist
- $RM -rf unfat-$$
- @@ -2932,7 +3816,7 @@ func_extract_archives ()
- func_extract_an_archive "$my_xdir" "$my_xabs"
- ;;
- esac
- - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
- + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
- done
-
- func_extract_archives_result="$my_oldobjs"
- @@ -3014,7 +3898,110 @@ func_fallback_echo ()
- _LTECHO_EOF'
- }
- ECHO=\"$qECHO\"
- - fi\
- + fi
- +
- +# Very basic option parsing. These options are (a) specific to
- +# the libtool wrapper, (b) are identical between the wrapper
- +# /script/ and the wrapper /executable/ which is used only on
- +# windows platforms, and (c) all begin with the string "--lt-"
- +# (application programs are unlikely to have options which match
- +# this pattern).
- +#
- +# There are only two supported options: --lt-debug and
- +# --lt-dump-script. There is, deliberately, no --lt-help.
- +#
- +# The first argument to this parsing function should be the
- +# script's $0 value, followed by "$@".
- +lt_option_debug=
- +func_parse_lt_options ()
- +{
- + lt_script_arg0=\$0
- + shift
- + for lt_opt
- + do
- + case \"\$lt_opt\" in
- + --lt-debug) lt_option_debug=1 ;;
- + --lt-dump-script)
- + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
- + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
- + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
- + cat \"\$lt_dump_D/\$lt_dump_F\"
- + exit 0
- + ;;
- + --lt-*)
- + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
- + exit 1
- + ;;
- + esac
- + done
- +
- + # Print the debug banner immediately:
- + if test -n \"\$lt_option_debug\"; then
- + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
- + fi
- +}
- +
- +# Used when --lt-debug. Prints its arguments to stdout
- +# (redirection is the responsibility of the caller)
- +func_lt_dump_args ()
- +{
- + lt_dump_args_N=1;
- + for lt_arg
- + do
- + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
- + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
- + done
- +}
- +
- +# Core function for launching the target application
- +func_exec_program_core ()
- +{
- +"
- + case $host in
- + # Backslashes separate directories on plain windows
- + *-*-mingw | *-*-os2* | *-cegcc*)
- + $ECHO "\
- + if test -n \"\$lt_option_debug\"; then
- + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
- + func_lt_dump_args \${1+\"\$@\"} 1>&2
- + fi
- + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- +"
- + ;;
- +
- + *)
- + $ECHO "\
- + if test -n \"\$lt_option_debug\"; then
- + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
- + func_lt_dump_args \${1+\"\$@\"} 1>&2
- + fi
- + exec \"\$progdir/\$program\" \${1+\"\$@\"}
- +"
- + ;;
- + esac
- + $ECHO "\
- + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- + exit 1
- +}
- +
- +# A function to encapsulate launching the target application
- +# Strips options in the --lt-* namespace from \$@ and
- +# launches target application with the remaining arguments.
- +func_exec_program ()
- +{
- + for lt_wr_arg
- + do
- + case \$lt_wr_arg in
- + --lt-*) ;;
- + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
- + esac
- + shift
- + done
- + func_exec_program_core \${1+\"\$@\"}
- +}
- +
- + # Parse options
- + func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
- # Find the directory that this script lives in.
- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
- @@ -3078,7 +4065,7 @@ _LTECHO_EOF'
-
- # relink executable if necessary
- if test -n \"\$relink_command\"; then
- - if relink_command_output=\`eval \"\$relink_command\" 2>&1\`; then :
- + if relink_command_output=\`eval \$relink_command 2>&1\`; then :
- else
- $ECHO \"\$relink_command_output\" >&2
- $RM \"\$progdir/\$file\"
- @@ -3102,6 +4089,18 @@ _LTECHO_EOF'
-
- if test -f \"\$progdir/\$program\"; then"
-
- + # fixup the dll searchpath if we need to.
- + #
- + # Fix the DLL searchpath if we need to. Do this before prepending
- + # to shlibpath, because on Windows, both are PATH and uninstalled
- + # libraries must come first.
- + if test -n "$dllsearchpath"; then
- + $ECHO "\
- + # Add the dll search path components to the executable PATH
- + PATH=$dllsearchpath:\$PATH
- +"
- + fi
- +
- # Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- $ECHO "\
- @@ -3116,35 +4115,10 @@ _LTECHO_EOF'
- "
- fi
-
- - # fixup the dll searchpath if we need to.
- - if test -n "$dllsearchpath"; then
- - $ECHO "\
- - # Add the dll search path components to the executable PATH
- - PATH=$dllsearchpath:\$PATH
- -"
- - fi
- -
- $ECHO "\
- if test \"\$libtool_execute_magic\" != \"$magic\"; then
- # Run the actual program with our arguments.
- -"
- - case $host in
- - # Backslashes separate directories on plain windows
- - *-*-mingw | *-*-os2* | *-cegcc*)
- - $ECHO "\
- - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
- -"
- - ;;
- -
- - *)
- - $ECHO "\
- - exec \"\$progdir/\$program\" \${1+\"\$@\"}
- -"
- - ;;
- - esac
- - $ECHO "\
- - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
- - exit 1
- + func_exec_program \${1+\"\$@\"}
- fi
- else
- # The program doesn't exist.
- @@ -3158,166 +4132,6 @@ fi\
- }
-
-
- -# func_to_host_path arg
- -#
- -# Convert paths to host format when used with build tools.
- -# Intended for use with "native" mingw (where libtool itself
- -# is running under the msys shell), or in the following cross-
- -# build environments:
- -# $build $host
- -# mingw (msys) mingw [e.g. native]
- -# cygwin mingw
- -# *nix + wine mingw
- -# where wine is equipped with the `winepath' executable.
- -# In the native mingw case, the (msys) shell automatically
- -# converts paths for any non-msys applications it launches,
- -# but that facility isn't available from inside the cwrapper.
- -# Similar accommodations are necessary for $host mingw and
- -# $build cygwin. Calling this function does no harm for other
- -# $host/$build combinations not listed above.
- -#
- -# ARG is the path (on $build) that should be converted to
- -# the proper representation for $host. The result is stored
- -# in $func_to_host_path_result.
- -func_to_host_path ()
- -{
- - func_to_host_path_result="$1"
- - if test -n "$1"; then
- - case $host in
- - *mingw* )
- - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- - case $build in
- - *mingw* ) # actually, msys
- - # awkward: cmd appends spaces to result
- - func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
- - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
- - ;;
- - *cygwin* )
- - func_to_host_path_result=`cygpath -w "$1" |
- - $SED -e "$lt_sed_naive_backslashify"`
- - ;;
- - * )
- - # Unfortunately, winepath does not exit with a non-zero
- - # error code, so we are forced to check the contents of
- - # stdout. On the other hand, if the command is not
- - # found, the shell will set an exit code of 127 and print
- - # *an error message* to stdout. So we must check for both
- - # error code of zero AND non-empty stdout, which explains
- - # the odd construction:
- - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
- - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
- - func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
- - $SED -e "$lt_sed_naive_backslashify"`
- - else
- - # Allow warning below.
- - func_to_host_path_result=
- - fi
- - ;;
- - esac
- - if test -z "$func_to_host_path_result" ; then
- - func_error "Could not determine host path corresponding to"
- - func_error " \`$1'"
- - func_error "Continuing, but uninstalled executables may not work."
- - # Fallback:
- - func_to_host_path_result="$1"
- - fi
- - ;;
- - esac
- - fi
- -}
- -# end: func_to_host_path
- -
- -# func_to_host_pathlist arg
- -#
- -# Convert pathlists to host format when used with build tools.
- -# See func_to_host_path(), above. This function supports the
- -# following $build/$host combinations (but does no harm for
- -# combinations not listed here):
- -# $build $host
- -# mingw (msys) mingw [e.g. native]
- -# cygwin mingw
- -# *nix + wine mingw
- -#
- -# Path separators are also converted from $build format to
- -# $host format. If ARG begins or ends with a path separator
- -# character, it is preserved (but converted to $host format)
- -# on output.
- -#
- -# ARG is a pathlist (on $build) that should be converted to
- -# the proper representation on $host. The result is stored
- -# in $func_to_host_pathlist_result.
- -func_to_host_pathlist ()
- -{
- - func_to_host_pathlist_result="$1"
- - if test -n "$1"; then
- - case $host in
- - *mingw* )
- - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- - # Remove leading and trailing path separator characters from
- - # ARG. msys behavior is inconsistent here, cygpath turns them
- - # into '.;' and ';.', and winepath ignores them completely.
- - func_stripname : : "$1"
- - func_to_host_pathlist_tmp1=$func_stripname_result
- - case $build in
- - *mingw* ) # Actually, msys.
- - # Awkward: cmd appends spaces to result.
- - func_to_host_pathlist_result=`
- - ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
- - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
- - ;;
- - *cygwin* )
- - func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
- - $SED -e "$lt_sed_naive_backslashify"`
- - ;;
- - * )
- - # unfortunately, winepath doesn't convert pathlists
- - func_to_host_pathlist_result=""
- - func_to_host_pathlist_oldIFS=$IFS
- - IFS=:
- - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
- - IFS=$func_to_host_pathlist_oldIFS
- - if test -n "$func_to_host_pathlist_f" ; then
- - func_to_host_path "$func_to_host_pathlist_f"
- - if test -n "$func_to_host_path_result" ; then
- - if test -z "$func_to_host_pathlist_result" ; then
- - func_to_host_pathlist_result="$func_to_host_path_result"
- - else
- - func_append func_to_host_pathlist_result ";$func_to_host_path_result"
- - fi
- - fi
- - fi
- - done
- - IFS=$func_to_host_pathlist_oldIFS
- - ;;
- - esac
- - if test -z "$func_to_host_pathlist_result"; then
- - func_error "Could not determine the host path(s) corresponding to"
- - func_error " \`$1'"
- - func_error "Continuing, but uninstalled executables may not work."
- - # Fallback. This may break if $1 contains DOS-style drive
- - # specifications. The fix is not to complicate the expression
- - # below, but for the user to provide a working wine installation
- - # with winepath so that path translation in the cross-to-mingw
- - # case works properly.
- - lt_replace_pathsep_nix_to_dos="s|:|;|g"
- - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
- - $SED -e "$lt_replace_pathsep_nix_to_dos"`
- - fi
- - # Now, add the leading and trailing path separators back
- - case "$1" in
- - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
- - ;;
- - esac
- - case "$1" in
- - *: ) func_append func_to_host_pathlist_result ";"
- - ;;
- - esac
- - ;;
- - esac
- - fi
- -}
- -# end: func_to_host_pathlist
- -
- # func_emit_cwrapperexe_src
- # emit the source code for a wrapper executable on stdout
- # Must ONLY be called from within func_mode_link because
- @@ -3334,10 +4148,6 @@ func_emit_cwrapperexe_src ()
-
- This wrapper executable should never be moved out of the build directory.
- If it is, it will not operate correctly.
- -
- - Currently, it simply execs the wrapper *script* "$SHELL $output",
- - but could eventually absorb all of the scripts functionality and
- - exec $objdir/$outputname directly.
- */
- EOF
- cat <<"EOF"
- @@ -3462,22 +4272,13 @@ int setenv (const char *, const char *, int);
- if (stale) { free ((void *) stale); stale = 0; } \
- } while (0)
-
- -#undef LTWRAPPER_DEBUGPRINTF
- -#if defined LT_DEBUGWRAPPER
- -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
- -static void
- -ltwrapper_debugprintf (const char *fmt, ...)
- -{
- - va_list args;
- - va_start (args, fmt);
- - (void) vfprintf (stderr, fmt, args);
- - va_end (args);
- -}
- +#if defined(LT_DEBUGWRAPPER)
- +static int lt_debug = 1;
- #else
- -# define LTWRAPPER_DEBUGPRINTF(args)
- +static int lt_debug = 0;
- #endif
-
- -const char *program_name = NULL;
- +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
- void *xmalloc (size_t num);
- char *xstrdup (const char *string);
- @@ -3487,7 +4288,10 @@ char *chase_symlinks (const char *pathspec);
- int make_executable (const char *path);
- int check_executable (const char *path);
- char *strendzap (char *str, const char *pat);
- -void lt_fatal (const char *message, ...);
- +void lt_debugprintf (const char *file, int line, const char *fmt, ...);
- +void lt_fatal (const char *file, int line, const char *message, ...);
- +static const char *nonnull (const char *s);
- +static const char *nonempty (const char *s);
- void lt_setenv (const char *name, const char *value);
- char *lt_extend_str (const char *orig_value, const char *add, int to_end);
- void lt_update_exe_path (const char *name, const char *value);
- @@ -3497,14 +4301,14 @@ void lt_dump_script (FILE *f);
- EOF
-
- cat <<EOF
- -const char * MAGIC_EXE = "$magic_exe";
- +volatile const char * MAGIC_EXE = "$magic_exe";
- const char * LIB_PATH_VARNAME = "$shlibpath_var";
- EOF
-
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
- - func_to_host_pathlist "$temp_rpath"
- + func_to_host_path "$temp_rpath"
- cat <<EOF
- -const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result";
- +const char * LIB_PATH_VALUE = "$func_to_host_path_result";
- EOF
- else
- cat <<"EOF"
- @@ -3513,10 +4317,10 @@ EOF
- fi
-
- if test -n "$dllsearchpath"; then
- - func_to_host_pathlist "$dllsearchpath:"
- + func_to_host_path "$dllsearchpath:"
- cat <<EOF
- const char * EXE_PATH_VARNAME = "PATH";
- -const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result";
- +const char * EXE_PATH_VALUE = "$func_to_host_path_result";
- EOF
- else
- cat <<"EOF"
- @@ -3539,12 +4343,10 @@ EOF
- cat <<"EOF"
-
- #define LTWRAPPER_OPTION_PREFIX "--lt-"
- -#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
-
- -static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
- static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
- -
- static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
- +static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
-
- int
- main (int argc, char *argv[])
- @@ -3561,10 +4363,13 @@ main (int argc, char *argv[])
- int i;
-
- program_name = (char *) xstrdup (base_name (argv[0]));
- - LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
- - LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
- + newargz = XMALLOC (char *, argc + 1);
-
- - /* very simple arg parsing; don't want to rely on getopt */
- + /* very simple arg parsing; don't want to rely on getopt
- + * also, copy all non cwrapper options to newargz, except
- + * argz[0], which is handled differently
- + */
- + newargc=0;
- for (i = 1; i < argc; i++)
- {
- if (strcmp (argv[i], dumpscript_opt) == 0)
- @@ -3581,21 +4386,54 @@ EOF
- lt_dump_script (stdout);
- return 0;
- }
- + if (strcmp (argv[i], debug_opt) == 0)
- + {
- + lt_debug = 1;
- + continue;
- + }
- + if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
- + {
- + /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- + namespace, but it is not one of the ones we know about and
- + have already dealt with, above (inluding dump-script), then
- + report an error. Otherwise, targets might begin to believe
- + they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- + namespace. The first time any user complains about this, we'll
- + need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- + or a configure.ac-settable value.
- + */
- + lt_fatal (__FILE__, __LINE__,
- + "unrecognized %s option: '%s'",
- + ltwrapper_option_prefix, argv[i]);
- + }
- + /* otherwise ... */
- + newargz[++newargc] = xstrdup (argv[i]);
- }
- + newargz[++newargc] = NULL;
- +
- +EOF
- + cat <<EOF
- + /* The GNU banner must be the first non-error debug message */
- + lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
- +EOF
- + cat <<"EOF"
- + lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
- + lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
- - newargz = XMALLOC (char *, argc + 1);
- tmp_pathspec = find_executable (argv[0]);
- if (tmp_pathspec == NULL)
- - lt_fatal ("Couldn't find %s", argv[0]);
- - LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
- - tmp_pathspec));
- + lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
- + lt_debugprintf (__FILE__, __LINE__,
- + "(main) found exe (before symlink chase) at: %s\n",
- + tmp_pathspec);
-
- actual_cwrapper_path = chase_symlinks (tmp_pathspec);
- - LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
- - actual_cwrapper_path));
- + lt_debugprintf (__FILE__, __LINE__,
- + "(main) found exe (after symlink chase) at: %s\n",
- + actual_cwrapper_path);
- XFREE (tmp_pathspec);
-
- - actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
- + actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
- strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
- /* wrapper name transforms */
- @@ -3613,8 +4451,9 @@ EOF
- target_name = tmp_pathspec;
- tmp_pathspec = 0;
-
- - LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
- - target_name));
- + lt_debugprintf (__FILE__, __LINE__,
- + "(main) libtool target name: %s\n",
- + target_name);
- EOF
-
- cat <<EOF
- @@ -3664,35 +4503,19 @@ EOF
-
- lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
- lt_setenv ("DUALCASE", "1"); /* for MSK sh */
- - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
- + /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must
- + be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
- + because on Windows, both *_VARNAMEs are PATH but uninstalled
- + libraries must come first. */
- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
- + lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
- - newargc=0;
- - for (i = 1; i < argc; i++)
- - {
- - if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
- - {
- - /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
- - namespace, but it is not one of the ones we know about and
- - have already dealt with, above (inluding dump-script), then
- - report an error. Otherwise, targets might begin to believe
- - they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
- - namespace. The first time any user complains about this, we'll
- - need to make LTWRAPPER_OPTION_PREFIX a configure-time option
- - or a configure.ac-settable value.
- - */
- - lt_fatal ("Unrecognized option in %s namespace: '%s'",
- - ltwrapper_option_prefix, argv[i]);
- - }
- - /* otherwise ... */
- - newargz[++newargc] = xstrdup (argv[i]);
- - }
- - newargz[++newargc] = NULL;
- -
- - LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
- + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
- + nonnull (lt_argv_zero));
- for (i = 0; i < newargc; i++)
- {
- - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
- + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
- + i, nonnull (newargz[i]));
- }
-
- EOF
- @@ -3706,7 +4529,9 @@ EOF
- if (rval == -1)
- {
- /* failed to start process */
- - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
- + lt_debugprintf (__FILE__, __LINE__,
- + "(main) failed to launch target \"%s\": %s\n",
- + lt_argv_zero, nonnull (strerror (errno)));
- return 127;
- }
- return rval;
- @@ -3728,7 +4553,7 @@ xmalloc (size_t num)
- {
- void *p = (void *) malloc (num);
- if (!p)
- - lt_fatal ("Memory exhausted");
- + lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
- return p;
- }
- @@ -3762,8 +4587,8 @@ check_executable (const char *path)
- {
- struct stat st;
-
- - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
- - path ? (*path ? path : "EMPTY!") : "NULL!"));
- + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
- + nonempty (path));
- if ((!path) || (!*path))
- return 0;
-
- @@ -3780,8 +4605,8 @@ make_executable (const char *path)
- int rval = 0;
- struct stat st;
-
- - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
- - path ? (*path ? path : "EMPTY!") : "NULL!"));
- + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
- + nonempty (path));
- if ((!path) || (!*path))
- return 0;
-
- @@ -3807,8 +4632,8 @@ find_executable (const char *wrapper)
- int tmp_len;
- char *concat_name;
-
- - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
- - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
- + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
- + nonempty (wrapper));
-
- if ((wrapper == NULL) || (*wrapper == '\0'))
- return NULL;
- @@ -3861,7 +4686,8 @@ find_executable (const char *wrapper)
- {
- /* empty path: current directory */
- if (getcwd (tmp, LT_PATHMAX) == NULL)
- - lt_fatal ("getcwd failed");
- + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- + nonnull (strerror (errno)));
- tmp_len = strlen (tmp);
- concat_name =
- XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
- @@ -3886,7 +4712,8 @@ find_executable (const char *wrapper)
- }
- /* Relative path | not found in path: prepend cwd */
- if (getcwd (tmp, LT_PATHMAX) == NULL)
- - lt_fatal ("getcwd failed");
- + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
- + nonnull (strerror (errno)));
- tmp_len = strlen (tmp);
- concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
- memcpy (concat_name, tmp, tmp_len);
- @@ -3912,8 +4739,9 @@ chase_symlinks (const char *pathspec)
- int has_symlinks = 0;
- while (strlen (tmp_pathspec) && !has_symlinks)
- {
- - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
- - tmp_pathspec));
- + lt_debugprintf (__FILE__, __LINE__,
- + "checking path component for symlinks: %s\n",
- + tmp_pathspec);
- if (lstat (tmp_pathspec, &s) == 0)
- {
- if (S_ISLNK (s.st_mode) != 0)
- @@ -3935,8 +4763,9 @@ chase_symlinks (const char *pathspec)
- }
- else
- {
- - char *errstr = strerror (errno);
- - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
- + lt_fatal (__FILE__, __LINE__,
- + "error accessing file \"%s\": %s",
- + tmp_pathspec, nonnull (strerror (errno)));
- }
- }
- XFREE (tmp_pathspec);
- @@ -3949,7 +4778,8 @@ chase_symlinks (const char *pathspec)
- tmp_pathspec = realpath (pathspec, buf);
- if (tmp_pathspec == 0)
- {
- - lt_fatal ("Could not follow symlinks for %s", pathspec);
- + lt_fatal (__FILE__, __LINE__,
- + "could not follow symlinks for %s", pathspec);
- }
- return xstrdup (tmp_pathspec);
- #endif
- @@ -3975,11 +4805,25 @@ strendzap (char *str, const char *pat)
- return str;
- }
-
- +void
- +lt_debugprintf (const char *file, int line, const char *fmt, ...)
- +{
- + va_list args;
- + if (lt_debug)
- + {
- + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
- + va_start (args, fmt);
- + (void) vfprintf (stderr, fmt, args);
- + va_end (args);
- + }
- +}
- +
- static void
- -lt_error_core (int exit_status, const char *mode,
- +lt_error_core (int exit_status, const char *file,
- + int line, const char *mode,
- const char *message, va_list ap)
- {
- - fprintf (stderr, "%s: %s: ", program_name, mode);
- + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
- vfprintf (stderr, message, ap);
- fprintf (stderr, ".\n");
-
- @@ -3988,20 +4832,32 @@ lt_error_core (int exit_status, const char *mode,
- }
-
- void
- -lt_fatal (const char *message, ...)
- +lt_fatal (const char *file, int line, const char *message, ...)
- {
- va_list ap;
- va_start (ap, message);
- - lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
- + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
- va_end (ap);
- }
-
- +static const char *
- +nonnull (const char *s)
- +{
- + return s ? s : "(null)";
- +}
- +
- +static const char *
- +nonempty (const char *s)
- +{
- + return (s && !*s) ? "(empty)" : nonnull (s);
- +}
- +
- void
- lt_setenv (const char *name, const char *value)
- {
- - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
- - (name ? name : "<NULL>"),
- - (value ? value : "<NULL>")));
- + lt_debugprintf (__FILE__, __LINE__,
- + "(lt_setenv) setting '%s' to '%s'\n",
- + nonnull (name), nonnull (value));
- {
- #ifdef HAVE_SETENV
- /* always make a copy, for consistency with !HAVE_SETENV */
- @@ -4049,9 +4905,9 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
- void
- lt_update_exe_path (const char *name, const char *value)
- {
- - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- - (name ? name : "<NULL>"),
- - (value ? value : "<NULL>")));
- + lt_debugprintf (__FILE__, __LINE__,
- + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
- + nonnull (name), nonnull (value));
-
- if (name && *name && value && *value)
- {
- @@ -4070,9 +4926,9 @@ lt_update_exe_path (const char *name, const char *value)
- void
- lt_update_lib_path (const char *name, const char *value)
- {
- - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- - (name ? name : "<NULL>"),
- - (value ? value : "<NULL>")));
- + lt_debugprintf (__FILE__, __LINE__,
- + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
- + nonnull (name), nonnull (value));
-
- if (name && *name && value && *value)
- {
- @@ -4222,7 +5078,7 @@ EOF
- func_win32_import_lib_p ()
- {
- $opt_debug
- - case `eval "$file_magic_cmd \"\$1\" 2>/dev/null" | $SED -e 10q` in
- + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
- *import*) : ;;
- *) false ;;
- esac
- @@ -4401,9 +5257,9 @@ func_mode_link ()
- ;;
- *)
- if test "$prev" = dlfiles; then
- - dlfiles="$dlfiles $arg"
- + func_append dlfiles " $arg"
- else
- - dlprefiles="$dlprefiles $arg"
- + func_append dlprefiles " $arg"
- fi
- prev=
- continue
- @@ -4427,7 +5283,7 @@ func_mode_link ()
- *-*-darwin*)
- case "$deplibs " in
- *" $qarg.ltframework "*) ;;
- - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
- + *) func_append deplibs " $qarg.ltframework" # this is fixed later
- ;;
- esac
- ;;
- @@ -4446,7 +5302,7 @@ func_mode_link ()
- moreargs=
- for fil in `cat "$save_arg"`
- do
- -# moreargs="$moreargs $fil"
- +# func_append moreargs " $fil"
- arg=$fil
- # A libtool-controlled object.
-
- @@ -4475,7 +5331,7 @@ func_mode_link ()
-
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- - dlfiles="$dlfiles $pic_object"
- + func_append dlfiles " $pic_object"
- prev=
- continue
- else
- @@ -4487,7 +5343,7 @@ func_mode_link ()
- # CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
- # Preload the old-style object.
- - dlprefiles="$dlprefiles $pic_object"
- + func_append dlprefiles " $pic_object"
- prev=
- fi
-
- @@ -4557,12 +5413,12 @@ func_mode_link ()
- if test "$prev" = rpath; then
- case "$rpath " in
- *" $arg "*) ;;
- - *) rpath="$rpath $arg" ;;
- + *) func_append rpath " $arg" ;;
- esac
- else
- case "$xrpath " in
- *" $arg "*) ;;
- - *) xrpath="$xrpath $arg" ;;
- + *) func_append xrpath " $arg" ;;
- esac
- fi
- prev=
- @@ -4574,28 +5430,28 @@ func_mode_link ()
- continue
- ;;
- weak)
- - weak_libs="$weak_libs $arg"
- + func_append weak_libs " $arg"
- prev=
- continue
- ;;
- xcclinker)
- - linker_flags="$linker_flags $qarg"
- - compiler_flags="$compiler_flags $qarg"
- + func_append linker_flags " $qarg"
- + func_append compiler_flags " $qarg"
- prev=
- func_append compile_command " $qarg"
- func_append finalize_command " $qarg"
- continue
- ;;
- xcompiler)
- - compiler_flags="$compiler_flags $qarg"
- + func_append compiler_flags " $qarg"
- prev=
- func_append compile_command " $qarg"
- func_append finalize_command " $qarg"
- continue
- ;;
- xlinker)
- - linker_flags="$linker_flags $qarg"
- - compiler_flags="$compiler_flags $wl$qarg"
- + func_append linker_flags " $qarg"
- + func_append compiler_flags " $wl$qarg"
- prev=
- func_append compile_command " $wl$qarg"
- func_append finalize_command " $wl$qarg"
- @@ -4686,15 +5542,16 @@ func_mode_link ()
- ;;
-
- -L*)
- - func_stripname '-L' '' "$arg"
- - dir=$func_stripname_result
- - if test -z "$dir"; then
- + func_stripname "-L" '' "$arg"
- + if test -z "$func_stripname_result"; then
- if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
- else
- func_fatal_error "need path for \`-L' option"
- fi
- fi
- + func_resolve_sysroot "$func_stripname_result"
- + dir=$func_resolve_sysroot_result
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- @@ -4706,10 +5563,16 @@ func_mode_link ()
- ;;
- esac
- case "$deplibs " in
- - *" -L$dir "*) ;;
- + *" -L$dir "* | *" $arg "*)
- + # Will only happen for absolute or sysroot arguments
- + ;;
- *)
- - deplibs="$deplibs -L$dir"
- - lib_search_path="$lib_search_path $dir"
- + # Preserve sysroot, but never include relative directories
- + case $dir in
- + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
- + *) func_append deplibs " -L$dir" ;;
- + esac
- + func_append lib_search_path " $dir"
- ;;
- esac
- case $host in
- @@ -4718,12 +5581,12 @@ func_mode_link ()
- case :$dllsearchpath: in
- *":$dir:"*) ;;
- ::) dllsearchpath=$dir;;
- - *) dllsearchpath="$dllsearchpath:$dir";;
- + *) func_append dllsearchpath ":$dir";;
- esac
- case :$dllsearchpath: in
- *":$testbindir:"*) ;;
- ::) dllsearchpath=$testbindir;;
- - *) dllsearchpath="$dllsearchpath:$testbindir";;
- + *) func_append dllsearchpath ":$testbindir";;
- esac
- ;;
- esac
- @@ -4747,7 +5610,7 @@ func_mode_link ()
- ;;
- *-*-rhapsody* | *-*-darwin1.[012])
- # Rhapsody C and math libraries are in the System framework
- - deplibs="$deplibs System.ltframework"
- + func_append deplibs " System.ltframework"
- continue
- ;;
- *-*-sco3.2v5* | *-*-sco5v6*)
- @@ -4758,9 +5621,6 @@ func_mode_link ()
- # Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
- ;;
- - *-*-linux*)
- - test "X$arg" = "X-lc" && continue
- - ;;
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
- @@ -4770,7 +5630,7 @@ func_mode_link ()
- ;;
- esac
- fi
- - deplibs="$deplibs $arg"
- + func_append deplibs " $arg"
- continue
- ;;
-
- @@ -4782,8 +5642,8 @@ func_mode_link ()
- # Tru64 UNIX uses -model [arg] to determine the layout of C++
- # classes, name mangling, and exception handling.
- # Darwin uses the -arch flag to determine output architecture.
- - -model|-arch|-isysroot)
- - compiler_flags="$compiler_flags $arg"
- + -model|-arch|-isysroot|--sysroot)
- + func_append compiler_flags " $arg"
- func_append compile_command " $arg"
- func_append finalize_command " $arg"
- prev=xcompiler
- @@ -4791,12 +5651,12 @@ func_mode_link ()
- ;;
-
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- - compiler_flags="$compiler_flags $arg"
- + func_append compiler_flags " $arg"
- func_append compile_command " $arg"
- func_append finalize_command " $arg"
- case "$new_inherited_linker_flags " in
- *" $arg "*) ;;
- - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
- + * ) func_append new_inherited_linker_flags " $arg" ;;
- esac
- continue
- ;;
- @@ -4863,13 +5723,17 @@ func_mode_link ()
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) ;;
- + =*)
- + func_stripname '=' '' "$dir"
- + dir=$lt_sysroot$func_stripname_result
- + ;;
- *)
- func_fatal_error "only absolute run-paths are allowed"
- ;;
- esac
- case "$xrpath " in
- *" $dir "*) ;;
- - *) xrpath="$xrpath $dir" ;;
- + *) func_append xrpath " $dir" ;;
- esac
- continue
- ;;
- @@ -4922,8 +5786,8 @@ func_mode_link ()
- for flag in $args; do
- IFS="$save_ifs"
- func_quote_for_eval "$flag"
- - arg="$arg $func_quote_for_eval_result"
- - compiler_flags="$compiler_flags $func_quote_for_eval_result"
- + func_append arg " $func_quote_for_eval_result"
- + func_append compiler_flags " $func_quote_for_eval_result"
- done
- IFS="$save_ifs"
- func_stripname ' ' '' "$arg"
- @@ -4938,9 +5802,9 @@ func_mode_link ()
- for flag in $args; do
- IFS="$save_ifs"
- func_quote_for_eval "$flag"
- - arg="$arg $wl$func_quote_for_eval_result"
- - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
- - linker_flags="$linker_flags $func_quote_for_eval_result"
- + func_append arg " $wl$func_quote_for_eval_result"
- + func_append compiler_flags " $wl$func_quote_for_eval_result"
- + func_append linker_flags " $func_quote_for_eval_result"
- done
- IFS="$save_ifs"
- func_stripname ' ' '' "$arg"
- @@ -4968,24 +5832,27 @@ func_mode_link ()
- arg="$func_quote_for_eval_result"
- ;;
-
- - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
- - # -r[0-9][0-9]* specifies the processor on the SGI compiler
- - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
- - # +DA*, +DD* enable 64-bit mode on the HP compiler
- - # -q* pass through compiler args for the IBM compiler
- - # -m*, -t[45]*, -txscale* pass through architecture-specific
- - # compiler args for GCC
- - # -F/path gives path to uninstalled frameworks, gcc on darwin
- - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- - # @file GCC response files
- - # -tp=* Portland pgcc target processor selection
- + # Flags to be passed through unchanged, with rationale:
- + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
- + # -r[0-9][0-9]* specify processor for the SGI compiler
- + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
- + # +DA*, +DD* enable 64-bit mode for the HP compiler
- + # -q* compiler args for the IBM compiler
- + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
- + # -F/path path to uninstalled frameworks, gcc on darwin
- + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
- + # @file GCC response files
- + # -tp=* Portland pgcc target processor selection
- + # --sysroot=* for sysroot support
- + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
- + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- + -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
- func_append finalize_command " $arg"
- - compiler_flags="$compiler_flags $arg"
- + func_append compiler_flags " $arg"
- continue
- ;;
-
- @@ -4997,7 +5864,7 @@ func_mode_link ()
-
- *.$objext)
- # A standard object.
- - objs="$objs $arg"
- + func_append objs " $arg"
- ;;
-
- *.lo)
- @@ -5028,7 +5895,7 @@ func_mode_link ()
-
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
- - dlfiles="$dlfiles $pic_object"
- + func_append dlfiles " $pic_object"
- prev=
- continue
- else
- @@ -5040,7 +5907,7 @@ func_mode_link ()
- # CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
- # Preload the old-style object.
- - dlprefiles="$dlprefiles $pic_object"
- + func_append dlprefiles " $pic_object"
- prev=
- fi
-
- @@ -5085,24 +5952,25 @@ func_mode_link ()
-
- *.$libext)
- # An archive.
- - deplibs="$deplibs $arg"
- - old_deplibs="$old_deplibs $arg"
- + func_append deplibs " $arg"
- + func_append old_deplibs " $arg"
- continue
- ;;
-
- *.la)
- # A libtool-controlled library.
-
- + func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
- # This library was specified with -dlopen.
- - dlfiles="$dlfiles $arg"
- + func_append dlfiles " $func_resolve_sysroot_result"
- prev=
- elif test "$prev" = dlprefiles; then
- # The library was specified with -dlpreopen.
- - dlprefiles="$dlprefiles $arg"
- + func_append dlprefiles " $func_resolve_sysroot_result"
- prev=
- else
- - deplibs="$deplibs $arg"
- + func_append deplibs " $func_resolve_sysroot_result"
- fi
- continue
- ;;
- @@ -5127,7 +5995,7 @@ func_mode_link ()
- func_fatal_help "the \`$prevarg' option requires an argument"
-
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
- - eval "arg=\"$export_dynamic_flag_spec\""
- + eval arg=\"$export_dynamic_flag_spec\"
- func_append compile_command " $arg"
- func_append finalize_command " $arg"
- fi
- @@ -5144,11 +6012,13 @@ func_mode_link ()
- else
- shlib_search_path=
- fi
- - eval "sys_lib_search_path=\"$sys_lib_search_path_spec\""
- - eval "sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\""
- + eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
- + eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
- func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
- + func_to_tool_file "$output_objdir/"
- + tool_output_objdir=$func_to_tool_file_result
- # Create the object directory.
- func_mkdir_p "$output_objdir"
-
- @@ -5169,12 +6039,12 @@ func_mode_link ()
- # Find all interdependent deplibs by searching for libraries
- # that are linked more than once (e.g. -la -lb -la)
- for deplib in $deplibs; do
- - if $opt_duplicate_deps ; then
- + if $opt_preserve_dup_deps ; then
- case "$libs " in
- - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- - libs="$libs $deplib"
- + func_append libs " $deplib"
- done
-
- if test "$linkmode" = lib; then
- @@ -5187,9 +6057,9 @@ func_mode_link ()
- if $opt_duplicate_compiler_generated_deps; then
- for pre_post_dep in $predeps $postdeps; do
- case "$pre_post_deps " in
- - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
- + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
- esac
- - pre_post_deps="$pre_post_deps $pre_post_dep"
- + func_append pre_post_deps " $pre_post_dep"
- done
- fi
- pre_post_deps=
- @@ -5256,8 +6126,9 @@ func_mode_link ()
- for lib in $dlprefiles; do
- # Ignore non-libtool-libs
- dependency_libs=
- + func_resolve_sysroot "$lib"
- case $lib in
- - *.la) func_source "$lib" ;;
- + *.la) func_source "$func_resolve_sysroot_result" ;;
- esac
-
- # Collect preopened libtool deplibs, except any this library
- @@ -5267,7 +6138,7 @@ func_mode_link ()
- deplib_base=$func_basename_result
- case " $weak_libs " in
- *" $deplib_base "*) ;;
- - *) deplibs="$deplibs $deplib" ;;
- + *) func_append deplibs " $deplib" ;;
- esac
- done
- done
- @@ -5288,11 +6159,11 @@ func_mode_link ()
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- - compiler_flags="$compiler_flags $deplib"
- + func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
- case "$new_inherited_linker_flags " in
- *" $deplib "*) ;;
- - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
- + * ) func_append new_inherited_linker_flags " $deplib" ;;
- esac
- fi
- fi
- @@ -5377,7 +6248,7 @@ func_mode_link ()
- if test "$linkmode" = lib ; then
- case "$new_inherited_linker_flags " in
- *" $deplib "*) ;;
- - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
- + * ) func_append new_inherited_linker_flags " $deplib" ;;
- esac
- fi
- fi
- @@ -5390,7 +6261,8 @@ func_mode_link ()
- test "$pass" = conv && continue
- newdependency_libs="$deplib $newdependency_libs"
- func_stripname '-L' '' "$deplib"
- - newlib_search_path="$newlib_search_path $func_stripname_result"
- + func_resolve_sysroot "$func_stripname_result"
- + func_append newlib_search_path " $func_resolve_sysroot_result"
- ;;
- prog)
- if test "$pass" = conv; then
- @@ -5404,7 +6276,8 @@ func_mode_link ()
- finalize_deplibs="$deplib $finalize_deplibs"
- fi
- func_stripname '-L' '' "$deplib"
- - newlib_search_path="$newlib_search_path $func_stripname_result"
- + func_resolve_sysroot "$func_stripname_result"
- + func_append newlib_search_path " $func_resolve_sysroot_result"
- ;;
- *)
- func_warning "\`-L' is ignored for archives/objects"
- @@ -5415,17 +6288,21 @@ func_mode_link ()
- -R*)
- if test "$pass" = link; then
- func_stripname '-R' '' "$deplib"
- - dir=$func_stripname_result
- + func_resolve_sysroot "$func_stripname_result"
- + dir=$func_resolve_sysroot_result
- # Make sure the xrpath contains only unique directories.
- case "$xrpath " in
- *" $dir "*) ;;
- - *) xrpath="$xrpath $dir" ;;
- + *) func_append xrpath " $dir" ;;
- esac
- fi
- deplibs="$deplib $deplibs"
- continue
- ;;
- - *.la) lib="$deplib" ;;
- + *.la)
- + func_resolve_sysroot "$deplib"
- + lib=$func_resolve_sysroot_result
- + ;;
- *.$libext)
- if test "$pass" = conv; then
- deplibs="$deplib $deplibs"
- @@ -5488,11 +6365,11 @@ func_mode_link ()
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
- # If there is no dlopen support or we're linking statically,
- # we need to preload.
- - newdlprefiles="$newdlprefiles $deplib"
- + func_append newdlprefiles " $deplib"
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- - newdlfiles="$newdlfiles $deplib"
- + func_append newdlfiles " $deplib"
- fi
- fi
- continue
- @@ -5538,7 +6415,7 @@ func_mode_link ()
- for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
- case " $new_inherited_linker_flags " in
- *" $tmp_inherited_linker_flag "*) ;;
- - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
- + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
- esac
- done
- fi
- @@ -5546,8 +6423,8 @@ func_mode_link ()
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
- - test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
- + test -n "$dlopen" && func_append dlfiles " $dlopen"
- + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
- fi
-
- if test "$pass" = conv; then
- @@ -5558,20 +6435,20 @@ func_mode_link ()
- func_fatal_error "cannot find name of link library for \`$lib'"
- fi
- # It is a libtool convenience library, so add in its objects.
- - convenience="$convenience $ladir/$objdir/$old_library"
- - old_convenience="$old_convenience $ladir/$objdir/$old_library"
- + func_append convenience " $ladir/$objdir/$old_library"
- + func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
- fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- - if $opt_duplicate_deps ; then
- + if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- - tmp_libs="$tmp_libs $deplib"
- + func_append tmp_libs " $deplib"
- done
- continue
- fi # $pass = conv
- @@ -5579,9 +6456,15 @@ func_mode_link ()
-
- # Get the name of the library we link against.
- linklib=
- - for l in $old_library $library_names; do
- - linklib="$l"
- - done
- + if test -n "$old_library" &&
- + { test "$prefer_static_libs" = yes ||
- + test "$prefer_static_libs,$installed" = "built,no"; }; then
- + linklib=$old_library
- + else
- + for l in $old_library $library_names; do
- + linklib="$l"
- + done
- + fi
- if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
- fi
- @@ -5598,9 +6481,9 @@ func_mode_link ()
- # statically, we need to preload. We also need to preload any
- # dependent libraries so libltdl's deplib preloader doesn't
- # bomb out in the load deplibs phase.
- - dlprefiles="$dlprefiles $lib $dependency_libs"
- + func_append dlprefiles " $lib $dependency_libs"
- else
- - newdlfiles="$newdlfiles $lib"
- + func_append newdlfiles " $lib"
- fi
- continue
- fi # $pass = dlopen
- @@ -5622,14 +6505,14 @@ func_mode_link ()
-
- # Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
- - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
- - dir="$libdir"
- - absdir="$libdir"
- + dir="$lt_sysroot$libdir"
- + absdir="$lt_sysroot$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
- @@ -5637,12 +6520,12 @@ func_mode_link ()
- dir="$ladir"
- absdir="$abs_ladir"
- # Remove this search path later
- - notinst_path="$notinst_path $abs_ladir"
- + func_append notinst_path " $abs_ladir"
- else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
- # Remove this search path later
- - notinst_path="$notinst_path $abs_ladir"
- + func_append notinst_path " $abs_ladir"
- fi
- fi # $installed = yes
- func_stripname 'lib' '.la' "$laname"
- @@ -5653,20 +6536,46 @@ func_mode_link ()
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
- fi
- - # Prefer using a static library (so that no silly _DYNAMIC symbols
- - # are required to link).
- - if test -n "$old_library"; then
- - newdlprefiles="$newdlprefiles $dir/$old_library"
- - # Keep a list of preopened convenience libraries to check
- - # that they are being used correctly in the link pass.
- - test -z "$libdir" && \
- - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
- - # Otherwise, use the dlname, so that lt_dlopen finds it.
- - elif test -n "$dlname"; then
- - newdlprefiles="$newdlprefiles $dir/$dlname"
- - else
- - newdlprefiles="$newdlprefiles $dir/$linklib"
- - fi
- + case "$host" in
- + # special handling for platforms with PE-DLLs.
- + *cygwin* | *mingw* | *cegcc* )
- + # Linker will automatically link against shared library if both
- + # static and shared are present. Therefore, ensure we extract
- + # symbols from the import library if a shared library is present
- + # (otherwise, the dlopen module name will be incorrect). We do
- + # this by putting the import library name into $newdlprefiles.
- + # We recover the dlopen module name by 'saving' the la file
- + # name in a special purpose variable, and (later) extracting the
- + # dlname from the la file.
- + if test -n "$dlname"; then
- + func_tr_sh "$dir/$linklib"
- + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
- + func_append newdlprefiles " $dir/$linklib"
- + else
- + func_append newdlprefiles " $dir/$old_library"
- + # Keep a list of preopened convenience libraries to check
- + # that they are being used correctly in the link pass.
- + test -z "$libdir" && \
- + func_append dlpreconveniencelibs " $dir/$old_library"
- + fi
- + ;;
- + * )
- + # Prefer using a static library (so that no silly _DYNAMIC symbols
- + # are required to link).
- + if test -n "$old_library"; then
- + func_append newdlprefiles " $dir/$old_library"
- + # Keep a list of preopened convenience libraries to check
- + # that they are being used correctly in the link pass.
- + test -z "$libdir" && \
- + func_append dlpreconveniencelibs " $dir/$old_library"
- + # Otherwise, use the dlname, so that lt_dlopen finds it.
- + elif test -n "$dlname"; then
- + func_append newdlprefiles " $dir/$dlname"
- + else
- + func_append newdlprefiles " $dir/$linklib"
- + fi
- + ;;
- + esac
- fi # $pass = dlpreopen
-
- if test -z "$libdir"; then
- @@ -5684,7 +6593,7 @@ func_mode_link ()
-
-
- if test "$linkmode" = prog && test "$pass" != link; then
- - newlib_search_path="$newlib_search_path $ladir"
- + func_append newlib_search_path " $ladir"
- deplibs="$lib $deplibs"
-
- linkalldeplibs=no
- @@ -5697,7 +6606,8 @@ func_mode_link ()
- for deplib in $dependency_libs; do
- case $deplib in
- -L*) func_stripname '-L' '' "$deplib"
- - newlib_search_path="$newlib_search_path $func_stripname_result"
- + func_resolve_sysroot "$func_stripname_result"
- + func_append newlib_search_path " $func_resolve_sysroot_result"
- ;;
- esac
- # Need to link against all dependency_libs?
- @@ -5708,12 +6618,12 @@ func_mode_link ()
- # or/and link against static libraries
- newdependency_libs="$deplib $newdependency_libs"
- fi
- - if $opt_duplicate_deps ; then
- + if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- + *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- - tmp_libs="$tmp_libs $deplib"
- + func_append tmp_libs " $deplib"
- done # for deplib
- continue
- fi # $linkmode = prog...
- @@ -5728,7 +6638,7 @@ func_mode_link ()
- # Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
- *"$absdir:"*) ;;
- - *) temp_rpath="$temp_rpath$absdir:" ;;
- + *) func_append temp_rpath "$absdir:" ;;
- esac
- fi
-
- @@ -5740,7 +6650,7 @@ func_mode_link ()
- *)
- case "$compile_rpath " in
- *" $absdir "*) ;;
- - *) compile_rpath="$compile_rpath $absdir"
- + *) func_append compile_rpath " $absdir" ;;
- esac
- ;;
- esac
- @@ -5749,7 +6659,7 @@ func_mode_link ()
- *)
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- - *) finalize_rpath="$finalize_rpath $libdir"
- + *) func_append finalize_rpath " $libdir" ;;
- esac
- ;;
- esac
- @@ -5774,12 +6684,12 @@ func_mode_link ()
- case $host in
- *cygwin* | *mingw* | *cegcc*)
- # No point in relinking DLLs because paths are not encoded
- - notinst_deplibs="$notinst_deplibs $lib"
- + func_append notinst_deplibs " $lib"
- need_relink=no
- ;;
- *)
- if test "$installed" = no; then
- - notinst_deplibs="$notinst_deplibs $lib"
- + func_append notinst_deplibs " $lib"
- need_relink=yes
- fi
- ;;
- @@ -5814,7 +6724,7 @@ func_mode_link ()
- *)
- case "$compile_rpath " in
- *" $absdir "*) ;;
- - *) compile_rpath="$compile_rpath $absdir"
- + *) func_append compile_rpath " $absdir" ;;
- esac
- ;;
- esac
- @@ -5823,7 +6733,7 @@ func_mode_link ()
- *)
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- - *) finalize_rpath="$finalize_rpath $libdir"
- + *) func_append finalize_rpath " $libdir" ;;
- esac
- ;;
- esac
- @@ -5835,7 +6745,7 @@ func_mode_link ()
- shift
- realname="$1"
- shift
- - eval "libname=\"$libname_spec\""
- + libname=`eval "\\$ECHO \"$libname_spec\""`
- # use dlname if we got it. it's perfectly good, no?
- if test -n "$dlname"; then
- soname="$dlname"
- @@ -5848,7 +6758,7 @@ func_mode_link ()
- versuffix="-$major"
- ;;
- esac
- - eval "soname=\"$soname_spec\""
- + eval soname=\"$soname_spec\"
- else
- soname="$realname"
- fi
- @@ -5877,7 +6787,7 @@ func_mode_link ()
- linklib=$newlib
- fi # test -n "$old_archive_from_expsyms_cmds"
-
- - if test "$linkmode" = prog || test "$mode" != relink; then
- + if test "$linkmode" = prog || test "$opt_mode" != relink; then
- add_shlibpath=
- add_dir=
- add=
- @@ -5933,7 +6843,7 @@ func_mode_link ()
- if test -n "$inst_prefix_dir"; then
- case $libdir in
- [\\/]*)
- - add_dir="$add_dir -L$inst_prefix_dir$libdir"
- + func_append add_dir " -L$inst_prefix_dir$libdir"
- ;;
- esac
- fi
- @@ -5955,7 +6865,7 @@ func_mode_link ()
- if test -n "$add_shlibpath"; then
- case :$compile_shlibpath: in
- *":$add_shlibpath:"*) ;;
- - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
- + *) func_append compile_shlibpath "$add_shlibpath:" ;;
- esac
- fi
- if test "$linkmode" = prog; then
- @@ -5969,13 +6879,13 @@ func_mode_link ()
- test "$hardcode_shlibpath_var" = yes; then
- case :$finalize_shlibpath: in
- *":$libdir:"*) ;;
- - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
- + *) func_append finalize_shlibpath "$libdir:" ;;
- esac
- fi
- fi
- fi
-
- - if test "$linkmode" = prog || test "$mode" = relink; then
- + if test "$linkmode" = prog || test "$opt_mode" = relink; then
- add_shlibpath=
- add_dir=
- add=
- @@ -5989,7 +6899,7 @@ func_mode_link ()
- elif test "$hardcode_shlibpath_var" = yes; then
- case :$finalize_shlibpath: in
- *":$libdir:"*) ;;
- - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
- + *) func_append finalize_shlibpath "$libdir:" ;;
- esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
- @@ -6001,12 +6911,12 @@ func_mode_link ()
- fi
- else
- # We cannot seem to hardcode it, guess we'll fake it.
- - add_dir="-L$libdir"
- + add_dir="-L$lt_sysroot$libdir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
- case $libdir in
- [\\/]*)
- - add_dir="$add_dir -L$inst_prefix_dir$libdir"
- + func_append add_dir " -L$inst_prefix_dir$libdir"
- ;;
- esac
- fi
- @@ -6083,27 +6993,33 @@ func_mode_link ()
- temp_xrpath=$func_stripname_result
- case " $xrpath " in
- *" $temp_xrpath "*) ;;
- - *) xrpath="$xrpath $temp_xrpath";;
- + *) func_append xrpath " $temp_xrpath";;
- esac;;
- - *) temp_deplibs="$temp_deplibs $libdir";;
- + *) func_append temp_deplibs " $libdir";;
- esac
- done
- dependency_libs="$temp_deplibs"
- fi
-
- - newlib_search_path="$newlib_search_path $absdir"
- + func_append newlib_search_path " $absdir"
- # Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
- # ... and its dependency_libs
- tmp_libs=
- for deplib in $dependency_libs; do
- newdependency_libs="$deplib $newdependency_libs"
- - if $opt_duplicate_deps ; then
- + case $deplib in
- + -L*) func_stripname '-L' '' "$deplib"
- + func_resolve_sysroot "$func_stripname_result";;
- + *) func_resolve_sysroot "$deplib" ;;
- + esac
- + if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- + *" $func_resolve_sysroot_result "*)
- + func_append specialdeplibs " $func_resolve_sysroot_result" ;;
- esac
- fi
- - tmp_libs="$tmp_libs $deplib"
- + func_append tmp_libs " $func_resolve_sysroot_result"
- done
-
- if test "$link_all_deplibs" != no; then
- @@ -6113,8 +7029,10 @@ func_mode_link ()
- case $deplib in
- -L*) path="$deplib" ;;
- *.la)
- + func_resolve_sysroot "$deplib"
- + deplib=$func_resolve_sysroot_result
- func_dirname "$deplib" "" "."
- - dir="$func_dirname_result"
- + dir=$func_dirname_result
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
- @@ -6130,7 +7048,7 @@ func_mode_link ()
- case $host in
- *-*-darwin*)
- depdepl=
- - deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- + eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- @@ -6141,8 +7059,8 @@ func_mode_link ()
- if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
- fi
- - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
- + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
- path=
- fi
- fi
- @@ -6152,7 +7070,7 @@ func_mode_link ()
- ;;
- esac
- else
- - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
- test "$absdir" != "$libdir" && \
- @@ -6192,7 +7110,7 @@ func_mode_link ()
- for dir in $newlib_search_path; do
- case "$lib_search_path " in
- *" $dir "*) ;;
- - *) lib_search_path="$lib_search_path $dir" ;;
- + *) func_append lib_search_path " $dir" ;;
- esac
- done
- newlib_search_path=
- @@ -6205,7 +7123,7 @@ func_mode_link ()
- fi
- for var in $vars dependency_libs; do
- # Add libraries to $var in reverse order
- - eval tmp_libs=\$$var
- + eval tmp_libs=\"\$$var\"
- new_libs=
- for deplib in $tmp_libs; do
- # FIXME: Pedantically, this is the right thing to do, so
- @@ -6250,13 +7168,13 @@ func_mode_link ()
- -L*)
- case " $tmp_libs " in
- *" $deplib "*) ;;
- - *) tmp_libs="$tmp_libs $deplib" ;;
- + *) func_append tmp_libs " $deplib" ;;
- esac
- ;;
- - *) tmp_libs="$tmp_libs $deplib" ;;
- + *) func_append tmp_libs " $deplib" ;;
- esac
- done
- - eval $var=\$tmp_libs
- + eval $var=\"$tmp_libs\"
- done # for var
- fi
- # Last step: remove runtime libs from dependency_libs
- @@ -6269,7 +7187,7 @@ func_mode_link ()
- ;;
- esac
- if test -n "$i" ; then
- - tmp_libs="$tmp_libs $i"
- + func_append tmp_libs " $i"
- fi
- done
- dependency_libs=$tmp_libs
- @@ -6310,7 +7228,7 @@ func_mode_link ()
- # Now set the variables for building old libraries.
- build_libtool_libs=no
- oldlibs="$output"
- - objs="$objs$old_deplibs"
- + func_append objs "$old_deplibs"
- ;;
-
- lib)
- @@ -6319,8 +7237,8 @@ func_mode_link ()
- lib*)
- func_stripname 'lib' '.la' "$outputname"
- name=$func_stripname_result
- - eval "shared_ext=\"$shrext_cmds\""
- - eval "libname=\"$libname_spec\""
- + eval shared_ext=\"$shrext_cmds\"
- + eval libname=\"$libname_spec\"
- ;;
- *)
- test "$module" = no && \
- @@ -6330,8 +7248,8 @@ func_mode_link ()
- # Add the "lib" prefix for modules if required
- func_stripname '' '.la' "$outputname"
- name=$func_stripname_result
- - eval "shared_ext=\"$shrext_cmds\""
- - eval "libname=\"$libname_spec\""
- + eval shared_ext=\"$shrext_cmds\"
- + eval libname=\"$libname_spec\"
- else
- func_stripname '' '.la' "$outputname"
- libname=$func_stripname_result
- @@ -6346,7 +7264,7 @@ func_mode_link ()
- echo
- $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
- $ECHO "*** objects $objs is not portable!"
- - libobjs="$libobjs $objs"
- + func_append libobjs " $objs"
- fi
- fi
-
- @@ -6544,7 +7462,7 @@ func_mode_link ()
- done
-
- # Make executables depend on our current version.
- - verstring="$verstring:${current}.0"
- + func_append verstring ":${current}.0"
- ;;
-
- qnx)
- @@ -6612,10 +7530,10 @@ func_mode_link ()
- fi
-
- func_generate_dlsyms "$libname" "$libname" "yes"
- - libobjs="$libobjs $symfileobj"
- + func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
-
- - if test "$mode" != relink; then
- + if test "$opt_mode" != relink; then
- # Remove our outputs, but don't remove object files since they
- # may have been created when compiling PIC objects.
- removelist=
- @@ -6631,7 +7549,7 @@ func_mode_link ()
- continue
- fi
- fi
- - removelist="$removelist $p"
- + func_append removelist " $p"
- ;;
- *) ;;
- esac
- @@ -6642,7 +7560,7 @@ func_mode_link ()
-
- # Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
- - oldlibs="$oldlibs $output_objdir/$libname.$libext"
- + func_append oldlibs " $output_objdir/$libname.$libext"
-
- # Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
- @@ -6659,10 +7577,11 @@ func_mode_link ()
- # If the user specified any rpath flags, then add them.
- temp_xrpath=
- for libdir in $xrpath; do
- - temp_xrpath="$temp_xrpath -R$libdir"
- + func_replace_sysroot "$libdir"
- + func_append temp_xrpath " -R$func_replace_sysroot_result"
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- - *) finalize_rpath="$finalize_rpath $libdir" ;;
- + *) func_append finalize_rpath " $libdir" ;;
- esac
- done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- @@ -6676,7 +7595,7 @@ func_mode_link ()
- for lib in $old_dlfiles; do
- case " $dlprefiles $dlfiles " in
- *" $lib "*) ;;
- - *) dlfiles="$dlfiles $lib" ;;
- + *) func_append dlfiles " $lib" ;;
- esac
- done
-
- @@ -6686,7 +7605,7 @@ func_mode_link ()
- for lib in $old_dlprefiles; do
- case "$dlprefiles " in
- *" $lib "*) ;;
- - *) dlprefiles="$dlprefiles $lib" ;;
- + *) func_append dlprefiles " $lib" ;;
- esac
- done
-
- @@ -6698,7 +7617,7 @@ func_mode_link ()
- ;;
- *-*-rhapsody* | *-*-darwin1.[012])
- # Rhapsody C library is in the System framework
- - deplibs="$deplibs System.ltframework"
- + func_append deplibs " System.ltframework"
- ;;
- *-*-netbsd*)
- # Don't link with libc until the a.out ld.so is fixed.
- @@ -6715,7 +7634,7 @@ func_mode_link ()
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
- - deplibs="$deplibs -lc"
- + func_append deplibs " -lc"
- fi
- ;;
- esac
- @@ -6764,18 +7683,18 @@ EOF
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
- - newdeplibs="$newdeplibs $i"
- + func_append newdeplibs " $i"
- i=""
- ;;
- esac
- fi
- if test -n "$i" ; then
- - eval "libname=\"$libname_spec\""
- - eval "deplib_matches=\"$library_names_spec\""
- + libname=`eval "\\$ECHO \"$libname_spec\""`
- + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
- set dummy $deplib_matches; shift
- deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- - newdeplibs="$newdeplibs $i"
- + func_append newdeplibs " $i"
- else
- droppeddeps=yes
- echo
- @@ -6789,7 +7708,7 @@ EOF
- fi
- ;;
- *)
- - newdeplibs="$newdeplibs $i"
- + func_append newdeplibs " $i"
- ;;
- esac
- done
- @@ -6807,18 +7726,18 @@ EOF
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $i "*)
- - newdeplibs="$newdeplibs $i"
- + func_append newdeplibs " $i"
- i=""
- ;;
- esac
- fi
- if test -n "$i" ; then
- - eval "libname=\"$libname_spec\""
- - eval "deplib_matches=\"$library_names_spec\""
- + libname=`eval "\\$ECHO \"$libname_spec\""`
- + deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
- set dummy $deplib_matches; shift
- deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
- - newdeplibs="$newdeplibs $i"
- + func_append newdeplibs " $i"
- else
- droppeddeps=yes
- echo
- @@ -6840,7 +7759,7 @@ EOF
- fi
- ;;
- *)
- - newdeplibs="$newdeplibs $i"
- + func_append newdeplibs " $i"
- ;;
- esac
- done
- @@ -6857,15 +7776,27 @@ EOF
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $a_deplib "*)
- - newdeplibs="$newdeplibs $a_deplib"
- + func_append newdeplibs " $a_deplib"
- a_deplib=""
- ;;
- esac
- fi
- if test -n "$a_deplib" ; then
- - eval "libname=\"$libname_spec\""
- + libname=`eval "\\$ECHO \"$libname_spec\""`
- + if test -n "$file_magic_glob"; then
- + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
- + else
- + libnameglob=$libname
- + fi
- + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- - potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- + if test "$want_nocaseglob" = yes; then
- + shopt -s nocaseglob
- + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- + $nocaseglob
- + else
- + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
- + fi
- for potent_lib in $potential_libs; do
- # Follow soft links.
- if ls -lLd "$potent_lib" 2>/dev/null |
- @@ -6885,10 +7816,10 @@ EOF
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
- esac
- done
- - if eval "$file_magic_cmd \"\$potlib\"" 2>/dev/null |
- + if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
- $SED -e 10q |
- $EGREP "$file_magic_regex" > /dev/null; then
- - newdeplibs="$newdeplibs $a_deplib"
- + func_append newdeplibs " $a_deplib"
- a_deplib=""
- break 2
- fi
- @@ -6913,7 +7844,7 @@ EOF
- ;;
- *)
- # Add a -L argument.
- - newdeplibs="$newdeplibs $a_deplib"
- + func_append newdeplibs " $a_deplib"
- ;;
- esac
- done # Gone through all deplibs.
- @@ -6929,20 +7860,20 @@ EOF
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- case " $predeps $postdeps " in
- *" $a_deplib "*)
- - newdeplibs="$newdeplibs $a_deplib"
- + func_append newdeplibs " $a_deplib"
- a_deplib=""
- ;;
- esac
- fi
- if test -n "$a_deplib" ; then
- - eval "libname=\"$libname_spec\""
- + libname=`eval "\\$ECHO \"$libname_spec\""`
- for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
- for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
- $EGREP "$match_pattern_regex" > /dev/null; then
- - newdeplibs="$newdeplibs $a_deplib"
- + func_append newdeplibs " $a_deplib"
- a_deplib=""
- break 2
- fi
- @@ -6967,7 +7898,7 @@ EOF
- ;;
- *)
- # Add a -L argument.
- - newdeplibs="$newdeplibs $a_deplib"
- + func_append newdeplibs " $a_deplib"
- ;;
- esac
- done # Gone through all deplibs.
- @@ -7071,7 +8002,7 @@ EOF
- *)
- case " $deplibs " in
- *" -L$path/$objdir "*)
- - new_libs="$new_libs -L$path/$objdir" ;;
- + func_append new_libs " -L$path/$objdir" ;;
- esac
- ;;
- esac
- @@ -7081,10 +8012,10 @@ EOF
- -L*)
- case " $new_libs " in
- *" $deplib "*) ;;
- - *) new_libs="$new_libs $deplib" ;;
- + *) func_append new_libs " $deplib" ;;
- esac
- ;;
- - *) new_libs="$new_libs $deplib" ;;
- + *) func_append new_libs " $deplib" ;;
- esac
- done
- deplibs="$new_libs"
- @@ -7101,10 +8032,12 @@ EOF
- hardcode_libdirs=
- dep_rpath=
- rpath="$finalize_rpath"
- - test "$mode" != relink && rpath="$compile_rpath$rpath"
- + test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
- for libdir in $rpath; do
- if test -n "$hardcode_libdir_flag_spec"; then
- if test -n "$hardcode_libdir_separator"; then
- + func_replace_sysroot "$libdir"
- + libdir=$func_replace_sysroot_result
- if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
- else
- @@ -7113,18 +8046,18 @@ EOF
- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- ;;
- *)
- - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- ;;
- esac
- fi
- else
- - eval "flag=\"$hardcode_libdir_flag_spec\""
- - dep_rpath="$dep_rpath $flag"
- + eval flag=\"$hardcode_libdir_flag_spec\"
- + func_append dep_rpath " $flag"
- fi
- elif test -n "$runpath_var"; then
- case "$perm_rpath " in
- *" $libdir "*) ;;
- - *) perm_rpath="$perm_rpath $libdir" ;;
- + *) func_apped perm_rpath " $libdir" ;;
- esac
- fi
- done
- @@ -7133,40 +8066,38 @@ EOF
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- if test -n "$hardcode_libdir_flag_spec_ld"; then
- - eval "dep_rpath=\"$hardcode_libdir_flag_spec_ld\""
- + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
- else
- - eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
- + eval dep_rpath=\"$hardcode_libdir_flag_spec\"
- fi
- fi
- if test -n "$runpath_var" && test -n "$perm_rpath"; then
- # We should set the runpath_var.
- rpath=
- for dir in $perm_rpath; do
- - rpath="$rpath$dir:"
- + func_append rpath "$dir:"
- done
- - eval $runpath_var=\$rpath\$$runpath_var
- - export $runpath_var
- + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
- fi
- test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
- fi
-
- shlibpath="$finalize_shlibpath"
- - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
- + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
- if test -n "$shlibpath"; then
- - eval $shlibpath_var=\$shlibpath\$$shlibpath_var
- - export $shlibpath_var
- + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
- fi
-
- # Get the real and link names of the library.
- - eval "shared_ext=\"$shrext_cmds\""
- - eval "library_names=\"$library_names_spec\""
- + eval shared_ext=\"$shrext_cmds\"
- + eval library_names=\"$library_names_spec\"
- set dummy $library_names
- shift
- realname="$1"
- shift
-
- if test -n "$soname_spec"; then
- - eval "soname=\"$soname_spec\""
- + eval soname=\"$soname_spec\"
- else
- soname="$realname"
- fi
- @@ -7178,7 +8109,7 @@ EOF
- linknames=
- for link
- do
- - linknames="$linknames $link"
- + func_append linknames " $link"
- done
-
- # Use standard objects if they are pic
- @@ -7189,7 +8120,7 @@ EOF
- if test -n "$export_symbols" && test -n "$include_expsyms"; then
- $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
- - delfiles="$delfiles $export_symbols"
- + func_append delfiles " $export_symbols"
- fi
-
- orig_export_symbols=
- @@ -7220,13 +8151,45 @@ EOF
- $opt_dry_run || $RM $export_symbols
- cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
- - for cmd in $cmds; do
- + for cmd1 in $cmds; do
- IFS="$save_ifs"
- - eval "cmd=\"$cmd\""
- - func_len " $cmd"
- - len=$func_len_result
- - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- + # Take the normal branch if the nm_file_list_spec branch
- + # doesn't work or if tool conversion is not needed.
- + case $nm_file_list_spec~$to_tool_file_cmd in
- + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
- + try_normal_branch=yes
- + eval cmd=\"$cmd1\"
- + func_len " $cmd"
- + len=$func_len_result
- + ;;
- + *)
- + try_normal_branch=no
- + ;;
- + esac
- + if test "$try_normal_branch" = yes \
- + && { test "$len" -lt "$max_cmd_len" \
- + || test "$max_cmd_len" -le -1; }
- + then
- + func_show_eval "$cmd" 'exit $?'
- + skipped_export=false
- + elif test -n "$nm_file_list_spec"; then
- + func_basename "$output"
- + output_la=$func_basename_result
- + save_libobjs=$libobjs
- + save_output=$output
- + output=${output_objdir}/${output_la}.nm
- + func_to_tool_file "$output"
- + libobjs=$nm_file_list_spec$func_to_tool_file_result
- + func_append delfiles " $output"
- + func_verbose "creating $NM input file list: $output"
- + for obj in $save_libobjs; do
- + func_to_tool_file "$obj"
- + $ECHO "$func_to_tool_file_result"
- + done > "$output"
- + eval cmd=\"$cmd1\"
- func_show_eval "$cmd" 'exit $?'
- + output=$save_output
- + libobjs=$save_libobjs
- skipped_export=false
- else
- # The command line is too long to execute in one step.
- @@ -7248,7 +8211,7 @@ EOF
- if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
- + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- fi
-
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
- @@ -7260,7 +8223,7 @@ EOF
- # global variables. join(1) would be nice here, but unfortunately
- # isn't a blessed tool.
- $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
- + func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- export_symbols=$output_objdir/$libname.def
- $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- fi
- @@ -7270,7 +8233,7 @@ EOF
- case " $convenience " in
- *" $test_deplib "*) ;;
- *)
- - tmp_deplibs="$tmp_deplibs $test_deplib"
- + func_append tmp_deplibs " $test_deplib"
- ;;
- esac
- done
- @@ -7286,43 +8249,43 @@ EOF
- fi
- if test -n "$whole_archive_flag_spec"; then
- save_libobjs=$libobjs
- - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
- + eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- test "X$libobjs" = "X " && libobjs=
- else
- gentop="$output_objdir/${outputname}x"
- - generated="$generated $gentop"
- + func_append generated " $gentop"
-
- func_extract_archives $gentop $convenience
- - libobjs="$libobjs $func_extract_archives_result"
- + func_append libobjs " $func_extract_archives_result"
- test "X$libobjs" = "X " && libobjs=
- fi
- fi
-
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- - eval "flag=\"$thread_safe_flag_spec\""
- - linker_flags="$linker_flags $flag"
- + eval flag=\"$thread_safe_flag_spec\"
- + func_append linker_flags " $flag"
- fi
-
- # Make a backup of the uninstalled library when relinking
- - if test "$mode" = relink; then
- - $opt_dry_run || (cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U) || exit $?
- + if test "$opt_mode" = relink; then
- + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
- fi
-
- # Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
- - eval "test_cmds=\"$module_expsym_cmds\""
- + eval test_cmds=\"$module_expsym_cmds\"
- cmds=$module_expsym_cmds
- else
- - eval "test_cmds=\"$module_cmds\""
- + eval test_cmds=\"$module_cmds\"
- cmds=$module_cmds
- fi
- else
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- - eval "test_cmds=\"$archive_expsym_cmds\""
- + eval test_cmds=\"$archive_expsym_cmds\"
- cmds=$archive_expsym_cmds
- else
- - eval "test_cmds=\"$archive_cmds\""
- + eval test_cmds=\"$archive_cmds\"
- cmds=$archive_cmds
- fi
- fi
- @@ -7366,10 +8329,13 @@ EOF
- echo 'INPUT (' > $output
- for obj in $save_libobjs
- do
- - $ECHO "$obj" >> $output
- + func_to_tool_file "$obj"
- + $ECHO "$func_to_tool_file_result" >> $output
- done
- echo ')' >> $output
- - delfiles="$delfiles $output"
- + func_append delfiles " $output"
- + func_to_tool_file "$output"
- + output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
- func_verbose "creating linker input file list: $output"
- @@ -7383,15 +8349,17 @@ EOF
- fi
- for obj
- do
- - $ECHO "$obj" >> $output
- + func_to_tool_file "$obj"
- + $ECHO "$func_to_tool_file_result" >> $output
- done
- - delfiles="$delfiles $output"
- - output=$firstobj\"$file_list_spec$output\"
- + func_append delfiles " $output"
- + func_to_tool_file "$output"
- + output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
- else
- if test -n "$save_libobjs"; then
- func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
- - eval "test_cmds=\"$reload_cmds\""
- + eval test_cmds=\"$reload_cmds\"
- func_len " $test_cmds"
- len0=$func_len_result
- len=$len0
- @@ -7411,12 +8379,12 @@ EOF
- if test "$k" -eq 1 ; then
- # The first file doesn't have a previous command to add.
- reload_objs=$objlist
- - eval "concat_cmds=\"$reload_cmds\""
- + eval concat_cmds=\"$reload_cmds\"
- else
- # All subsequent reloadable object files will link in
- # the last one created.
- reload_objs="$objlist $last_robj"
- - eval "concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\""
- + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
- fi
- last_robj=$output_objdir/$output_la-${k}.$objext
- func_arith $k + 1
- @@ -7433,11 +8401,11 @@ EOF
- # files will link in the last one created.
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- reload_objs="$objlist $last_robj"
- - eval "concat_cmds=\"\${concat_cmds}$reload_cmds\""
- + eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
- if test -n "$last_robj"; then
- - eval "concat_cmds=\"\${concat_cmds}~\$RM $last_robj\""
- + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
- fi
- - delfiles="$delfiles $output"
- + func_append delfiles " $output"
-
- else
- output=
- @@ -7450,9 +8418,9 @@ EOF
- libobjs=$output
- # Append the command to create the export file.
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- - eval "concat_cmds=\"\$concat_cmds$export_symbols_cmds\""
- + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
- if test -n "$last_robj"; then
- - eval "concat_cmds=\"\$concat_cmds~\$RM $last_robj\""
- + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
- fi
- fi
-
- @@ -7471,7 +8439,7 @@ EOF
- lt_exit=$?
-
- # Restore the uninstalled library and exit
- - if test "$mode" = relink; then
- + if test "$opt_mode" = relink; then
- ( cd "$output_objdir" && \
- $RM "${realname}T" && \
- $MV "${realname}U" "$realname" )
- @@ -7492,7 +8460,7 @@ EOF
- if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
- - $opt_dry_run || $ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"
- + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
- fi
-
- if test -n "$orig_export_symbols"; then
- @@ -7504,7 +8472,7 @@ EOF
- # global variables. join(1) would be nice here, but unfortunately
- # isn't a blessed tool.
- $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
- - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
- + func_append delfiles " $export_symbols $output_objdir/$libname.filter"
- export_symbols=$output_objdir/$libname.def
- $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
- fi
- @@ -7515,7 +8483,7 @@ EOF
- output=$save_output
-
- if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
- - eval "libobjs=\"\$libobjs $whole_archive_flag_spec\""
- + eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- test "X$libobjs" = "X " && libobjs=
- fi
- # Expand the library linking commands again to reset the
- @@ -7539,23 +8507,23 @@ EOF
-
- if test -n "$delfiles"; then
- # Append the command to remove temporary files to $cmds.
- - eval "cmds=\"\$cmds~\$RM $delfiles\""
- + eval cmds=\"\$cmds~\$RM $delfiles\"
- fi
-
- # Add any objects from preloaded convenience libraries
- if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
- - generated="$generated $gentop"
- + func_append generated " $gentop"
-
- func_extract_archives $gentop $dlprefiles
- - libobjs="$libobjs $func_extract_archives_result"
- + func_append libobjs " $func_extract_archives_result"
- test "X$libobjs" = "X " && libobjs=
- fi
-
- save_ifs="$IFS"; IFS='~'
- for cmd in $cmds; do
- IFS="$save_ifs"
- - eval "cmd=\"$cmd\""
- + eval cmd=\"$cmd\"
- $opt_silent || {
- func_quote_for_expand "$cmd"
- eval "func_echo $func_quote_for_expand_result"
- @@ -7564,7 +8532,7 @@ EOF
- lt_exit=$?
-
- # Restore the uninstalled library and exit
- - if test "$mode" = relink; then
- + if test "$opt_mode" = relink; then
- ( cd "$output_objdir" && \
- $RM "${realname}T" && \
- $MV "${realname}U" "$realname" )
- @@ -7576,8 +8544,8 @@ EOF
- IFS="$save_ifs"
-
- # Restore the uninstalled library and exit
- - if test "$mode" = relink; then
- - $opt_dry_run || (cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname) || exit $?
- + if test "$opt_mode" = relink; then
- + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
- if test -n "$convenience"; then
- if test -z "$whole_archive_flag_spec"; then
- @@ -7656,17 +8624,20 @@ EOF
-
- if test -n "$convenience"; then
- if test -n "$whole_archive_flag_spec"; then
- - eval "tmp_whole_archive_flags=\"$whole_archive_flag_spec\""
- + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
- else
- gentop="$output_objdir/${obj}x"
- - generated="$generated $gentop"
- + func_append generated " $gentop"
-
- func_extract_archives $gentop $convenience
- reload_conv_objs="$reload_objs $func_extract_archives_result"
- fi
- fi
-
- + # If we're not building shared, we need to use non_pic_objs
- + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
- +
- # Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
- @@ -7690,7 +8661,7 @@ EOF
- # Create an invalid libtool object if no PIC, so that we don't
- # accidentally link it into a program.
- # $show "echo timestamp > $libobj"
- - # $opt_dry_run || echo timestamp > $libobj || exit $?
- + # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
- exit $EXIT_SUCCESS
- fi
-
- @@ -7740,8 +8711,8 @@ EOF
- if test "$tagname" = CXX ; then
- case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
- 10.[0123])
- - compile_command="$compile_command ${wl}-bind_at_load"
- - finalize_command="$finalize_command ${wl}-bind_at_load"
- + func_append compile_command " ${wl}-bind_at_load"
- + func_append finalize_command " ${wl}-bind_at_load"
- ;;
- esac
- fi
- @@ -7761,7 +8732,7 @@ EOF
- *)
- case " $compile_deplibs " in
- *" -L$path/$objdir "*)
- - new_libs="$new_libs -L$path/$objdir" ;;
- + func_append new_libs " -L$path/$objdir" ;;
- esac
- ;;
- esac
- @@ -7771,17 +8742,17 @@ EOF
- -L*)
- case " $new_libs " in
- *" $deplib "*) ;;
- - *) new_libs="$new_libs $deplib" ;;
- + *) func_append new_libs " $deplib" ;;
- esac
- ;;
- - *) new_libs="$new_libs $deplib" ;;
- + *) func_append new_libs " $deplib" ;;
- esac
- done
- compile_deplibs="$new_libs"
-
-
- - compile_command="$compile_command $compile_deplibs"
- - finalize_command="$finalize_command $finalize_deplibs"
- + func_append compile_command " $compile_deplibs"
- + func_append finalize_command " $finalize_deplibs"
-
- if test -n "$rpath$xrpath"; then
- # If the user specified any rpath flags, then add them.
- @@ -7789,7 +8760,7 @@ EOF
- # This is the magic to use -rpath.
- case "$finalize_rpath " in
- *" $libdir "*) ;;
- - *) finalize_rpath="$finalize_rpath $libdir" ;;
- + *) func_append finalize_rpath " $libdir" ;;
- esac
- done
- fi
- @@ -7808,18 +8779,18 @@ EOF
- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- ;;
- *)
- - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- ;;
- esac
- fi
- else
- - eval "flag=\"$hardcode_libdir_flag_spec\""
- - rpath="$rpath $flag"
- + eval flag=\"$hardcode_libdir_flag_spec\"
- + func_append rpath " $flag"
- fi
- elif test -n "$runpath_var"; then
- case "$perm_rpath " in
- *" $libdir "*) ;;
- - *) perm_rpath="$perm_rpath $libdir" ;;
- + *) func_append perm_rpath " $libdir" ;;
- esac
- fi
- case $host in
- @@ -7828,12 +8799,12 @@ EOF
- case :$dllsearchpath: in
- *":$libdir:"*) ;;
- ::) dllsearchpath=$libdir;;
- - *) dllsearchpath="$dllsearchpath:$libdir";;
- + *) func_append dllsearchpath ":$libdir";;
- esac
- case :$dllsearchpath: in
- *":$testbindir:"*) ;;
- ::) dllsearchpath=$testbindir;;
- - *) dllsearchpath="$dllsearchpath:$testbindir";;
- + *) func_append dllsearchpath ":$testbindir";;
- esac
- ;;
- esac
- @@ -7842,7 +8813,7 @@ EOF
- if test -n "$hardcode_libdir_separator" &&
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- - eval "rpath=\" $hardcode_libdir_flag_spec\""
- + eval rpath=\" $hardcode_libdir_flag_spec\"
- fi
- compile_rpath="$rpath"
-
- @@ -7859,18 +8830,18 @@ EOF
- *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- ;;
- *)
- - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
- ;;
- esac
- fi
- else
- - eval "flag=\"$hardcode_libdir_flag_spec\""
- - rpath="$rpath $flag"
- + eval flag=\"$hardcode_libdir_flag_spec\"
- + func_append rpath " $flag"
- fi
- elif test -n "$runpath_var"; then
- case "$finalize_perm_rpath " in
- *" $libdir "*) ;;
- - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
- + *) func_append finalize_perm_rpath " $libdir" ;;
- esac
- fi
- done
- @@ -7878,7 +8849,7 @@ EOF
- if test -n "$hardcode_libdir_separator" &&
- test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
- - eval "rpath=\" $hardcode_libdir_flag_spec\""
- + eval rpath=\" $hardcode_libdir_flag_spec\"
- fi
- finalize_rpath="$rpath"
-
- @@ -7921,6 +8892,12 @@ EOF
- exit_status=0
- func_show_eval "$link_command" 'exit_status=$?'
-
- + if test -n "$postlink_cmds"; then
- + func_to_tool_file "$output"
- + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- + func_execute_cmds "$postlink_cmds" 'exit $?'
- + fi
- +
- # Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
- @@ -7943,7 +8920,7 @@ EOF
- # We should set the runpath_var.
- rpath=
- for dir in $perm_rpath; do
- - rpath="$rpath$dir:"
- + func_append rpath "$dir:"
- done
- compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
- fi
- @@ -7951,7 +8928,7 @@ EOF
- # We should set the runpath_var.
- rpath=
- for dir in $finalize_perm_rpath; do
- - rpath="$rpath$dir:"
- + func_append rpath "$dir:"
- done
- finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
- fi
- @@ -7966,6 +8943,13 @@ EOF
- $opt_dry_run || $RM $output
- # Link the executable and exit
- func_show_eval "$link_command" 'exit $?'
- +
- + if test -n "$postlink_cmds"; then
- + func_to_tool_file "$output"
- + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
- + func_execute_cmds "$postlink_cmds" 'exit $?'
- + fi
- +
- exit $EXIT_SUCCESS
- fi
-
- @@ -7999,6 +8983,12 @@ EOF
-
- func_show_eval "$link_command" 'exit $?'
-
- + if test -n "$postlink_cmds"; then
- + func_to_tool_file "$output_objdir/$outputname"
- + 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'`
- + func_execute_cmds "$postlink_cmds" 'exit $?'
- + fi
- +
- # Now create the wrapper script.
- func_verbose "creating $output"
-
- @@ -8096,7 +9086,7 @@ EOF
- else
- oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- - oldobjs="$oldobjs $symfileobj"
- + func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- @@ -8104,10 +9094,10 @@ EOF
-
- if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
- - generated="$generated $gentop"
- + func_append generated " $gentop"
-
- func_extract_archives $gentop $addlibs
- - oldobjs="$oldobjs $func_extract_archives_result"
- + func_append oldobjs " $func_extract_archives_result"
- fi
-
- # Do each command in the archive commands.
- @@ -8118,10 +9108,10 @@ EOF
- # Add any objects from preloaded convenience libraries
- if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
- - generated="$generated $gentop"
- + func_append generated " $gentop"
-
- func_extract_archives $gentop $dlprefiles
- - oldobjs="$oldobjs $func_extract_archives_result"
- + func_append oldobjs " $func_extract_archives_result"
- fi
-
- # POSIX demands no paths to be encoded in archives. We have
- @@ -8139,7 +9129,7 @@ EOF
- else
- echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
- - generated="$generated $gentop"
- + func_append generated " $gentop"
- func_mkdir_p "$gentop"
- save_oldobjs=$oldobjs
- oldobjs=
- @@ -8163,18 +9153,28 @@ EOF
- esac
- done
- func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
- - oldobjs="$oldobjs $gentop/$newobj"
- + func_append oldobjs " $gentop/$newobj"
- ;;
- - *) oldobjs="$oldobjs $obj" ;;
- + *) func_append oldobjs " $obj" ;;
- esac
- done
- fi
- - eval "cmds=\"$old_archive_cmds\""
- + eval cmds=\"$old_archive_cmds\"
-
- func_len " $cmds"
- len=$func_len_result
- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- cmds=$old_archive_cmds
- + elif test -n "$archiver_list_spec"; then
- + func_verbose "using command file archive linking..."
- + for obj in $oldobjs
- + do
- + func_to_tool_file "$obj"
- + $ECHO "$func_to_tool_file_result"
- + done > $output_objdir/$libname.libcmd
- + func_to_tool_file "$output_objdir/$libname.libcmd"
- + oldobjs=" $archiver_list_spec$func_to_tool_file_result"
- + cmds=$old_archive_cmds
- else
- # the command line is too long to link in one step, link in parts
- func_verbose "using piecewise archive linking..."
- @@ -8189,7 +9189,7 @@ EOF
- do
- last_oldobj=$obj
- done
- - eval "test_cmds=\"$old_archive_cmds\""
- + eval test_cmds=\"$old_archive_cmds\"
- func_len " $test_cmds"
- len0=$func_len_result
- len=$len0
- @@ -8208,7 +9208,7 @@ EOF
- RANLIB=$save_RANLIB
- fi
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- - eval "concat_cmds=\"\${concat_cmds}$old_archive_cmds\""
- + eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
- objlist=
- len=$len0
- fi
- @@ -8216,9 +9216,9 @@ EOF
- RANLIB=$save_RANLIB
- oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
- - eval "cmds=\"\$concat_cmds\""
- + eval cmds=\"\$concat_cmds\"
- else
- - eval "cmds=\"\$concat_cmds~\$old_archive_cmds\""
- + eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
- fi
- fi
- fi
- @@ -8268,12 +9268,23 @@ EOF
- *.la)
- func_basename "$deplib"
- name="$func_basename_result"
- - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- + func_resolve_sysroot "$deplib"
- + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
- - newdependency_libs="$newdependency_libs $libdir/$name"
- + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
- + ;;
- + -L*)
- + func_stripname -L '' "$deplib"
- + func_replace_sysroot "$func_stripname_result"
- + func_append newdependency_libs " -L$func_replace_sysroot_result"
- ;;
- - *) newdependency_libs="$newdependency_libs $deplib" ;;
- + -R*)
- + func_stripname -R '' "$deplib"
- + func_replace_sysroot "$func_stripname_result"
- + func_append newdependency_libs " -R$func_replace_sysroot_result"
- + ;;
- + *) func_append newdependency_libs " $deplib" ;;
- esac
- done
- dependency_libs="$newdependency_libs"
- @@ -8284,12 +9295,14 @@ EOF
- *.la)
- func_basename "$lib"
- name="$func_basename_result"
- - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- + func_resolve_sysroot "$lib"
- + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- +
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- - newdlfiles="$newdlfiles $libdir/$name"
- + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
- ;;
- - *) newdlfiles="$newdlfiles $lib" ;;
- + *) func_append newdlfiles " $lib" ;;
- esac
- done
- dlfiles="$newdlfiles"
- @@ -8303,10 +9316,11 @@ EOF
- # the library:
- func_basename "$lib"
- name="$func_basename_result"
- - libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
- + func_resolve_sysroot "$lib"
- + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
- test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
- - newdlprefiles="$newdlprefiles $libdir/$name"
- + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
- ;;
- esac
- done
- @@ -8318,7 +9332,7 @@ EOF
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- *) abs=`pwd`"/$lib" ;;
- esac
- - newdlfiles="$newdlfiles $abs"
- + func_append newdlfiles " $abs"
- done
- dlfiles="$newdlfiles"
- newdlprefiles=
- @@ -8327,7 +9341,7 @@ EOF
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- *) abs=`pwd`"/$lib" ;;
- esac
- - newdlprefiles="$newdlprefiles $abs"
- + func_append newdlprefiles " $abs"
- done
- dlprefiles="$newdlprefiles"
- fi
- @@ -8412,7 +9426,7 @@ relink_command=\"$relink_command\""
- exit $EXIT_SUCCESS
- }
-
- -{ test "$mode" = link || test "$mode" = relink; } &&
- +{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
-
-
- @@ -8432,9 +9446,9 @@ func_mode_uninstall ()
- for arg
- do
- case $arg in
- - -f) RM="$RM $arg"; rmforce=yes ;;
- - -*) RM="$RM $arg" ;;
- - *) files="$files $arg" ;;
- + -f) func_append RM " $arg"; rmforce=yes ;;
- + -*) func_append RM " $arg" ;;
- + *) func_append files " $arg" ;;
- esac
- done
-
- @@ -8443,24 +9457,23 @@ func_mode_uninstall ()
-
- rmdirs=
-
- - origobjdir="$objdir"
- for file in $files; do
- func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- - objdir="$origobjdir"
- + odir="$objdir"
- else
- - objdir="$dir/$origobjdir"
- + odir="$dir/$objdir"
- fi
- func_basename "$file"
- name="$func_basename_result"
- - test "$mode" = uninstall && objdir="$dir"
- + test "$opt_mode" = uninstall && odir="$dir"
-
- - # Remember objdir for removal later, being careful to avoid duplicates
- - if test "$mode" = clean; then
- + # Remember odir for removal later, being careful to avoid duplicates
- + if test "$opt_mode" = clean; then
- case " $rmdirs " in
- - *" $objdir "*) ;;
- - *) rmdirs="$rmdirs $objdir" ;;
- + *" $odir "*) ;;
- + *) func_append rmdirs " $odir" ;;
- esac
- fi
-
- @@ -8486,18 +9499,17 @@ func_mode_uninstall ()
-
- # Delete the libtool libraries and symlinks.
- for n in $library_names; do
- - rmfiles="$rmfiles $objdir/$n"
- + func_append rmfiles " $odir/$n"
- done
- - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
- + test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
- - case "$mode" in
- + case "$opt_mode" in
- clean)
- - case " $library_names " in
- - # " " in the beginning catches empty $dlname
- + case " $library_names " in
- *" $dlname "*) ;;
- - *) rmfiles="$rmfiles $objdir/$dlname" ;;
- + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
- esac
- - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
- ;;
- uninstall)
- if test -n "$library_names"; then
- @@ -8525,19 +9537,19 @@ func_mode_uninstall ()
- # Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
- - rmfiles="$rmfiles $dir/$pic_object"
- + func_append rmfiles " $dir/$pic_object"
- fi
-
- # Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
- - rmfiles="$rmfiles $dir/$non_pic_object"
- + func_append rmfiles " $dir/$non_pic_object"
- fi
- fi
- ;;
-
- *)
- - if test "$mode" = clean ; then
- + if test "$opt_mode" = clean ; then
- noexename=$name
- case $file in
- *.exe)
- @@ -8547,7 +9559,7 @@ func_mode_uninstall ()
- noexename=$func_stripname_result
- # $file with .exe has already been added to rmfiles,
- # add $file without .exe
- - rmfiles="$rmfiles $file"
- + func_append rmfiles " $file"
- ;;
- esac
- # Do a test to see if this is a libtool program.
- @@ -8556,7 +9568,7 @@ func_mode_uninstall ()
- func_ltwrapper_scriptname "$file"
- relink_command=
- func_source $func_ltwrapper_scriptname_result
- - rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
- + func_append rmfiles " $func_ltwrapper_scriptname_result"
- else
- relink_command=
- func_source $dir/$noexename
- @@ -8564,12 +9576,12 @@ func_mode_uninstall ()
-
- # note $name still contains .exe if it was in $file originally
- # as does the version of $file that was added into $rmfiles
- - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
- + func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
- - rmfiles="$rmfiles $objdir/lt-$name"
- + func_append rmfiles " $odir/lt-$name"
- fi
- if test "X$noexename" != "X$name" ; then
- - rmfiles="$rmfiles $objdir/lt-${noexename}.c"
- + func_append rmfiles " $odir/lt-${noexename}.c"
- fi
- fi
- fi
- @@ -8577,7 +9589,6 @@ func_mode_uninstall ()
- esac
- func_show_eval "$RM $rmfiles" 'exit_status=1'
- done
- - objdir="$origobjdir"
-
- # Try to remove the ${objdir}s in the directories where we deleted files
- for dir in $rmdirs; do
- @@ -8589,16 +9600,16 @@ func_mode_uninstall ()
- exit $exit_status
- }
-
- -{ test "$mode" = uninstall || test "$mode" = clean; } &&
- +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
-
- -test -z "$mode" && {
- +test -z "$opt_mode" && {
- help="$generic_help"
- func_fatal_help "you must specify a MODE"
- }
-
- test -z "$exec_cmd" && \
- - func_fatal_help "invalid operation mode \`$mode'"
- + func_fatal_help "invalid operation mode \`$opt_mode'"
-
- if test -n "$exec_cmd"; then
- eval exec "$exec_cmd"
- diff --git a/ltoptions.m4 b/ltoptions.m4
- index 5ef12ced2a8..17cfd51c0b3 100644
- --- a/ltoptions.m4
- +++ b/ltoptions.m4
- @@ -8,7 +8,7 @@
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
-
- -# serial 6 ltoptions.m4
- +# serial 7 ltoptions.m4
-
- # This is to help aclocal find these macros, as it can't see m4_define.
- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
- diff --git a/ltversion.m4 b/ltversion.m4
- index bf87f77132d..9c7b5d41185 100644
- --- a/ltversion.m4
- +++ b/ltversion.m4
- @@ -7,17 +7,17 @@
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
-
- -# Generated from ltversion.in.
- +# @configure_input@
-
- -# serial 3134 ltversion.m4
- +# serial 3293 ltversion.m4
- # This file is part of GNU Libtool
-
- -m4_define([LT_PACKAGE_VERSION], [2.2.7a])
- -m4_define([LT_PACKAGE_REVISION], [1.3134])
- +m4_define([LT_PACKAGE_VERSION], [2.4])
- +m4_define([LT_PACKAGE_REVISION], [1.3293])
-
- AC_DEFUN([LTVERSION_VERSION],
- -[macro_version='2.2.7a'
- -macro_revision='1.3134'
- +[macro_version='2.4'
- +macro_revision='1.3293'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
- diff --git a/lt~obsolete.m4 b/lt~obsolete.m4
- index bf92b5e0790..c573da90c5c 100644
- --- a/lt~obsolete.m4
- +++ b/lt~obsolete.m4
- @@ -7,7 +7,7 @@
- # unlimited permission to copy and/or distribute it, with or without
- # modifications, as long as this notice is preserved.
-
- -# serial 4 lt~obsolete.m4
- +# serial 5 lt~obsolete.m4
-
- # These exist entirely to fool aclocal when bootstrapping libtool.
- #
- diff --git a/opcodes/configure b/opcodes/configure
- index 3513e408ce1..133948631e9 100755
- --- a/opcodes/configure
- +++ b/opcodes/configure
- @@ -680,6 +680,9 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- +ac_ct_AR
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -798,6 +801,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_checking
- enable_targets
- @@ -1464,6 +1468,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
-
- Some influential environment variables:
- CC C compiler command
- @@ -4751,8 +4757,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -4792,7 +4798,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -5478,8 +5484,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -5528,6 +5534,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -5544,6 +5624,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -5712,7 +5797,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -5866,6 +5952,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -5881,6 +5982,157 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -5895,8 +6147,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -5912,7 +6166,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5932,11 +6186,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -5952,7 +6210,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5971,6 +6229,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -5982,25 +6244,20 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
- +
-
-
-
- @@ -6011,6 +6268,63 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
- +
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
- +
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
- +
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
- +
- +
- +
- +
- +
- +
-
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- @@ -6351,8 +6665,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -6388,6 +6702,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -6429,6 +6744,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -6440,7 +6767,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -6466,8 +6793,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -6477,8 +6804,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -6515,6 +6842,14 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
-
-
-
- @@ -6533,6 +6868,47 @@ fi
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
- +
- +
-
-
-
- @@ -6742,6 +7118,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -7305,6 +7798,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -7470,7 +7965,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -7559,7 +8055,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -7857,8 +8353,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -8024,6 +8518,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -8086,7 +8586,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -8143,13 +8643,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -8210,6 +8714,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -8560,7 +9069,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -8659,12 +9169,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -8678,8 +9188,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -8697,8 +9207,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8744,8 +9254,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8875,7 +9385,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -8888,22 +9404,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -8915,7 +9438,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
- @@ -8928,22 +9457,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -8988,20 +9524,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -9062,7 +9641,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -9070,7 +9649,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -9086,7 +9665,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -9110,10 +9689,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -9192,23 +9771,36 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -9293,7 +9885,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -9312,9 +9904,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -9890,8 +10482,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -9924,13 +10517,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -10012,7 +10663,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -10808,7 +11459,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10811 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10852,10 +11503,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -10914,7 +11565,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10917 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10958,10 +11609,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -13101,13 +13752,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -13122,14 +13780,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -13162,12 +13823,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -13222,8 +13883,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -13233,12 +13899,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -13254,7 +13922,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -13290,6 +13957,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -14055,7 +14723,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -14158,19 +14827,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -14200,6 +14892,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -14209,6 +14907,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -14323,12 +15024,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -14415,9 +15116,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -14433,6 +15131,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -14465,210 +15166,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
- diff --git a/zlib/configure b/zlib/configure
- index 695819cd54b..14b5f28013a 100755
- --- a/zlib/configure
- +++ b/zlib/configure
- @@ -646,8 +646,11 @@ OTOOL
- LIPO
- NMEDIT
- DSYMUTIL
- +MANIFEST_TOOL
- RANLIB
- +ac_ct_AR
- AR
- +DLLTOOL
- OBJDUMP
- LN_S
- NM
- @@ -774,6 +777,7 @@ enable_static
- with_pic
- enable_fast_install
- with_gnu_ld
- +with_libtool_sysroot
- enable_libtool_lock
- enable_host_shared
- '
- @@ -1428,6 +1432,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- + --with-libtool-sysroot=DIR Search for dependent libraries within DIR
- + (or the compiler's sysroot if not specified).
-
- Some influential environment variables:
- CC C compiler command
- @@ -4147,8 +4153,8 @@ esac
-
-
-
- -macro_version='2.2.7a'
- -macro_revision='1.3134'
- +macro_version='2.4'
- +macro_revision='1.3293'
-
-
-
- @@ -4188,7 +4194,7 @@ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
- $as_echo_n "checking how to print strings... " >&6; }
- # Test print first, because it will be a builtin if present.
- -if test "X`print -r -- -n 2>/dev/null`" = X-n && \
- +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
- ECHO='print -r --'
- elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
- @@ -5004,8 +5010,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
- - test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
- - = c,a/b,, \
- + test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- + = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
- @@ -5054,6 +5060,80 @@ esac
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
- +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
- +if ${lt_cv_to_host_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
- + ;;
- + esac
- + ;;
- + *-*-cygwin* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
- + ;;
- + *-*-cygwin* )
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- + * ) # otherwise, assume *nix
- + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
- + ;;
- + esac
- + ;;
- + * ) # unhandled hosts (and "normal" native builds)
- + lt_cv_to_host_file_cmd=func_convert_file_noop
- + ;;
- +esac
- +
- +fi
- +
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
- +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
- +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
- +if ${lt_cv_to_tool_file_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + #assume ordinary cross tools, or native build.
- +lt_cv_to_tool_file_cmd=func_convert_file_noop
- +case $host in
- + *-*-mingw* )
- + case $build in
- + *-*-mingw* ) # actually msys
- + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
- + ;;
- + esac
- + ;;
- +esac
- +
- +fi
- +
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
- +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
- +
- +
- +
- +
- +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
- if ${lt_cv_ld_reload_flag+:} false; then :
- @@ -5070,6 +5150,11 @@ case $reload_flag in
- esac
- reload_cmds='$LD$reload_flag -o $output$reload_objs'
- case $host_os in
- + cygwin* | mingw* | pw32* | cegcc*)
- + if test "$GCC" != yes; then
- + reload_cmds=false
- + fi
- + ;;
- darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
- @@ -5238,7 +5323,8 @@ mingw* | pw32*)
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
- - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- + # Keep this pattern in sync with the one in func_win32_libid.
- + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
- @@ -5392,6 +5478,21 @@ esac
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- +
- +file_magic_glob=
- +want_nocaseglob=no
- +if test "$build" = "$host"; then
- + case $host_os in
- + mingw* | pw32*)
- + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
- + want_nocaseglob=yes
- + else
- + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
- + fi
- + ;;
- + esac
- +fi
- +
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
- test -z "$deplibs_check_method" && deplibs_check_method=unknown
- @@ -5407,6 +5508,158 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$DLLTOOL"; then
- + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +DLLTOOL=$ac_cv_prog_DLLTOOL
- +if test -n "$DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
- +$as_echo "$DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_DLLTOOL"; then
- + ac_ct_DLLTOOL=$DLLTOOL
- + # Extract the first word of "dlltool", so it can be a program name with args.
- +set dummy dlltool; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_DLLTOOL"; then
- + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- +if test -n "$ac_ct_DLLTOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
- +$as_echo "$ac_ct_DLLTOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_DLLTOOL" = x; then
- + DLLTOOL="false"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + DLLTOOL=$ac_ct_DLLTOOL
- + fi
- +else
- + DLLTOOL="$ac_cv_prog_DLLTOOL"
- +fi
- +
- +test -z "$DLLTOOL" && DLLTOOL=dlltool
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
- +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
- +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_sharedlib_from_linklib_cmd='unknown'
- +
- +case $host_os in
- +cygwin* | mingw* | pw32* | cegcc*)
- + # two different shell functions defined in ltmain.sh
- + # decide which to use based on capabilities of $DLLTOOL
- + case `$DLLTOOL --help 2>&1` in
- + *--identify-strict*)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
- + ;;
- + *)
- + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
- + ;;
- + esac
- + ;;
- +*)
- + # fallback: assume linklib IS sharedlib
- + lt_cv_sharedlib_from_linklib_cmd="$ECHO"
- + ;;
- +esac
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
- +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
- +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
- +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
- +
- +
- +
- +
- +
- +
- +
- +
- plugin_option=
- plugin_names="liblto_plugin.so liblto_plugin-0.dll cyglto_plugin-0.dll"
- for plugin in $plugin_names; do
- @@ -5421,8 +5674,10 @@ for plugin in $plugin_names; do
- done
-
- if test -n "$ac_tool_prefix"; then
- - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- -set dummy ${ac_tool_prefix}ar; ac_word=$2
- + for ac_prog in ar
- + do
- + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_AR+:} false; then :
- @@ -5438,7 +5693,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_AR="${ac_tool_prefix}ar"
- + ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5458,11 +5713,15 @@ $as_echo "no" >&6; }
- fi
-
-
- + test -n "$AR" && break
- + done
- fi
- -if test -z "$ac_cv_prog_AR"; then
- +if test -z "$AR"; then
- ac_ct_AR=$AR
- - # Extract the first word of "ar", so it can be a program name with args.
- -set dummy ar; ac_word=$2
- + for ac_prog in ar
- +do
- + # Extract the first word of "$ac_prog", so it can be a program name with args.
- +set dummy $ac_prog; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
- if ${ac_cv_prog_ac_ct_AR+:} false; then :
- @@ -5478,7 +5737,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- - ac_cv_prog_ac_ct_AR="ar"
- + ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- @@ -5497,6 +5756,10 @@ else
- $as_echo "no" >&6; }
- fi
-
- +
- + test -n "$ac_ct_AR" && break
- +done
- +
- if test "x$ac_ct_AR" = x; then
- AR="false"
- else
- @@ -5508,25 +5771,19 @@ ac_tool_warned=yes ;;
- esac
- AR=$ac_ct_AR
- fi
- -else
- - AR="$ac_cv_prog_AR"
- fi
-
- -test -z "$AR" && AR=ar
- -if test -n "$plugin_option"; then
- - if $AR --help 2>&1 | grep -q "\--plugin"; then
- - touch conftest.c
- - $AR $plugin_option rc conftest.a conftest.c
- - if test "$?" != 0; then
- - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- + touch conftest.c
- + $AR $plugin_option rc conftest.a conftest.c
- + if test "$?" != 0; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Failed: $AR $plugin_option rc" >&5
- $as_echo "$as_me: WARNING: Failed: $AR $plugin_option rc" >&2;}
- - else
- - AR="$AR $plugin_option"
- - fi
- - rm -f conftest.*
- + else
- + AR="$AR $plugin_option"
- fi
- -fi
- -test -z "$AR_FLAGS" && AR_FLAGS=cru
- + rm -f conftest.*
- +: ${AR=ar}
- +: ${AR_FLAGS=cru}
-
-
-
- @@ -5538,6 +5795,64 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
-
-
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
- +$as_echo_n "checking for archiver @FILE support... " >&6; }
- +if ${lt_cv_ar_at_file+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_ar_at_file=no
- + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- +/* end confdefs.h. */
- +
- +int
- +main ()
- +{
- +
- + ;
- + return 0;
- +}
- +_ACEOF
- +if ac_fn_c_try_compile "$LINENO"; then :
- + echo conftest.$ac_objext > conftest.lst
- + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -eq 0; then
- + # Ensure the archiver fails upon bogus file names.
- + rm -f conftest.$ac_objext libconftest.a
- + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
- + (eval $lt_ar_try) 2>&5
- + ac_status=$?
- + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- + test $ac_status = 0; }
- + if test "$ac_status" -ne 0; then
- + lt_cv_ar_at_file=@
- + fi
- + fi
- + rm -f conftest.* libconftest.a
- +
- +fi
- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- +
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
- +$as_echo "$lt_cv_ar_at_file" >&6; }
- +
- +if test "x$lt_cv_ar_at_file" = xno; then
- + archiver_list_spec=
- +else
- + archiver_list_spec=$lt_cv_ar_at_file
- +fi
- +
- +
- +
- +
- +
- +
- +
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
- @@ -5877,8 +6192,8 @@ esac
- lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
- # Transform an extracted symbol line into symbol name and symbol address
- -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- -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'"
- +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'"
- +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'"
-
- # Handle CRLF in mingw tool chain
- opt_cr=
- @@ -5914,6 +6229,7 @@ for ac_symprfx in "" "_"; do
- else
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- fi
- + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
- # Check to see that the pipe works correctly.
- pipe_works=no
- @@ -5955,6 +6271,18 @@ _LT_EOF
- if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
- if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
- cat <<_LT_EOF > conftest.$ac_ext
- +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
- +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
- +/* DATA imports from DLLs on WIN32 con't be const, because runtime
- + relocations are performed -- see ld's documentation on pseudo-relocs. */
- +# define LT_DLSYM_CONST
- +#elif defined(__osf__)
- +/* This system does not cope well with relocations in const data. */
- +# define LT_DLSYM_CONST
- +#else
- +# define LT_DLSYM_CONST const
- +#endif
- +
- #ifdef __cplusplus
- extern "C" {
- #endif
- @@ -5966,7 +6294,7 @@ _LT_EOF
- cat <<_LT_EOF >> conftest.$ac_ext
-
- /* The mapping between symbol names and symbols. */
- -const struct {
- +LT_DLSYM_CONST struct {
- const char *name;
- void *address;
- }
- @@ -5992,8 +6320,8 @@ static const void *lt_preloaded_setup() {
- _LT_EOF
- # Now try linking the two files.
- mv conftest.$ac_objext conftstm.$ac_objext
- - lt_save_LIBS="$LIBS"
- - lt_save_CFLAGS="$CFLAGS"
- + lt_globsym_save_LIBS=$LIBS
- + lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
- CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
- @@ -6003,8 +6331,8 @@ _LT_EOF
- test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- pipe_works=yes
- fi
- - LIBS="$lt_save_LIBS"
- - CFLAGS="$lt_save_CFLAGS"
- + LIBS=$lt_globsym_save_LIBS
- + CFLAGS=$lt_globsym_save_CFLAGS
- else
- echo "cannot find nm_test_func in $nlist" >&5
- fi
- @@ -6041,6 +6369,17 @@ else
- $as_echo "ok" >&6; }
- fi
-
- +# Response file support.
- +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- + nm_file_list_spec='@'
- +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
- + nm_file_list_spec='@'
- +fi
- +
- +
- +
- +
- +
-
-
-
- @@ -6058,6 +6397,43 @@ fi
-
-
-
- +
- +
- +
- +
- +
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
- +$as_echo_n "checking for sysroot... " >&6; }
- +
- +# Check whether --with-libtool-sysroot was given.
- +if test "${with_libtool_sysroot+set}" = set; then :
- + withval=$with_libtool_sysroot;
- +else
- + with_libtool_sysroot=no
- +fi
- +
- +
- +lt_sysroot=
- +case ${with_libtool_sysroot} in #(
- + yes)
- + if test "$GCC" = yes; then
- + lt_sysroot=`$CC --print-sysroot 2>/dev/null`
- + fi
- + ;; #(
- + /*)
- + lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
- + ;; #(
- + no|'')
- + ;; #(
- + *)
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
- +$as_echo "${with_libtool_sysroot}" >&6; }
- + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
- + ;;
- +esac
- +
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
- +$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
- @@ -6272,6 +6648,123 @@ esac
-
- need_locks="$enable_libtool_lock"
-
- +if test -n "$ac_tool_prefix"; then
- + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
- +set dummy ${ac_tool_prefix}mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$MANIFEST_TOOL"; then
- + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
- +if test -n "$MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
- +$as_echo "$MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- +
- +fi
- +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
- + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
- + # Extract the first word of "mt", so it can be a program name with args.
- +set dummy mt; ac_word=$2
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- +$as_echo_n "checking for $ac_word... " >&6; }
- +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test -n "$ac_ct_MANIFEST_TOOL"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
- +else
- +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- +for as_dir in $PATH
- +do
- + IFS=$as_save_IFS
- + test -z "$as_dir" && as_dir=.
- + for ac_exec_ext in '' $ac_executable_extensions; do
- + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
- + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- + break 2
- + fi
- +done
- + done
- +IFS=$as_save_IFS
- +
- +fi
- +fi
- +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
- +if test -n "$ac_ct_MANIFEST_TOOL"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
- +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
- +else
- + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- +$as_echo "no" >&6; }
- +fi
- +
- + if test "x$ac_ct_MANIFEST_TOOL" = x; then
- + MANIFEST_TOOL=":"
- + else
- + case $cross_compiling:$ac_tool_warned in
- +yes:)
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- +ac_tool_warned=yes ;;
- +esac
- + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
- + fi
- +else
- + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
- +fi
- +
- +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
- +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
- +if ${lt_cv_path_mainfest_tool+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_path_mainfest_tool=no
- + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
- + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
- + cat conftest.err >&5
- + if $GREP 'Manifest Tool' conftest.out > /dev/null; then
- + lt_cv_path_mainfest_tool=yes
- + fi
- + rm -f conftest*
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
- +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- +if test "x$lt_cv_path_mainfest_tool" != xyes; then
- + MANIFEST_TOOL=:
- +fi
- +
- +
- +
- +
- +
-
- case $host_os in
- rhapsody* | darwin*)
- @@ -6838,6 +7331,8 @@ _LT_EOF
- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
- echo "$AR cru libconftest.a conftest.o" >&5
- $AR cru libconftest.a conftest.o 2>&5
- + echo "$RANLIB libconftest.a" >&5
- + $RANLIB libconftest.a 2>&5
- cat > conftest.c << _LT_EOF
- int main() { return 0;}
- _LT_EOF
- @@ -7300,7 +7795,8 @@ fi
- LIBTOOL_DEPS="$ltmain"
-
- # Always use our own libtool.
- -LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- +LIBTOOL='$(SHELL) $(top_builddir)'
- +LIBTOOL="$LIBTOOL/${host_alias}-libtool"
-
-
-
- @@ -7389,7 +7885,7 @@ aix3*)
- esac
-
- # Global variables:
- -ofile=libtool
- +ofile=${host_alias}-libtool
- can_build_shared=yes
-
- # All known linkers require a `.a' archive for static linking (except MSVC,
- @@ -7687,8 +8183,6 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
-
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- -$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-
- if test "$GCC" = yes; then
- lt_prog_compiler_wl='-Wl,'
- @@ -7854,6 +8348,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='--shared'
- lt_prog_compiler_static='--static'
- ;;
- + nagfor*)
- + # NAG Fortran compiler
- + lt_prog_compiler_wl='-Wl,-Wl,,'
- + lt_prog_compiler_pic='-PIC'
- + lt_prog_compiler_static='-Bstatic'
- + ;;
- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- @@ -7916,7 +8416,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- lt_prog_compiler_pic='-KPIC'
- lt_prog_compiler_static='-Bstatic'
- case $cc_basename in
- - f77* | f90* | f95*)
- + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- lt_prog_compiler_wl='-Qoption ld ';;
- *)
- lt_prog_compiler_wl='-Wl,';;
- @@ -7973,13 +8473,17 @@ case $host_os in
- lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
- ;;
- esac
- -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- -$as_echo "$lt_prog_compiler_pic" >&6; }
- -
- -
- -
- -
-
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- +if ${lt_cv_prog_compiler_pic+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
- +$as_echo "$lt_cv_prog_compiler_pic" >&6; }
- +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
- #
- # Check to make sure the PIC flag actually works.
- @@ -8040,6 +8544,11 @@ fi
-
-
-
- +
- +
- +
- +
- +
- #
- # Check to make sure the static flag actually works.
- #
- @@ -8390,7 +8899,8 @@ _LT_EOF
- allow_undefined_flag=unsupported
- always_export_symbols=no
- enable_shared_with_static_runtimes=yes
- - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + 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'
- + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
- if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- @@ -8489,12 +8999,12 @@ _LT_EOF
- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- - archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
- + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- - $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
- @@ -8508,8 +9018,8 @@ _LT_EOF
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
- @@ -8527,8 +9037,8 @@ _LT_EOF
-
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8574,8 +9084,8 @@ _LT_EOF
-
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
- @@ -8705,7 +9215,13 @@ _LT_EOF
- allow_undefined_flag='-berok'
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - if test x$gcc_no_link = xyes; then
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test x$gcc_no_link = xyes; then
- as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
- fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -8721,22 +9237,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- 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"
- @@ -8748,7 +9271,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- else
- # Determine the default libpath from the value encoded in an
- # empty executable.
- - if test x$gcc_no_link = xyes; then
- + if test "${lt_cv_aix_libpath+set}" = set; then
- + aix_libpath=$lt_cv_aix_libpath
- +else
- + if ${lt_cv_aix_libpath_+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + if test x$gcc_no_link = xyes; then
- as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
- fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- @@ -8764,22 +9293,29 @@ main ()
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- -lt_aix_libpath_sed='
- - /Import File Strings/,/^$/ {
- - /^0/ {
- - s/^0 *\(.*\)$/\1/
- - p
- - }
- - }'
- -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -# Check for a 64-bit object if we didn't find anything.
- -if test -z "$aix_libpath"; then
- - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- -fi
- + lt_aix_libpath_sed='
- + /Import File Strings/,/^$/ {
- + /^0/ {
- + s/^0 *\([^ ]*\) *$/\1/
- + p
- + }
- + }'
- + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + # Check for a 64-bit object if we didn't find anything.
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- + fi
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- + if test -z "$lt_cv_aix_libpath_"; then
- + lt_cv_aix_libpath_="/usr/lib:/lib"
- + fi
- +
- +fi
- +
- + aix_libpath=$lt_cv_aix_libpath_
- +fi
-
- hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
- # Warning - without using the other run time loading flags,
- @@ -8824,20 +9360,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- # Microsoft Visual C++.
- # hardcode_libdir_flag_spec is actually meaningless, as there is
- # no search path for DLLs.
- - hardcode_libdir_flag_spec=' '
- - allow_undefined_flag=unsupported
- - # Tell ltmain to make .lib files, not .a files.
- - libext=lib
- - # Tell ltmain to make .dll files, not .so files.
- - shrext_cmds=".dll"
- - # FIXME: Setting linknames here is a bad hack.
- - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- - # The linker will automatically build a .lib file if we build a DLL.
- - old_archive_from_new_cmds='true'
- - # FIXME: Should let the user specify the lib program.
- - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- - fix_srcfile_path='`cygpath -w "$srcfile"`'
- - enable_shared_with_static_runtimes=yes
- + case $cc_basename in
- + cl*)
- + # Native MSVC
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + always_export_symbols=yes
- + file_list_spec='@'
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- + else
- + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- + fi~
- + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- + linknames='
- + # The linker will not automatically build a static lib if we build a DLL.
- + # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
- + enable_shared_with_static_runtimes=yes
- + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- + # Don't use ranlib
- + old_postinstall_cmds='chmod 644 $oldlib'
- + postlink_cmds='lt_outputfile="@OUTPUT@"~
- + lt_tool_outputfile="@TOOL_OUTPUT@"~
- + case $lt_outputfile in
- + *.exe|*.EXE) ;;
- + *)
- + lt_outputfile="$lt_outputfile.exe"
- + lt_tool_outputfile="$lt_tool_outputfile.exe"
- + ;;
- + esac~
- + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- + $RM "$lt_outputfile.manifest";
- + fi'
- + ;;
- + *)
- + # Assume MSVC wrapper
- + hardcode_libdir_flag_spec=' '
- + allow_undefined_flag=unsupported
- + # Tell ltmain to make .lib files, not .a files.
- + libext=lib
- + # Tell ltmain to make .dll files, not .so files.
- + shrext_cmds=".dll"
- + # FIXME: Setting linknames here is a bad hack.
- + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- + # The linker will automatically build a .lib file if we build a DLL.
- + old_archive_from_new_cmds='true'
- + # FIXME: Should let the user specify the lib program.
- + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
- + enable_shared_with_static_runtimes=yes
- + ;;
- + esac
- ;;
-
- darwin* | rhapsody*)
- @@ -8898,7 +9477,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
- - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- @@ -8906,7 +9485,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux9*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- else
- 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'
- fi
- @@ -8922,7 +9501,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
- hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
- fi
- @@ -8946,10 +9525,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- ia64*)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
- - archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
- else
- @@ -9028,26 +9607,39 @@ fi
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- - 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'
- + 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'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- - save_LDFLAGS="$LDFLAGS"
- - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- - if test x$gcc_no_link = xyes; then
- + # This should be the same for all languages, so no per-tag cache variable.
- + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
- +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
- +if ${lt_cv_irix_exported_symbol+:} false; then :
- + $as_echo_n "(cached) " >&6
- +else
- + save_LDFLAGS="$LDFLAGS"
- + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- + if test x$gcc_no_link = xyes; then
- as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
- fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- -int foo(void) {}
- +int foo (void) { return 0; }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- - 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'
- -
- + lt_cv_irix_exported_symbol=yes
- +else
- + lt_cv_irix_exported_symbol=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- - LDFLAGS="$save_LDFLAGS"
- + LDFLAGS="$save_LDFLAGS"
- +fi
- +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
- +$as_echo "$lt_cv_irix_exported_symbol" >&6; }
- + if test "$lt_cv_irix_exported_symbol" = yes; then
- + 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'
- + fi
- else
- 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'
- 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'
- @@ -9132,7 +9724,7 @@ rm -f core conftest.err conftest.$ac_objext \
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
- - 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'
- + 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'
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- else
- allow_undefined_flag=' -expect_unresolved \*'
- @@ -9151,9 +9743,9 @@ rm -f core conftest.err conftest.$ac_objext \
- no_undefined_flag=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- - archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- + archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- - $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
- + $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'
- else
- case `$CC -V 2>&1` in
- *"Compilers 5.0"*)
- @@ -9729,8 +10321,9 @@ cygwin* | mingw* | pw32* | cegcc*)
- need_version=no
- need_lib_prefix=no
-
- - case $GCC,$host_os in
- - yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
- + case $GCC,$cc_basename in
- + yes,*)
- + # gcc
- library_names_spec='$libname.dll.a'
- # DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- @@ -9763,13 +10356,71 @@ cygwin* | mingw* | pw32* | cegcc*)
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- ;;
- esac
- + dynamic_linker='Win32 ld.exe'
- + ;;
- +
- + *,cl*)
- + # Native MSVC
- + libname_spec='$name'
- + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- + library_names_spec='${libname}.dll.lib'
- +
- + case $build_os in
- + mingw*)
- + sys_lib_search_path_spec=
- + lt_save_ifs=$IFS
- + IFS=';'
- + for lt_path in $LIB
- + do
- + IFS=$lt_save_ifs
- + # Let DOS variable expansion print the short 8.3 style file name.
- + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
- + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
- + done
- + IFS=$lt_save_ifs
- + # Convert to MSYS style.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
- + ;;
- + cygwin*)
- + # Convert to unix form, then to dos form, then back to unix form
- + # but this time dos style (no spaces!) so that the unix form looks
- + # like /cygdrive/c/PROGRA~1:/cygdr...
- + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
- + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
- + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + ;;
- + *)
- + sys_lib_search_path_spec="$LIB"
- + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
- + # It is most probably a Windows format PATH.
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- + else
- + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
- + fi
- + # FIXME: find the short name or the path components, as spaces are
- + # common. (e.g. "Program Files" -> "PROGRA~1")
- + ;;
- + esac
- +
- + # DLL is installed to $(libdir)/../bin by postinstall_cmds
- + postinstall_cmds='base_file=`basename \${file}`~
- + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
- + dldir=$destdir/`dirname \$dlpath`~
- + test -d \$dldir || mkdir -p \$dldir~
- + $install_prog $dir/$dlname \$dldir/$dlname'
- + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- + dlpath=$dir/\$dldll~
- + $RM \$dlpath'
- + shlibpath_overrides_runpath=yes
- + dynamic_linker='Win32 link.exe'
- ;;
-
- *)
- + # Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
- + dynamic_linker='Win32 ld.exe'
- ;;
- esac
- - dynamic_linker='Win32 ld.exe'
- # FIXME: first we should search . and the directory the executable is in
- shlibpath_var=PATH
- ;;
- @@ -9851,7 +10502,7 @@ haiku*)
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib'
- + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
- hardcode_into_libs=yes
- ;;
-
- @@ -10665,7 +11316,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10668 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10709,10 +11360,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -10771,7 +11422,7 @@ else
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
- -#line 10774 "configure"
- +#line $LINENO "configure"
- #include "confdefs.h"
-
- #if HAVE_DLFCN_H
- @@ -10815,10 +11466,10 @@ else
- /* When -fvisbility=hidden is used, assume the code has been annotated
- correspondingly for the symbols needed. */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
- -void fnord () __attribute__((visibility("default")));
- +int fnord () __attribute__((visibility("default")));
- #endif
-
- -void fnord () { int i=42; }
- +int fnord () { return 42; }
- int main ()
- {
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
- @@ -12288,13 +12939,20 @@ exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
- lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
- lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
- lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
- +lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
- reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
- reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
- OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
- deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
- file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
- +file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
- +want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
- +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
- +sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
- AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
- AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
- +archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
- STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
- RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
- old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
- @@ -12309,14 +12967,17 @@ lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$de
- lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
- lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
- 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"`'
- +nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
- +lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
- objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
- MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
- -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
- +lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
- lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
- lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
- need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
- +MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
- DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
- NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
- LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
- @@ -12349,12 +13010,12 @@ hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_q
- hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
- inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
- link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
- -fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
- always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
- export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
- exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
- include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
- prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
- +postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
- file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
- variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
- need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
- @@ -12409,8 +13070,13 @@ reload_flag \
- OBJDUMP \
- deplibs_check_method \
- file_magic_cmd \
- +file_magic_glob \
- +want_nocaseglob \
- +DLLTOOL \
- +sharedlib_from_linklib_cmd \
- AR \
- AR_FLAGS \
- +archiver_list_spec \
- STRIP \
- RANLIB \
- CC \
- @@ -12420,12 +13086,14 @@ lt_cv_sys_global_symbol_pipe \
- lt_cv_sys_global_symbol_to_cdecl \
- lt_cv_sys_global_symbol_to_c_name_address \
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
- +nm_file_list_spec \
- lt_prog_compiler_no_builtin_flag \
- -lt_prog_compiler_wl \
- lt_prog_compiler_pic \
- +lt_prog_compiler_wl \
- lt_prog_compiler_static \
- lt_cv_prog_compiler_c_o \
- need_locks \
- +MANIFEST_TOOL \
- DSYMUTIL \
- NMEDIT \
- LIPO \
- @@ -12441,7 +13109,6 @@ no_undefined_flag \
- hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
- hardcode_libdir_separator \
- -fix_srcfile_path \
- exclude_expsyms \
- include_expsyms \
- file_list_spec \
- @@ -12477,6 +13144,7 @@ module_cmds \
- module_expsym_cmds \
- export_symbols_cmds \
- prelink_cmds \
- +postlink_cmds \
- postinstall_cmds \
- postuninstall_cmds \
- finish_cmds \
- @@ -13075,7 +13743,8 @@ $as_echo X"$file" |
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- -# 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- +# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- +# Inc.
- # Written by Gordon Matzigkeit, 1996
- #
- # This file is part of GNU Libtool.
- @@ -13178,19 +13847,42 @@ SP2NL=$lt_lt_SP2NL
- # turn newlines into spaces.
- NL2SP=$lt_lt_NL2SP
-
- +# convert \$build file names to \$host format.
- +to_host_file_cmd=$lt_cv_to_host_file_cmd
- +
- +# convert \$build files to toolchain format.
- +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
- +
- # An object symbol dumper.
- OBJDUMP=$lt_OBJDUMP
-
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
-
- -# Command to use when deplibs_check_method == "file_magic".
- +# Command to use when deplibs_check_method = "file_magic".
- file_magic_cmd=$lt_file_magic_cmd
-
- +# How to find potential files when deplibs_check_method = "file_magic".
- +file_magic_glob=$lt_file_magic_glob
- +
- +# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- +want_nocaseglob=$lt_want_nocaseglob
- +
- +# DLL creation program.
- +DLLTOOL=$lt_DLLTOOL
- +
- +# Command to associate shared and link libraries.
- +sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
- +
- # The archiver.
- AR=$lt_AR
- +
- +# Flags to create an archive.
- AR_FLAGS=$lt_AR_FLAGS
-
- +# How to feed a file listing to the archiver.
- +archiver_list_spec=$lt_archiver_list_spec
- +
- # A symbol stripping program.
- STRIP=$lt_STRIP
-
- @@ -13220,6 +13912,12 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- # Transform the output of nm in a C name address pair when lib prefix is needed.
- global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
- +# Specify filename containing input files for \$NM.
- +nm_file_list_spec=$lt_nm_file_list_spec
- +
- +# The root where to search for dependent libraries,and in which our libraries should be installed.
- +lt_sysroot=$lt_sysroot
- +
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-
- @@ -13229,6 +13927,9 @@ MAGIC_CMD=$MAGIC_CMD
- # Must we lock files when doing compilation?
- need_locks=$lt_need_locks
-
- +# Manifest tool.
- +MANIFEST_TOOL=$lt_MANIFEST_TOOL
- +
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
- DSYMUTIL=$lt_DSYMUTIL
-
- @@ -13343,12 +14044,12 @@ with_gcc=$GCC
- # Compiler flag to turn off builtin functions.
- no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
- -# How to pass a linker flag through the compiler.
- -wl=$lt_lt_prog_compiler_wl
- -
- # Additional compiler flags for building library objects.
- pic_flag=$lt_lt_prog_compiler_pic
-
- +# How to pass a linker flag through the compiler.
- +wl=$lt_lt_prog_compiler_wl
- +
- # Compiler flag to prevent dynamic linking.
- link_static_flag=$lt_lt_prog_compiler_static
-
- @@ -13435,9 +14136,6 @@ inherit_rpath=$inherit_rpath
- # Whether libtool must link a program against all its dependency libraries.
- link_all_deplibs=$link_all_deplibs
-
- -# Fix the shell variable \$srcfile for the compiler.
- -fix_srcfile_path=$lt_fix_srcfile_path
- -
- # Set to "yes" if exported symbols are required.
- always_export_symbols=$always_export_symbols
-
- @@ -13453,6 +14151,9 @@ include_expsyms=$lt_include_expsyms
- # Commands necessary for linking programs (against libraries) with templates.
- prelink_cmds=$lt_prelink_cmds
-
- +# Commands necessary for finishing linking programs.
- +postlink_cmds=$lt_postlink_cmds
- +
- # Specify filename containing input files.
- file_list_spec=$lt_file_list_spec
-
- @@ -13485,210 +14186,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
- # if finds mixed CR/LF and LF-only lines. Since sed operates in
- # text mode, it properly converts lines to CR/LF. This bash problem
- # is reportedly fixed, but why not run on old versions too?
- - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - case $xsi_shell in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_dirname_and_basename file append nondir_replacement
- -# perform func_basename and func_dirname in a single function
- -# call:
- -# dirname: Compute the dirname of FILE. If nonempty,
- -# add APPEND to the result, otherwise set result
- -# to NONDIR_REPLACEMENT.
- -# value returned in "$func_dirname_result"
- -# basename: Compute filename of FILE.
- -# value retuned in "$func_basename_result"
- -# Implementation must be kept synchronized with func_dirname
- -# and func_basename. For efficiency, we do not delegate to
- -# those functions but instead duplicate the functionality here.
- -func_dirname_and_basename ()
- -{
- - case ${1} in
- - */*) func_dirname_result="${1%/*}${2}" ;;
- - * ) func_dirname_result="${3}" ;;
- - esac
- - func_basename_result="${1##*/}"
- -}
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -func_stripname ()
- -{
- - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- - # positional parameters, so assign one to ordinary parameter first.
- - func_stripname_result=${3}
- - func_stripname_result=${func_stripname_result#"${1}"}
- - func_stripname_result=${func_stripname_result%"${2}"}
- -}
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=${1%%=*}
- - func_opt_split_arg=${1#*=}
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - case ${1} in
- - *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- - *) func_lo2o_result=${1} ;;
- - esac
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=${1%.*}.lo
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=$(( $* ))
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=${#1}
- -}
- -
- -_LT_EOF
- - ;;
- - *) # Bourne compatible functions.
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_dirname file append nondir_replacement
- -# Compute the dirname of FILE. If nonempty, add APPEND to the result,
- -# otherwise set result to NONDIR_REPLACEMENT.
- -func_dirname ()
- -{
- - # Extract subdirectory from the argument.
- - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- - if test "X$func_dirname_result" = "X${1}"; then
- - func_dirname_result="${3}"
- - else
- - func_dirname_result="$func_dirname_result${2}"
- - fi
- -}
- -
- -# func_basename file
- -func_basename ()
- -{
- - func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- -}
- -
- -
- -# func_stripname prefix suffix name
- -# strip PREFIX and SUFFIX off of NAME.
- -# PREFIX and SUFFIX must not contain globbing or regex special
- -# characters, hashes, percent signs, but SUFFIX may contain a leading
- -# dot (in which case that matches only a dot).
- -# func_strip_suffix prefix name
- -func_stripname ()
- -{
- - case ${2} in
- - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- - esac
- -}
- -
- -# sed scripts:
- -my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
- -my_sed_long_arg='1s/^-[^=]*=//'
- -
- -# func_opt_split
- -func_opt_split ()
- -{
- - func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
- - func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
- -}
- -
- -# func_lo2o object
- -func_lo2o ()
- -{
- - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- -}
- -
- -# func_xform libobj-or-source
- -func_xform ()
- -{
- - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
- -}
- -
- -# func_arith arithmetic-term...
- -func_arith ()
- -{
- - func_arith_result=`expr "$@"`
- -}
- -
- -# func_len string
- -# STRING may not start with a hyphen.
- -func_len ()
- -{
- - func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
- -}
- -
- -_LT_EOF
- -esac
- -
- -case $lt_shell_append in
- - yes)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1+=\$2"
- -}
- -_LT_EOF
- - ;;
- - *)
- - cat << \_LT_EOF >> "$cfgfile"
- -
- -# func_append var value
- -# Append VALUE to the end of shell variable VAR.
- -func_append ()
- -{
- - eval "$1=\$$1\$2"
- -}
- -
- -_LT_EOF
- - ;;
- - esac
- -
- -
- - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- - || (rm -f "$cfgfile"; exit 1)
- -
- - mv -f "$cfgfile" "$ofile" ||
- + sed '$q' "$ltmain" >> "$cfgfile" \
- + || (rm -f "$cfgfile"; exit 1)
- +
- + if test x"$xsi_shell" = xyes; then
- + sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
- +func_dirname ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_basename ()$/,/^} # func_basename /c\
- +func_basename ()\
- +{\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
- +func_dirname_and_basename ()\
- +{\
- +\ case ${1} in\
- +\ */*) func_dirname_result="${1%/*}${2}" ;;\
- +\ * ) func_dirname_result="${3}" ;;\
- +\ esac\
- +\ func_basename_result="${1##*/}"\
- +} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
- +func_stripname ()\
- +{\
- +\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
- +\ # positional parameters, so assign one to ordinary parameter first.\
- +\ func_stripname_result=${3}\
- +\ func_stripname_result=${func_stripname_result#"${1}"}\
- +\ func_stripname_result=${func_stripname_result%"${2}"}\
- +} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
- +func_split_long_opt ()\
- +{\
- +\ func_split_long_opt_name=${1%%=*}\
- +\ func_split_long_opt_arg=${1#*=}\
- +} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
- +func_split_short_opt ()\
- +{\
- +\ func_split_short_opt_arg=${1#??}\
- +\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
- +} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
- +func_lo2o ()\
- +{\
- +\ case ${1} in\
- +\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
- +\ *) func_lo2o_result=${1} ;;\
- +\ esac\
- +} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_xform ()$/,/^} # func_xform /c\
- +func_xform ()\
- +{\
- + func_xform_result=${1%.*}.lo\
- +} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_arith ()$/,/^} # func_arith /c\
- +func_arith ()\
- +{\
- + func_arith_result=$(( $* ))\
- +} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_len ()$/,/^} # func_len /c\
- +func_len ()\
- +{\
- + func_len_result=${#1}\
- +} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +fi
- +
- +if test x"$lt_shell_append" = xyes; then
- + sed -e '/^func_append ()$/,/^} # func_append /c\
- +func_append ()\
- +{\
- + eval "${1}+=\\${2}"\
- +} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
- +func_append_quoted ()\
- +{\
- +\ func_quote_for_eval "${2}"\
- +\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
- +} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- +test 0 -eq $? || _lt_function_replace_fail=:
- +
- +
- + # Save a `func_append' function call where possible by direct use of '+='
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +else
- + # Save a `func_append' function call even when '+=' is not available
- + sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- + && mv -f "$cfgfile.tmp" "$cfgfile" \
- + || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- + test 0 -eq $? || _lt_function_replace_fail=:
- +fi
- +
- +if test x"$_lt_function_replace_fail" = x":"; then
- + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
- +$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
- +fi
- +
- +
- + mv -f "$cfgfile" "$ofile" ||
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
- chmod +x "$ofile"
-
|