[Pkg-mono-svn-commits] rev 3283 - in non-group/banshee/trunk/debian: . patches
Sebastian Dröge
slomo at alioth.debian.org
Tue Aug 14 19:25:35 UTC 2007
Author: slomo
Date: 2007-08-14 19:25:31 +0000 (Tue, 14 Aug 2007)
New Revision: 3283
Removed:
non-group/banshee/trunk/debian/generic-artist.png.uue
non-group/banshee/trunk/debian/patches/05_wavpack-profile.patch
non-group/banshee/trunk/debian/patches/10_branch-0.12.x-2007-06-14.patch
Modified:
non-group/banshee/trunk/debian/banshee.install
non-group/banshee/trunk/debian/changelog
non-group/banshee/trunk/debian/patches/01_gst-inspect.patch
non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch
non-group/banshee/trunk/debian/patches/04_external-taglib-sharp.patch
non-group/banshee/trunk/debian/patches/99_autoreconf.patch
non-group/banshee/trunk/debian/rules
Log:
* New upstream release
* debian/banshee.install:
+ Add the new bookmarks plugin.
* debian/patches/05_wavpack-profile.patch,
debian/patches/10_branch-0.12.x-2007-06-14.patch:
+ Dropped, merged upstream.
* debian/patches/01_gst-inspect.patch,
debian/patches/03_fix_2.18_multimedia_keys.patch,
debian/patches/04_external-taglib-sharp.patch,
debian/patches/99_autoreconf.patch:
+ Updated for new upstream version.
* debian/rules,
debian/generic-artist.png.uue:
+ Dropped manual installation of that icon, it's upstream now.
Modified: non-group/banshee/trunk/debian/banshee.install
===================================================================
--- non-group/banshee/trunk/debian/banshee.install 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/banshee.install 2007-08-14 19:25:31 UTC (rev 3283)
@@ -12,6 +12,8 @@
debian/tmp/usr/lib/banshee/Banshee.Dap/
debian/tmp/usr/lib/banshee/Banshee.Plugins/Banshee.Plugins.Audioscrobbler.dll*
debian/tmp/etc/gconf/schemas/banshee-plugin-audioscrobbler.schemas
+debian/tmp/usr/lib/banshee/Banshee.Plugins/Banshee.Plugins.Bookmarks.dll*
+debian/tmp/etc/gconf/schemas/banshee-plugin-bookmarks.schemas
debian/tmp/usr/lib/banshee/Banshee.Plugins/Banshee.Plugins.MetadataSearch.dll*
debian/tmp/etc/gconf/schemas/banshee-plugin-metadatasearcher.schemas
debian/tmp/usr/lib/banshee/Banshee.Plugins/Banshee.Plugins.MiniMode.dll*
Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/changelog 2007-08-14 19:25:31 UTC (rev 3283)
@@ -1,3 +1,22 @@
+banshee (0.13.0+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/banshee.install:
+ + Add the new bookmarks plugin.
+ * debian/patches/05_wavpack-profile.patch,
+ debian/patches/10_branch-0.12.x-2007-06-14.patch:
+ + Dropped, merged upstream.
+ * debian/patches/01_gst-inspect.patch,
+ debian/patches/03_fix_2.18_multimedia_keys.patch,
+ debian/patches/04_external-taglib-sharp.patch,
+ debian/patches/99_autoreconf.patch:
+ + Updated for new upstream version.
+ * debian/rules,
+ debian/generic-artist.png.uue:
+ + Dropped manual installation of that icon, it's upstream now.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 14 Aug 2007 20:18:24 +0200
+
banshee (0.12.1+dfsg-5) unstable; urgency=low
* debian/control:
Deleted: non-group/banshee/trunk/debian/generic-artist.png.uue
===================================================================
--- non-group/banshee/trunk/debian/generic-artist.png.uue 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/generic-artist.png.uue 2007-08-14 19:25:31 UTC (rev 3283)
@@ -1,72 +0,0 @@
-begin 644 generic-artist.png
-MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!'-"250("`@(
-M?`ADB`````EP2%ES```-UP``#=<!0BB;>````!ET15AT4V]F='=A<F4`=W=W
-M+FEN:W-C87!E+F]R9YON/!H```M\241!5&B!U9E[C%S77<<_Y]ZY<^>Q,_N>
-M]3YLUXD?8#D138(=$?*B>%)"E8H6B at 0(I*2H`JFH0J"0()2D_:.*4*E0:3$U
-M"K0R`IS(3<"Q!<5"LO,2<;)H8V]L9Q_>\:YW=F>],W/G>1_G'/Z8V<VLL[9W
-MUW$B?M)/(^UY?3][?K_?.6=&:*WY_VS&IRW at 9BUTJR9^X[E$*@BL>X00^S#8
-MHC1O"*U.Q^<*9^[^.^U_7.N(CS.$3CR=[`Y;UO>$X!&TB%EARXO$XFTATS)J
-MU5+-<UU?*AD1AIB42CWUX'/YG]SLFA\;P,F_Z'Q,&,:/$LFN6-?`SK`52R+,
-M*"!`NB`$RB\CZPZU4H[<W.6*5OH_\>03O_CM0OY3`WC]R=Z$BNH7#&$\NFGK
-M[EA;WRZT]"#PT-)%21>T1*L`$`@A$"$;67>X<GG<+5?*5:7XG0>^M7CL4P%X
-M[=F>?X_%D_LWW;[7-J-=**\(6B&$"4*`UF at 5H*6'EG6T7T,%-805P[1B5!8S
-MS,W.5*46#SWXS86WU[O^356AD\]T_Z8AC%_JWWZO;=AQE+N(,"R,<`+#3F+8
-M[<W/!$:X#<-J0UAQC%`$[97P2]/$N[?2TY.*FD*]>/R/A/V)`9SX\[X^`0?[
-MMNZ)&9%VM%_!",4:0L,MXL-+WH:P8AA6%!&*(DP;M"8H9TFDMHF(;??$.[N>
-M7Z^.#8?0:\_U_%NBO?OSX4W[K(E+\\Q7(D3")EL'.MFVN1\[$@-A-.)?NBB_
-MBO;+2+?,].5Y)F<=KE1-VO0"GQGL9*`#9C,7JEK(^^]_IO#N+06X=[.([G_X
-MCM+`OJ^:J4V#V+9-H5!@86&!J:DI)B<G,?T"6WIMT`JM`H3VZ1ZXG1UW?9Z.
-MSBZ"(&!A88&%A05F9F;(3%U$%$?UW=W3!YXZ7/FZUEK>$@`AQ(^`WWWSS3>)
-MQ^/D<KEE(;E<CFPVR_CX.(5"@='143RW3CQJXRO!Z=.GJ=?K'QF3R628F)B@
-M6"QR_OQY7-<=UEK?M18]&SF))R.6R)=*I4XI)8[CX#@.^7R>(T>.,#HZ2A`$
-M`/S<[MMX\6^^0=*6?/MO7Z9<+E.M5I?'9+-9#ATZ1":369Z\(R:T"R?6*F;=
-M2:RU?O8_GNSZU^'3;ZT0?_#@049&1I;%`WSQ<W?1VVYCF8HG?NUNWGCC]17B
-M#QPXL$(\P--?;/-//MWS5[<,`,`TV=ZQ\`JY7`['<3AV[!A34U,K^MPVU,/7
-M?GTORBNA_1J;.FT*8R?(Y_,XCL-++[W$XN+BBC$/W-'-?3]CUQ!Z\UJU;. at R
-MIY5^:^_`E8>/OWW(/+O8PZE3IU:T[]S:P]\_^QN$10WE*;1TT4&-QW^YE^?_
-MY8>,Y=LX<^;,BC'[=B7XSN_OI+9P+EISPV=O*8`4^G_<6K7\>P\GVM\[=X&N
-M+VSA;*9*5T><>WYV at -_ZE3N)1&R4ZS2KD(\.ZH2TRU-?ZN'4<(8AW<^Y2R6V
-M=)OLW1'E2P_MPO<J7$;,I?\R6[FE`"'#?"<(`DO5'79O3;![<PS#BB.L*,*,
-M('0%Y;HM5PF_<94(:FB_QB_LBG+O;7UHOVUY3L.*X!:S`.NZ3FPH!^Y[)G=9
-M:>W[]2*&&4;[591?07EEE%=">0[*7?(BRBTU_UYI]`NJ:+^V/)\(11%&B&K)
-MJ;F!>NV6`P`$@?CK^=E,%4"8X1;QI1;A1:3K-(&:;7X9[54`U51O$$H,4LM/
-M4Z[5@\R">_ at 3`?C3?UQ\OEKW9_)S$]J,=8-TT<OB':3K()L0RBTV(+P2VJ\"
-M'QZ>H5@*%=28O3Q=/3\CGWK\A[7L)P)`_]VQ'[R]]<I\KB!<9XY0^U80)MHO
-M-\46&S#-<-)^!53K2U)@QGHQ["39Z7$N+H86OO:"<Y3EK5F;;2B)]^_??V]7
-M5]>KHY=FDC^Q(GQ93+)YLT^T8S/2+2`K.=#!-<>+4(108A`=>,Q>/,.5Q3+?
-M?W.@[[[[MO^395E?``IKU;+NNU`ZG4Y+*8]<N'`AWM'1P>+B(M_;OT#74(QD
-M,DEJ\'8,*X;R*^B at WJ@\2B)"$43(Q at A%$:$(]>(,F:D,7MGC])C)=]\*T=W=
-M[0X.#F9MV_[Y8\>.Y3YV@'0Z_3DIY2L7+ER(IU(IIJ>GF9^?YSMIN*-?(+K;
-ML-O"='=U84<3A*,)#"N",$*HH$[@5G%K#M52D:)3H3!;(>)Z'#IC,ASLPG$<
-MHM&H-S0TE(G%8GN/'CUZP[?RF@'2Z?0]01#\=R:3:6MO;V=L;`S'<0#XZF?A
-MB<]"H0YNV,*(AXFU65AA`0A,TT!*A9*:6DV2+_B8E3IMIJ;=AC\\#N]?";%K
-MURYJM1KA<-CM[^\?Z^GIN>OPX</>]72M*0<>>^RQF)3RY<G)R;;.SDY&1T>I
-MU^O+[<?'X!OW-FK+.[,^KW[@\]MW@"_!L$.8EL"M2I"*>@#?/`D'?A4Z(I"O
-MP7MS``'OO_\^V[=O1TII%XO%SQB&\23PK>MI6U,5JE0JW\_E<EV)1(*IJ:D5
-MX@%F2O#V#'1&X(5A.#$!AH#N*"0(B'@^'9:B)P:G,C!?@:,7&@!'SGTXCU**
-M#S[X@&@T2C:;C0-_MG___BTW!9!.IW=HK;^2S^>CGN=]Y`:Y9'_R4RAY,#('
-MOH)W9Z$WWN*QAK\SV^A_-@<C\_`/_[MR'JTU$Q,3]/7UD<ED+*74 at 9L""(+@
-MF=G9V7`JE>+BQ8O7['>E!E]Y"60SI4Y.04]3=*H)`3#6Y#]W!?[@U=7G*I?+
-MY/-YE%)6$`0/I-/I](8`'GWT4=LPC"]+*4-S<W.XKGN][EQLJ=ZG+S?":#`)
-M at PG8G&S\UY>L6&_XM>S2I4LDDTFFIJ;B4LJ#&P+P?7]GO5[W(I$(Q6+QNN*O
-M- at V\<AY,`2&C`?-?$VL?+Z5D=G86(01`ZI%''EGUD7-=`,,P=E>K52,2B5"M
-M5M<AOV$OMR:HAA.3ZQOO.`[)9!+'<3REU-Y5-5YO`BGEG4$0Q.OU.DJMZXH"
-MP.N7/@R3L[E&GJS'JM4JEF51*!0201`\O%J?&X70/J64J-76N7+3E(;AYMUR
-M9&Y#4U`NEU%*":WU at T*(V-7MUP000H0`R_=]PN'PQE8'WFT"O#>_L?%**3S/
-M0PC1"T2$$"O$7&\'PL#)<#@<Q&(?`5^S#3?K_D9WP+9M#,-`2CD#V$U?ME4!
-MA!`&$*I4*N\D$HFZE))()+(A`3>[`[9M8UD62JE)&E<?4S1+$UQ[!P1 at C(V-
-MO1>+Q>Q2J40JE=J0@(L%.#,/BQM(HV0RB>_[1"(17VL]WM2[Y,#U0T at 7BT77
-M==V3X7#8[^WMW?`N_'AD_6.$$*12*;+9+'U]?2J3R1RG<;QH6EYMJP(TOQF6
-M@!P;&WNZKZ_/+10*;-NVC5!H_8^X?SYSXSZM%@J%V+)E"Y[G,3`PX%:KU1]/
-M3T_/+FFBY5%]O1WP`2^;S<Z5R^7G!@8&:DHI]NS90WM[.RUA>$-;:_B8IDEO
-M;R][]NS!\SQLV_8[.CJ*(R,C!YMZ?*#6^H:YYH.FF2AQH`V([]V[]_%X//['
-MV6S6-DU3V+9-N5S&\SRDE&LZZ%:#- at P#R[((A\-$HU$<QZ%4*C$T-%2+Q6+C
-MHZ.C7U]86)@!*H`#E-<$T%S06`(`XCMV[+BSO[__NT!O/I\W/<\+:ZW16J\)
-M8+6UM-:-7RX;<#J52M5LVY;5:O7%X>'A'_B^7VH17[IZCAL^*9L0<2"VY$-#
-M0SO[^OH>LFW[?B%$IVF:<2%$I-EW>>C5PEMV0+>T22EE62FUJ)2Z5"@4?CH^
-M/OZ6[_MEH-IT!ZBLIG7-;V(A1*0)$FUZI,67#I at P8-&LUTT7+3"JZ0&-9/0!
-M#W";G_46KS7%%X#@FJ&^GF\EFGEATP at KNT5\N$5\*X!Q#8"E:K*4F%X+B`LL
-MA8U_PPC9R(]\S5`(\>%NK";^:@#=XDL`00M$K2FZKM<AZO\`[\<?ZIF?D'@`
-+````245.1*Y"8((`
-`
-end
Modified: non-group/banshee/trunk/debian/patches/01_gst-inspect.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/01_gst-inspect.patch 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/patches/01_gst-inspect.patch 2007-08-14 19:25:31 UTC (rev 3283)
@@ -1,13 +1,12 @@
--- configure.ac.old 2007-06-14 22:52:40.000000000 +0200
+++ configure.ac 2007-06-14 22:52:44.000000000 +0200
-@@ -23,15 +23,6 @@
+@@ -23,14 +23,6 @@
BANSHEE_CHECK_LIBBANSHEE
BANSHEE_CHECK_NAUTILUS_BURN
BANSHEE_CHECK_GSTREAMER
-SHAMROCK_CHECK_GSTREAMER_0_10_PLUGINS([
- decodebin
- playbin
-- cdparanoia
- gnomevfssink
- gnomevfssrc
- audioconvert
Modified: non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/patches/03_fix_2.18_multimedia_keys.patch 2007-08-14 19:25:31 UTC (rev 3283)
@@ -1,6 +1,16 @@
-diff -Nur banshee-0.12.0+dfsg/src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs banshee-0.12.0+dfsg.new/src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs
---- banshee-0.12.0+dfsg/src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs 2007-01-02 05:25:56.000000000 +1100
-+++ banshee-0.12.0+dfsg.new/src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs 2007-03-30 16:55:44.000000000 +1000
+--- src/Plugins/Banshee.Plugins.MMKeys/Makefile.am.old 2007-06-14 22:53:21.000000000 +0200
++++ src/Plugins/Banshee.Plugins.MMKeys/Makefile.am 2007-06-14 22:53:38.000000000 +0200
+@@ -13,7 +13,7 @@
+ $(srcdir)/MMKeysConfigPage.cs
+
+ $(ASSEMBLY): $(ASSEMBLY_SOURCES)
+- $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
++ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
+
+ include $(top_srcdir)/build/gconf-schema-rules
+
+--- src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs.old 2007-08-14 21:14:19.000000000 +0200
++++ src/Plugins/Banshee.Plugins.MMKeys/MMKeysPlugin.cs 2007-08-14 21:17:55.000000000 +0200
@@ -2,6 +2,7 @@
* MMKeysPlugin.cs
*
@@ -9,7 +19,7 @@
****************************************************************************/
/* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
-@@ -31,90 +32,112 @@
+@@ -31,6 +32,8 @@
using Gdk;
using Mono.Unix;
@@ -18,21 +28,7 @@
using Banshee.Base;
using Banshee.Configuration;
- public static class PluginModuleEntry
- {
-- public static Type [] GetTypes()
-- {
-- return new Type [] {
-- typeof(Banshee.Plugins.MMKeys.MMKeysPlugin)
-- };
-- }
-+ public static Type [] GetTypes()
-+ {
-+ return new Type [] {
-+ typeof(Banshee.Plugins.MMKeys.MMKeysPlugin)
-+ };
-+ }
- }
+@@ -46,10 +49,22 @@
namespace Banshee.Plugins.MMKeys
{
@@ -48,49 +44,29 @@
+
public class MMKeysPlugin : Banshee.Plugins.Plugin
{
-- protected override string ConfigurationName { get { return "mmkeys"; } }
++ private const string BusName = "org.gnome.SettingsDaemon";
++ private const string ObjectPath = "/org/gnome/SettingsDaemon";
+ protected override string ConfigurationName { get { return "mmkeys"; } }
- public override string DisplayName { get { return Catalog.GetString("Multimedia Keys"); } }
--
-+ private const string BusName = "org.gnome.SettingsDaemon";
-+ private const string ObjectPath = "/org/gnome/SettingsDaemon";
-+
-+ protected override string ConfigurationName { get { return "mmkeys"; } }
-+ public override string DisplayName { get { return Catalog.GetString("Multimedia Keys"); } }
-+
++ public override string DisplayName { get { return Catalog.GetString("Multimedia Keys"); } }
+
public override string Description {
-- get {
-- return Catalog.GetString(
-- "Adds support for multimedia keys configured through GNOME."
-- );
-- }
-- }
--
-- public override string [] Authors {
-- get {
-- return new string [] {
+ get {
+@@ -62,63 +77,67 @@
+ public override string [] Authors {
+ get {
+ return new string [] {
- "Danilo Reinhardt"
-- };
-- }
-- }
-+ get {
-+ return Catalog.GetString("Adds support for multimedia keys configured through GNOME.");
-+ }
-+ }
-+
-+ public override string [] Authors {
-+ get {
-+ return new string [] {
-+ "Danilo Reinhardt",
-+ "Jan Arne Petersen"
-+ };
-+ }
-+ }
-+
-+ private ISettingsDaemon settings_daemon;
++ "Danilo Reinhardt",
++ "Jan Arne Petersen"
+ };
+ }
+ }
- private SpecialKeys special_keys;
--
- protected override void PluginInitialize()
++ private ISettingsDaemon settings_daemon;
+
+- protected override void PluginInitialize()
- {
- special_keys = new SpecialKeys();
- special_keys.Delay = new TimeSpan(500 * TimeSpan.TicksPerMillisecond);
@@ -98,7 +74,8 @@
- special_keys.RegisterHandler(OnSpecialKeysPressed,
- SpecialKey.AudioPlay,
- SpecialKey.AudioPrev,
-- SpecialKey.AudioNext
+- SpecialKey.AudioNext,
+- SpecialKey.AudioStop
- );
- }
-
@@ -114,6 +91,9 @@
- case SpecialKey.AudioPrev:
- Globals.ActionManager["PreviousAction"].Activate();
- break;
+- case SpecialKey.AudioStop:
+- PlayerEngineCore.Close();
+- break;
- }
- }
-
@@ -137,70 +117,59 @@
- "Plugin enabled",
- "Multimedia Keys plugin enabled"
- );
-+ {
-+ settings_daemon = Bus.Session.GetObject<ISettingsDaemon>(BusName, new ObjectPath(ObjectPath));;
++ protected override void PluginInitialize()
++ {
++ settings_daemon = Bus.Session.GetObject<ISettingsDaemon>(BusName, new ObjectPath(ObjectPath));;
+
-+ settings_daemon.GrabMediaPlayerKeys("Banshee", 0);
-+ settings_daemon.MediaPlayerKeyPressed += OnMediaPlayerKeyPressed;
-+ }
++ settings_daemon.GrabMediaPlayerKeys("Banshee", 0);
++ settings_daemon.MediaPlayerKeyPressed += OnMediaPlayerKeyPressed;
++ }
+
-+ protected override void InterfaceInitialize()
-+ {
-+ InterfaceElements.MainWindow.FocusInEvent += OnFocusInEvent;
-+ }
++ protected override void InterfaceInitialize()
++ {
++ InterfaceElements.MainWindow.FocusInEvent += OnFocusInEvent;
++ }
+
-+ private void OnMediaPlayerKeyPressed(string application, string key)
-+ {
-+ if (application != "Banshee") {
-+ return;
-+ }
-+ switch(key) {
-+ case "Play":
-+ Globals.ActionManager["PlayPauseAction"].Activate();
-+ break;
-+ case "Next":
-+ Globals.ActionManager["NextAction"].Activate();
-+ break;
-+ case "Previous":
-+ Globals.ActionManager["PreviousAction"].Activate();
-+ break;
-+ }
++ private void OnMediaPlayerKeyPressed(string application, string key)
++ {
++ if (application != "Banshee") {
++ return;
+ }
-+
-+ private void OnFocusInEvent(object o, FocusInEventArgs args)
-+ {
-+ settings_daemon.GrabMediaPlayerKeys("Banshee", 0);
++ switch(key) {
++ case "Play":
++ Globals.ActionManager["PlayPauseAction"].Activate();
++ break;
++ case "Next":
++ Globals.ActionManager["NextAction"].Activate();
++ break;
++ case "Previous":
++ Globals.ActionManager["PreviousAction"].Activate();
++ break;
+ }
++ }
+
++ private void OnFocusInEvent(object o, FocusInEventArgs args)
++ {
++ settings_daemon.GrabMediaPlayerKeys("Banshee", 0);
++ }
+
-+ protected override void PluginDispose()
-+ {
-+ InterfaceElements.MainWindow.FocusInEvent -= OnFocusInEvent;
-+ settings_daemon.MediaPlayerKeyPressed -= OnMediaPlayerKeyPressed;
-+ settings_daemon.ReleaseMediaPlayerKeys("Banshee");
-+ }
++ protected override void PluginDispose()
++ {
++ InterfaceElements.MainWindow.FocusInEvent -= OnFocusInEvent;
++ settings_daemon.MediaPlayerKeyPressed -= OnMediaPlayerKeyPressed;
++ settings_daemon.ReleaseMediaPlayerKeys("Banshee");
++ }
+
-+ public override Gtk.Widget GetConfigurationWidget()
-+ {
-+ return new MMKeysConfigPage();
-+ }
++ public override Gtk.Widget GetConfigurationWidget()
++ {
++ return new MMKeysConfigPage();
++ }
+
-+ public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool>(
-+ "plugins.mmkeys", "enabled",
-+ false,
-+ "Plugin enabled",
-+ "Multimedia Keys plugin enabled"
-+ );
++ public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool>(
++ "plugins.mmkeys", "enabled",
++ false,
++ "Plugin enabled",
++ "Multimedia Keys plugin enabled"
++ );
}
}
---- banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.am.old 2007-06-14 22:53:21.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.am 2007-06-14 22:53:38.000000000 +0200
-@@ -13,7 +13,7 @@
- $(srcdir)/MMKeysConfigPage.cs
-
- $(ASSEMBLY): $(ASSEMBLY_SOURCES)
-- $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-+ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(LINK_DBUS) $(LINK_GTK) $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-
- include $(top_srcdir)/build/gconf-schema-rules
-
Modified: non-group/banshee/trunk/debian/patches/04_external-taglib-sharp.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/04_external-taglib-sharp.patch 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/patches/04_external-taglib-sharp.patch 2007-08-14 19:25:31 UTC (rev 3283)
@@ -21,36 +21,6 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
---- ext/taglib-sharp/Makefile.am.old 2007-06-14 23:08:25.000000000 +0200
-+++ ext/taglib-sharp/Makefile.am 2007-06-14 23:10:43.000000000 +0200
-@@ -3,20 +3,23 @@
- ASSEMBLY_NAME = TagLib
- ASSEMBLY = $(ASSEMBLY_NAME).dll
-
--taglibdir = $(pkglibdir)
--taglib_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
--
- ASSEMBLY_SOURCES = \
- $(srcdir)/TagLib/*.cs \
- $(srcdir)/TagLib/*/*.cs \
- $(srcdir)/TagLib/*/*/*.cs
-
-+if !EXTERNAL_TAGLIB_SHARP
-+taglibdir = $(pkglibdir)
-+taglib_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
-+
- all: $(ASSEMBLY)
-
- $(ASSEMBLY): $(ASSEMBLY_SOURCES)
- $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-
-+endif
-+
- EXTRA_DIST = $(ASSEMBLY_SOURCES)
--CLEANFILES = $(taglib_SCRIPTS)
-+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
- MAINTAINERCLEANFILES = Makefile.in
-
--- configure.ac.old 2007-06-14 23:05:07.000000000 +0200
+++ configure.ac 2007-06-14 23:05:30.000000000 +0200
@@ -63,6 +63,9 @@
@@ -83,165 +53,31 @@
+])
+
---- src/Core/Banshee.Base/Gui/TrackEditor.cs 2007/02/03 23:01:46 2064
-+++ src/Core/Banshee.Base/Gui/TrackEditor.cs 2007/05/08 17:46:59 2263
-@@ -334,13 +334,9 @@
- } catch {
- }*/
-
-- if(file.AudioProperties != null) {
-- track.Bitrate = file.AudioProperties.Bitrate;
-- track.SampleRate = file.AudioProperties.SampleRate;
-- track.Channels = file.AudioProperties.Channels;
-- } else {
-- throw new Exception();
-- }
-+ track.Bitrate = file.Properties.AudioBitrate;
-+ track.SampleRate = file.Properties.AudioSampleRate;
-+ track.Channels = file.Properties.AudioChannels;
- } catch(Exception) {
- track.Bitrate = -1;
- }
---- src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs 2007/01/01 18:25:08 1901
-+++ src/Dap/Banshee.Dap.Ipod/DatabaseRebuilder.cs 2007/06/04 00:04:04 2296
-@@ -114,20 +114,20 @@
-
- private void ProcessTrack(FileInfo file)
- {
-- TagLib.File af = TagLib.File.Create(file.FullName);
-+ TagLib.File af = Banshee.IO.IOProxy.OpenFile(file.FullName);
- Track song = dap.Device.TrackDatabase.CreateTrack();
+--- ext/taglib-sharp/Makefile.am.old 2007-08-14 21:10:41.000000000 +0200
++++ ext/taglib-sharp/Makefile.am 2007-08-14 21:11:44.000000000 +0200
+@@ -3,17 +3,21 @@
+ ASSEMBLY_NAME = TagLib
+ ASSEMBLY = $(ASSEMBLY_NAME).dll
- song.FileName = file.FullName;
- song.Album = af.Tag.Album;
-- song.Artist = af.Tag.Artists[0];
-+ song.Artist = af.Tag.FirstArtist;
- song.Title = af.Tag.Title;
- song.Genre = af.Tag.Genres[0];
- song.TrackNumber = (int)af.Tag.Track;
- song.TotalTracks = (int)af.Tag.TrackCount;
-- song.Duration = af.AudioProperties.Duration;
-+ song.Duration = af.Properties.Duration;
- song.Year = (int)af.Tag.Year;
-- song.BitRate = af.AudioProperties.Bitrate / 1024;
-- song.SampleRate = (ushort)af.AudioProperties.SampleRate;
-+ song.BitRate = af.Properties.AudioBitrate / 1024;
-+ song.SampleRate = (ushort)af.Properties.AudioSampleRate;
- }
-
- private void SaveDatabase()
-
---- src/Core/Banshee.Base/FileTrackInfo.cs 2007/01/01 18:17:10 1897
-+++ src/Core/Banshee.Base/FileTrackInfo.cs 2007/06/04 00:04:04 2296
-@@ -49,7 +49,7 @@
- ParsePath(uri.LocalPath);
- track_id = 0;
-
-- TagLib.File file = TagLib.File.Create(uri.LocalPath);
-+ TagLib.File file = Banshee.IO.IOProxy.OpenFile(uri.LocalPath);
-
- artist = Choose(file.Tag.JoinedArtists, artist);
- album = Choose(file.Tag.Album, album);
-@@ -57,7 +57,7 @@
- genre = Choose(file.Tag.FirstGenre, genre);
- track_number = file.Tag.Track == 0 ? track_number : (uint)file.Tag.Track;
- track_count = file.Tag.TrackCount == 0 ? track_count : (uint)file.Tag.TrackCount;
-- duration = file.AudioProperties.Duration;
-+ duration = file.Properties.Duration;
- year = (int)file.Tag.Year;
++include $(srcdir)/TagLib/TagLib.sources
++
++if !EXTERNAL_TAGLIB_SHARP
++
+ taglibdir = $(pkglibdir)
+ taglib_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
- this.date_added = DateTime.Now;
-
---- src/Core/Banshee.Base/IO/IOProxy.cs 2007/01/15 08:24:04 1986
-+++ src/Core/Banshee.Base/IO/IOProxy.cs 2007/06/04 00:04:04 2296
-@@ -58,7 +58,16 @@
-
- file = (IFile)Activator.CreateInstance(config.FileBackend);
- directory = (IDirectory)Activator.CreateInstance(config.DirectoryBackend);
-- TagLib.File.SetFileAbstractionCreator(TagLibVfsCreator);
-+ }
-+
-+ public static TagLib.File OpenFile(string file, string mimetype, TagLib.ReadStyle readStyle)
-+ {
-+ return TagLib.File.Create(TagLibVfsCreator (file), mimetype, readStyle);
-+ }
-+
-+ public static TagLib.File OpenFile(string file)
-+ {
-+ return TagLib.File.Create(TagLibVfsCreator (file));
- }
-
- private static TagLib.File.IFileAbstraction TagLibVfsCreator(string file)
-
-
---- src/Core/Banshee.Base/StreamTagger.cs 2007/01/19 19:42:45 2011
-+++ src/Core/Banshee.Base/StreamTagger.cs 2007/06/04 00:04:04 2296
-@@ -83,8 +83,8 @@
- }
- }
+-include $(srcdir)/TagLib/TagLib.sources
+-
+ all: $(ASSEMBLY)
-- return TagLib.File.Create(uri.IsLocalPath ? uri.LocalPath : uri.AbsoluteUri,
-- mimetype, TagLib.AudioProperties.ReadStyle.Average);
-+ return Banshee.IO.IOProxy.OpenFile(uri.IsLocalPath ? uri.LocalPath : uri.AbsoluteUri,
-+ mimetype, TagLib.ReadStyle.Average);
- }
-
- private static string Choose(string priority, string fallback)
-@@ -103,9 +103,7 @@
- track.Year = (int)file.Tag.Year;
- track.MimeType = file.MimeType;
-
-- if(file.AudioProperties != null) {
-- track.Duration = file.AudioProperties.Duration;
-- }
-+ track.Duration = file.Properties.Duration;
- }
-
- public static void TrackInfoMerge(TrackInfo track, StreamTag tag)
-
---- src/Core/Banshee.Base/IO/Unix.cs 2007/01/01 18:17:10 1897
-+++ src/Core/Banshee.Base/IO/Unix.cs 2007/05/23 17:42:18 2281
-@@ -180,6 +180,11 @@
- file_info = new UnixFileInfo(path);
- }
-
-+ public void CloseStream(Stream stream)
-+ {
-+ stream.Close();
-+ }
-+
- public string Name {
- get { return file_info.FullName; }
- }
-
---- src/Core/Banshee.Base/IO/GnomeVfs.cs 2007/01/01 18:17:10 1897
-+++ src/Core/Banshee.Base/IO/GnomeVfs.cs 2007/05/23 17:42:18 2281
-@@ -165,6 +165,11 @@
- | FileInfoOptions.GetAccessRights).Permissions;
- }
-
-+ public void CloseStream(System.IO.Stream stream)
-+ {
-+ stream.Close();
-+ }
-+
- public string Name {
- get { return name; }
- }
-
---- src/Core/Banshee.Base/IO/SystemIO.cs 2007/01/01 18:17:10 1897
-+++ src/Core/Banshee.Base/IO/SystemIO.cs 2007/05/23 17:42:18 2281
-@@ -111,6 +111,11 @@
- {
- file_info = new FileInfo(path);
- }
-+
-+ public void CloseStream(Stream stream)
-+ {
-+ stream.Close();
-+ }
-
- public string Name {
- get { return file_info.FullName; }
-
+ $(ASSEMBLY): $(TAGLIB_CSFILES)
+ $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(TAGLIB_CSFILES)
+
++endif
++
+ EXTRA_DIST = $(TAGLIB_CSFILES) $(srcdir)/TagLib/TagLib.sources
+-CLEANFILES = $(taglib_SCRIPTS)
++CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
+ MAINTAINERCLEANFILES = Makefile.in
+
Deleted: non-group/banshee/trunk/debian/patches/05_wavpack-profile.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/05_wavpack-profile.patch 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/patches/05_wavpack-profile.patch 2007-08-14 19:25:31 UTC (rev 3283)
@@ -1,31 +0,0 @@
---- banshee/data/audio-profiles/wavpack.xml.in 2007/01/24 20:48:20 2036
-+++ banshee/data/audio-profiles/wavpack.xml.in 2007/06/12 18:06:25 2307
-@@ -15,10 +15,10 @@
- (gst-construct-element "wavpackenc"
- "mode" mode
- (if (cast-bool lossy_mode)
-- ("bitrate" (* bitrate 1000.0))
-+ ("bitrate" (* bitrate 1000))
- ("" ""))
- "md5" (cast-bool md5_sum)
-- "extra-processing" (cast-bool extra_processing))
-+ "extra-processing" extra_processing)
- (if (gst-element-is-available "apev2mux")
- "apev2mux"
- (if (gst-element-is-available "id3v2mux")
-@@ -49,8 +49,13 @@
- </variable>
- <variable id="extra_processing">
- <_name>Extra processing</_name>
-- <control-type>check</control-type>
-+ <control-type>slider</control-type>
- <default-value>0</default-value>
-+ <min-value>0</min-value>
-+ <_min-label>Default</_min-label>
-+ <max-value>6</max-value>
-+ <_max-label>Highest</_max-label>
-+ <step-value>1</step-value>
- </variable>
- <variable id="bitrate">
- <_name>Bitrate</_name>
-
Deleted: non-group/banshee/trunk/debian/patches/10_branch-0.12.x-2007-06-14.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/10_branch-0.12.x-2007-06-14.patch 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/patches/10_branch-0.12.x-2007-06-14.patch 2007-08-14 19:25:31 UTC (rev 3283)
@@ -1,376 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog (Revision 2190)
-+++ ChangeLog (Revision 2327)
-@@ -1,3 +1,41 @@
-+2007-04-23 Aaron Bockover <abock at gnome.org>
-+
-+ * src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs:
-+ Load generic-artist.png in place of the artist photo if there's a problem
-+ loading the artist photo from last.fm (BGO #432200); cosmetic string
-+ changes; round the similarity value to the nearest whole percentage;
-+ introduce a cache wipe/versioning system to allow the cache to be wiped
-+ if the code to parse it changes later on (see NOTE in code) - everyone
-+ will start out with a clean cache after this update at version 2
-+
-+ * src/Plugins/Banshee.Plugins.Recommendation/RecommendationPlugin.cs:
-+ Added schema for cache_version
-+
-+ * src/Plugins/Banshee.Plugins.Recommendation/generic-artist.png: Added
-+ a musician to display if an artist photo cannot be loaded from last.fm
-+
-+2007-04-18 Aaron Bockover <abock at gnome.org>
-+
-+ Crash/Bug patches backported from trunk
-+
-+ * src/Plugins/Banshee.Plugins.Daap/DaapSource.cs: Crash fix (BGO #406923,
-+ Eric Butler)
-+
-+ * src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs: Resolve PSP Audio
-+ Device Properties crash (BGO #419163, Jason Conti)
-+
-+ * src/Plugins/Banshee.Plugins.Recommendation/RecommendationUtilities.cs:
-+ Prevent reco cache from getting corrupt (BGO #381229, Pepijn van de Geer)
-+
-+ * src/Core/Banshee.Base/Dap/Dap.cs: Fixed NJB syncing (BGO #405289,
-+ Mitch Reierson)
-+
-+ * src/Core/Banshee.Base/Banshee.AudioProfiles.Gui/ProfileComboBox.cs:
-+ Do not forget profile setting (BGO #410498, Lauri Kotilainen)
-+
-+ * src/Core/Banshee.Base/Gui/SourceView.cs: Ensure sources that are not
-+ CanActivate really can't be activated (BGO #415138, Scott Peterson)
-+
- 2007-04-01 Aaron Bockover <abock at gnome.org>
-
- 0.12.1 Released
-Index: src/Plugins/Banshee.Plugins.Recommendation/generic-artist.png
-===================================================================
-Kann nicht anzeigen: Dateityp ist als binär angegeben.
-svn:mime-type = application/octet-stream
-
-Eigenschaftsänderungen: src/Plugins/Banshee.Plugins.Recommendation/generic-artist.png
-___________________________________________________________________
-Name: svn:mime-type
- + application/octet-stream
-
-Index: src/Plugins/Banshee.Plugins.Recommendation/RecommendationUtilities.cs
-===================================================================
---- src/Plugins/Banshee.Plugins.Recommendation/RecommendationUtilities.cs (Revision 2190)
-+++ src/Plugins/Banshee.Plugins.Recommendation/RecommendationUtilities.cs (Revision 2327)
-@@ -94,7 +94,7 @@
- HttpWebResponse response = (HttpWebResponse)request.GetResponse();
- Stream stream = response.GetResponseStream();
-
-- FileStream file_stream = File.OpenWrite(path);
-+ FileStream file_stream = File.Open(path, FileMode.Create);
- BufferedStream buffered_stream = new BufferedStream(file_stream);
-
- byte [] buffer = new byte[8192];
-Index: src/Plugins/Banshee.Plugins.Recommendation/RecommendationPlugin.cs
-===================================================================
---- src/Plugins/Banshee.Plugins.Recommendation/RecommendationPlugin.cs (Revision 2190)
-+++ src/Plugins/Banshee.Plugins.Recommendation/RecommendationPlugin.cs (Revision 2327)
-@@ -274,5 +274,12 @@
- "Plugin enabled",
- "Recommendation plugin enabled"
- );
-+
-+ public static readonly SchemaEntry<int> CacheVersion = new SchemaEntry<int>(
-+ "plugins.recommendation", "cache_version",
-+ 0,
-+ "Cache version",
-+ "Version of the cache layout on disk, located at ~/.config/banshee/plugins/recommendation"
-+ );
- }
- }
-Index: src/Plugins/Banshee.Plugins.Recommendation/Makefile.am
-===================================================================
---- src/Plugins/Banshee.Plugins.Recommendation/Makefile.am (Revision 2190)
-+++ src/Plugins/Banshee.Plugins.Recommendation/Makefile.am (Revision 2327)
-@@ -9,16 +9,20 @@
- $(srcdir)/RecommendationPane.cs \
- $(srcdir)/RecommendationUtilities.cs
-
--MENU_RESOURCE = RecommendationMenu.xml
--NO_RESULTS_RESOURCE = no-results.png
-+RESOURCES = \
-+ RecommendationMenu.xml \
-+ no-results.png \
-+ generic-artist.png
-
-+RESOURCES_BUILD = $(foreach resource,$(RESOURCES),$(addprefix -resource:,$(resource)),$(notdir $(resource)))
-+
- plugindir = $(pkglibdir)/Banshee.Plugins
- plugin_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
-
- all: $(ASSEMBLY)
-
--$(ASSEMBLY): $(SOURCES)
-- $(BUILD_LIB_BANSHEE_CORE) -out:$@ -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) -resource:$(srcdir)/$(NO_RESULTS_RESOURCE),$(NO_RESULTS_RESOURCE) $(SOURCES) $(LINK_GTK) $(LINK_MONO_UNIX) -r:System.Web
-+$(ASSEMBLY): $(SOURCES) $(RESOURCES)
-+ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(RESOURCES_BUILD) $(SOURCES) $(LINK_GTK) $(LINK_MONO_UNIX) -r:System.Web
-
- include $(top_srcdir)/build/gconf-schema-rules
-
-Index: src/Plugins/Banshee.Plugins.Recommendation/banshee-plugin-recommendation.schemas.in
-===================================================================
---- src/Plugins/Banshee.Plugins.Recommendation/banshee-plugin-recommendation.schemas.in (Revision 2190)
-+++ src/Plugins/Banshee.Plugins.Recommendation/banshee-plugin-recommendation.schemas.in (Revision 2327)
-@@ -2,6 +2,17 @@
- <gconfschemafile>
- <schemalist>
- <schema>
-+ <key>/schemas/apps/banshee/plugins/recommendation/cache_version</key>
-+ <applyto>/apps/banshee/plugins/recommendation/cache_version</applyto>
-+ <owner>banshee</owner>
-+ <type>int</type>
-+ <default>0</default>
-+ <locale name="C">
-+ <short>Cache version</short>
-+ <long>Version of the cache layout on disk, located at ~/.config/banshee/plugins/recommendation</long>
-+ </locale>
-+ </schema>
-+ <schema>
- <key>/schemas/apps/banshee/plugins/recommendation/enabled</key>
- <applyto>/apps/banshee/plugins/recommendation/enabled</applyto>
- <owner>banshee</owner>
-Index: src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs
-===================================================================
---- src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs (Revision 2190)
-+++ src/Plugins/Banshee.Plugins.Recommendation/RecommendationPane.cs (Revision 2327)
-@@ -1,7 +1,7 @@
- /***************************************************************************
- * RecommendationPane.cs
- *
-- * Copyright (C) 2006 Novell, Inc.
-+ * Copyright (C) 2006-2007 Novell, Inc.
- * Written by Fredrik Hedberg
- * Aaron Bockover
- * Lukas Lipka
-@@ -44,6 +44,12 @@
- {
- public class RecommendationPane : Frame
- {
-+ // NOTE: This is a precaution that will allow us to introduce changes in the cache system
-+ // without breaking the app when it expects new changes and encounters old cache data.
-+ // Whenever a fix or cache update is made in the code, increment this value to ensure
-+ // old cache data is wiped first.
-+ private const int CACHE_VERSION = 2;
-+
- private const string AUDIOSCROBBLER_SIMILAR_URL = "http://ws.audioscrobbler.com/1.0/artist/{0}/similar.xml";
- private const string AUDIOSCROBBLER_TOP_TRACKS_URL = "http://ws.audioscrobbler.com/1.0/artist/{0}/toptracks.xml";
- private const string AUDIOSCROBBLER_TOP_ALBUMS_URL = "http://ws.audioscrobbler.com/1.0/artist/{0}/topalbums.xml";
-@@ -68,8 +74,30 @@
- public RecommendationPane()
- {
- CreateWidget();
-+ CheckForCacheWipe();
-+ SetupCache();
-+ }
-
-+ private void CheckForCacheWipe()
-+ {
-+ bool wipe = false;
-+
- if(!Directory.Exists(Utilities.CACHE_PATH)) {
-+ return;
-+ }
-+
-+ if(RecommendationPlugin.CacheVersion.Get() < CACHE_VERSION) {
-+ Directory.Delete(Utilities.CACHE_PATH, true);
-+ LogCore.Instance.PushDebug("Recommendation Plugin", "Destroyed outdated cache");
-+ }
-+ }
-+
-+ private void SetupCache()
-+ {
-+ bool clean = false;
-+
-+ if(!Directory.Exists(Utilities.CACHE_PATH)) {
-+ clean = true;
- Directory.CreateDirectory(Utilities.CACHE_PATH);
- }
-
-@@ -86,6 +114,12 @@
- Directory.CreateDirectory(subdir);
- }
- }
-+
-+ RecommendationPlugin.CacheVersion.Set(CACHE_VERSION);
-+
-+ if(clean) {
-+ LogCore.Instance.PushDebug("Recommendation Plugin", "Created a new cache layout");
-+ }
- }
-
- private void CreateWidget()
-@@ -327,9 +361,14 @@
- artist_tile.PrimaryText = node.SelectSingleNode("name").InnerText.Trim();
-
- // translators: 25% similarity
-- artist_tile.SecondaryText = String.Format(Catalog.GetString("{0}% similarity"),
-- node.SelectSingleNode("match").InnerText);
--
-+ try {
-+ int similarity = (int)Math.Round(Double.Parse(node.SelectSingleNode("match").InnerText));
-+ artist_tile.SecondaryText = String.Format(Catalog.GetString("{0}% similarity"), similarity);
-+ } catch {
-+ // Reusing strings that already exist to keep string freeze
-+ artist_tile.SecondaryText = String.Format(Catalog.GetString("{0}% similarity"), Catalog.GetString("Unknown"));
-+ }
-+
- artist_tile.Clicked += delegate {
- Gnome.Url.Show(node.SelectSingleNode ("url").InnerText);
- };
-@@ -339,6 +378,8 @@
-
- private static Gdk.Pixbuf now_playing_arrow = IconThemeUtils.LoadIcon(16, "media-playback-start",
- Stock.MediaPlay, "now-playing-arrow");
-+
-+ private static Gdk.Pixbuf unknown_artist_pixbuf = null;
-
- private Widget RenderTrack(XmlNode node, int rank)
- {
-@@ -394,7 +435,22 @@
- {
- string path = Utilities.GetCachedPathFromUrl(url);
- Utilities.DownloadContent(url, path, true);
-- return new Gdk.Pixbuf(path);
-+
-+ try {
-+ return new Gdk.Pixbuf(path);
-+ } catch {
-+ // Remove the corrupt image so it may be downloaded again
-+ try {
-+ File.Delete(path);
-+ } catch {
-+ }
-+
-+ if(unknown_artist_pixbuf == null) {
-+ unknown_artist_pixbuf = Gdk.Pixbuf.LoadFromResource("generic-artist.png");
-+ }
-+
-+ return unknown_artist_pixbuf;
-+ }
- }
- }
- }
-Index: src/Plugins/Banshee.Plugins.Daap/DaapSource.cs
-===================================================================
---- src/Plugins/Banshee.Plugins.Daap/DaapSource.cs (Revision 2190)
-+++ src/Plugins/Banshee.Plugins.Daap/DaapSource.cs (Revision 2327)
-@@ -87,9 +87,9 @@
- SetStatusMessage(String.Format(Catalog.GetString("Connecting to {0}"), Name));
-
- ThreadAssist.Spawn(delegate {
-- client = new Client(service);
-- client.Updated += OnClientUpdated;
- try {
-+ client = new Client(service);
-+ client.Updated += OnClientUpdated;
- if(client.AuthenticationMethod == AuthenticationMethod.None) {
- client.Login();
- } else {
-Index: src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs
-===================================================================
---- src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs (Revision 2190)
-+++ src/Dap/Banshee.Dap.MassStorage/MassStorageDap.cs (Revision 2327)
-@@ -173,8 +173,11 @@
- List<string> mimetypes = new List<string>();
- foreach(string format in PlaybackFormats) {
- string codec = Banshee.Dap.CodecType.GetCodec(format);
-- extensions.AddRange(CodecType.GetExtensions(codec));
-- mimetypes.AddRange(CodecType.GetMimeTypes(codec));
-+
-+ if(codec != null) {
-+ extensions.AddRange(CodecType.GetExtensions(codec));
-+ mimetypes.AddRange(CodecType.GetMimeTypes(codec));
-+ }
- }
-
- SupportedExtensions = extensions.ToArray();
-Index: src/Core/Banshee.Base/Gui/SourceView.cs
-===================================================================
---- src/Core/Banshee.Base/Gui/SourceView.cs (Revision 2190)
-+++ src/Core/Banshee.Base/Gui/SourceView.cs (Revision 2327)
-@@ -304,7 +304,6 @@
- if(iter.Equals(TreeIter.Zero)) {
- return;
- }
--
- renderer.Editable = true;
- SetCursor(store.GetPath(iter), focus_column, true);
- renderer.Editable = false;
-@@ -319,9 +318,13 @@
- }
-
- Source source = GetSource(path);
--
-- if(evnt.Button == 1 && evnt.Type == EventType.TwoButtonPress) {
-+ if(evnt.Button == 1) {
- if(!source.CanActivate) {
-+ if(!source.Expanded) {
-+ ExpandRow(path, false);
-+ } else {
-+ CollapseRow(path);
-+ }
- return false;
- }
-
-@@ -329,9 +332,10 @@
- SourceManager.SetActiveSource(source);
- }
-
-- OnSourceDoubleClicked();
--
-- return false;
-+ if(evnt.Type == EventType.TwoButtonPress) {
-+ OnSourceDoubleClicked();
-+ }
-+
- } else if(evnt.Button == 3) {
- HighlightPath(path);
-
-Index: src/Core/Banshee.Base/Banshee.AudioProfiles.Gui/ProfileComboBox.cs
-===================================================================
---- src/Core/Banshee.Base/Banshee.AudioProfiles.Gui/ProfileComboBox.cs (Revision 2190)
-+++ src/Core/Banshee.Base/Banshee.AudioProfiles.Gui/ProfileComboBox.cs (Revision 2327)
-@@ -65,6 +65,7 @@
-
- public void ReloadProfiles()
- {
-+ Profile active_profile = ActiveProfile;
- TreeIter active_iter;
- store.Clear();
-
-@@ -99,6 +100,7 @@
- if(store.IterNthChild(out active_iter, 0)) {
- SetActiveIter(active_iter);
- }
-+ ActiveProfile = active_profile;
- }
-
- public void SetActiveProfile(Profile profile)
-Index: src/Core/Banshee.Base/Dap/Dap.cs
-===================================================================
---- src/Core/Banshee.Base/Dap/Dap.cs (Revision 2190)
-+++ src/Core/Banshee.Base/Dap/Dap.cs (Revision 2327)
-@@ -383,7 +383,7 @@
- Queue remove_queue = new Queue();
-
- foreach(TrackInfo track in Tracks) {
-- if(track == null || track.Uri == null) {
-+ if(track == null || track.Uri == null || !track.Uri.IsFile) {
- continue;
- }
-
-
-Eigenschaftsänderungen: ext/taglib-sharp
-___________________________________________________________________
-Name: svn:externals
- - TagLib svn://svn.myrealbox.com/source/tags/taglib-sharp-banshee-0.11.7/src/TagLib
-
- + TagLib svn://anonsvn.mono-project.com/source/tags/taglib-sharp-banshee-0.11.7/src/TagLib
-
-
Modified: non-group/banshee/trunk/debian/patches/99_autoreconf.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/99_autoreconf.patch 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/patches/99_autoreconf.patch 2007-08-14 19:25:31 UTC (rev 3283)
@@ -1,6 +1,6 @@
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/aclocal.m4 banshee-0.12.1+dfsg/aclocal.m4
---- banshee-0.12.1+dfsg.old/aclocal.m4 2007-04-01 07:43:53.000000000 +0200
-+++ banshee-0.12.1+dfsg/aclocal.m4 2007-06-14 23:26:45.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/aclocal.m4 banshee-0.13.0+dfsg/aclocal.m4
+--- banshee-0.13.0+dfsg.old/aclocal.m4 2007-08-05 23:42:24.000000000 +0200
++++ banshee-0.13.0+dfsg/aclocal.m4 2007-08-14 21:23:00.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
@@ -11,7 +11,7 @@
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-@@ -11,4121 +11,3708 @@
+@@ -11,4144 +11,3772 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -32,23 +32,10 @@
- *)
- ;;
-esac
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl you should install foo.schemas files
-+dnl
-
+-
-if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
-
+-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
@@ -57,8 +44,12 @@
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
-fi
-+ AC_ARG_WITH(gconf-source,
-+ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -78,8 +69,13 @@
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -99,16 +95,15 @@
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-AC_SUBST(INTLTOOL_SERVICE_RULE)
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
++ AC_ARG_WITH(gconf-source,
++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-# Use the tools built into the package, not the ones that are installed.
-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-+ AC_ARG_WITH(gconf-schema-file-dir,
-+ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
@@ -125,13 +120,44 @@
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
- fi
-fi
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
-AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
++ AC_ARG_WITH(gconf-schema-file-dir,
++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
+
+-# Substitute ALL_LINGUAS so we can use it in po/Makefile
+-AC_SUBST(ALL_LINGUAS)
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
+- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr],
+- [DATADIRNAME=share],
+- [case $host in
+- *-*-solaris*)
+- dnl On Solaris, if bind_textdomain_codeset is in libc,
+- dnl GNU format message catalog is always supported,
+- dnl since both are added to the libc all together.
+- dnl Hence, we'd like to go with DATADIRNAME=share
+- dnl in this case.
+- AC_CHECK_FUNC(bind_textdomain_codeset,
+- [DATADIRNAME=share], [DATADIRNAME=lib])
+- ;;
+- *)
+- [DATADIRNAME=lib]
+- ;;
+- esac])
+-fi
+-AC_SUBST(DATADIRNAME)
+ AC_ARG_ENABLE(schemas-install,
+ [ --disable-schemas-install Disable the schemas installation],
+ [case ${enableval} in
@@ -141,9 +167,6 @@
+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])
--# Substitute ALL_LINGUAS so we can use it in po/Makefile
--AC_SUBST(ALL_LINGUAS)
--
-IT_PO_SUBDIR([po])
+# Configure paths for GLIB
+# Owen Taylor 1997-2001
@@ -267,26 +290,16 @@
-])dnl
-])
-
-
+-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
--
+
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 48 AC_PROG_LIBTOOL
--
--
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If this macro is not defined by Autoconf, define it here.
--m4_ifdef([AC_PROVIDE_IFELSE],
-- [],
-- [m4_define([AC_PROVIDE_IFELSE],
-- [m4_ifdef([AC_PROVIDE_$1],
-- [$2], [$3])])])
+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+ :
+ else
@@ -299,6 +312,16 @@
+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+- [],
+- [m4_define([AC_PROVIDE_IFELSE],
+- [m4_ifdef([AC_PROVIDE_$1],
+- [$2], [$3])])])
+-
+-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
@@ -563,7 +586,20 @@
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
--
++# GLIB_LC_MESSAGES
++#--------------------
++glib_DEFUN([GLIB_LC_MESSAGES],
++ [AC_CHECK_HEADERS([locale.h])
++ if test $ac_cv_header_locale_h = yes; then
++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
++ if test $am_cv_val_LC_MESSAGES = yes; then
++ AC_DEFINE(HAVE_LC_MESSAGES, 1,
++ [Define if your <locale.h> file defines LC_MESSAGES.])
++ fi
++ fi])
+
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
@@ -573,7 +609,19 @@
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
-- ;;
++# GLIB_PATH_PROG_WITH_TEST
++#----------------------------
++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++ /*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
@@ -634,38 +682,12 @@
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-+# GLIB_LC_MESSAGES
-+#--------------------
-+glib_DEFUN([GLIB_LC_MESSAGES],
-+ [AC_CHECK_HEADERS([locale.h])
-+ if test $ac_cv_header_locale_h = yes; then
-+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-+ if test $am_cv_val_LC_MESSAGES = yes; then
-+ AC_DEFINE(HAVE_LC_MESSAGES, 1,
-+ [Define if your <locale.h> file defines LC_MESSAGES.])
-+ fi
-+ fi])
-
+-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
-+# GLIB_PATH_PROG_WITH_TEST
-+#----------------------------
-+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-+dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-+[# Extract the first word of "$2", so it can be a program name with args.
-+set dummy $2; ac_word=[$]2
-+AC_MSG_CHECKING([for $ac_word])
-+AC_CACHE_VAL(ac_cv_path_$1,
-+[case "[$]$1" in
-+ /*)
-+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-+ ;;
*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
@@ -863,7 +885,7 @@
+ AC_CHECK_FUNCS(dcgettext)
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
-+ GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
@@ -1540,7 +1562,7 @@
- rm -rf conftest*
- ;;
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 35 IT_PROG_INTLTOOL
++# serial 36 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL],
+[AC_PREREQ([2.50])dnl
@@ -1591,6 +1613,7 @@
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
@@ -1643,6 +1666,7 @@
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
+
+# Use the tools built into the package, not the ones that are installed.
+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
@@ -1671,11 +1695,6 @@
- ifelse([$5], , :, [$5])
-else
- ifelse([$6], , :, [$6])
-+AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv)
-+AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
-+AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
-+AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
@@ -1797,10 +1816,6 @@
+for file in intltool-extract intltool-merge intltool-update; do
+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-+ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-+ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-+ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-+ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+ < ${ac_aux_dir}/${file}.in > ${file}.out
+ if cmp -s ${file} ${file}.out 2>/dev/null; then
@@ -1820,9 +1835,7 @@
+],
+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
- # This has been around since 386BSD, at least. Likely further.
@@ -1928,19 +1941,19 @@
- AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-
-
-# _LT_AC_CHECK_DLFCN
-# ------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ---------------------------------------------------------------------
@@ -1954,14 +1967,14 @@
- cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#include <stdio.h>
++# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
-#ifdef RTLD_GLOBAL
-# define LT_DLGLOBAL RTLD_GLOBAL
@@ -1972,14 +1985,6 @@
-# define LT_DLGLOBAL 0
-# endif
-#endif
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+ [],
-+ [m4_define([AC_PROVIDE_IFELSE],
-+ [m4_ifdef([AC_PROVIDE_$1],
-+ [$2], [$3])])])
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
- find out it does not work in some platform. */
@@ -2002,10 +2007,24 @@
-# endif
-# endif
-#endif
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++ [],
++ [m4_define([AC_PROVIDE_IFELSE],
++ [m4_ifdef([AC_PROVIDE_$1],
++ [$2], [$3])])])
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
+
+-void fnord() { int i=42;}
+-int main ()
+-{
+- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+- int status = $lt_dlunknown;
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
@@ -2022,11 +2041,14 @@
+ [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
--void fnord() { int i=42;}
--int main ()
--{
-- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-- int status = $lt_dlunknown;
+- if (self)
+- {
+- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- /* dlclose (self); */
+- }
+- else
+- puts (dlerror ());
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
@@ -2045,15 +2067,6 @@
+ defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
-- if (self)
-- {
-- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-- /* dlclose (self); */
-- }
-- else
-- puts (dlerror ());
-
- exit (status);
-}]
-EOF
@@ -2072,6 +2085,7 @@
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
@@ -2080,9 +2094,6 @@
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# AC_LIBTOOL_DLOPEN_SELF
-# ----------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
@@ -2094,9 +2105,8 @@
-else
- lt_cv_dlopen=no
- lt_cv_dlopen_libs=
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- case $host_os in
- beos*)
@@ -2104,19 +2114,32 @@
- lt_cv_dlopen_libs=
- lt_cv_dlopen_self=yes
- ;;
-+# Prevent multiple expansion
-+define([AC_PROG_LIBTOOL], [])
-+])# _AC_PROG_LIBTOOL
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
- mingw* | pw32*)
- lt_cv_dlopen="LoadLibrary"
- lt_cv_dlopen_libs=
- ;;
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])# _AC_PROG_LIBTOOL
- cygwin*)
- lt_cv_dlopen="dlopen"
- lt_cv_dlopen_libs=
- ;;
+
+- darwin*)
+- # if libdl is installed we need to link against it
+- AC_CHECK_LIB([dl], [dlopen],
+- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+- lt_cv_dlopen="dyld"
+- lt_cv_dlopen_libs=
+- lt_cv_dlopen_self=yes
+- ])
+- ;;
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
@@ -2131,22 +2154,6 @@
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
-- darwin*)
-- # if libdl is installed we need to link against it
-- AC_CHECK_LIB([dl], [dlopen],
-- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
-- ])
-- ;;
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+AC_REQUIRE([AC_OBJEXT])dnl
-+AC_REQUIRE([AC_EXEEXT])dnl
-+dnl
-
- *)
- AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
@@ -2167,17 +2174,31 @@
- ])
- ;;
- esac
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
- enable_dlopen=no
+- fi
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
+
+- case $lt_cv_dlopen in
+- dlopen)
+- save_CPPFLAGS="$CPPFLAGS"
+- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
-+
+
+- save_LDFLAGS="$LDFLAGS"
+- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
@@ -2186,38 +2207,25 @@
+ if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
- fi
++ fi
+ ;;
+esac
-- case $lt_cv_dlopen in
-- dlopen)
-- save_CPPFLAGS="$CPPFLAGS"
-- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+- save_LIBS="$LIBS"
+- LIBS="$lt_cv_dlopen_libs $LIBS"
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-- save_LDFLAGS="$LDFLAGS"
-- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-- save_LIBS="$LIBS"
-- LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
- AC_CACHE_CHECK([whether a program can dlopen itself],
- lt_cv_dlopen_self, [dnl
- _LT_AC_TRY_DLOPEN_SELF(
- lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
- lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
- ])
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
- if test "x$lt_cv_dlopen_self" = xyes; then
- wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
@@ -2228,28 +2236,24 @@
- lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
- ])
- fi
-+# Constants:
-+rm="rm -f"
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
- ;;
- esac
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
- case $lt_cv_dlopen_self in
- yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
- *) enable_dlopen_self=unknown ;;
- esac
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
++# Constants:
++rm="rm -f"
- case $lt_cv_dlopen_self_static in
- yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
@@ -2257,12 +2261,16 @@
- esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-+AC_CHECK_TOOL(AR, ar, false)
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+AC_CHECK_TOOL(STRIP, strip, :)
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
@@ -2277,23 +2285,9 @@
- cd conftest
- mkdir out
- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
- lt_compiler_flag="-o out/conftest2.$ac_objext"
- # Insert the option either (1) after the last *FLAGS variable, or
@@ -2330,29 +2324,36 @@
- $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
-+if test -n "$RANLIB"; then
-+ case $host_os in
-+ openbsd*)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+ ;;
-+ *)
-+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+ ;;
-+ esac
-+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-+_LT_CC_BASENAME([$compiler])
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
@@ -2368,20 +2369,24 @@
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
- need_locks=warn
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+ AC_PATH_MAGIC
- fi
+- fi
-else
- need_locks=no
--fi
++if test -n "$RANLIB"; then
++ case $host_os in
++ openbsd*)
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ ;;
++ *)
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ ;;
++ esac
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
--
-+ ;;
-+esac
++_LT_CC_BASENAME([$compiler])
+
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
@@ -2397,15 +2402,19 @@
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++ AC_PATH_MAGIC
++ fi
++ ;;
++esac
+
+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+enable_win32_dll=yes, enable_win32_dll=no)
-+AC_ARG_ENABLE([libtool-lock],
-+ [AC_HELP_STRING([--disable-libtool-lock],
-+ [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
@@ -2415,12 +2424,10 @@
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
- test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+AC_ARG_WITH([pic],
-+ [AC_HELP_STRING([--with-pic],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [pic_mode="$withval"],
-+ [pic_mode=default])
-+test -z "$pic_mode" && pic_mode=default
++AC_ARG_ENABLE([libtool-lock],
++ [AC_HELP_STRING([--disable-libtool-lock],
++ [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- # We can hardcode non-existant directories.
- if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -2441,11 +2448,12 @@
- _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-+# Use C for the default configuration in the libtool script
-+tagname=
-+AC_LIBTOOL_LANG_C_CONFIG
-+_LT_AC_TAGCONFIG
-+])# AC_LIBTOOL_SETUP
++AC_ARG_WITH([pic],
++ [AC_HELP_STRING([--with-pic],
++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++ [pic_mode="$withval"],
++ [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
- # Fast installation is not supported
@@ -2456,11 +2464,12 @@
- enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
@@ -2489,12 +2498,14 @@
- esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
@@ -2529,20 +2540,22 @@
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_AC_SYS_COMPILER
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
-case $host_os in
-aix3*)
- version_type=linux
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
- shlibpath_var=LIBPATH
--
+
- # AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
@@ -2615,8 +2628,9 @@
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
@@ -2646,8 +2660,9 @@
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
@@ -2682,12 +2697,20 @@
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
-+}'`; fi],[])
++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
+])# _LT_AC_SYS_LIBPATH_AIX
@@ -2929,7 +2952,9 @@
- # HP-UX runs *really* slowly unless shared libraries are mode 555.
- postinstall_cmds='chmod 555 $lib'
- ;;
--
++ done
++fi
+
-interix3*)
- version_type=linux
- need_lib_prefix=no
@@ -2941,8 +2966,16 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-+ done
-+fi
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ :
++else
++ # The Solaris, AIX, and Digital Unix default echo programs unquote
++ # backslashes. This makes it impossible to quote backslashes using
++ # echo "$something" | sed 's/\\/\\\\/g'
++ #
++ # So, first we look for a working echo in the user's PATH.
-irix5* | irix6* | nonstopux*)
- case $host_os in
@@ -2980,21 +3013,6 @@
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- hardcode_into_libs=yes
- ;;
-+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-+ echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-+ test "X$echo_testing_string" = "X$echo_test_string"; then
-+ :
-+else
-+ # The Solaris, AIX, and Digital Unix default echo programs unquote
-+ # backslashes. This makes it impossible to quote backslashes using
-+ # echo "$something" | sed 's/\\/\\\\/g'
-+ #
-+ # So, first we look for a working echo in the user's PATH.
-
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
-- dynamic_linker=no
-- ;;
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
@@ -3008,20 +3026,10 @@
+ done
+ IFS="$lt_save_ifs"
--# This must be Linux ELF.
--linux*)
-- version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=no
-- # This implies no fast_install, which is unacceptable.
-- # Some rework will be needed to allow for fast_install
-- # before this can be enabled.
-- hardcode_into_libs=yes
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+- dynamic_linker=no
+- ;;
+ if test "X$echo" = Xecho; then
+ # We didn't find a better echo, so look for alternatives.
+ if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
@@ -3063,11 +3071,20 @@
+ # maybe with a smaller string...
+ prev=:
-- # Append ld.so.conf contents to the search path
-- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-- fi
+-# This must be Linux ELF.
+-linux*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- # This implies no fast_install, which is unacceptable.
+- # Some rework will be needed to allow for fast_install
+- # before this can be enabled.
+- hardcode_into_libs=yes
+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
+ if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+ then
@@ -3076,6 +3093,24 @@
+ prev="$cmd"
+ done
+- # Append ld.so.conf contents to the search path
+- if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ if test "$prev" != 'sed 50q "[$]0"'; then
++ echo_test_string=`eval $prev`
++ export echo_test_string
++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++ else
++ # Oops. We lost completely, so just stick with echo.
++ echo=echo
++ fi
++ fi
++ fi
+ fi
++fi
++fi
+
- # We used to test for /lib/ld.so.1 and disable shared libraries on
- # powerpc, because MkLinux only supported shared libraries with the
- # GNU dynamic linker. Since this was broken with cross compilers,
@@ -3084,7 +3119,13 @@
- # assume the GNU/Linux dynamic linker is in use.
- dynamic_linker='GNU/Linux ld.so'
- ;;
--
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
+
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
@@ -3096,7 +3137,9 @@
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
--
++AC_SUBST(ECHO)
++])])# _LT_AC_PROG_ECHO_BACKSLASH
+
-netbsd*)
- version_type=sunos
- need_lib_prefix=no
@@ -3109,17 +3152,7 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- dynamic_linker='NetBSD ld.elf_so'
-+ if test "$prev" != 'sed 50q "[$]0"'; then
-+ echo_test_string=`eval $prev`
-+ export echo_test_string
-+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+ else
-+ # Oops. We lost completely, so just stick with echo.
-+ echo=echo
-+ fi
-+ fi
-+ fi
- fi
+- fi
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
@@ -3131,7 +3164,7 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
--
+
-nto-qnx*)
- version_type=linux
- need_lib_prefix=no
@@ -3141,8 +3174,13 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- ;;
-+fi
-+fi
++# _LT_AC_LOCK
++# -----------
++AC_DEFUN([_LT_AC_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++ [AC_HELP_STRING([--disable-libtool-lock],
++ [avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-openbsd*)
- version_type=sunos
@@ -3167,15 +3205,25 @@
- esac
- else
- shlibpath_overrides_runpath=yes
-- fi
-- ;;
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+ECHO=$echo
-+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+ ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
-
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.$ac_objext` in
++ *ELF-32*)
++ HPUX_IA64_MODE="32"
++ ;;
++ *ELF-64*)
++ HPUX_IA64_MODE="64"
++ ;;
++ esac
+ fi
++ rm -rf conftest*
+ ;;
+-
-os2*)
- libname_spec='$name'
- shrext_cmds=".dll"
@@ -3184,9 +3232,7 @@
- dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
- ;;
-+AC_SUBST(ECHO)
-+])])# _LT_AC_PROG_ECHO_BACKSLASH
-
+-
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
@@ -3197,7 +3243,7 @@
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
+-
-solaris*)
- version_type=linux
- need_lib_prefix=no
@@ -3210,14 +3256,7 @@
- # ldd complains unless libraries are executable
- postinstall_cmds='chmod +x $lib'
- ;;
-+# _LT_AC_LOCK
-+# -----------
-+AC_DEFUN([_LT_AC_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+ [AC_HELP_STRING([--disable-libtool-lock],
-+ [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
+-
-sunos4*)
- version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -3226,37 +3265,6 @@
- shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+ # Find out which ABI we are using.
-+ echo 'int i;' > conftest.$ac_ext
-+ if AC_TRY_EVAL(ac_compile); then
-+ case `/usr/bin/file conftest.$ac_objext` in
-+ *ELF-32*)
-+ HPUX_IA64_MODE="32"
-+ ;;
-+ *ELF-64*)
-+ HPUX_IA64_MODE="64"
-+ ;;
-+ esac
- fi
-- need_version=yes
-+ rm -rf conftest*
- ;;
--
--sysv4 | sysv4.3*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
-- case $host_vendor in
-- sni)
-- shlibpath_overrides_runpath=no
-- need_lib_prefix=no
-- export_dynamic_flag_spec='${wl}-Blargedynsym'
-- runpath_var=LD_RUN_PATH
+*-*-irix6*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -3265,21 +3273,13 @@
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
- ;;
-- siemens)
-- need_lib_prefix=no
++ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
- ;;
-- motorola)
-- need_lib_prefix=no
-- need_version=no
-- shlibpath_overrides_runpath=no
-- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
- ;;
-- esac
++ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
@@ -3294,23 +3294,36 @@
+ ;;
+ esac
+ fi
-+ fi
+ fi
+- need_version=yes
+ rm -rf conftest*
;;
--sysv4*MP*)
-- if test -d /usr/nec ;then
-- version_type=linux
-- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-- soname_spec='$libname${shared_ext}.$major'
-- shlibpath_var=LD_LIBRARY_PATH
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+-sysv4 | sysv4.3*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- case $host_vendor in
+- sni)
+- shlibpath_overrides_runpath=no
+- need_lib_prefix=no
+- export_dynamic_flag_spec='${wl}-Blargedynsym'
+- runpath_var=LD_RUN_PATH
+- ;;
+- siemens)
+- need_lib_prefix=no
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
@@ -3324,9 +3337,17 @@
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
-+ ;;
+ ;;
+- motorola)
+- need_lib_prefix=no
+- need_version=no
+- shlibpath_overrides_runpath=no
+- sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ *64-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
@@ -3340,12 +3361,33 @@
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
-+ ;;
+ ;;
+- esac
+ esac
- fi
++ fi
+ rm -rf conftest*
;;
+-sysv4*MP*)
+- if test -d /usr/nec ;then
+- version_type=linux
+- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+- soname_spec='$libname${shared_ext}.$major'
+- shlibpath_var=LD_LIBRARY_PATH
++*-*-sco3.2v5*)
++ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS -belf"
++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++ [AC_LANG_PUSH(C)
++ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++ AC_LANG_POP])
++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
- need_lib_prefix=no
@@ -3364,27 +3406,6 @@
- sco3.2v5*)
- sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
- ;;
-- esac
-+*-*-sco3.2v5*)
-+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+ SAVE_CFLAGS="$CFLAGS"
-+ CFLAGS="$CFLAGS -belf"
-+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+ [AC_LANG_PUSH(C)
-+ AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+ AC_LANG_POP])
-+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+ CFLAGS="$SAVE_CFLAGS"
- fi
-- sys_lib_dlsearch_path_spec='/usr/lib'
- ;;
--
--uts4*)
-- version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
+sparc*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
@@ -3396,11 +3417,19 @@
+ *) LD="${LD-ld} -64" ;;
+ esac
+ ;;
-+ esac
-+ fi
+ esac
+ fi
+- sys_lib_dlsearch_path_spec='/usr/lib'
+ rm -rf conftest*
;;
+-uts4*)
+- version_type=linux
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- ;;
+-
-*)
- dynamic_linker=no
+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
@@ -3413,15 +3442,16 @@
esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
--
+
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
+need_locks="$enable_libtool_lock"
++])# _LT_AC_LOCK
+
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -3429,24 +3459,11 @@
- [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
- [include additional configurations @<:@automatic@:>@])],
- [tagnames="$withval"])
-+])# _LT_AC_LOCK
-if test -f "$ltmain" && test -n "$tagnames"; then
- if test ! -f "${ofile}"; then
- AC_MSG_WARN([output file `$ofile' does not exist])
- fi
-
-- if test -z "$LTCC"; then
-- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-- if test -z "$LTCC"; then
-- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-- else
-- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-- fi
-- fi
-- if test -z "$LTCFLAGS"; then
-- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-- fi
+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
@@ -3456,7 +3473,7 @@
+AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
@@ -3484,9 +3501,17 @@
+ $rm conftest*
+])
-- # Extract list of available tagged configurations in $ofile.
-- # Note that this assumes the entire list is on one line.
-- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+- if test -z "$LTCC"; then
+- eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
+- if test -z "$LTCC"; then
+- AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+- else
+- AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+- fi
+- fi
+- if test -z "$LTCFLAGS"; then
+- eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
+- fi
+if test x"[$]$2" = xyes; then
+ ifelse([$5], , :, [$5])
+else
@@ -3494,6 +3519,10 @@
+fi
+])# AC_LIBTOOL_COMPILER_OPTION
+- # Extract list of available tagged configurations in $ofile.
+- # Note that this assumes the entire list is on one line.
+- available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
+
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for tagname in $tagnames; do
- IFS="$lt_save_ifs"
@@ -3503,21 +3532,17 @@
- *) AC_MSG_ERROR([invalid tag name: $tagname])
- ;;
- esac
-
-- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-- then
-- AC_MSG_ERROR([tag name \"$tagname\" already exists])
-- fi
+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+# [ACTION-SUCCESS], [ACTION-FAILURE])
+# ------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-+[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
-+ printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
@@ -3537,9 +3562,10 @@
+ LDFLAGS="$save_LDFLAGS"
+])
-- # Update the list of available tags.
-- if test -n "$tagname"; then
-- echo appending configuration tag \"$tagname\" to $ofile
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
+- then
+- AC_MSG_ERROR([tag name \"$tagname\" already exists])
+- fi
+if test x"[$]$2" = xyes; then
+ ifelse([$4], , :, [$4])
+else
@@ -3547,6 +3573,10 @@
+fi
+])# AC_LIBTOOL_LINKER_OPTION
+- # Update the list of available tags.
+- if test -n "$tagname"; then
+- echo appending configuration tag \"$tagname\" to $ofile
+
- case $tagname in
- CXX)
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
@@ -3557,14 +3587,6 @@
- tagname=""
- fi
- ;;
-
-- F77)
-- if test -n "$F77" && test "X$F77" != "Xno"; then
-- AC_LIBTOOL_LANG_F77_CONFIG
-- else
-- tagname=""
-- fi
-- ;;
+# AC_LIBTOOL_SYS_MAX_CMD_LEN
+# --------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
@@ -3574,9 +3596,9 @@
+ i=0
+ teststring="ABCD"
-- GCJ)
-- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-- AC_LIBTOOL_LANG_GCJ_CONFIG
+- F77)
+- if test -n "$F77" && test "X$F77" != "Xno"; then
+- AC_LIBTOOL_LANG_F77_CONFIG
- else
- tagname=""
- fi
@@ -3590,8 +3612,12 @@
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
-- RC)
-- AC_LIBTOOL_LANG_RC_CONFIG
+- GCJ)
+- if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+- AC_LIBTOOL_LANG_GCJ_CONFIG
+- else
+- tagname=""
+- fi
- ;;
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
@@ -3600,10 +3626,9 @@
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
-- *)
-- AC_MSG_ERROR([Unsupported tag name: $tagname])
+- RC)
+- AC_LIBTOOL_LANG_RC_CONFIG
- ;;
-- esac
+ cygwin* | mingw*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
@@ -3615,19 +3640,32 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+- *)
+- AC_MSG_ERROR([Unsupported tag name: $tagname])
+- ;;
+- esac
++ amigaos*)
++ # On AmigaOS with pdksh, this test takes hours, literally.
++ # So we just punt and use a minimum line length of 8192.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
+
- # Append the new tag name to the list of available tags.
- if test -n "$tagname" ; then
- available_tags="$available_tags $tagname"
- fi
-- fi
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
- done
- IFS="$lt_save_ifs"
-+ amigaos*)
-+ # On AmigaOS with pdksh, this test takes hours, literally.
-+ # So we just punt and use a minimum line length of 8192.
-+ lt_cv_sys_max_cmd_len=8192;
-+ ;;
-
+-
- # Now substitute the updated list of available tags.
- if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
- mv "${ofile}T" "$ofile"
@@ -3636,25 +3674,56 @@
- rm -f "${ofile}T"
- AC_MSG_ERROR([unable to update list of available tagged configurations.])
- fi
-+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+ # This has been around since 386BSD, at least. Likely further.
-+ if test -x /sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+ elif test -x /usr/sbin/sysctl; then
-+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+ else
-+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
-+ fi
+-fi
+-])# _LT_AC_TAGCONFIG
+-
+-
+-# AC_LIBTOOL_DLOPEN
+-# -----------------
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
+-
+-
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
-+
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
-+
+
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_shared=yes ;;
+- no) enable_shared=no ;;
+- *)
+- enable_shared=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_shared=yes
+- fi
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -3680,24 +3749,41 @@
+ fi
+ ;;
+ *)
-+ # If test is not a shell built-in, we'll probably end up computing a
-+ # maximum length that is only half of the actual maximum length, but
-+ # we can't tell.
-+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
-+ new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+ lt_cv_sys_max_cmd_len=$new_result &&
-+ test $i != 17 # 1/2 MB should be enough
-+ do
-+ i=`expr $i + 1`
-+ teststring=$teststring$teststring
-+ done
-+ teststring=
-+ # Add a significant safety factor because C++ compilers can tack on massive
-+ # amounts of additional arguments before passing them to the linker.
-+ # It appears as though 1/2 is a usable value.
-+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
+ done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
+-
+-
+-# AC_DISABLE_SHARED
+-# -----------------
+-# set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+])
@@ -3705,17 +3791,38 @@
+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+ AC_MSG_RESULT(none)
- fi
--])# _LT_AC_TAGCONFIG
++fi
+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# AC_LIBTOOL_DLOPEN
--# -----------------
--# enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN],
-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_DLOPEN
+-# AC_ENABLE_STATIC([DEFAULT])
+-# ---------------------------
+-# implement the --enable-static flag
+-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([static],
+- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
+- [p=${PACKAGE-default}
+- case $enableval in
+- yes) enable_static=yes ;;
+- no) enable_static=no ;;
+- *)
+- enable_static=no
+- # Look at the argument we got. We use all the common list separators.
+- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+- for pkg in $enableval; do
+- IFS="$lt_save_ifs"
+- if test "X$pkg" = "X$p"; then
+- enable_static=yes
+- fi
+- done
+- IFS="$lt_save_ifs"
+- ;;
+- esac],
+- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
+-])# AC_ENABLE_STATIC
+# _LT_AC_CHECK_DLFCN
+# ------------------
+AC_DEFUN([_LT_AC_CHECK_DLFCN],
@@ -3723,12 +3830,13 @@
+])# _LT_AC_CHECK_DLFCN
--# AC_LIBTOOL_WIN32_DLL
--# --------------------
--# declare package support for building win32 DLLs
--AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_WIN32_DLL
+-# AC_DISABLE_STATIC
+-# -----------------
+-# set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)
+-])# AC_DISABLE_STATIC
+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ---------------------------------------------------------------------
@@ -3747,34 +3855,34 @@
+#include <dlfcn.h>
+#endif
--# AC_ENABLE_SHARED([DEFAULT])
--# ---------------------------
--# implement the --enable-shared flag
+-# AC_ENABLE_FAST_INSTALL([DEFAULT])
+-# ---------------------------------
+-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_SHARED],
--[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([shared],
-- [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-- [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([fast-install],
+- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
- [p=${PACKAGE-default}
- case $enableval in
-- yes) enable_shared=yes ;;
-- no) enable_shared=no ;;
+- yes) enable_fast_install=yes ;;
+- no) enable_fast_install=no ;;
- *)
-- enable_shared=no
+- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
-- enable_shared=yes
+- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac],
-- [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
--])# AC_ENABLE_SHARED
+- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
+-])# AC_ENABLE_FAST_INSTALL
+#include <stdio.h>
+#ifdef RTLD_GLOBAL
@@ -3787,13 +3895,13 @@
+# endif
+#endif
--# AC_DISABLE_SHARED
--# -----------------
--# set the default shared flag to --disable-shared
--AC_DEFUN([AC_DISABLE_SHARED],
+-# AC_DISABLE_FAST_INSTALL
+-# -----------------------
+-# set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)
--])# AC_DISABLE_SHARED
+-AC_ENABLE_FAST_INSTALL(no)
+-])# AC_DISABLE_FAST_INSTALL
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
@@ -3820,34 +3928,14 @@
+extern "C" void exit (int);
+#endif
--# AC_ENABLE_STATIC([DEFAULT])
--# ---------------------------
--# implement the --enable-static flag
--# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_STATIC],
--[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([static],
-- [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-- [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-- [p=${PACKAGE-default}
-- case $enableval in
-- yes) enable_static=yes ;;
-- no) enable_static=no ;;
-- *)
-- enable_static=no
-- # Look at the argument we got. We use all the common list separators.
-- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-- for pkg in $enableval; do
-- IFS="$lt_save_ifs"
-- if test "X$pkg" = "X$p"; then
-- enable_static=yes
-- fi
-- done
-- IFS="$lt_save_ifs"
-- ;;
-- esac],
-- [enable_static=]AC_ENABLE_STATIC_DEFAULT)
--])# AC_ENABLE_STATIC
+-# AC_LIBTOOL_PICMODE([MODE])
+-# --------------------------
+-# implement the --with-pic flag
+-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)
+-])# AC_LIBTOOL_PICMODE
+void fnord() { int i=42;}
+int main ()
+{
@@ -3863,13 +3951,19 @@
+ else
+ puts (dlerror ());
--# AC_DISABLE_STATIC
--# -----------------
--# set the default static flag to --disable-static
--AC_DEFUN([AC_DISABLE_STATIC],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_STATIC(no)
--])# AC_DISABLE_STATIC
+-# AC_PROG_EGREP
+-# -------------
+-# This is predefined starting with Autoconf 2.54, so this conditional
+-# definition can be removed once we require Autoconf 2.54 or later.
+-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
+-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+- then ac_cv_prog_egrep='grep -E'
+- else ac_cv_prog_egrep='egrep'
+- fi])
+- EGREP=$ac_cv_prog_egrep
+- AC_SUBST([EGREP])
+-])])
+ exit (status);
+}]
+EOF
@@ -3890,133 +3984,6 @@
+])# _LT_AC_TRY_DLOPEN_SELF
--# AC_ENABLE_FAST_INSTALL([DEFAULT])
--# ---------------------------------
--# implement the --enable-fast-install flag
--# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_FAST_INSTALL],
--[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([fast-install],
-- [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-- [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-- [p=${PACKAGE-default}
-- case $enableval in
-- yes) enable_fast_install=yes ;;
-- no) enable_fast_install=no ;;
-- *)
-- enable_fast_install=no
-- # Look at the argument we got. We use all the common list separators.
-- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-- for pkg in $enableval; do
-- IFS="$lt_save_ifs"
-- if test "X$pkg" = "X$p"; then
-- enable_fast_install=yes
-- fi
-- done
-- IFS="$lt_save_ifs"
-- ;;
-- esac],
-- [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
--])# AC_ENABLE_FAST_INSTALL
-+# AC_LIBTOOL_DLOPEN_SELF
-+# ----------------------
-+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+ enable_dlopen=unknown
-+ enable_dlopen_self=unknown
-+ enable_dlopen_self_static=unknown
-+else
-+ lt_cv_dlopen=no
-+ lt_cv_dlopen_libs=
-
-+ case $host_os in
-+ beos*)
-+ lt_cv_dlopen="load_add_on"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ;;
-
--# AC_DISABLE_FAST_INSTALL
--# -----------------------
--# set the default to --disable-fast-install
--AC_DEFUN([AC_DISABLE_FAST_INSTALL],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_FAST_INSTALL(no)
--])# AC_DISABLE_FAST_INSTALL
-+ mingw* | pw32*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
-+ ;;
-
--# AC_LIBTOOL_PICMODE([MODE])
--# --------------------------
--# implement the --with-pic flag
--# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
--AC_DEFUN([AC_LIBTOOL_PICMODE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--pic_mode=ifelse($#,1,$1,default)
--])# AC_LIBTOOL_PICMODE
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-+ ])
-+ ;;
-
-+ *)
-+ AC_CHECK_FUNC([shl_load],
-+ [lt_cv_dlopen="shl_load"],
-+ [AC_CHECK_LIB([dld], [shl_load],
-+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+ [AC_CHECK_FUNC([dlopen],
-+ [lt_cv_dlopen="dlopen"],
-+ [AC_CHECK_LIB([dl], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+ [AC_CHECK_LIB([svld], [dlopen],
-+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+ [AC_CHECK_LIB([dld], [dld_link],
-+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ])
-+ ;;
-+ esac
-
--# AC_PROG_EGREP
--# -------------
--# This is predefined starting with Autoconf 2.54, so this conditional
--# definition can be removed once we require Autoconf 2.54 or later.
--m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
--[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-- [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
-- fi])
-- EGREP=$ac_cv_prog_egrep
-- AC_SUBST([EGREP])
--])])
-+ if test "x$lt_cv_dlopen" != xno; then
-+ enable_dlopen=yes
-+ else
-+ enable_dlopen=no
-+ fi
-
-+ case $lt_cv_dlopen in
-+ dlopen)
-+ save_CPPFLAGS="$CPPFLAGS"
-+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
@@ -4050,9 +4017,7 @@
- :
- else
- cat <<EOF 1>&2
-+ save_LDFLAGS="$LDFLAGS"
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
+-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
@@ -4061,30 +4026,13 @@
-*** libraries will work regardless of this problem. Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool at gnu.org
-+ save_LIBS="$LIBS"
-+ LIBS="$lt_cv_dlopen_libs $LIBS"
-
+-
-EOF
- fi ;;
- esac
- fi
- break
-+ AC_CACHE_CHECK([whether a program can dlopen itself],
-+ lt_cv_dlopen_self, [dnl
-+ _LT_AC_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+ ])
-+
-+ if test "x$lt_cv_dlopen_self" = xyes; then
-+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+ lt_cv_dlopen_self_static, [dnl
-+ _LT_AC_TRY_DLOPEN_SELF(
-+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
-+ ])
- fi
+- fi
- done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
@@ -4093,21 +4041,27 @@
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
- AC_MSG_RESULT($MAGIC_CMD)
--else
++# AC_LIBTOOL_DLOPEN_SELF
++# ----------------------
++AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++ enable_dlopen=unknown
++ enable_dlopen_self=unknown
++ enable_dlopen_self_static=unknown
+ else
- AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
++ lt_cv_dlopen=no
++ lt_cv_dlopen_libs=
-+ CPPFLAGS="$save_CPPFLAGS"
-+ LDFLAGS="$save_LDFLAGS"
-+ LIBS="$save_LIBS"
++ case $host_os in
++ beos*)
++ lt_cv_dlopen="load_add_on"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
+ ;;
-+ esac
-+
-+ case $lt_cv_dlopen_self in
-+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+ *) enable_dlopen_self=unknown ;;
-+ esac
-# AC_PATH_MAGIC
-# -------------
@@ -4120,14 +4074,27 @@
- else
- MAGIC_CMD=:
- fi
-+ case $lt_cv_dlopen_self_static in
-+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+ *) enable_dlopen_self_static=unknown ;;
-+ esac
- fi
+-fi
-])# AC_PATH_MAGIC
-+])# AC_LIBTOOL_DLOPEN_SELF
++ mingw* | pw32*)
++ lt_cv_dlopen="LoadLibrary"
++ lt_cv_dlopen_libs=
++ ;;
++ cygwin*)
++ lt_cv_dlopen="dlopen"
++ lt_cv_dlopen_libs=
++ ;;
++
++ darwin*)
++ # if libdl is installed we need to link against it
++ AC_CHECK_LIB([dl], [dlopen],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++ lt_cv_dlopen="dyld"
++ lt_cv_dlopen_libs=
++ lt_cv_dlopen_self=yes
++ ])
++ ;;
-# AC_PROG_LD
-# ----------
@@ -4168,11 +4135,28 @@
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
-- *)
+ *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
-- ;;
-- esac
++ AC_CHECK_FUNC([shl_load],
++ [lt_cv_dlopen="shl_load"],
++ [AC_CHECK_LIB([dld], [shl_load],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [AC_CHECK_FUNC([dlopen],
++ [lt_cv_dlopen="dlopen"],
++ [AC_CHECK_LIB([dl], [dlopen],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++ [AC_CHECK_LIB([svld], [dlopen],
++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++ [AC_CHECK_LIB([dld], [dld_link],
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ ])
++ ])
++ ])
++ ])
++ ])
+ ;;
+ esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
@@ -4212,8 +4196,13 @@
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
--
--
+
++ if test "x$lt_cv_dlopen" != xno; then
++ enable_dlopen=yes
++ else
++ enable_dlopen=no
++ fi
+
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
@@ -4230,8 +4219,14 @@
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
--
--
++ case $lt_cv_dlopen in
++ dlopen)
++ save_CPPFLAGS="$CPPFLAGS"
++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
++ save_LDFLAGS="$LDFLAGS"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
@@ -4256,11 +4251,94 @@
- ;;
-esac
-])# AC_PROG_LD_RELOAD_FLAG
++ save_LIBS="$LIBS"
++ LIBS="$lt_cv_dlopen_libs $LIBS"
+
++ AC_CACHE_CHECK([whether a program can dlopen itself],
++ lt_cv_dlopen_self, [dnl
++ _LT_AC_TRY_DLOPEN_SELF(
++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++ ])
+
+-# AC_DEPLIBS_CHECK_METHOD
+-# -----------------------
+-# how to check for library dependencies
+-# -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++ if test "x$lt_cv_dlopen_self" = xyes; then
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++ lt_cv_dlopen_self_static, [dnl
++ _LT_AC_TRY_DLOPEN_SELF(
++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross)
++ ])
++ fi
+
+-case $host_os in
+-aix4* | aix5*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++ CPPFLAGS="$save_CPPFLAGS"
++ LDFLAGS="$save_LDFLAGS"
++ LIBS="$save_LIBS"
++ ;;
++ esac
+
+-beos*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
++ case $lt_cv_dlopen_self in
++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++ *) enable_dlopen_self=unknown ;;
++ esac
+
+-bsdi[[45]]*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- lt_cv_file_magic_test_file=/shlib/libc.so
+- ;;
++ case $lt_cv_dlopen_self_static in
++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++ *) enable_dlopen_self_static=unknown ;;
++ esac
++fi
++])# AC_LIBTOOL_DLOPEN_SELF
+
+-cygwin*)
+- # func_win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='func_win32_libid'
+- ;;
+
+-mingw* | pw32*)
+- # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
+- ;;
+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+# ---------------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler
+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
@@ -4268,8 +4346,11 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-darwin* | rhapsody*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
@@ -4306,29 +4387,23 @@
+])
+])# AC_LIBTOOL_PROG_CC_C_O
--# AC_DEPLIBS_CHECK_METHOD
--# -----------------------
--# how to check for library dependencies
--# -- PORTME fill in with the dynamic library characteristics
--AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
--lt_cv_deplibs_check_method,
--[lt_cv_file_magic_cmd='$MAGIC_CMD'
--lt_cv_file_magic_test_file=
--lt_cv_deplibs_check_method='unknown'
--# Need to set the preceding variable on all platforms that support
--# interlibrary dependencies.
--# 'none' -- dependencies not supported.
--# `unknown' -- same as none, but documents that we really don't know.
--# 'pass_all' -- all dependencies passed with no checks.
--# 'test_compile' -- check by making test program.
--# 'file_magic [[regex]]' -- check by looking for files in library path
--# which responds to the $file_magic_cmd with a given extended regex.
--# If you have `file' or equivalent on your system and you're not sure
--# whether `pass_all' will *always* work, you probably want this one.
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+- case $host_cpu in
+- i*86 )
+- # Not sure whether the presence of OpenBSD here was a mistake.
+- # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+- ;;
+- esac
+- else
+- lt_cv_deplibs_check_method=pass_all
+- fi
+- ;;
--case $host_os in
--aix4* | aix5*)
+-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
@@ -4337,8 +4412,22 @@
+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
+[AC_REQUIRE([_LT_AC_LOCK])dnl
--beos*)
-- lt_cv_deplibs_check_method=pass_all
+-hpux10.20* | hpux11*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- case $host_cpu in
+- ia64*)
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+- ;;
+- hppa*64*)
+- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+- ;;
+- *)
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+- lt_cv_file_magic_test_file=/usr/lib/libc.sl
+- ;;
+- esac
- ;;
+hard_links="nottested"
+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
@@ -4360,16 +4449,19 @@
+fi
+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
--bsdi[[45]]*)
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-- lt_cv_file_magic_cmd='/usr/bin/file -L'
-- lt_cv_file_magic_test_file=/shlib/libc.so
+-interix3*)
+- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
- ;;
--cygwin*)
-- # func_win32_libid is a shell function defined in ltmain.sh
-- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-- lt_cv_file_magic_cmd='func_win32_libid'
+-irix5* | irix6* | nonstopux*)
+- case $LD in
+- *-32|*"-32 ") libmagic=32-bit;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- lt_cv_deplibs_check_method=pass_all
- ;;
+# AC_LIBTOOL_OBJDIR
+# -----------------
@@ -4387,16 +4479,14 @@
+objdir=$lt_cv_objdir
+])# AC_LIBTOOL_OBJDIR
--mingw* | pw32*)
-- # Base MSYS/MinGW do not provide the 'file' command needed by
-- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-- lt_cv_file_magic_cmd='$OBJDUMP -f'
+-# This must be Linux ELF.
+-linux*)
+- lt_cv_deplibs_check_method=pass_all
- ;;
--darwin* | rhapsody*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
+-netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
+# ----------------------------------------------
+# Check hardcoding attributes.
@@ -4406,18 +4496,7 @@
+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
--freebsd* | kfreebsd*-gnu | dragonfly*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- case $host_cpu in
-- i*86 )
-- # Not sure whether the presence of OpenBSD here was a mistake.
-- # Let's accept both of them until this is cleared up.
-- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-- ;;
-- esac
++
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -4428,7 +4507,7 @@
+ # Linking always hardcodes the temporary library directory.
+ _LT_AC_TAGVAR(hardcode_action, $1)=relink
else
-- lt_cv_deplibs_check_method=pass_all
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ _LT_AC_TAGVAR(hardcode_action, $1)=immediate
fi
@@ -4440,26 +4519,10 @@
+fi
+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
--gnu*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
--hpux10.20* | hpux11*)
+-newos6*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
- lt_cv_file_magic_cmd=/usr/bin/file
-- case $host_cpu in
-- ia64*)
-- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-- ;;
-- hppa*64*)
-- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-- ;;
-- *)
-- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-- lt_cv_file_magic_test_file=/usr/lib/libc.sl
-- ;;
-- esac
+- lt_cv_file_magic_test_file=/usr/lib/libnls.so
- ;;
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+ # Fast installation is not supported
@@ -4471,17 +4534,49 @@
+fi
+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
--interix3*)
-- # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+-nto-qnx*)
+- lt_cv_deplibs_check_method=unknown
- ;;
--irix5* | irix6* | nonstopux*)
-- case $LD in
-- *-32|*"-32 ") libmagic=32-bit;;
-- *-n32|*"-n32 ") libmagic=N32;;
-- *-64|*"-64 ") libmagic=64-bit;;
-- *) libmagic=never-match;;
+-openbsd*)
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+- else
+- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+- fi
+- ;;
+-
+-osf3* | osf4* | osf5*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+-solaris*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+-sysv4 | sysv4.3*)
+- case $host_vendor in
+- motorola)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+- ;;
+- ncr)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+- sequent)
+- lt_cv_file_magic_cmd='/bin/file'
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+- ;;
+- sni)
+- lt_cv_file_magic_cmd='/bin/file'
+- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+- lt_cv_file_magic_test_file=/lib/libc.so
+- ;;
+- siemens)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+- pc)
+- lt_cv_deplibs_check_method=pass_all
+# AC_LIBTOOL_SYS_LIB_STRIP
+# ------------------------
+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
@@ -4498,6 +4593,7 @@
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
@@ -4505,26 +4601,41 @@
+ ;;
+ *)
+ AC_MSG_RESULT([no])
-+ ;;
+ ;;
esac
+- ;;
+-
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- lt_cv_deplibs_check_method=pass_all
- ;;
+-esac
+-])
+-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
+-])# AC_DEPLIBS_CHECK_METHOD
+fi
+])# AC_LIBTOOL_SYS_LIB_STRIP
--# This must be Linux ELF.
--linux*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+-# AC_PROG_NM
+-# ----------
+-# find the pathname to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
+-[if test -n "$NM"; then
+- # Let the user override the test.
+- lt_cv_path_NM="$NM"
+-else
+- lt_nm_to_check="${ac_tool_prefix}nm"
+- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+- lt_nm_to_check="$lt_nm_to_check nm"
+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-+[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
@@ -4538,36 +4649,116 @@
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
+if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+ if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+ sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
fi
-- ;;
+- for lt_tmp_nm in $lt_nm_to_check; do
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/$lt_tmp_nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
+- break
+- ;;
+- *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
+- ;;
+- esac
+- ;;
+- esac
+- fi
+- done
+- IFS="$lt_save_ifs"
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
+ done
+- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
+ fi])
+-NM="$lt_cv_path_NM"
+-])# AC_PROG_NM
+need_lib_prefix=unknown
+hardcode_into_libs=no
--newos6*)
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-- lt_cv_file_magic_cmd=/usr/bin/file
-- lt_cv_file_magic_test_file=/usr/lib/libnls.so
-- ;;
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
--nto-qnx*)
-- lt_cv_deplibs_check_method=unknown
+-# AC_CHECK_LIBM
+-# -------------
+-# check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+- # These system don't have libm, or don't need it
+- ;;
+-*-ncr-sysv4.3*)
+- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+- ;;
+-*)
+- AC_CHECK_LIB(m, cos, LIBM="-lm")
+case $host_os in
+aix3*)
+ version_type=linux
@@ -4577,10 +4768,9 @@
+ # AIX 3 has no versioning support, so we append a major version to the name.
+ soname_spec='${libname}${release}${shared_ext}$major'
;;
+-esac
+-])# AC_CHECK_LIBM
--openbsd*)
-- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+aix4* | aix5*)
+ version_type=linux
+ need_lib_prefix=no
@@ -4590,8 +4780,7 @@
+ # AIX 5 supports IA64
+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+ # the line `#! .'. This would cause the generated library to
@@ -4623,50 +4812,122 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ fi
+ shlibpath_var=LIBPATH
- fi
- ;;
++ fi
++ ;;
--osf3* | osf4* | osf5*)
-- lt_cv_deplibs_check_method=pass_all
+-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl convenience library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that
+-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+-# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
+-# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+-# (note the single quotes!). If your package is not flat and you're not
+-# using automake, define top_builddir and top_srcdir appropriately in
+-# the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+- case $enable_ltdl_convenience in
+- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+- "") enable_ltdl_convenience=yes
+- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+- esac
+- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+- # For backwards non-gettext consistent compatibility...
+- INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_CONVENIENCE
+amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
++ ;;
--solaris*)
-- lt_cv_deplibs_check_method=pass_all
+beos*)
+ library_names_spec='${libname}${shared_ext}'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
- ;;
++ ;;
--sysv4 | sysv4.3*)
-- case $host_vendor in
-- motorola)
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-- ;;
-- ncr)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-- sequent)
-- lt_cv_file_magic_cmd='/bin/file'
-- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-- ;;
-- sni)
-- lt_cv_file_magic_cmd='/bin/file'
-- lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-- lt_cv_file_magic_test_file=/lib/libc.so
-- ;;
-- siemens)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-- pc)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
-- esac
+-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
+-# -----------------------------------
+-# sets LIBLTDL to the link flags for the libltdl installable library and
+-# LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that
+-# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
+-# and an installed libltdl is not found, it is assumed to be `libltdl'.
+-# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and top_srcdir
+-# appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+- AC_CHECK_LIB(ltdl, lt_dlinit,
+- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+- [if test x"$enable_ltdl_install" = xno; then
+- AC_MSG_WARN([libltdl not installed, but installation disabled])
+- else
+- enable_ltdl_install=yes
+- fi
+- ])
+- if test x"$enable_ltdl_install" = x"yes"; then
+- ac_configure_args="$ac_configure_args --enable-ltdl-install"
+- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+- else
+- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+- LIBLTDL="-lltdl"
+- LTDLINCL=
+- fi
+- # For backwards non-gettext consistent compatibility...
+- INCLTDL="$LTDLINCL"
+-])# AC_LIBLTDL_INSTALLABLE
+-
+-
+-# AC_LIBTOOL_CXX
+-# --------------
+-# enable support for C++ libraries
+-AC_DEFUN([AC_LIBTOOL_CXX],
+-[AC_REQUIRE([_LT_AC_LANG_CXX])
+-])# AC_LIBTOOL_CXX
+-
+-
+-# _LT_AC_LANG_CXX
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_CXX],
+-[AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+-])# _LT_AC_LANG_CXX
+-
+-# _LT_AC_PROG_CXXCPP
+-# ------------------
+-AC_DEFUN([_LT_AC_PROG_CXXCPP],
+-[
+-AC_REQUIRE([AC_PROG_CXX])
+-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- AC_PROG_CXXCPP
+-fi
+-])# _LT_AC_PROG_CXXCPP
+-
+-# AC_LIBTOOL_F77
+-# --------------
+-# enable support for Fortran 77 libraries
+-AC_DEFUN([AC_LIBTOOL_F77],
+-[AC_REQUIRE([_LT_AC_LANG_F77])
+-])# AC_LIBTOOL_F77
+-
+-
+-# _LT_AC_LANG_F77
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_F77],
+-[AC_REQUIRE([AC_PROG_F77])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+-])# _LT_AC_LANG_F77
+bsdi[[45]]*)
+ version_type=linux
+ need_version=no
@@ -4679,23 +4940,20 @@
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
- ;;
++ ;;
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--esac
--])
--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
--])# AC_DEPLIBS_CHECK_METHOD
+cygwin* | mingw* | pw32*)
+ version_type=windows
+ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+-# AC_LIBTOOL_GCJ
+-# --------------
+-# enable support for GCJ libraries
+-AC_DEFUN([AC_LIBTOOL_GCJ],
+-[AC_REQUIRE([_LT_AC_LANG_GCJ])
+-])# AC_LIBTOOL_GCJ
+ case $GCC,$host_os in
+ yes,cygwin* | yes,mingw* | yes,pw32*)
+ library_names_spec='$libname.dll.a'
@@ -4711,48 +4969,6 @@
+ $rm \$dlpath'
+ shlibpath_overrides_runpath=yes
--# AC_PROG_NM
--# ----------
--# find the pathname to a BSD-compatible name lister
--AC_DEFUN([AC_PROG_NM],
--[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
--[if test -n "$NM"; then
-- # Let the user override the test.
-- lt_cv_path_NM="$NM"
--else
-- lt_nm_to_check="${ac_tool_prefix}nm"
-- if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-- lt_nm_to_check="$lt_nm_to_check nm"
-- fi
-- for lt_tmp_nm in $lt_nm_to_check; do
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-- IFS="$lt_save_ifs"
-- test -z "$ac_dir" && ac_dir=.
-- tmp_nm="$ac_dir/$lt_tmp_nm"
-- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-- # Check to see if the nm accepts a BSD-compat flag.
-- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-- # nm: unknown option "B" ignored
-- # Tru64's nm complains that /dev/null is an invalid object file
-- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-- */dev/null* | *'Invalid file or object type'*)
-- lt_cv_path_NM="$tmp_nm -B"
-- break
-- ;;
-- *)
-- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-- */dev/null*)
-- lt_cv_path_NM="$tmp_nm -p"
-- break
-- ;;
-- *)
-- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-- continue # so that we can try to find one that supports BSD flags
-- ;;
-- esac
-- ;;
-- esac
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -4773,36 +4989,7 @@
+ 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
-- done
-- IFS="$lt_save_ifs"
-- done
-- test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
--fi])
--NM="$lt_cv_path_NM"
--])# AC_PROG_NM
--
--
--# AC_CHECK_LIBM
--# -------------
--# check for math library
--AC_DEFUN([AC_CHECK_LIBM],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-- # These system don't have libm, or don't need it
-- ;;
--*-ncr-sysv4.3*)
-- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-- ;;
--*)
-- AC_CHECK_LIB(m, cos, LIBM="-lm")
-- ;;
--esac
--])# AC_CHECK_LIBM
--
++ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -4811,64 +4998,26 @@
+ esac
+ ;;
--# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl convenience library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments. Note that
--# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
--# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
--# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
--# (note the single quotes!). If your package is not flat and you're not
--# using automake, define top_builddir and top_srcdir appropriately in
--# the Makefiles.
--AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-- case $enable_ltdl_convenience in
-- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-- "") enable_ltdl_convenience=yes
-- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-# _LT_AC_LANG_GCJ
+-# ---------------
+-AC_DEFUN([_LT_AC_LANG_GCJ],
+-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
+- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
+- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
+- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
+- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+-])# _LT_AC_LANG_GCJ
+ *)
+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ ;;
- esac
-- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-- # For backwards non-gettext consistent compatibility...
-- INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_CONVENIENCE
--
++ esac
+ dynamic_linker='Win32 ld.exe'
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
--# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl installable library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments. Note that
--# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
--# and an installed libltdl is not found, it is assumed to be `libltdl'.
--# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
--# '${top_srcdir}/' (note the single quotes!). If your package is not
--# flat and you're not using automake, define top_builddir and top_srcdir
--# appropriately in the Makefiles.
--# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
--AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-- AC_CHECK_LIB(ltdl, lt_dlinit,
-- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-- [if test x"$enable_ltdl_install" = xno; then
-- AC_MSG_WARN([libltdl not installed, but installation disabled])
-- else
-- enable_ltdl_install=yes
-- fi
-- ])
-- if test x"$enable_ltdl_install" = x"yes"; then
-- ac_configure_args="$ac_configure_args --enable-ltdl-install"
-- LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-- LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
@@ -4879,28 +5028,18 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+ # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+ if test "$GCC" = yes; then
-+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
-- ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-- LIBLTDL="-lltdl"
-- LTDLINCL=
-+ sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
- fi
-- # For backwards non-gettext consistent compatibility...
-- INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_INSTALLABLE
--
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
--# AC_LIBTOOL_CXX
--# --------------
--# enable support for C++ libraries
--AC_DEFUN([AC_LIBTOOL_CXX],
--[AC_REQUIRE([_LT_AC_LANG_CXX])
--])# AC_LIBTOOL_CXX
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
+dgux*)
+ version_type=linux
+ need_lib_prefix=no
@@ -4914,13 +5053,15 @@
+ dynamic_linker=no
+ ;;
--# _LT_AC_LANG_CXX
--# ---------------
--AC_DEFUN([_LT_AC_LANG_CXX],
--[AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([_LT_AC_PROG_CXXCPP])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
--])# _LT_AC_LANG_CXX
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined. Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
@@ -4958,39 +5099,15 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
-+ freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
--# _LT_AC_PROG_CXXCPP
--# ------------------
--AC_DEFUN([_LT_AC_PROG_CXXCPP],
--[
--AC_REQUIRE([AC_PROG_CXX])
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-- (test "X$CXX" != "Xg++"))) ; then
-- AC_PROG_CXXCPP
--fi
--])# _LT_AC_PROG_CXXCPP
--
--# AC_LIBTOOL_F77
--# --------------
--# enable support for Fortran 77 libraries
--AC_DEFUN([AC_LIBTOOL_F77],
--[AC_REQUIRE([_LT_AC_LANG_F77])
--])# AC_LIBTOOL_F77
--
--
--# _LT_AC_LANG_F77
--# ---------------
--AC_DEFUN([_LT_AC_LANG_F77],
--[AC_REQUIRE([AC_PROG_F77])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
--])# _LT_AC_LANG_F77
+-# Source file extension for C test sources.
+-ac_ext=c
+gnu*)
+ version_type=linux
+ need_lib_prefix=no
@@ -5001,6 +5118,12 @@
+ hardcode_into_libs=yes
+ ;;
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+-
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
@@ -5047,13 +5170,9 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
--# AC_LIBTOOL_GCJ
--# --------------
--# enable support for GCJ libraries
--AC_DEFUN([AC_LIBTOOL_GCJ],
--[AC_REQUIRE([_LT_AC_LANG_GCJ])
--])# AC_LIBTOOL_GCJ
-+interix3*)
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++interix[[3-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -5065,6 +5184,7 @@
+ hardcode_into_libs=yes
+ ;;
+-_LT_AC_SYS_COMPILER
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
@@ -5102,22 +5222,23 @@
+ hardcode_into_libs=yes
+ ;;
--# _LT_AC_LANG_GCJ
--# ---------------
--AC_DEFUN([_LT_AC_LANG_GCJ],
--[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-- [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-- [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-- [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
--])# _LT_AC_LANG_GCJ
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
+-AC_LIBTOOL_PROG_COMPILER_PIC($1)
+-AC_LIBTOOL_PROG_CC_C_O($1)
+-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
+-AC_LIBTOOL_PROG_LD_SHLIBS($1)
+-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ version_type=linux
@@ -5133,19 +5254,17 @@
+ # before this can be enabled.
+ hardcode_into_libs=yes
--# AC_LIBTOOL_RC
--# -------------
--# enable support for Windows resource files
--AC_DEFUN([AC_LIBTOOL_RC],
--[AC_REQUIRE([LT_AC_PROG_RC])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
--])# AC_LIBTOOL_RC
+-# Report which library types will actually be built
+-AC_MSG_CHECKING([if libtool supports shared libraries])
+-AC_MSG_RESULT([$can_build_shared])
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
-+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
@@ -5155,15 +5274,15 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
--# AC_LIBTOOL_LANG_C_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
--AC_DEFUN([_LT_AC_LANG_C_CONFIG],
--[lt_save_CC="$CC"
--AC_LANG_PUSH(C)
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case $host_os in
+-aix3*)
+- test "$enable_shared" = yes && enable_static=no
+- if test -n "$RANLIB"; then
+- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+- postinstall_cmds='$RANLIB $lib'
+- fi
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
@@ -5174,10 +5293,11 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
-+ ;;
+ ;;
--# Source file extension for C test sources.
--ac_ext=c
+-aix4* | aix5*)
+- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+- test "$enable_shared" = yes && enable_static=no
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
@@ -5190,15 +5310,19 @@
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
-+ fi
+ fi
+- ;;
+-esac
+-AC_MSG_RESULT([$enable_shared])
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
--# Object file extension for compiled C test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+-AC_MSG_CHECKING([whether to build static libraries])
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-AC_MSG_RESULT([$enable_static])
+newsos6)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -5206,8 +5330,7 @@
+ shlibpath_overrides_runpath=yes
+ ;;
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
+-AC_LIBTOOL_CONFIG($1)
+nto-qnx*)
+ version_type=linux
+ need_lib_prefix=no
@@ -5218,8 +5341,9 @@
+ shlibpath_overrides_runpath=yes
+ ;;
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
+-AC_LANG_POP
+-CC="$lt_save_CC"
+-])# AC_LIBTOOL_LANG_C_CONFIG
+openbsd*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec="/usr/lib"
@@ -5246,7 +5370,6 @@
+ fi
+ ;;
--_LT_AC_SYS_COMPILER
+os2*)
+ libname_spec='$name'
+ shrext_cmds=".dll"
@@ -5256,9 +5379,16 @@
+ shlibpath_var=LIBPATH
+ ;;
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-# AC_LIBTOOL_LANG_CXX_CONFIG
+-# --------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined. Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+-[AC_LANG_PUSH(C++)
+-AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
@@ -5270,15 +5400,35 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF
+-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+-_LT_AC_TAGVAR(always_export_symbols, $1)=no
+-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_direct, $1)=no
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
+-_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
+-_LT_AC_TAGVAR(module_cmds, $1)=
+-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
+-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_AC_TAGVAR(no_undefined_flag, $1)=
+-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++rdos*)
++ dynamic_linker=no
++ ;;
+
+-# Dependencies to place before and after the object being linked:
+-_LT_AC_TAGVAR(predep_objects, $1)=
+-_LT_AC_TAGVAR(postdep_objects, $1)=
+-_LT_AC_TAGVAR(predeps, $1)=
+-_LT_AC_TAGVAR(postdeps, $1)=
+-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+solaris*)
+ version_type=linux
+ need_lib_prefix=no
@@ -5292,9 +5442,8 @@
+ postinstall_cmds='chmod +x $lib'
+ ;;
--# Report which library types will actually be built
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
+sunos4*)
+ version_type=sunos
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -5307,8 +5456,9 @@
+ need_version=yes
+ ;;
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
+sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -5333,26 +5483,19 @@
+ esac
+ ;;
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case $host_os in
--aix3*)
-- test "$enable_shared" = yes && enable_static=no
-- if test -n "$RANLIB"; then
-- archive_cmds="$archive_cmds~\$RANLIB \$lib"
-- postinstall_cmds='$RANLIB $lib'
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
+sysv4*MP*)
+ if test -d /usr/nec ;then
+ version_type=linux
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
- fi
- ;;
++ fi
++ ;;
--aix4* | aix5*)
-- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-- test "$enable_shared" = yes && enable_static=no
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=freebsd-elf
+ need_lib_prefix=no
@@ -5372,169 +5515,29 @@
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
- fi
-- ;;
++ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
-+
+
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
+uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
-+
+
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
+*)
+ dynamic_linker=no
+ ;;
- esac
--AC_MSG_RESULT([$enable_shared])
++esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
--AC_LIBTOOL_CONFIG($1)
-
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_C_CONFIG
-+# _LT_AC_TAGCONFIG
-+# ----------------
-+AC_DEFUN([_LT_AC_TAGCONFIG],
-+[AC_ARG_WITH([tags],
-+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-+ [include additional configurations @<:@automatic@:>@])],
-+ [tagnames="$withval"])
-
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+ if test ! -f "${ofile}"; then
-+ AC_MSG_WARN([output file `$ofile' does not exist])
-+ fi
-
--# AC_LIBTOOL_LANG_CXX_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined. Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
--AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
--[AC_LANG_PUSH(C++)
--AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+ if test -z "$LTCC"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+ if test -z "$LTCC"; then
-+ AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-+ else
-+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-+ fi
-+ fi
-+ if test -z "$LTCFLAGS"; then
-+ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+ fi
-
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+ # Extract list of available tagged configurations in $ofile.
-+ # Note that this assumes the entire list is on one line.
-+ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
--# Dependencies to place before and after the object being linked:
--_LT_AC_TAGVAR(predep_objects, $1)=
--_LT_AC_TAGVAR(postdep_objects, $1)=
--_LT_AC_TAGVAR(predeps, $1)=
--_LT_AC_TAGVAR(postdeps, $1)=
--_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for tagname in $tagnames; do
-+ IFS="$lt_save_ifs"
-+ # Check whether tagname contains only valid characters
-+ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-+ "") ;;
-+ *) AC_MSG_ERROR([invalid tag name: $tagname])
-+ ;;
-+ esac
-
--# Source file extension for C++ test sources.
--ac_ext=cpp
-+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+ then
-+ AC_MSG_ERROR([tag name \"$tagname\" already exists])
-+ fi
-
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
-+ # Update the list of available tags.
-+ if test -n "$tagname"; then
-+ echo appending configuration tag \"$tagname\" to $ofile
-
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+ case $tagname in
-+ CXX)
-+ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ AC_LIBTOOL_LANG_CXX_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
-
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-+ F77)
-+ if test -n "$F77" && test "X$F77" != "Xno"; then
-+ AC_LIBTOOL_LANG_F77_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
-
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
-+ GCJ)
-+ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+ AC_LIBTOOL_LANG_GCJ_CONFIG
-+ else
-+ tagname=""
-+ fi
-+ ;;
-
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+ RC)
-+ AC_LIBTOOL_LANG_RC_CONFIG
-+ ;;
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
@@ -5551,16 +5554,16 @@
- lt_cv_path_LD=$lt_cv_path_LDCXX
-else
- $as_unset lt_cv_path_LD
--fi
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-+ *)
-+ AC_MSG_ERROR([Unsupported tag name: $tagname])
-+ ;;
-+ esac
++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
@@ -5569,54 +5572,60 @@
-else
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-+ # Append the new tag name to the list of available tags.
-+ if test -n "$tagname" ; then
-+ available_tags="$available_tags $tagname"
-+ fi
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-if test "$GXX" = yes; then
- # Set up default GNU C++ configuration
-+ # Now substitute the updated list of available tags.
-+ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+ mv "${ofile}T" "$ofile"
-+ chmod +x "$ofile"
-+ else
-+ rm -f "${ofile}T"
-+ AC_MSG_ERROR([unable to update list of available tagged configurations.])
-+ fi
-+fi
-+])# _LT_AC_TAGCONFIG
++# _LT_AC_TAGCONFIG
++# ----------------
++AC_DEFUN([_LT_AC_TAGCONFIG],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
++ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++ [include additional configurations @<:@automatic@:>@])],
++ [tagnames="$withval"])
- AC_PROG_LD
++if test -f "$ltmain" && test -n "$tagnames"; then
++ if test ! -f "${ofile}"; then
++ AC_MSG_WARN([output file `$ofile' does not exist])
++ fi
- # Check if GNU C++ uses GNU ld as the underlying linker, since the
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+# AC_LIBTOOL_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
++ if test -z "$LTCC"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++ if test -z "$LTCC"; then
++ AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
++ else
++ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
++ fi
++ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # Extract list of available tagged configurations in $ofile.
++ # Note that this assumes the entire list is on one line.
++ available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
- # If archive_cmds runs LD, not CC, wlarc should be empty
- # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
- # investigate it a little bit more. (MM)
- wlarc='${wl}'
-+# AC_LIBTOOL_WIN32_DLL
-+# --------------------
-+# declare package support for building win32 DLLs
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_WIN32_DLL
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for tagname in $tagnames; do
++ IFS="$lt_save_ifs"
++ # Check whether tagname contains only valid characters
++ case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++ "") ;;
++ *) AC_MSG_ERROR([invalid tag name: $tagname])
++ ;;
++ esac
- # ancient GNU ld didn't support --whole-archive et. al.
- if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
@@ -5624,7 +5633,10 @@
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- else
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-- fi
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++ then
++ AC_MSG_ERROR([tag name \"$tagname\" already exists])
+ fi
- else
- with_gnu_ld=no
- wlarc=
@@ -5636,52 +5648,37 @@
- # the platform it is being used on.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- fi
-+# AC_ENABLE_SHARED([DEFAULT])
-+# ---------------------------
-+# implement the --enable-shared flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([shared],
-+ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-+])# AC_ENABLE_SHARED
++ # Update the list of available tags.
++ if test -n "$tagname"; then
++ echo appending configuration tag \"$tagname\" to $ofile
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++ case $tagname in
++ CXX)
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_LIBTOOL_LANG_CXX_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
-else
- GXX=no
- with_gnu_ld=no
- wlarc=
-fi
-+# AC_DISABLE_SHARED
-+# -----------------
-+# set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)
-+])# AC_DISABLE_SHARED
++ F77)
++ if test -n "$F77" && test "X$F77" != "Xno"; then
++ AC_LIBTOOL_LANG_F77_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
@@ -5700,6 +5697,13 @@
- no_entry_flag=""
- else
- aix_use_runtimelinking=no
++ GCJ)
++ if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++ AC_LIBTOOL_LANG_GCJ_CONFIG
++ else
++ tagname=""
++ fi
++ ;;
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -5713,53 +5717,40 @@
- ;;
- esac
- done
-- ;;
-- esac
-+# AC_ENABLE_STATIC([DEFAULT])
-+# ---------------------------
-+# implement the --enable-static flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([static],
-+ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-+])# AC_ENABLE_STATIC
++ RC)
++ AC_LIBTOOL_LANG_RC_CONFIG
++ ;;
++
++ *)
++ AC_MSG_ERROR([Unsupported tag name: $tagname])
+ ;;
+ esac
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
-- fi
++ # Append the new tag name to the list of available tags.
++ if test -n "$tagname" ; then
++ available_tags="$available_tags $tagname"
++ fi
+ fi
++ done
++ IFS="$lt_save_ifs"
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+# AC_DISABLE_STATIC
-+# -----------------
-+# set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)
-+])# AC_DISABLE_STATIC
++ # Now substitute the updated list of available tags.
++ if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++ mv "${ofile}T" "$ofile"
++ chmod +x "$ofile"
++ else
++ rm -f "${ofile}T"
++ AC_MSG_ERROR([unable to update list of available tagged configurations.])
++ fi
++fi
++])# _LT_AC_TAGCONFIG
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -5785,28 +5776,7 @@
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+# AC_ENABLE_FAST_INSTALL([DEFAULT])
-+# ---------------------------------
-+# implement the --enable-fast-install flag
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([fast-install],
-+ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
- fi
+- fi
- ;;
- esac
- shared_flag='-shared'
@@ -5827,12 +5797,12 @@
- fi
- fi
- fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-+])# AC_ENABLE_FAST_INSTALL
++# AC_LIBTOOL_DLOPEN
++# -----------------
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
@@ -5867,13 +5837,12 @@
- fi
- fi
- ;;
-+# AC_DISABLE_FAST_INSTALL
-+# -----------------------
-+# set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)
-+])# AC_DISABLE_FAST_INSTALL
++# AC_LIBTOOL_WIN32_DLL
++# --------------------
++# declare package support for building win32 DLLs
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_WIN32_DLL
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -5894,14 +5863,34 @@
- ;;
- esac
- ;;
-+# AC_LIBTOOL_PICMODE([MODE])
-+# --------------------------
-+# implement the --with-pic flag
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)
-+])# AC_LIBTOOL_PICMODE
++# AC_ENABLE_SHARED([DEFAULT])
++# ---------------------------
++# implement the --enable-shared flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++ [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++ [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
@@ -5925,32 +5914,7 @@
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-+# AC_PROG_EGREP
-+# -------------
-+# This is predefined starting with Autoconf 2.54, so this conditional
-+# definition can be removed once we require Autoconf 2.54 or later.
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+ then ac_cv_prog_egrep='grep -E'
-+ else ac_cv_prog_egrep='egrep'
-+ fi])
-+ EGREP=$ac_cv_prog_egrep
-+ AC_SUBST([EGREP])
-+])])
-+
-+
-+# AC_PATH_TOOL_PREFIX
-+# -------------------
-+# find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] | ?:[\\/]*])
-+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
- ;;
+- ;;
- darwin* | rhapsody*)
- case $host_os in
- rhapsody* | darwin1.[[012]])
@@ -5977,28 +5941,13 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+*)
-+ lt_save_MAGIC_CMD="$MAGIC_CMD"
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word. This closes a longstanding sh security hole.
-+ ac_dummy="ifelse([$2], , $PATH, [$2])"
-+ for ac_dir in $ac_dummy; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$1; then
-+ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+ if test -n "$file_magic_test_file"; then
-+ case $deplibs_check_method in
-+ "file_magic "*)
-+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+ $EGREP "$file_magic_regex" > /dev/null; then
-+ :
-+ else
-+ cat <<EOF 1>&2
++# AC_DISABLE_SHARED
++# -----------------
++# set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
- if test "$GXX" = yes ; then
- lt_int_apple_cc_single_mod=no
@@ -6033,35 +5982,9 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such. This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem. Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+ fi ;;
-+ esac
- fi
+- fi
- ;;
-+ break
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ MAGIC_CMD="$lt_save_MAGIC_CMD"
-+ ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+ AC_MSG_RESULT($MAGIC_CMD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+])# AC_PATH_TOOL_PREFIX
-
+-
- dgux*)
- case $cc_basename in
- ec++*)
@@ -6119,33 +6042,46 @@
- # dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
- ;;
-- *)
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++ [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++ [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
+ *)
- if test "$GXX" = yes; then
- _LT_AC_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'
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
-- ;;
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
+ ;;
- esac
- ;;
- hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# AC_PATH_MAGIC
-+# -------------
-+# find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+ if test -n "$ac_tool_prefix"; then
-+ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+ else
-+ MAGIC_CMD=:
-+ fi
-+fi
-+])# AC_PATH_MAGIC
++ esac],
++ [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
- case $host_cpu in
- hppa*64*|ia64*)
@@ -6161,13 +6097,49 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-- *)
++
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
++
++
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++ [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++ [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_fast_install=yes ;;
++ no) enable_fast_install=no ;;
+ *)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
- # but as the default
- # location of the library.
-- ;;
++ enable_fast_install=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_fast_install=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
+ ;;
- esac
++ esac],
++ [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
- case $cc_basename in
- CC*)
@@ -6217,45 +6189,7 @@
- fi
- ;;
- esac
-+# AC_PROG_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([AC_PROG_LD],
-+[AC_ARG_WITH([gnu-ld],
-+ [AC_HELP_STRING([--with-gnu-ld],
-+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+ [test "$withval" = no || with_gnu_ld=yes],
-+ [with_gnu_ld=no])
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+ # Check if gcc -print-prog-name=ld gives a path.
-+ AC_MSG_CHECKING([for ld used by $CC])
-+ case $host in
-+ *-*-mingw*)
-+ # gcc leaves a trailing carriage return which upsets mingw
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+ *)
-+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+ esac
-+ case $ac_prog in
-+ # Accept absolute paths.
-+ [[\\/]]* | ?:[[\\/]]*)
-+ re_direlt='/[[^/]][[^/]]*/\.\./'
-+ # Canonicalize the pathname of ld
-+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+ done
-+ test -z "$LD" && LD="$ac_prog"
-+ ;;
-+ "")
-+ # If it fails, then pretend we aren't using GCC.
-+ ac_prog=ld
- ;;
+- ;;
- interix3*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6269,43 +6203,20 @@
- # time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+ *)
-+ # If it is relative, then search for the first ld in PATH.
-+ with_gnu_ld=unknown
- ;;
+- ;;
- irix5* | irix6*)
- case $cc_basename in
- CC*)
- # SGI C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--
+
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
- # necessary to make sure instantiated templates are included
- # in the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+ esac
-+elif test "$with_gnu_ld" = yes; then
-+ AC_MSG_CHECKING([for GNU ld])
-+else
-+ AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+ lt_cv_path_LD="$ac_dir/$ac_prog"
-+ # Check to see if the program is GNU ld. I'd rather use --version,
-+ # but apparently some variants of GNU ld only accept -v.
-+ # Break only if it was the GNU/non-GNU ld that we prefer.
-+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+ *GNU* | *'with BFD'*)
-+ test "$with_gnu_ld" != no && break
- ;;
- *)
+- ;;
+- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -6314,8 +6225,7 @@
- fi
- fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ test "$with_gnu_ld" != yes && break
- ;;
+- ;;
- esac
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6324,22 +6234,13 @@
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-+ esac
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+else
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+ AC_MSG_RESULT($LD)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])# AC_PROG_LD
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
@@ -6355,10 +6256,18 @@
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--
+
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
+
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
@@ -6401,22 +6310,19 @@
- # Compaq C++
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+# AC_PROG_LD_GNU
-+# --------------
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+ lt_cv_prog_gnu_ld=yes
-+ ;;
-+*)
-+ lt_cv_prog_gnu_ld=no
-+ ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# AC_PROG_LD_GNU
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++ then ac_cv_prog_egrep='grep -E'
++ else ac_cv_prog_egrep='egrep'
++ fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
- runpath_var=LD_RUN_PATH
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6478,67 +6384,84 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+# AC_PROG_LD_RELOAD_FLAG
-+# ----------------------
-+# find reload flag for linker
-+# -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+ lt_cv_ld_reload_flag,
-+ [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+ darwin*)
-+ if test "$GCC" = yes; then
-+ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+ else
-+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
- fi
+- fi
- output_verbose_link_cmd='echo'
- ;;
+- ;;
- osf3*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
--
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognize shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] | ?:[\\/]*])
++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++ ;;
++*)
++ lt_save_MAGIC_CMD="$MAGIC_CMD"
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word. This closes a longstanding sh security hole.
++ ac_dummy="ifelse([$2], , $PATH, [$2])"
++ for ac_dir in $ac_dummy; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$1; then
++ lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++ if test -n "$file_magic_test_file"; then
++ case $deplibs_check_method in
++ "file_magic "*)
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++ $EGREP "$file_magic_regex" > /dev/null; then
++ :
++ else
++ cat <<EOF 1>&2
+
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+esac
-+])# AC_PROG_LD_RELOAD_FLAG
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such. This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem. Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++EOF
++ fi ;;
++ esac
++ fi
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++ MAGIC_CMD="$lt_save_MAGIC_CMD"
++ ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++ AC_MSG_RESULT($MAGIC_CMD)
++else
++ AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+# AC_DEPLIBS_CHECK_METHOD
-+# -----------------------
-+# how to check for library dependencies
-+# -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
- ;;
- RCC*)
@@ -6549,16 +6472,22 @@
- cxx*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+case $host_os in
-+aix4* | aix5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognize a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++ if test -n "$ac_tool_prefix"; then
++ AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++ else
++ MAGIC_CMD=:
++ fi
++fi
++])# AC_PATH_MAGIC
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+beos*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
@@ -6569,35 +6498,116 @@
- # from the output so that they don't get included in the library
- # dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-- ;;
-- *)
++# AC_PROG_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH([gnu-ld],
++ [AC_HELP_STRING([--with-gnu-ld],
++ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
++ [test "$withval" = no || with_gnu_ld=yes],
++ [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
++ AC_MSG_CHECKING([for ld used by $CC])
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [[\\/]]* | ?:[[\\/]]*)
++ re_direlt='/[[^/]][[^/]]*/\.\./'
++ # Canonicalize the pathname of ld
++ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
++ ac_prog=ld
++ ;;
++ *)
++ # If it is relative, then search for the first ld in PATH.
++ with_gnu_ld=unknown
++ ;;
++ esac
++elif test "$with_gnu_ld" = yes; then
++ AC_MSG_CHECKING([for GNU ld])
++else
++ AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++ lt_cv_path_LD="$ac_dir/$ac_prog"
++ # Check to see if the program is GNU ld. I'd rather use --version,
++ # but apparently some variants of GNU ld only accept -v.
++ # Break only if it was the GNU/non-GNU ld that we prefer.
++ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++ *GNU* | *'with BFD'*)
++ test "$with_gnu_ld" != no && break
+ ;;
+ *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+bsdi[[45]]*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+ lt_cv_file_magic_cmd='/usr/bin/file -L'
-+ lt_cv_file_magic_test_file=/shlib/libc.so
-+ ;;
++ test "$with_gnu_ld" != yes && break
++ ;;
++ esac
++ fi
++ done
++ IFS="$lt_save_ifs"
++else
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++ AC_MSG_RESULT($LD)
++else
++ AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+cygwin*)
-+ # func_win32_libid is a shell function defined in ltmain.sh
-+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+ lt_cv_file_magic_cmd='func_win32_libid'
-+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+mingw* | pw32*)
-+ # Base MSYS/MinGW do not provide the 'file' command needed by
-+ # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+ lt_cv_file_magic_cmd='$OBJDUMP -f'
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++ lt_cv_prog_gnu_ld=yes
+ ;;
++*)
++ lt_cv_prog_gnu_ld=no
++ ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
- else
- # FIXME: insert proper C++ library support
@@ -6605,40 +6615,63 @@
- fi
- ;;
- esac
-- ;;
++
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++# -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++ lt_cv_ld_reload_flag,
++ [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
+ ;;
- osf4* | osf5*)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-+darwin* | rhapsody*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+freebsd* | dragonfly*)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ case $host_cpu in
-+ i*86 )
-+ # Not sure whether the presence of OpenBSD here was a mistake.
-+ # Let's accept both of them until this is cleared up.
-+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+ ;;
-+ esac
-+ else
-+ lt_cv_deplibs_check_method=pass_all
-+ fi
-+ ;;
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+gnu*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++# -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
@@ -6656,29 +6689,15 @@
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
- $rm $lib.exp'
-+hpux10.20* | hpux11*)
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ case $host_cpu in
-+ ia64*)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+ ;;
-+ hppa*64*)
-+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+ ;;
-+ *)
-+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+ ;;
-+ esac
++case $host_os in
++aix4* | aix5*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+interix3*)
-+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++beos*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
- # Commands to make compiler produce verbose output that lists
@@ -6695,32 +6714,34 @@
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+irix5* | irix6* | nonstopux*)
-+ case $LD in
-+ *-32|*"-32 ") libmagic=32-bit;;
-+ *-n32|*"-n32 ") libmagic=N32;;
-+ *-64|*"-64 ") libmagic=64-bit;;
-+ *) libmagic=never-match;;
-+ esac
-+ lt_cv_deplibs_check_method=pass_all
++bsdi[[45]]*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++ lt_cv_file_magic_cmd='/usr/bin/file -L'
++ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+ lt_cv_deplibs_check_method=pass_all
++cygwin*)
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++mingw* | pw32*)
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ 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='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
@@ -6730,44 +6751,11 @@
- fi
- ;;
- esac
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+ ;;
-+
-+nto-qnx*)
-+ lt_cv_deplibs_check_method=unknown
-+ ;;
-+
-+openbsd*)
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+ fi
-+ ;;
-+
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+
-+sysv4 | sysv4.3*)
-+ case $host_vendor in
-+ motorola)
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
- ;;
+- ;;
- psos*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ncr)
-+ lt_cv_deplibs_check_method=pass_all
- ;;
+- ;;
- sunos4*)
- case $cc_basename in
- CC*)
@@ -6784,10 +6772,36 @@
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-- esac
-+ sequent)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++darwin* | rhapsody*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++freebsd* | dragonfly*)
++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++ case $host_cpu in
++ i*86 )
++ # Not sure whether the presence of OpenBSD here was a mistake.
++ # Let's accept both of them until this is cleared up.
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++ ;;
+ esac
++ else
++ lt_cv_deplibs_check_method=pass_all
++ fi
++ ;;
++
++gnu*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++hpux10.20* | hpux11*)
++ lt_cv_file_magic_cmd=/usr/bin/file
++ case $host_cpu in
++ ia64*)
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
- solaris*)
- case $cc_basename in
@@ -6798,17 +6812,14 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+ sni)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+ lt_cv_file_magic_test_file=/lib/libc.so
++ hppa*64*)
++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
++ *)
++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
-+ pc)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
+ esac
+ ;;
@@ -6816,53 +6827,7 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+esac
-+])
-+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
-+])# AC_DEPLIBS_CHECK_METHOD
-+
-+
-+# AC_PROG_NM
-+# ----------
-+# find the pathname to a BSD-compatible name lister
-+AC_DEFUN([AC_PROG_NM],
-+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+ # Let the user override the test.
-+ lt_cv_path_NM="$NM"
-+else
-+ lt_nm_to_check="${ac_tool_prefix}nm"
-+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+ lt_nm_to_check="$lt_nm_to_check nm"
-+ fi
-+ for lt_tmp_nm in $lt_nm_to_check; do
-+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+ IFS="$lt_save_ifs"
-+ test -z "$ac_dir" && ac_dir=.
-+ tmp_nm="$ac_dir/$lt_tmp_nm"
-+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+ # Check to see if the nm accepts a BSD-compat flag.
-+ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+ # nm: unknown option "B" ignored
-+ # Tru64's nm complains that /dev/null is an invalid object file
-+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+ */dev/null* | *'Invalid file or object type'*)
-+ lt_cv_path_NM="$tmp_nm -B"
-+ break
-+ ;;
-+ *)
-+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+ */dev/null*)
-+ lt_cv_path_NM="$tmp_nm -p"
-+ break
-+ ;;
- *)
+- *)
- # The C++ compiler is used as linker so we must use $wl
- # flag to pass the commands to the underlying system
- # linker. We must also pass each convience library through
@@ -6872,23 +6837,24 @@
- # without $wl.
- # Supported since Solaris 2.6 (maybe 2.5.1?)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+ continue # so that we can try to find one that supports BSD flags
- ;;
-+ esac
-+ ;;
- esac
+- ;;
+- esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ done
-+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi])
-+NM="$lt_cv_path_NM"
-+])# AC_PROG_NM
++interix[[3-9]]*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++ ;;
- output_verbose_link_cmd='echo'
++irix5* | irix6* | nonstopux*)
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
++ esac
++ lt_cv_deplibs_check_method=pass_all
++ ;;
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6899,25 +6865,10 @@
- gcx*)
- # Green Hills C++ Compiler
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+# AC_CHECK_LIBM
-+# -------------
-+# check for math library
-+AC_DEFUN([AC_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+ # These system don't have libm, or don't need it
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
-+*-ncr-sysv4.3*)
-+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+ ;;
-+*)
-+ AC_CHECK_LIB(m, cos, LIBM="-lm")
-+ ;;
-+esac
-+])# AC_CHECK_LIBM
- # The C++ compiler must be used to create the archive.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
@@ -6930,6 +6881,13 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_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'
++netbsd* | netbsdelf*-gnu)
++ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++ else
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++ fi
++ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
@@ -6941,35 +6899,20 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl convenience library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-convenience to the configure arguments. Note that
-+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
-+# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
-+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-+# (note the single quotes!). If your package is not flat and you're not
-+# using automake, define top_builddir and top_srcdir appropriately in
-+# the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+ case $enable_ltdl_convenience in
-+ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+ "") enable_ltdl_convenience=yes
-+ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+ esac
-+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+ # For backwards non-gettext consistent compatibility...
-+ INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_CONVENIENCE
++newos6*)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=/usr/lib/libnls.so
++ ;;
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
- fi
++nto-qnx*)
++ lt_cv_deplibs_check_method=unknown
++ ;;
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
- fi
@@ -6981,40 +6924,13 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var='LD_RUN_PATH'
-+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl installable library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-install to the configure arguments. Note that
-+# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
-+# and an installed libltdl is not found, it is assumed to be `libltdl'.
-+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-+# '${top_srcdir}/' (note the single quotes!). If your package is not
-+# flat and you're not using automake, define top_builddir and top_srcdir
-+# appropriately in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+ AC_CHECK_LIB(ltdl, lt_dlinit,
-+ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+ [if test x"$enable_ltdl_install" = xno; then
-+ AC_MSG_WARN([libltdl not installed, but installation disabled])
-+ else
-+ enable_ltdl_install=yes
-+ fi
-+ ])
-+ if test x"$enable_ltdl_install" = x"yes"; then
-+ ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
-+ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+ LIBLTDL="-lltdl"
-+ LTDLINCL=
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
-+ # For backwards non-gettext consistent compatibility...
-+ INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_INSTALLABLE
++ ;;
- case $cc_basename in
- CC*)
@@ -7052,6 +6968,9 @@
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var='LD_RUN_PATH'
++osf3* | osf4* | osf5*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
- case $cc_basename in
- CC*)
@@ -7063,7 +6982,20 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- esac
-- ;;
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++solaris*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++sysv4 | sysv4.3*)
++ case $host_vendor in
++ motorola)
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ ;;
- tandem*)
- case $cc_basename in
- NCC*)
@@ -7076,27 +7008,38 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- esac
-- ;;
++ ncr)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
- vxworks*)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
++ sequent)
++ lt_cv_file_magic_cmd='/bin/file'
++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+ ;;
- *)
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-- ;;
++ sni)
++ lt_cv_file_magic_cmd='/bin/file'
++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+# AC_LIBTOOL_CXX
-+# --------------
-+# enable support for C++ libraries
-+AC_DEFUN([AC_LIBTOOL_CXX],
-+[AC_REQUIRE([_LT_AC_LANG_CXX])
-+])# AC_LIBTOOL_CXX
-
+-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
++ siemens)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ esac
++ ;;
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
@@ -7105,26 +7048,17 @@
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+# _LT_AC_LANG_CXX
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_CXX],
-+[AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-+])# _LT_AC_LANG_CXX
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++esac
++])
++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
++])# AC_DEPLIBS_CHECK_METHOD
-AC_LIBTOOL_CONFIG($1)
-+# _LT_AC_PROG_CXXCPP
-+# ------------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+ (test "X$CXX" != "Xg++"))) ; then
-+ AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
-AC_LANG_POP
-CC=$lt_save_CC
@@ -7138,13 +7072,7 @@
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-+# AC_LIBTOOL_F77
-+# --------------
-+# enable support for Fortran 77 libraries
-+AC_DEFUN([AC_LIBTOOL_F77],
-+[AC_REQUIRE([_LT_AC_LANG_F77])
-+])# AC_LIBTOOL_F77
-
+-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------------------
-# Figure out "hidden" library dependencies from verbose
@@ -7192,19 +7120,88 @@
-if AC_TRY_EVAL(ac_compile); then
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
--
++# AC_PROG_NM
++# ----------
++# find the pathname to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
++[if test -n "$NM"; then
++ # Let the user override the test.
++ lt_cv_path_NM="$NM"
++else
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
++ break
++ ;;
++ *)
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
++ ;;
++ esac
++ fi
++ done
++ IFS="$lt_save_ifs"
++ done
++ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])# AC_PROG_NM
+
- # Sentinel used to keep track of whether or not we are before
- # the conftest object file.
- pre_test_object_deps_done=no
--
+
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
- output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
--
++# AC_CHECK_LIBM
++# -------------
++# check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++ # These system don't have libm, or don't need it
++ ;;
++*-ncr-sysv4.3*)
++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++ ;;
++*)
++ AC_CHECK_LIB(m, cos, LIBM="-lm")
++ ;;
++esac
++])# AC_CHECK_LIBM
+
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
--
+
- -L* | -R* | -l*)
- # Some compilers place space between "-{L,R}" and the path.
- # Remove the space.
@@ -7215,7 +7212,30 @@
- else
- prev=
- fi
--
++# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl convenience library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++ case $enable_ltdl_convenience in
++ no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++ "") enable_ltdl_convenience=yes
++ ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++ esac
++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++ # For backwards non-gettext consistent compatibility...
++ INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_CONVENIENCE
+
- if test "$pre_test_object_deps_done" = no; then
- case $p in
- -L* | -R*)
@@ -7239,7 +7259,7 @@
- fi
- fi
- ;;
--
+
- *.$objext)
- # This assumes that the test object file only shows up
- # once in the compiler output.
@@ -7247,6 +7267,40 @@
- pre_test_object_deps_done=yes
- continue
- fi
++# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl installable library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++ AC_CHECK_LIB(ltdl, lt_dlinit,
++ [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++ [if test x"$enable_ltdl_install" = xno; then
++ AC_MSG_WARN([libltdl not installed, but installation disabled])
++ else
++ enable_ltdl_install=yes
++ fi
++ ])
++ if test x"$enable_ltdl_install" = x"yes"; then
++ ac_configure_args="$ac_configure_args --enable-ltdl-install"
++ LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++ LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++ else
++ ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++ LIBLTDL="-lltdl"
++ LTDLINCL=
++ fi
++ # For backwards non-gettext consistent compatibility...
++ INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_INSTALLABLE
- if test "$pre_test_object_deps_done" = no; then
- if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
@@ -7262,42 +7316,49 @@
- fi
- fi
- ;;
-+# _LT_AC_LANG_F77
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_F77],
-+[AC_REQUIRE([AC_PROG_F77])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-+])# _LT_AC_LANG_F77
- *) ;; # Ignore the rest.
++# AC_LIBTOOL_CXX
++# --------------
++# enable support for C++ libraries
++AC_DEFUN([AC_LIBTOOL_CXX],
++[AC_REQUIRE([_LT_AC_LANG_CXX])
++])# AC_LIBTOOL_CXX
- esac
- done
-+# AC_LIBTOOL_GCJ
-+# --------------
-+# enable support for GCJ libraries
-+AC_DEFUN([AC_LIBTOOL_GCJ],
-+[AC_REQUIRE([_LT_AC_LANG_GCJ])
-+])# AC_LIBTOOL_GCJ
- # Clean up.
- rm -f a.out a.exe
-else
- echo "libtool.m4: error: problem compiling $1 test program"
--fi
++# _LT_AC_LANG_CXX
++# ---------------
++AC_DEFUN([_LT_AC_LANG_CXX],
++[AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])# _LT_AC_LANG_CXX
++
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
+ fi
++])# _LT_AC_PROG_CXXCPP
-$rm -f confest.$objext
-+# _LT_AC_LANG_GCJ
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_GCJ],
-+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-+ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-+ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-+ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-+ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-+])# _LT_AC_LANG_GCJ
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
-# PORTME: override above test on systems where it is broken
-ifelse([$1],[CXX],
@@ -7322,13 +7383,12 @@
- ;;
-esac
-])
-+# AC_LIBTOOL_RC
-+# -------------
-+# enable support for Windows resource files
-+AC_DEFUN([AC_LIBTOOL_RC],
-+[AC_REQUIRE([LT_AC_PROG_RC])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-+])# AC_LIBTOOL_RC
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
@@ -7337,6 +7397,36 @@
-# AC_LIBTOOL_LANG_F77_CONFIG
-# --------------------------
++# AC_LIBTOOL_GCJ
++# --------------
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
++
++
++# _LT_AC_LANG_GCJ
++# ---------------
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++ [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++ [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++ [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++ [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
++
++
++# AC_LIBTOOL_RC
++# -------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
++
++
+# AC_LIBTOOL_LANG_C_CONFIG
+# ------------------------
# Ensure that the configuration vars for the C compiler are
@@ -7382,11 +7472,11 @@
# Code to be used in simple compile tests
-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
-+lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code=" program t\n end\n"
-+lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
@@ -7415,7 +7505,7 @@
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
-@@ -4142,11 +3729,12 @@
+@@ -4165,11 +3793,12 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7429,7 +7519,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -4155,44 +3743,63 @@
+@@ -4178,44 +3807,63 @@
test "$enable_shared" = yes || enable_static=yes
AC_MSG_RESULT([$enable_static])
@@ -7460,16 +7550,14 @@
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
--
--# Source file extension for Java test sources.
--ac_ext=java
+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+[AC_LANG_PUSH(C++)
+AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
--# Object file extension for compiled Java test sources.
+-# Source file extension for Java test sources.
+-ac_ext=java
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
@@ -7489,7 +7577,8 @@
+_LT_AC_TAGVAR(no_undefined_flag, $1)=
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
+
+-# Object file extension for compiled Java test sources.
+# Dependencies to place before and after the object being linked:
+_LT_AC_TAGVAR(predep_objects, $1)=
+_LT_AC_TAGVAR(postdep_objects, $1)=
@@ -7506,15 +7595,15 @@
# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-+lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4202,4215 +3809,4673 @@
+@@ -4225,4215 +3873,4812 @@
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
@@ -7703,7 +7792,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -7810,7 +7899,29 @@
- _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
- _LT_AC_TAGVAR(exclude_expsyms, $1) \
- _LT_AC_TAGVAR(include_expsyms, $1); do
--
++ _LT_AC_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 echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ else
++ if test "$host_cpu" = ia64; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++ else
++ # Determine the default libpath from the value encoded in an empty executable.
++ _LT_AC_SYS_LIBPATH_AIX
++ _LT_AC_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.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++ # Exported symbols can be pulled into shared objects from archives
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ fi
++ fi
++ ;;
+
- case $var in
- _LT_AC_TAGVAR(old_archive_cmds, $1) | \
- _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
@@ -7836,26 +7947,14 @@
- case $lt_echo in
- *'\[$]0 --fallback-echo"')
- lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-+ _LT_AC_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 echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+ else
-+ if test "$host_cpu" = ia64; then
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+ else
-+ # Determine the default libpath from the value encoded in an empty executable.
-+ _LT_AC_SYS_LIBPATH_AIX
-+ _LT_AC_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.
-+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+ # Exported symbols can be pulled into shared objects from archives
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+ # This is similar to how AIX traditionally builds its shared libraries.
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ fi
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
;;
- esac
@@ -7905,23 +8004,16 @@
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e 1s/^X//"
-
+-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+ beos*)
-+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+ # support --undefined. This deserves some investigation. FIXME
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ else
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ fi
-+ ;;
-# The names of the tagged configurations supported by this script.
-available_tags=
+-
+-# ### BEGIN LIBTOOL CONFIG],
+-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+ chorus*)
+ case $cc_basename in
+ *)
@@ -7931,8 +8023,7 @@
+ esac
+ ;;
--# ### BEGIN LIBTOOL CONFIG],
--[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
@@ -7941,7 +8032,8 @@
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_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
@@ -7984,8 +8076,8 @@
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
+ if test "$GXX" = yes ; then
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
@@ -8009,10 +8101,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
@@ -8022,9 +8114,6 @@
+ fi
+ ;;
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
--
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
+ dgux*)
@@ -8104,9 +8193,7 @@
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+ ;;
++ hppa*64*|ia64*) ;;
+ *)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
@@ -8127,6 +8214,11 @@
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
+-
+-# The host system.
+-host_alias=$host_alias
+-host=$host
+-host_os=$host_os
+ case $cc_basename in
+ CC*)
+ # FIXME: insert proper C++ library support
@@ -8176,7 +8268,7 @@
+ ;;
+ esac
+ ;;
-+ interix3*)
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -8196,10 +8288,10 @@
+ # SGI C++
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
+-# The build system.
+-build_alias=$build_alias
+-build=$build
+-build_os=$build_os
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -8225,10 +8317,8 @@
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
@@ -8244,14 +8334,14 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# A C compiler.
+-LTCC=$lt_LTCC
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
@@ -8286,17 +8376,8 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--# A C compiler.
--LTCC=$lt_LTCC
--
-# LTCC compiler flags.
-LTCFLAGS=$lt_LTCFLAGS
--
--# A language-specific compiler.
--CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
--
--# Is the compiler the GNU C compiler?
--with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
@@ -8306,14 +8387,14 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# A language-specific compiler.
+-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# The linker used to build libraries.
--LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+-# Is the compiler the GNU C compiler?
+-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -8324,6 +8405,29 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
@@ -8362,42 +8466,74 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ openbsd*)
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
-+ output_verbose_link_cmd='echo'
+ ;;
+ osf3*)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# An ERE matcher.
+-EGREP=$lt_EGREP
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# The linker used to build libraries.
+-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# A symbol stripping program
--STRIP=$lt_STRIP
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
+ # Archives containing C++ object files must be created using
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+-# A BSD-compatible nm program.
+-NM=$lt_NM
+-
+-# A symbol stripping program
+-STRIP=$lt_STRIP
+-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
+-
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
+-
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
+-
+-# Used on cygwin: assembler.
+-AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
+-
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+-# How to pass a linker flag through the compiler.
+-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+ ;;
+ RCC*)
+ # Rational C++ 2.4.1
@@ -8408,13 +8544,13 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Old archive suffix (normally "a").
+-libext="$libext"
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -8430,21 +8566,21 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--# Used on cygwin: assembler.
--AS="$AS"
+-# Executable file suffix (normally "").
+-exeext="$exeext"
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+-pic_mode=$pic_mode
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
+-# What is the maximum length of a command?
+-max_cmd_len=$lt_cv_sys_max_cmd_len
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8457,20 +8593,20 @@
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
--# How to pass a linker flag through the compiler.
--wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--# Object file suffix (normally "o").
--objext="$ac_objext"
+-# Must we lock files when doing compilation?
+-need_locks=$lt_need_locks
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# Old archive suffix (normally "a").
--libext="$libext"
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
+ # Archives containing C++ object files must be created using
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
@@ -8488,13 +8624,13 @@
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ $rm $lib.exp'
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
+-# Do we need a version for libraries?
+-need_version=$need_version
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# Executable file suffix (normally "").
--exeext="$exeext"
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -8510,21 +8646,20 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ _LT_AC_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" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--# Additional compiler flags for building library objects.
--pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--pic_mode=$pic_mode
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -8564,35 +8699,27 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
--
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
-+ # The C++ compiler is used as linker so we must use $wl
-+ # flag to pass the commands to the underlying system
-+ # linker. We must also pass each convience library through
-+ # to the system linker between allextract/defaultextract.
-+ # The C++ compiler will combine linker options so we
-+ # cannot just pass the convience library names through
-+ # without $wl.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--# Do we need a version for libraries?
--need_version=$need_version
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+ output_verbose_link_cmd='echo'
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+ # necessary to make sure instantiated templates are included
@@ -8603,8 +8730,8 @@
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+ # The C++ compiler must be used to create the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+ ;;
@@ -8617,8 +8744,8 @@
+ _LT_AC_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'
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-# Library versioning type.
+-version_type=$version_type
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
@@ -8630,17 +8757,24 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+ output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
+ fi
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+-# List of archive names. First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
@@ -8651,8 +8785,17 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ runpath_var='LD_RUN_PATH'
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
+-
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -8690,8 +8833,8 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+ case $cc_basename in
+ CC*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -8728,13 +8871,17 @@
+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
+-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
+_LT_AC_TAGVAR(GCC, $1)="$GXX"
+_LT_AC_TAGVAR(LD, $1)="$LD"
--# Library versioning type.
--version_type=$version_type
+-# Commands used to build a loadable module (assumed same as above if empty)
+-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
+-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+AC_LIBTOOL_POSTDEP_PREDEP($1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
@@ -8743,13 +8890,14 @@
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
+AC_LIBTOOL_CONFIG($1)
--# List of archive names. First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+AC_LANG_POP
+CC=$lt_save_CC
+LDCXX=$LD
@@ -8763,8 +8911,9 @@
+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+])# AC_LIBTOOL_LANG_CXX_CONFIG
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+# ------------------------------------
+# Figure out "hidden" library dependencies from verbose
@@ -8813,32 +8962,29 @@
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+ # Sentinel used to keep track of whether or not we are before
+ # the conftest object file.
+ pre_test_object_deps_done=no
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+-# The library search path used internally by the compiler when linking
+-# a shared library.
+-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
--archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
+ -L* | -R* | -l*)
+ # Some compilers place space between "-{L,R}" and the path.
+ # Remove the space.
@@ -8850,9 +8996,8 @@
+ prev=
+ fi
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
--module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
+ if test "$pre_test_object_deps_done" = no; then
+ case $p in
+ -L* | -R*)
@@ -8877,9 +9022,8 @@
+ fi
+ ;;
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
@@ -8888,9 +9032,8 @@
+ continue
+ fi
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+ if test "$pre_test_object_deps_done" = no; then
+ if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
+ _LT_AC_TAGVAR(predep_objects, $1)="$p"
@@ -8906,37 +9049,33 @@
+ fi
+ ;;
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
+ *) ;; # Ignore the rest.
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ esac
+ done
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ # Clean up.
+ rm -f a.out a.exe
+else
+ echo "libtool.m4: error: problem compiling $1 test program"
+fi
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+$rm -f confest.$objext
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
-+interix3*)
++interix[[3-9]]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ _LT_AC_TAGVAR(predep_objects,$1)=
@@ -8944,30 +9083,67 @@
+ _LT_AC_TAGVAR(postdeps,$1)=
+ ;;
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
+
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+solaris*)
+ case $cc_basename in
+ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
+
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
-+ _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
+ ;;
+ esac
+ ;;
+esac
+])
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+case " $_LT_AC_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+])# AC_LIBTOOL_POSTDEP_PREDEP
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
+# AC_LIBTOOL_LANG_F77_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
@@ -8978,8 +9154,9 @@
+[AC_REQUIRE([AC_PROG_F77])
+AC_LANG_PUSH(Fortran 77)
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
+_LT_AC_TAGVAR(always_export_symbols, $1)=no
@@ -8999,40 +9176,54 @@
+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-# If ld is used when linking, flag to hardcode \$libdir into
+-# a binary during linking. This must work even if \$libdir does
+-# not exist.
+-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+# Source file extension for f77 test sources.
+ac_ext=f
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_AC_TAGVAR(objext, $1)=$objext
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+# Code to be used in simple compile tests
-+lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+# Code to be used in simple link tests
-+lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_AC_SYS_COMPILER
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-# Set to yes if building a shared library automatically hardcodes DIR into the library
+-# and all subsequent libraries and executables linked against it.
+-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+CC=${F77-"f77"}
@@ -9040,19 +9231,18 @@
+_LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
--# How to hardcode a shared library path into an executable.
--hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+AC_MSG_CHECKING([if libtool supports shared libraries])
+AC_MSG_RESULT([$can_build_shared])
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+AC_MSG_CHECKING([whether to build shared libraries])
+test "$can_build_shared" = "no" && enable_shared=no
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+# On AIX, shared libraries and static libraries use the same namespace, and
+# are all built from PIC.
+case $host_os in
@@ -9071,23 +9261,20 @@
+esac
+AC_MSG_RESULT([$enable_shared])
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
+AC_MSG_CHECKING([whether to build static libraries])
+# Make sure either enable_shared or enable_static is yes.
+test "$enable_shared" = yes || enable_static=yes
+AC_MSG_RESULT([$enable_static])
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+_LT_AC_TAGVAR(GCC, $1)="$G77"
+_LT_AC_TAGVAR(LD, $1)="$LD"
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+AC_LIBTOOL_PROG_COMPILER_PIC($1)
+AC_LIBTOOL_PROG_CC_C_O($1)
+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
@@ -9095,25 +9282,22 @@
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
+AC_LIBTOOL_CONFIG($1)
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+AC_LANG_POP
+CC="$lt_save_CC"
+])# AC_LIBTOOL_LANG_F77_CONFIG
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+-# Symbols that must always be exported.
+-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
+-ifelse([$1],[],
+-[# ### END LIBTOOL CONFIG],
+-[# ### END LIBTOOL TAG CONFIG: $tagname])
+# AC_LIBTOOL_LANG_GCJ_CONFIG
+# --------------------------
+# Ensure that the configuration vars for the C compiler are
@@ -9123,77 +9307,17 @@
+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
+[AC_LANG_SAVE
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+-__EOF__
+# Source file extension for Java test sources.
+ac_ext=java
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
-
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-
--# Set to yes if exported symbols are required.
--always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
--# Symbols that must always be exported.
--include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-
--ifelse([$1],[],
--[# ### END LIBTOOL CONFIG],
--[# ### END LIBTOOL TAG CONFIG: $tagname])
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+AC_LIBTOOL_PROG_CC_C_O($1)
-+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-+AC_LIBTOOL_PROG_LD_SHLIBS($1)
-+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-
--__EOF__
-+AC_LIBTOOL_CONFIG($1)
-
-ifelse([$1],[], [
- case $host_os in
- aix3*)
- cat <<\EOF >> "$cfgfile"
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_GCJ_CONFIG
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
-# AIX sometimes has problems with the GCC collect2 program. For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
@@ -9205,20 +9329,16 @@
-EOF
- ;;
- esac
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}"
- # We use sed instead of cat because bash on DJGPP gets confused if
- # 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 '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-+# AC_LIBTOOL_LANG_RC_CONFIG
-+# -------------------------
-+# Ensure that the configuration vars for the Windows resource compiler are
-+# suitably defined. Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-+[AC_LANG_SAVE
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
- mv -f "$cfgfile" "$ofile" || \
- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
@@ -9234,28 +9354,31 @@
- fi
-fi
-])# AC_LIBTOOL_CONFIG
-+# Source file extension for RC test sources.
-+ac_ext=rc
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
@@ -9263,17 +9386,15 @@
- [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++AC_LIBTOOL_CONFIG($1)
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
@@ -9287,107 +9408,34 @@
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix. What could be older than Ultrix?!! ;)]
-+AC_LIBTOOL_CONFIG($1)
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_GCJ_CONFIG
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_RC_CONFIG
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++# AC_LIBTOOL_LANG_RC_CONFIG
++# -------------------------
++# Ensure that the configuration vars for the Windows resource compiler are
++# suitably defined. Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
++AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
++[AC_LANG_SAVE
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+# AC_LIBTOOL_CONFIG([TAGNAME])
-+# ----------------------------
-+# If TAGNAME is not passed, then create an initial libtool script
-+# with a default configuration from the untagged config vars. Otherwise
-+# add code to config.status for appending the configuration named by
-+# TAGNAME from the matching tagged config vars.
-+AC_DEFUN([AC_LIBTOOL_CONFIG],
-+[# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+ # See if we are running on zsh, and set the options which allow our commands through
-+ # without removal of \ escapes.
-+ if test -n "${ZSH_VERSION+set}" ; then
-+ setopt NO_GLOB_SUBST
-+ fi
-+ # Now quote all the things that may contain metacharacters while being
-+ # careful not to overquote the AC_SUBSTed values. We take copies of the
-+ # variables and quote the copies for generation of the libtool script.
-+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+ SED SHELL STRIP \
-+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+ deplibs_check_method reload_flag reload_cmds need_locks \
-+ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+ lt_cv_sys_global_symbol_to_c_name_address \
-+ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+ old_postinstall_cmds old_postuninstall_cmds \
-+ _LT_AC_TAGVAR(compiler, $1) \
-+ _LT_AC_TAGVAR(CC, $1) \
-+ _LT_AC_TAGVAR(LD, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-+ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-+ _LT_AC_TAGVAR(old_archive_cmds, $1) \
-+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-+ _LT_AC_TAGVAR(predep_objects, $1) \
-+ _LT_AC_TAGVAR(postdep_objects, $1) \
-+ _LT_AC_TAGVAR(predeps, $1) \
-+ _LT_AC_TAGVAR(postdeps, $1) \
-+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+ _LT_AC_TAGVAR(archive_cmds, $1) \
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
-+ _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-+ _LT_AC_TAGVAR(no_undefined_flag, $1) \
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-+ _LT_AC_TAGVAR(hardcode_automatic, $1) \
-+ _LT_AC_TAGVAR(module_cmds, $1) \
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
-+ _LT_AC_TAGVAR(include_expsyms, $1); do
++# Source file extension for RC test sources.
++ac_ext=rc
-# 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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ case $var in
-+ _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-+ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-+ _LT_AC_TAGVAR(archive_cmds, $1) | \
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-+ _LT_AC_TAGVAR(module_cmds, $1) | \
-+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+ postinstall_cmds | postuninstall_cmds | \
-+ old_postinstall_cmds | old_postuninstall_cmds | \
-+ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+ # Double-quote double-evaled strings.
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+ ;;
-+ *)
-+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+ ;;
-+ esac
-+ done
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
-# Define system-specific variables.
-case $host_os in
@@ -9433,11 +9481,8 @@
- symcode='[[DFNSTU]]'
- ;;
-esac
-+ case $lt_echo in
-+ *'\[$]0 --fallback-echo"')
-+ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-+ ;;
-+ esac
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-# Handle CRLF in mingw tool chain
-opt_cr=
@@ -9446,68 +9491,42 @@
- opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
- ;;
-esac
-+ifelse([$1], [],
-+ [cfgfile="${ofile}T"
-+ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+ $rm -f "$cfgfile"
-+ AC_MSG_NOTICE([creating $ofile])],
-+ [cfgfile="$ofile"])
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
- symcode='[[ABCDGIRSTW]]' ;;
-esac
-+ cat <<__EOF__ >> "$cfgfile"
-+ifelse([$1], [],
-+[#! $SHELL
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
- # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
- symxfrm="\\1 $ac_symprfx\\2 \\2"
-+# A sed program that does not truncate output.
-+SED=$lt_SED
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
- # Write the raw and C identifiers.
- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="$SED -e 1s/^X//"
++AC_LIBTOOL_CONFIG($1)
- # Check to see that the pipe works correctly.
- pipe_works=no
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_RC_CONFIG
- rm -f conftest*
- cat > conftest.$ac_ext <<EOF
@@ -9521,8 +9540,6 @@
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-+# The names of the tagged configurations supported by this script.
-+available_tags=
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
@@ -9534,8 +9551,71 @@
- else
- rm -f "$nlist"T
- fi
-+# ### BEGIN LIBTOOL CONFIG],
-+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++# AC_LIBTOOL_CONFIG([TAGNAME])
++# ----------------------------
++# If TAGNAME is not passed, then create an initial libtool script
++# with a default configuration from the untagged config vars. Otherwise
++# add code to config.status for appending the configuration named by
++# TAGNAME from the matching tagged config vars.
++AC_DEFUN([AC_LIBTOOL_CONFIG],
++[# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++ # See if we are running on zsh, and set the options which allow our commands through
++ # without removal of \ escapes.
++ if test -n "${ZSH_VERSION+set}" ; then
++ setopt NO_GLOB_SUBST
++ fi
++ # Now quote all the things that may contain metacharacters while being
++ # careful not to overquote the AC_SUBSTed values. We take copies of the
++ # variables and quote the copies for generation of the libtool script.
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
++ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++ deplibs_check_method reload_flag reload_cmds need_locks \
++ lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++ lt_cv_sys_global_symbol_to_c_name_address \
++ sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++ old_postinstall_cmds old_postuninstall_cmds \
++ _LT_AC_TAGVAR(compiler, $1) \
++ _LT_AC_TAGVAR(CC, $1) \
++ _LT_AC_TAGVAR(LD, $1) \
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
++ _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
++ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
++ _LT_AC_TAGVAR(old_archive_cmds, $1) \
++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
++ _LT_AC_TAGVAR(predep_objects, $1) \
++ _LT_AC_TAGVAR(postdep_objects, $1) \
++ _LT_AC_TAGVAR(predeps, $1) \
++ _LT_AC_TAGVAR(postdeps, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(archive_cmds, $1) \
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
++ _LT_AC_TAGVAR(postinstall_cmds, $1) \
++ _LT_AC_TAGVAR(postuninstall_cmds, $1) \
++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
++ _LT_AC_TAGVAR(allow_undefined_flag, $1) \
++ _LT_AC_TAGVAR(no_undefined_flag, $1) \
++ _LT_AC_TAGVAR(export_symbols_cmds, $1) \
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
++ _LT_AC_TAGVAR(hardcode_automatic, $1) \
++ _LT_AC_TAGVAR(module_cmds, $1) \
++ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
++ _LT_AC_TAGVAR(exclude_expsyms, $1) \
++ _LT_AC_TAGVAR(include_expsyms, $1); do
- # Make sure that we snagged all the symbols we need.
- if grep ' nm_test_var$' "$nlist" >/dev/null; then
@@ -9544,13 +9624,36 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++ case $var in
++ _LT_AC_TAGVAR(old_archive_cmds, $1) | \
++ _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
++ _LT_AC_TAGVAR(archive_cmds, $1) | \
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
++ _LT_AC_TAGVAR(module_cmds, $1) | \
++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
++ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
++ extract_expsyms_cmds | reload_cmds | finish_cmds | \
++ postinstall_cmds | postuninstall_cmds | \
++ old_postinstall_cmds | old_postuninstall_cmds | \
++ sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++ # Double-quote double-evaled strings.
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++ ;;
++ *)
++ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++ ;;
++ esac
++ done
-EOF
- # Now generate the symbol file.
- eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++ case $lt_echo in
++ *'\[$]0 --fallback-echo"')
++ lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++ ;;
++ esac
- cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
@@ -9559,8 +9662,12 @@
-# define lt_ptr_t char *
-# define const
-#endif
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++ifelse([$1], [],
++ [cfgfile="${ofile}T"
++ trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++ $rm -f "$cfgfile"
++ AC_MSG_NOTICE([creating $ofile])],
++ [cfgfile="$ofile"])
-/* The mapping between symbol names and symbols. */
-const struct {
@@ -9574,8 +9681,9 @@
- cat <<\EOF >> conftest.$ac_ext
- {0, (lt_ptr_t) 0}
-};
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++ cat <<__EOF__ >> "$cfgfile"
++ifelse([$1], [],
++[#! $SHELL
-#ifdef __cplusplus
-}
@@ -9606,8 +9714,34 @@
- cat conftest.$ac_ext >&5
- fi
- rm -f conftest* conftst*
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
- # Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
@@ -9626,11 +9760,11 @@
- AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
++# A sed program that does not truncate output.
++SED=$lt_SED
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e 1s/^X//"
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
@@ -9638,10 +9772,9 @@
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
@@ -9649,10 +9782,8 @@
- if test "$GXX" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# The names of the tagged configurations supported by this script.
++available_tags=
- case $host_os in
- aix*)
@@ -9924,6 +10055,39 @@
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++# ### BEGIN LIBTOOL CONFIG],
++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
++
+# An echo program that does not interpret backslashes.
+echo=$lt_echo
+
@@ -9995,84 +10159,6 @@
+# Additional compiler flags for building library objects.
+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-+
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names. First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
- case $host_os in
- aix*)
@@ -10082,9 +10168,8 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
- amigaos*)
- # FIXME: we need at least 68020 code to build shared libraries, but
@@ -10092,41 +10177,37 @@
- # like `-m68040'.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
- # PIC is the default for these OSes.
- ;;
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
- mingw* | pw32* | os2*)
- # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++# Do we need a version for libraries?
++need_version=$need_version
- interix3*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
- msdosdjgpp*)
- # Just because we use GCC doesn't mean we suddenly get shared libraries
@@ -10134,16 +10215,16 @@
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- enable_shared=no
- ;;
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
- sysv4*MP*)
- if test -d /usr/nec; then
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
- ;;
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
- hpux*)
- # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
@@ -10157,8 +10238,8 @@
- ;;
- esac
- ;;
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
@@ -10186,16 +10267,16 @@
- ;;
- esac
- ;;
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
- mingw* | pw32* | os2*)
- # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
- hpux9* | hpux10* | hpux11*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -10212,23 +10293,23 @@
- # Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- ;;
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
- irix5* | irix6* | nonstopux*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # PIC (with -KPIC) is the default.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
- newsos6)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++# Library versioning type.
++version_type=$version_type
- linux*)
- case $cc_basename in
@@ -10251,16 +10332,17 @@
- ;;
- esac
- ;;
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
- osf3* | osf4* | osf5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
++# List of archive names. First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
- solaris*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -10272,24 +10354,27 @@
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
- esac
- ;;
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
- sunos4*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
- sysv4 | sysv4.2uw2* | sysv4.3*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
- sysv4*MP*)
- if test -d /usr/nec ;then
@@ -10297,34 +10382,76 @@
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
- ;;
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
- sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++
++# 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.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
- unicos*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
- ;;
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
- uts4*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- ;;
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- *)
- _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
@@ -10333,27 +10460,8 @@
- fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-#
-# Check to make sure the PIC flag actually works.
@@ -10378,8 +10486,8 @@
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
- ;;
-esac
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-#
-# Check to make sure the static flag actually works.
@@ -10391,11 +10499,11 @@
- [],
- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-])
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
@@ -10480,15 +10588,15 @@
- with_gnu_ld=no
- ;;
- esac
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
- if test "$with_gnu_ld" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# How to hardcode a shared library path into an executable.
++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
- # Set some defaults for GNU ld with shared library support. These
- # are reset later if shared libraries are not supported. Putting them
@@ -10510,8 +10618,8 @@
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
- # See if GNU ld supports shared libraries.
- case $host_os in
@@ -10520,31 +10628,33 @@
- if test "$host_cpu" != ia64; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-+# Symbols that must always be exported.
-+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-+ifelse([$1],[],
-+[# ### END LIBTOOL CONFIG],
-+[# ### END LIBTOOL TAG CONFIG: $tagname])
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-EOF
- fi
- ;;
-+__EOF__
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ifelse([$1],[], [
-+ case $host_os in
-+ aix3*)
-+ cat <<\EOF >> "$cfgfile"
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
- # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
@@ -10554,16 +10664,9 @@
- # them.
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+# AIX sometimes has problems with the GCC collect2 program. For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+ COLLECT_NAMES=
-+ export COLLECT_NAMES
-+fi
-+EOF
-+ ;;
-+ esac
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
- beos*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10575,11 +10678,9 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+ # We use sed instead of cat because bash on DJGPP gets confused if
-+ # 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 '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
- cygwin* | mingw* | pw32*)
- # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
@@ -10589,20 +10690,9 @@
- _LT_AC_TAGVAR(always_export_symbols, $1)=no
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- _LT_AC_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'
-+ mv -f "$cfgfile" "$ofile" || \
-+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+ chmod +x "$ofile"
-+])
-+else
-+ # If there is no Makefile yet, we rely on a make rule to execute
-+ # `config.status --recheck' to rerun these tests and create the
-+ # libtool script then.
-+ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+ if test -f "$ltmain_in"; then
-+ test -f Makefile && make "$ltmain"
-+ fi
-+fi
-+])# AC_LIBTOOL_CONFIG
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
- if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -10619,6 +10709,12 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
- interix3*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=no
@@ -10634,12 +10730,8 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+
-+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- linux*)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10660,8 +10752,8 @@
- tmp_addflag=' -nofor_main' ;;
- esac
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+if test "$GCC" = yes; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
@@ -10673,12 +10765,8 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+ lt_cv_prog_compiler_rtti_exceptions,
-+ [-fno-rtti -fno-exceptions], [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path=$lt_fix_srcfile_path
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -10689,23 +10777,15 @@
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
++# Set to yes if exported symbols are required.
++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
- solaris*)
- if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<EOF 1>&2
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems. Therefore, libtool
@@ -10713,10 +10793,34 @@
-*** binutils to release 2.9.1 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++
++# Symbols that must always be exported.
++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++
++ifelse([$1],[],
++[# ### END LIBTOOL CONFIG],
++[# ### END LIBTOOL TAG CONFIG: $tagname])
++
++__EOF__
++
++ifelse([$1],[], [
++ case $host_os in
++ aix3*)
++ cat <<\EOF >> "$cfgfile"
--EOF
++# AIX sometimes has problems with the GCC collect2 program. For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++ COLLECT_NAMES=
++ export COLLECT_NAMES
++fi
+ EOF
- elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
@@ -10724,16 +10828,19 @@
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++ ;;
++ esac
- sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
- case `$LD -v 2>&1` in
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++ # We use sed instead of cat because bash on DJGPP gets confused if
++ # 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 '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems. Therefore, libtool
@@ -10741,8 +10848,20 @@
-*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-+# 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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ mv -f "$cfgfile" "$ofile" || \
++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++ chmod +x "$ofile"
++])
++else
++ # If there is no Makefile yet, we rely on a make rule to execute
++ # `config.status --recheck' to rerun these tests and create the
++ # libtool script then.
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
++ fi
++fi
++])# AC_LIBTOOL_CONFIG
-_LT_EOF
- ;;
@@ -10757,50 +10876,6 @@
- ;;
- esac
- ;;
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+ symcode='[[BCDT]]'
-+ ;;
-+cygwin* | mingw* | pw32*)
-+ symcode='[[ABCDGISTW]]'
-+ ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDEGRST]]'
-+ fi
-+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ ;;
-+linux* | k*bsd*-gnu)
-+ if test "$host_cpu" = ia64; then
-+ symcode='[[ABCDGIRSTW]]'
-+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
-+ fi
-+ ;;
-+irix* | nonstopux*)
-+ symcode='[[BCDEGRST]]'
-+ ;;
-+osf*)
-+ symcode='[[BCDEGQRST]]'
-+ ;;
-+solaris*)
-+ symcode='[[BDRT]]'
-+ ;;
-+sco3.2v5*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv4.2uw2*)
-+ symcode='[[DT]]'
-+ ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+ symcode='[[ABDT]]'
-+ ;;
-+sysv4)
-+ symcode='[[DFNSTU]]'
-+ ;;
-+esac
- sunos4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -10808,13 +10883,10 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+ ;;
-+esac
++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
- *)
- if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -10825,11 +10897,7 @@
- fi
- ;;
- esac
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+ symcode='[[ABCDGIRSTW]]' ;;
-+esac
++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
- runpath_var=
@@ -10853,8 +10921,8 @@
- _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
- fi
- ;;
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
++if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- aix4* | aix5*)
- if test "$host_cpu" = ia64; then
@@ -10872,8 +10940,12 @@
- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
- fi
- aix_use_runtimelinking=no
-+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+ symxfrm="\\1 $ac_symprfx\\2 \\2"
++ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++ lt_cv_prog_compiler_rtti_exceptions,
++ [-fno-rtti -fno-exceptions], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
- # Test if we are trying to use run time linking or normal
- # AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -10887,58 +10959,44 @@
- done
- ;;
- esac
-+ # Write the raw and C identifiers.
-+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+
-+ # Check to see that the pipe works correctly.
-+ pipe_works=no
-+
-+ rm -f conftest*
-+ cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
- exp_sym_flag='-bexport'
- no_entry_flag='-bnoentry'
-+ if AC_TRY_EVAL(ac_compile); then
-+ # Now try to grab the symbols.
-+ nlist=conftest.nm
-+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+ # Try sorting and uniquifying the output.
-+ if sort "$nlist" | uniq > "$nlist"T; then
-+ mv -f "$nlist"T "$nlist"
-+ else
-+ rm -f "$nlist"T
- fi
+- fi
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix. What could be older than Ultrix?!! ;)]
- # When large executables or shared objects are built, AIX ld can
- # have problems creating the table of contents. If linking a library
- # or program results in "error TOC overflow" add -mminimal-toc to
- # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
- # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+ # Make sure that we snagged all the symbols we need.
-+ if grep ' nm_test_var$' "$nlist" >/dev/null; then
-+ if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+ cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
- _LT_AC_TAGVAR(archive_cmds, $1)=''
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+EOF
-+ # Now generate the symbol file.
-+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
- if test "$GCC" = yes; then
- case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -10980,13 +11038,50 @@
- fi
- fi
- fi
-+ cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
++# Define system-specific variables.
++case $host_os in
++aix*)
++ symcode='[[BCDT]]'
++ ;;
++cygwin* | mingw* | pw32*)
++ symcode='[[ABCDGISTW]]'
++ ;;
++hpux*) # Its linker distinguishes data from code symbols
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDEGRST]]'
++ fi
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ ;;
++linux* | k*bsd*-gnu)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDGIRSTW]]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
++irix* | nonstopux*)
++ symcode='[[BCDEGRST]]'
++ ;;
++osf*)
++ symcode='[[BCDEGQRST]]'
++ ;;
++solaris*)
++ symcode='[[BDRT]]'
++ ;;
++sco3.2v5*)
++ symcode='[[DT]]'
++ ;;
++sysv4.2uw2*)
++ symcode='[[DT]]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[[ABDT]]'
++ ;;
++sysv4)
++ symcode='[[DFNSTU]]'
++ ;;
++esac
- # It seems that -bexpall does not export symbols beginning with
- # underscore (_), so it is better to generate a list of symbols to export.
@@ -11004,35 +11099,7 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
- _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+ const char *name;
-+ lt_ptr_t address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+ cat <<\EOF >> conftest.$ac_ext
-+ {0, (lt_ptr_t) 0}
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+ # Now try linking the two files.
-+ mv conftest.$ac_objext conftstm.$ac_objext
-+ lt_save_LIBS="$LIBS"
-+ lt_save_CFLAGS="$CFLAGS"
-+ LIBS="conftstm.$ac_objext"
-+ CFLAGS="$CFLAGS$_LT_AC_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"
- else
+- else
- # Determine the default libpath from the value encoded in an empty executable.
- _LT_AC_SYS_LIBPATH_AIX
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -11045,13 +11112,17 @@
- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
- fi
-+ else
-+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
- fi
+- fi
+- fi
- ;;
--
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++ opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++ ;;
++esac
+
- amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -11059,35 +11130,17 @@
- # see comment about different semantics on the GNU ld section
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
-+ else
-+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+ fi
-+ else
-+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+ cat conftest.$ac_ext >&5
-+ fi
-+ rm -f conftest* conftst*
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++ symcode='[[ABCDGIRSTW]]' ;;
++esac
- bsdi[[45]]*)
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
- ;;
-+ # Do not use the global_symbol_pipe unless it works.
-+ if test "$pipe_works" = yes; then
-+ break
-+ else
-+ lt_cv_sys_global_symbol_pipe=
-+ fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+ lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+ AC_MSG_RESULT(failed)
-+else
-+ AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
- cygwin* | mingw* | pw32*)
- # When not using gcc, we currently assume that we are using
@@ -11109,6 +11162,8 @@
- _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
- _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- ;;
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
- darwin* | rhapsody*)
- case $host_os in
@@ -11159,36 +11214,33 @@
- esac
- fi
- ;;
-+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-+# ---------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++ # Write the raw and C identifiers.
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- dgux*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+ ifelse([$1],[CXX],[
-+ # C++ specific cases for pic, static, wl, etc.
-+ if test "$GXX" = yes; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ # Check to see that the pipe works correctly.
++ pipe_works=no
- freebsd1*)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
- ;;
--
+- ;;
++ rm -f conftest*
++ cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
+
- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
- # support. Future versions do this automatically, but an explicit c++rt0.o
- # does not break anything, and helps significantly (at the cost of a little
@@ -11198,55 +11250,125 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
- ;;
--
+- ;;
++ if AC_TRY_EVAL(ac_compile); then
++ # Now try to grab the symbols.
++ nlist=conftest.nm
++ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++ # Try sorting and uniquifying the output.
++ if sort "$nlist" | uniq > "$nlist"T; then
++ mv -f "$nlist"T "$nlist"
++ else
++ rm -f "$nlist"T
++ fi
++
++ # Make sure that we snagged all the symbols we need.
++ if grep ' nm_test_var$' "$nlist" >/dev/null; then
++ if grep ' nm_test_func$' "$nlist" >/dev/null; then
++ cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
+
- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
- ;;
--
+- ;;
++EOF
++ # Now generate the symbol file.
++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
+
- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ mingw* | os2* | pw32*)
-+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
- ;;
--
+- ;;
++ cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
+
- hpux9*)
- if test "$GCC" = yes; then
- _LT_AC_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'
-- else
++/* The mapping between symbol names and symbols. */
++const struct {
++ const char *name;
++ lt_ptr_t address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++ cat <<\EOF >> conftest.$ac_ext
++ {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++ # Now try linking the two files.
++ mv conftest.$ac_objext conftstm.$ac_objext
++ lt_save_LIBS="$LIBS"
++ lt_save_CFLAGS="$CFLAGS"
++ LIBS="conftstm.$ac_objext"
++ CFLAGS="$CFLAGS$_LT_AC_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"
++ else
++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++ fi
+ else
- _LT_AC_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
++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+ fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--
++ else
++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++ fi
++ else
++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++ cat conftest.$ac_ext >&5
++ fi
++ rm -f conftest* conftst*
+
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
--
+- ;;
++ # Do not use the global_symbol_pipe unless it works.
++ if test "$pipe_works" = yes; then
++ break
++ else
++ lt_cv_sys_global_symbol_pipe=
++ fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++ lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++ AC_MSG_RESULT(failed)
++else
++ AC_MSG_RESULT(ok)
++fi
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+
- hpux10*)
- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -11256,24 +11378,32 @@
- if test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
+
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--
++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
++# ---------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+
- # hardcode_minus_L: Not really in the search PATH,
- # but as the default location of the library.
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ *djgpp*)
-+ # DJGPP does not support shared libraries at all
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
-+ ;;
-+ sysv4*MP*)
-+ if test -d /usr/nec; then
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++ ifelse([$1],[CXX],[
++ # C++ specific cases for pic, static, wl, etc.
++ if test "$GXX" = yes; then
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++ case $host_os in
++ aix*)
++ # All AIX code is PIC.
++ if test "$host_cpu" = ia64; then
++ # AIX 5 now supports IA64 processor
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
;;
-
@@ -11288,6 +11418,40 @@
- ;;
- *)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ amigaos*)
++ # FIXME: we need at least 68020 code to build shared libraries, but
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++ ;;
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ # PIC is the default for these OSes.
++ ;;
++ mingw* | cygwin* | os2* | pw32*)
++ # 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).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ ;;
++ darwin* | rhapsody*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++ ;;
++ *djgpp*)
++ # DJGPP does not support shared libraries at all
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++ ;;
++ interix[[3-9]]*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++ sysv4*MP*)
++ if test -d /usr/nec; then
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++ fi
++ ;;
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
@@ -11426,8 +11590,35 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
+ ;;
-+ esac
+ esac
+- fi
+- if test "$with_gnu_ld" = no; then
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-
+- case $host_cpu in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- *)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- ;;
+ ;;
+ lynxos*)
+ ;;
@@ -11440,7 +11631,9 @@
+ ;;
+ *)
+ ;;
-+ esac
+ esac
+- fi
+- ;;
+ ;;
+ netbsd* | netbsdelf*-gnu)
+ ;;
@@ -11481,26 +11674,7 @@
+ ;;
+ *)
+ ;;
- esac
-- fi
-- if test "$with_gnu_ld" = no; then
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
-- case $host_cpu in
-- hppa*64*|ia64*)
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=no
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
-- *)
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--
-- # hardcode_minus_L: Not really in the search PATH,
-- # but as the default location of the library.
-- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-- ;;
++ esac
+ ;;
+ sunos4*)
+ case $cc_basename in
@@ -11515,40 +11689,7 @@
+ ;;
+ *)
+ ;;
- esac
-- fi
-- ;;
--
-- irix5* | irix6* | nonstopux*)
-- if test "$GCC" = yes; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-- ;;
--
-- netbsd*)
-- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-- else
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-- fi
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
--
-- newsos6)
-- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-- ;;
++ esac
+ ;;
+ tandem*)
+ case $cc_basename in
@@ -11582,6 +11723,50 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- irix5* | irix6* | nonstopux*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++ case $host_os in
++ aix*)
++ # All AIX code is PIC.
++ if test "$host_cpu" = ia64; then
++ # AIX 5 now supports IA64 processor
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
+- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+- fi
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ amigaos*)
++ # FIXME: we need at least 68020 code to build shared libraries, but
++ # adding the `-m68020' flag to GCC prevents building anything better,
++ # like `-m68040'.
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- newsos6)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ # PIC is the default for these OSes.
+ ;;
+
- openbsd*)
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -11601,13 +11786,13 @@
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
-+ case $host_os in
-+ aix*)
-+ # All AIX code is PIC.
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- fi
+- fi
++ mingw* | cygwin* | pw32* | os2*)
++ # 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).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
- os2*)
@@ -11616,8 +11801,12 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-- ;;
--
++ darwin* | rhapsody*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
- osf3*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -11628,11 +11817,9 @@
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ amigaos*)
-+ # FIXME: we need at least 68020 code to build shared libraries, but
-+ # adding the `-m68020' flag to GCC prevents building anything better,
-+ # like `-m68040'.
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++ interix[[3-9]]*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
;;
- osf4* | osf5*) # as osf3* with the addition of -msym flag
@@ -11645,13 +11832,20 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
--
++ msdosdjgpp*)
++ # Just because we use GCC doesn't mean we suddenly get shared libraries
++ # on systems that don't support them.
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ enable_shared=no
++ ;;
+
- # Both c and cxx compiler support -rpath directly
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-- fi
++ sysv4*MP*)
++ if test -d /usr/nec; then
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+ fi
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+ # PIC is the default for these OSes.
;;
- solaris*)
@@ -11671,7 +11865,14 @@
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- case $host_os in
- solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-- *)
++ hpux*)
++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++ # not for PA HP-UX.
++ case $host_cpu in
++ hppa*64*|ia64*)
++ # +Z the default
++ ;;
+ *)
- # The compiler driver will combine linker options so we
- # cannot just pass the convience library names through
- # without $wl, iff we do not link with $LD.
@@ -11683,12 +11884,10 @@
- *)
- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
- esac ;;
-- esac
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ ;;
+ esac
- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+ mingw* | pw32* | os2*)
-+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
- sunos4*)
@@ -11696,17 +11895,42 @@
- # Use $CC to link under sequent, because it throws in some extra .o
- # files that make .init and .fini sections work.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-- else
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ ;;
++ esac
++ else
++ # PORTME Check for flag to pass linker flags through the system compiler.
++ case $host_os in
++ aix*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ if test "$host_cpu" = ia64; then
++ # AIX 5 now supports IA64 processor
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ else
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-- fi
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ darwin* | rhapsody*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
++
++ mingw* | cygwin* | pw32* | os2*)
++ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
- sysv4)
@@ -11714,7 +11938,14 @@
- sni)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-- ;;
++ hpux9* | hpux10* | hpux11*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++ # not for PA HP-UX.
++ case $host_cpu in
++ hppa*64*|ia64*)
++ # +Z the default
+ ;;
- siemens)
- ## LD is ld it makes a PLAMLIB
- ## CC just makes a GrossModule.
@@ -11725,35 +11956,37 @@
- motorola)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-- ;;
-- esac
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ ;;
+ esac
- runpath_var='LD_RUN_PATH'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ interix3*)
-+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+ # Instead, we relocate shared libraries at runtime.
++ # Is there a better lt_prog_compiler_static that works with the bundled CC?
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
;;
- sysv4.3*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+ msdosdjgpp*)
-+ # Just because we use GCC doesn't mean we suddenly get shared libraries
-+ # on systems that don't support them.
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ enable_shared=no
++ irix5* | irix6* | nonstopux*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ # PIC (with -KPIC) is the default.
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- sysv4*MP*)
- if test -d /usr/nec; then
+- sysv4*MP*)
+- if test -d /usr/nec; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
- fi
+- fi
++ newsos6)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
@@ -11769,15 +12002,40 @@
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- fi
-+ hpux*)
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
++ linux* | k*bsd*-gnu)
++ case $cc_basename in
++ icc* | ecc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ ccc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ # All Alpha code is PIC.
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ ;;
+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ esac
+ ;;
+ esac
;;
@@ -11802,61 +12060,35 @@
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+ ;;
-+ esac
-+ else
-+ # PORTME Check for flag to pass linker flags through the system compiler.
-+ case $host_os in
-+ aix*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ if test "$host_cpu" = ia64; then
-+ # AIX 5 now supports IA64 processor
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- else
+- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
- fi
+- fi
++ osf3* | osf4* | osf5*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ # All OSF/1 code is PIC.
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
-+ darwin*)
-+ # PIC is the default on this platform
-+ # Common symbols not allowed in MH_DYLIB files
-+ case $cc_basename in
-+ xlc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ ;;
-+ esac
-+ ;;
- uts4*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ mingw* | pw32* | os2*)
-+ # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- *)
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ hpux9* | hpux10* | hpux11*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+ # not for PA HP-UX.
-+ case $host_cpu in
-+ hppa*64*|ia64*)
-+ # +Z the default
-+ ;;
++ solaris*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+ ;;
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+ esac
-+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
;;
- esac
- fi
@@ -11876,10 +12108,10 @@
- case $_LT_AC_TAGVAR(archive_cmds, $1) in
- *'~'*)
- # FIXME: we may have to deal with multi-command sequences.
-+ irix5* | irix6* | nonstopux*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # PIC (with -KPIC) is the default.
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++ sunos4*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- '$CC '*)
- # Test whether the compiler implicitly links with -lc since on some
@@ -11912,41 +12144,49 @@
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
- else
- cat conftest.err 1>&5
-- fi
++ sysv4 | sysv4.2uw2* | sysv4.3*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ sysv4*MP*)
++ if test -d /usr/nec ;then
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ fi
- $rm conftest*
- AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-+ newsos6)
++ ;;
++
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
++ uts4*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
;;
-- esac
-- fi
+ esac
+ fi
- ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
+-
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-+ linux* | k*bsd*-gnu)
-+ case $cc_basename in
-+ icc* | ecc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+ ;;
-+ pgcc* | pgf77* | pgf90* | pgf95*)
-+ # Portland Group compilers (*not* the Pentium gcc compiler,
-+ # which looks to be a dead project)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-+ ccc*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All Alpha code is PIC.
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-+ esac
-+ ;;
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
@@ -11956,13 +12196,14 @@
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
--#
+ #
-# #ifndef __CYGWIN__
-# # ifdef __CYGWIN32__
-# # define __CYGWIN__ __CYGWIN32__
-# # endif
-# #endif
--#
++# Check to make sure the PIC flag actually works.
+ #
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
@@ -11970,13 +12211,35 @@
-# #ifdef __cplusplus
-# }
-# #endif
--#
++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
++ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
++ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++ "" | " "*) ;;
++ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++ esac],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case $host_os in
++ # For platforms which do not support PIC, -DPIC is meaningless:
++ *djgpp*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++ ;;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++ ;;
++esac
++
+ #
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
--#
++# Check to make sure the static flag actually works.
+ #
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
@@ -11985,38 +12248,13 @@
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-+ osf3* | osf4* | osf5*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ # All OSF/1 code is PIC.
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+ ;;
-
-+ solaris*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ case $cc_basename in
-+ f77* | f90* | f95*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+ esac
-+ ;;
-
+-
+-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-+ sunos4*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-
-+ sysv4 | sysv4.2uw2* | sysv4.3*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-
+-
+-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
@@ -12025,38 +12263,25 @@
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
-+ sysv4*MP*)
-+ if test -d /usr/nec ;then
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ fi
-+ ;;
-
+-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-
+-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
- AC_SUBST(GCJFLAGS)
--])
-+ unicos*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ $lt_tmp_static_flag,
++ [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-+ uts4*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+ ;;
-# NOTE: This macro has been submitted for inclusion into #
-# GNU Autoconf as AC_PROG_SED. When it is available in #
@@ -12097,11 +12322,7 @@
- if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
- lt_cv_path_SED=$lt_ac_sed
- break
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+ ;;
-+ esac
- fi
+- fi
- while true; do
- cat conftest.in conftest.in >conftest.tmp
- mv conftest.tmp conftest.in
@@ -12115,74 +12336,12 @@
- if test $lt_ac_count -gt $lt_ac_max; then
- lt_ac_max=$lt_ac_count
- lt_cv_path_SED=$lt_ac_sed
-- fi
-- done
--done
--])
--SED=$lt_cv_path_SED
--AC_MSG_RESULT([$SED])
- ])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
--# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
--#
--# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
- #
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
-+# Check to make sure the PIC flag actually works.
- #
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--# General Public License for more details.
-+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-+ "" | " "*) ;;
-+ *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+ esac],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+case $host_os in
-+ # For platforms which do not support PIC, -DPIC is meaningless:
-+ *djgpp*)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-+ ;;
-+esac
-+
- #
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Check to make sure the static flag actually works.
- #
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+ $lt_tmp_static_flag,
-+ [],
-+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+])
-+
-+
+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
+# ------------------------------------
+# See if the linker supports building shared libraries.
+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
@@ -12193,13 +12352,19 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ else
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+ fi
+ fi
+- done
+-done
+-])
+-SED=$lt_cv_path_SED
+-AC_MSG_RESULT([$SED])
+-])
+ ;;
+ pw32*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
-+ _LT_AC_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'
++ _LT_AC_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'
+ ;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
@@ -12265,6 +12430,33 @@
+ ;;
+ esac
+-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+-#
+-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++ if test "$with_gnu_ld" = yes; then
++ # If archive_cmds runs LD, not CC, wlarc should be empty
++ wlarc='${wl}'
+
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
@@ -12286,29 +12478,6 @@
-
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+ if test "$with_gnu_ld" = yes; then
-+ # If archive_cmds runs LD, not CC, wlarc should be empty
-+ wlarc='${wl}'
-
--# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
--#
--# Check to see whether a particular set of modules exists. Similar
--# to PKG_CHECK_MODULES(), but does not set variables or print errors.
--#
--#
--# Similar to PKG_CHECK_MODULES, make sure that the first instance of
--# this or PKG_CHECK_MODULES is called, or make sure to call
--# PKG_CHECK_EXISTS manually
--# --------------------------------------------------------------
--AC_DEFUN([PKG_CHECK_EXISTS],
--[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
--if test -n "$PKG_CONFIG" && \
-- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-- m4_ifval([$2], [$2], [:])
--m4_ifvaln([$3], [else
-- $3])dnl
--fi])
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
@@ -12330,6 +12499,24 @@
+ *) supports_anon_versioning=yes ;;
+ esac
+-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+-#
+-# Check to see whether a particular set of modules exists. Similar
+-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+-#
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
+-# --------------------------------------------------------------
+-AC_DEFUN([PKG_CHECK_EXISTS],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+-if test -n "$PKG_CONFIG" && \
+- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+- m4_ifval([$2], [$2], [:])
+-m4_ifvaln([$3], [else
+- $3])dnl
+-fi])
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
@@ -12338,6 +12525,12 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<EOF 1>&2
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support. If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
@@ -12353,11 +12546,9 @@
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support. If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
++EOF
++ fi
++ ;;
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
@@ -12369,15 +12560,20 @@
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-+EOF
-+ fi
-+ ;;
-
+ amigaos*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
++ # that the semantics of dynamic libraries on AmigaOS, at least up
++ # to version 4, is to share data among multiple programs linked
++ # with the same dynamic library. Since this doesn't match the
++ # behavior of shared libraries on other platforms, we can't use
++ # them.
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
+
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
@@ -12392,17 +12588,6 @@
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+ # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-+ # that the semantics of dynamic libraries on AmigaOS, at least up
-+ # to version 4, is to share data among multiple programs linked
-+ # with the same dynamic library. Since this doesn't match the
-+ # behavior of shared libraries on other platforms, we can't use
-+ # them.
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ ;;
-
--pkg_failed=no
--AC_MSG_CHECKING([for $1])
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -12414,8 +12599,8 @@
+ fi
+ ;;
--_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
--_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+-pkg_failed=no
+-AC_MSG_CHECKING([for $1])
+ cygwin* | mingw* | pw32*)
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
@@ -12423,11 +12608,10 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+ _LT_AC_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_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
--m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
--and $1[]_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.])
+-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $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
@@ -12444,16 +12628,10 @@
+ fi
+ ;;
--if test $pkg_failed = yes; then
-- _PKG_SHORT_ERRORS_SUPPORTED
-- if test $_pkg_short_errors_supported = yes; then
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-- else
-- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+ interix3*)
+-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+-and $1[]_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.])
++ interix[[3-9]]*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
@@ -12468,9 +12646,16 @@
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
-- ifelse([$4], , [AC_MSG_ERROR(dnl
--[Package requirements ($2) were not met:
-+ linux* | k*bsd*-gnu)
+-if test $pkg_failed = yes; then
+- _PKG_SHORT_ERRORS_SUPPORTED
+- if test $_pkg_short_errors_supported = yes; then
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+- else
+- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ tmp_addflag=
+ case $cc_basename,$host_cpu in
@@ -12488,14 +12673,24 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--$$1_PKG_ERRORS
+- ifelse([$4], , [AC_MSG_ERROR(dnl
+-[Package requirements ($2) were not met:
+ if test $supports_anon_versioning = yes; then
+ _LT_AC_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~
-+ $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
@@ -12503,8 +12698,7 @@
+ fi
+ ;;
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
+-$$1_PKG_ERRORS
+ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -12515,6 +12709,13 @@
+ fi
+ ;;
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
++ solaris*)
++ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ cat <<EOF 1>&2
+
-_PKG_TEXT
-])],
- [$4])
@@ -12523,11 +12724,6 @@
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-+ solaris*)
-+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+ cat <<EOF 1>&2
-+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
@@ -12556,7 +12752,7 @@
-])# PKG_CHECK_MODULES
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
-+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<_LT_EOF 1>&2
@@ -12769,7 +12965,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
@@ -12800,7 +12996,7 @@
+ fi
+ fi
+ fi
-+
+
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
@@ -12834,6 +13030,12 @@
+ fi
+ ;;
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ amigaos*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -12842,17 +13044,16 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
+-# serial 8
+ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
--# serial 8
+-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+-# written in clear, in which case automake, when reading aclocal.m4,
+-# will think it sees a *use*, and therefore will trigger all it's
+-# C support machinery. Also note that it means that autoscan, seeing
+-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ cygwin* | mingw* | pw32*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
@@ -12869,16 +13070,11 @@
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
-+ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery. Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ darwin* | rhapsody*)
+ case $host_os in
+ rhapsody* | darwin1.[[012]])
@@ -12916,10 +13112,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
@@ -12929,12 +13125,6 @@
+ fi
+ ;;
-+ dgux*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
@@ -12950,8 +13140,10 @@
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-+ freebsd1*)
-+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ dgux*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
@@ -12959,15 +13151,8 @@
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
-+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+ # support. Future versions do this automatically, but an explicit c++rt0.o
-+ # does not break anything, and helps significantly (at the cost of a little
-+ # extra space).
-+ freebsd2.2*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ freebsd1*)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
-AC_CACHE_CHECK([dependency style of $depcc],
@@ -12990,11 +13175,14 @@
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+ freebsd2*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++ # support. Future versions do this automatically, but an explicit c++rt0.o
++ # does not break anything, and helps significantly (at the cost of a little
++ # extra space).
++ freebsd2.2*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
@@ -13018,11 +13206,11 @@
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+ freebsd* | dragonfly*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++ freebsd2*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
@@ -13032,21 +13220,15 @@
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
-+ hpux9*)
-+ if test "$GCC" = yes; then
-+ _LT_AC_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'
- else
+- else
- break
-+ _LT_AC_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
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- fi
++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++ freebsd* | dragonfly*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+
-+ # hardcode_minus_L: Not really in the search PATH,
-+ # but as the default location of the library.
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- none) break ;;
- esac
@@ -13072,9 +13254,18 @@
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
-- fi
++
++ hpux9*)
++ if test "$GCC" = yes; then
++ _LT_AC_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'
++ else
++ _LT_AC_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
- fi
- done
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- cd ..
- rm -rf conftest.dir
@@ -13087,6 +13278,12 @@
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ ;;
+
+ hpux10*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -13096,7 +13293,15 @@
+ if test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
+
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
@@ -13106,13 +13311,18 @@
+ fi
+ ;;
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])
-])
+ hpux11*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -13144,6 +13354,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+ case $host_cpu in
+ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -13154,19 +13365,12 @@
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[ --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
--fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
--])
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -13175,7 +13379,7 @@
+ fi
+ ;;
--# Generate code to set up dependency tracking. -*- Autoconf -*-
+-#serial 3
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -13188,32 +13392,6 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+ netbsd* | netbsdelf*-gnu)
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
-+ else
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
-+ fi
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-
--#serial 3
-+ newsos6)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ ;;
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@@ -13256,34 +13434,23 @@
- done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+ openbsd*)
++ netbsd* | netbsdelf*-gnu)
++ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
++ fi
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+ else
-+ case $host_os in
-+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+ ;;
-+ *)
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+ ;;
-+ esac
-+ fi
+ ;;
-+ os2*)
-+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++ newsos6)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
-# AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -13298,6 +13465,47 @@
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
++ openbsd*)
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ os2*)
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++ ;;
+
+-# serial 8
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -13309,13 +13517,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
++
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -13326,8 +13528,7 @@
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-
--# serial 8
++
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+ fi
@@ -13352,17 +13553,16 @@
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
-+ # The compiler driver will combine linker options so we
-+ # cannot just pass the convience library names through
-+ # without $wl, iff we do not link with $LD.
-+ # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
-+ case $wlarc in
-+ '')
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ *)
-+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ esac ;;
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
@@ -13431,7 +13631,7 @@
-# This macro actually does too much. Some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -13598,7 +13798,7 @@
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
-+ printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-#
@@ -13805,6 +14005,43 @@
])
-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
+
+-# serial 4
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
+
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+# NOTE: This macro has been submitted for inclusion into #
+# GNU Autoconf as AC_PROG_SED. When it is available in #
+# a released version of Autoconf we should remove this #
@@ -13825,12 +14062,13 @@
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+done
++IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -13863,28 +14101,14 @@
+done
+])
+SED=$lt_cv_path_SED
++AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# serial 4
--
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
--
++#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
@@ -14185,7 +14409,7 @@
-then
- # Ok.
- :
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
else
- AC_MSG_ERROR([newly created file is older than distributed files!
@@ -15936,7 +16160,7 @@
m4_include([build/m4/banshee/boo.m4])
m4_include([build/m4/banshee/daap.m4])
-@@ -8424,8 +8489,8 @@
+@@ -8446,8 +8691,8 @@
m4_include([build/m4/banshee/gtk-sharp.m4])
m4_include([build/m4/banshee/libbanshee.m4])
m4_include([build/m4/banshee/nautilus-burn.m4])
@@ -15946,9 +16170,49 @@
m4_include([build/m4/shamrock/i18n.m4])
m4_include([build/m4/shamrock/mono-nunit.m4])
m4_include([build/m4/shamrock/mono.m4])
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/branding/Makefile.in banshee-0.12.1+dfsg/branding/Makefile.in
---- banshee-0.12.1+dfsg.old/branding/Makefile.in 2007-04-01 07:43:59.000000000 +0200
-+++ banshee-0.12.1+dfsg/branding/Makefile.in 2007-06-14 23:26:51.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/autogen.sh banshee-0.13.0+dfsg/autogen.sh
+--- banshee-0.13.0+dfsg.old/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ banshee-0.13.0+dfsg/autogen.sh 2007-08-14 21:22:51.000000000 +0200
+@@ -0,0 +1,36 @@
++#!/bin/bash
++# Run this to generate all the initial makefiles, etc.
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++PKG_NAME="banshee"
++
++(test -f $srcdir/configure.ac) || {
++ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
++ echo " top-level $PKG_NAME directory"
++ exit 1
++}
++
++which svn 1>/dev/null || {
++ echo "**Error**: subversion was not found, please install it"
++ exit 1
++}
++
++which gnome-autogen.sh || {
++ echo "You need to install gnome-common from the GNOME CVS"
++ exit 1
++}
++
++ACLOCAL_FLAGS="-I build/m4/shamrock -I build/m4/banshee $ACLOCAL_FLAGS" REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh
++
++if ! test -x ./mkinstalldirs; then
++ for automake_path in `whereis automake-1.9`; do
++ if ! test -z `echo $automake_path | grep share`; then
++ if test -x $automake_path/mkinstalldirs; then
++ cp $automake_path/mkinstalldirs .
++ fi
++ fi
++ done
++fi
++
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/branding/Makefile.in banshee-0.13.0+dfsg/branding/Makefile.in
+--- banshee-0.13.0+dfsg.old/branding/Makefile.in 2007-08-05 23:42:28.000000000 +0200
++++ banshee-0.13.0+dfsg/branding/Makefile.in 2007-08-14 21:23:06.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -15976,7 +16240,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -63,8 +59,8 @@
+@@ -62,8 +58,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -15986,16 +16250,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -74,7 +70,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -82,8 +78,6 @@
+@@ -81,8 +77,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -16004,7 +16259,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -96,8 +90,6 @@
+@@ -95,8 +89,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -16013,7 +16268,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -112,8 +104,6 @@
+@@ -111,8 +103,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -16022,7 +16277,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -126,28 +116,10 @@
+@@ -125,28 +115,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -16051,7 +16306,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -168,8 +140,7 @@
+@@ -169,8 +141,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -16061,7 +16316,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -224,12 +195,12 @@
+@@ -181,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -200,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -225,12 +193,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -16076,7 +16355,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -237,6 +208,7 @@
+@@ -238,6 +206,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -16084,7 +16363,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -263,17 +235,19 @@
+@@ -259,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -16108,7 +16393,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -285,6 +259,7 @@
+@@ -286,6 +258,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -16116,7 +16401,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -315,12 +290,15 @@
+@@ -316,12 +289,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16132,7 +16417,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -340,7 +318,6 @@
+@@ -341,7 +317,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -16140,7 +16425,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -355,6 +332,8 @@
+@@ -357,6 +332,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -16149,7 +16434,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -429,10 +408,6 @@
+@@ -431,10 +408,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -16160,7 +16445,7 @@
tags: TAGS
TAGS:
-@@ -441,23 +416,21 @@
+@@ -443,23 +416,21 @@
distdir: $(DISTFILES)
@@ -16197,7 +16482,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -503,7 +476,7 @@
+@@ -505,7 +476,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -16206,7 +16491,7 @@
dvi: dvi-am
-@@ -517,12 +490,20 @@
+@@ -519,12 +490,20 @@
install-data-am:
@@ -16227,7 +16512,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -541,17 +522,20 @@
+@@ -543,17 +522,20 @@
ps-am:
@@ -16253,9 +16538,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/build/m4/Makefile.in banshee-0.12.1+dfsg/build/m4/Makefile.in
---- banshee-0.12.1+dfsg.old/build/m4/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/build/m4/Makefile.in 2007-06-14 23:26:51.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/build/m4/Makefile.in banshee-0.13.0+dfsg/build/m4/Makefile.in
+--- banshee-0.13.0+dfsg.old/build/m4/Makefile.in 2007-08-05 23:42:28.000000000 +0200
++++ banshee-0.13.0+dfsg/build/m4/Makefile.in 2007-08-14 21:23:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -16283,7 +16568,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -16293,16 +16578,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,7 +58,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -70,8 +66,6 @@
+@@ -69,8 +65,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -16311,7 +16587,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -84,8 +78,6 @@
+@@ -83,8 +77,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -16320,7 +16596,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -100,8 +92,6 @@
+@@ -99,8 +91,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -16329,7 +16605,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -114,28 +104,10 @@
+@@ -113,28 +103,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -16358,7 +16634,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -156,8 +128,7 @@
+@@ -157,8 +129,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -16368,7 +16644,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -212,12 +183,12 @@
+@@ -169,14 +140,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -188,7 +157,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -213,12 +181,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -16383,7 +16683,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -225,6 +196,7 @@
+@@ -226,6 +194,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -16391,7 +16691,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -251,17 +223,19 @@
+@@ -247,22 +216,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -16415,7 +16721,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -273,6 +247,7 @@
+@@ -274,6 +246,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -16423,7 +16729,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -303,12 +278,15 @@
+@@ -304,12 +277,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16439,7 +16745,7 @@
EXTRA_DIST = $(srcdir)/banshee/*.m4 $(srcdir)/shamrock/*.m4
MAINTAINERCLEANFILES = Makefile.in
all: all-am
-@@ -349,10 +327,6 @@
+@@ -350,10 +326,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -16450,7 +16756,7 @@
tags: TAGS
TAGS:
-@@ -361,23 +335,21 @@
+@@ -362,23 +334,21 @@
distdir: $(DISTFILES)
@@ -16487,7 +16793,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -423,7 +395,7 @@
+@@ -424,7 +394,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -16496,7 +16802,7 @@
dvi: dvi-am
-@@ -437,12 +409,20 @@
+@@ -438,12 +408,20 @@
install-data-am:
@@ -16517,7 +16823,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -461,17 +441,20 @@
+@@ -462,17 +440,20 @@
ps-am:
@@ -16543,9 +16849,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/build/Makefile.in banshee-0.12.1+dfsg/build/Makefile.in
---- banshee-0.12.1+dfsg.old/build/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/build/Makefile.in 2007-06-14 23:26:51.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/build/Makefile.in banshee-0.13.0+dfsg/build/Makefile.in
+--- banshee-0.13.0+dfsg.old/build/Makefile.in 2007-08-05 23:42:28.000000000 +0200
++++ banshee-0.13.0+dfsg/build/Makefile.in 2007-08-14 21:23:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -16573,7 +16879,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -54,8 +50,8 @@
+@@ -53,8 +49,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -16583,16 +16889,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -65,7 +61,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = banshee.pc
- am__installdirs = "$(DESTDIR)$(bansheedir)" \
-@@ -76,10 +72,11 @@
+@@ -75,10 +71,11 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -16608,7 +16905,7 @@
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -88,14 +85,14 @@
+@@ -87,14 +84,14 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
@@ -16625,7 +16922,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -108,8 +105,6 @@
+@@ -107,8 +104,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -16634,7 +16931,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -124,8 +119,6 @@
+@@ -123,8 +118,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -16643,7 +16940,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -138,28 +131,10 @@
+@@ -137,28 +130,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -16672,7 +16969,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -180,8 +155,7 @@
+@@ -181,8 +156,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -16682,7 +16979,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -236,12 +210,12 @@
+@@ -193,14 +167,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -212,7 +184,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -237,12 +208,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -16697,7 +17018,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -249,6 +223,7 @@
+@@ -250,6 +221,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -16705,7 +17026,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -275,17 +250,19 @@
+@@ -271,22 +243,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -16729,7 +17056,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -297,6 +274,7 @@
+@@ -298,6 +273,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -16737,7 +17064,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -327,12 +305,15 @@
+@@ -328,12 +304,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -16753,7 +17080,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -352,7 +333,6 @@
+@@ -353,7 +332,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -16761,7 +17088,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -367,6 +347,8 @@
+@@ -369,6 +347,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -16770,7 +17097,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -456,7 +438,7 @@
+@@ -456,7 +436,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-bansheeSCRIPTS: $(banshee_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -16779,7 +17106,7 @@
@list='$(banshee_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -479,13 +461,9 @@
+@@ -479,13 +459,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -16794,7 +17121,7 @@
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -532,8 +510,7 @@
+@@ -532,8 +508,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -16804,7 +17131,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -634,23 +611,21 @@
+@@ -634,23 +609,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -16841,7 +17168,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -664,7 +639,7 @@
+@@ -664,7 +637,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -16850,7 +17177,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -672,6 +647,8 @@
+@@ -672,6 +645,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -16859,7 +17186,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -682,7 +659,7 @@
+@@ -682,7 +657,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bansheedir)" "$(DESTDIR)$(pkgconfigdir)"; do \
@@ -16868,7 +17195,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -717,8 +694,7 @@
+@@ -717,8 +692,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -16878,7 +17205,7 @@
dvi: dvi-recursive
-@@ -732,12 +708,20 @@
+@@ -732,12 +706,20 @@
install-data-am: install-bansheeSCRIPTS install-pkgconfigDATA
@@ -16899,7 +17226,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -756,25 +740,25 @@
+@@ -756,25 +738,25 @@
ps-am:
@@ -16939,14 +17266,14 @@
all: $(GCONF_SCHEMA_EXTRACTOR_ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/configure banshee-0.12.1+dfsg/configure
---- banshee-0.12.1+dfsg.old/configure 2007-04-01 07:43:56.000000000 +0200
-+++ banshee-0.12.1+dfsg/configure 2007-06-14 23:26:49.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/configure banshee-0.13.0+dfsg/configure
+--- banshee-0.13.0+dfsg.old/configure 2007-08-05 23:42:27.000000000 +0200
++++ banshee-0.13.0+dfsg/configure 2007-08-14 21:23:05.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60 for banshee 0.12.1.
-+# Generated by GNU Autoconf 2.61 for banshee 0.12.1.
+-# Generated by GNU Autoconf 2.60 for banshee 0.13.0.
++# Generated by GNU Autoconf 2.61 for banshee 0.13.0.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -17129,15 +17456,31 @@
CYGPATH_W
PACKAGE
VERSION
-@@ -869,6 +885,7 @@
- CCDEPMODE
+@@ -844,14 +860,11 @@
+ INTLTOOL_SCHEMAS_RULE
+ INTLTOOL_THEME_RULE
+ INTLTOOL_SERVICE_RULE
++INTLTOOL_POLICY_RULE
+ INTLTOOL_EXTRACT
+ INTLTOOL_MERGE
+ INTLTOOL_UPDATE
+ INTLTOOL_PERL
+-INTLTOOL_ICONV
+-INTLTOOL_MSGFMT
+-INTLTOOL_MSGMERGE
+-INTLTOOL_XGETTEXT
+ ALL_LINGUAS
+ CC
+ CFLAGS
+@@ -870,6 +883,7 @@
am__fastdepCC_TRUE
am__fastdepCC_FALSE
-+DATADIRNAME
+ DATADIRNAME
++SED
GREP
EGREP
LN_S
-@@ -940,6 +957,10 @@
+@@ -943,6 +957,10 @@
NDESK_DBUS_LIBS
EXTERNAL_NDESK_DBUS_TRUE
EXTERNAL_NDESK_DBUS_FALSE
@@ -17148,7 +17491,7 @@
GTKSHARP_CFLAGS
GTKSHARP_LIBS
SQLITE_CFLAGS
-@@ -978,11 +999,11 @@
+@@ -981,6 +999,7 @@
GETTEXT_PACKAGE
USE_NLS
MSGFMT
@@ -17156,12 +17499,7 @@
GMSGFMT
XGETTEXT
CATALOGS
- CATOBJEXT
--DATADIRNAME
- GMOFILES
- INSTOBJEXT
- INTLLIBS
-@@ -990,6 +1011,7 @@
+@@ -992,6 +1011,7 @@
PO_IN_DATADIR_FALSE
POFILES
POSUB
@@ -17169,7 +17507,7 @@
CONFIG_STATUS_DEPENDENCIES
LIBOBJS
LTLIBOBJS'
-@@ -1000,6 +1022,7 @@
+@@ -1002,6 +1022,7 @@
CC
CFLAGS
LDFLAGS
@@ -17177,7 +17515,7 @@
CPPFLAGS
CPP
CXX
-@@ -1031,6 +1054,8 @@
+@@ -1035,6 +1056,8 @@
BOO_LIBS
NDESK_DBUS_CFLAGS
NDESK_DBUS_LIBS
@@ -17186,7 +17524,7 @@
GTKSHARP_CFLAGS
GTKSHARP_LIBS
SQLITE_CFLAGS
-@@ -1150,10 +1175,10 @@
+@@ -1154,10 +1177,10 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
@@ -17199,7 +17537,7 @@
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
-@@ -1169,10 +1194,10 @@
+@@ -1173,10 +1196,10 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -17212,7 +17550,7 @@
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1366,19 +1391,19 @@
+@@ -1370,19 +1393,19 @@
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -17236,22 +17574,7 @@
eval with_$ac_package=no ;;
--x)
-@@ -1627,12 +1652,12 @@
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
-+ --disable-dependency-tracking speeds up one-time build
-+ --enable-dependency-tracking do not reject slow dependency extractors
- --enable-shared[=PKGS] build shared libraries [default=yes]
- --enable-static[=PKGS] build static libraries [default=yes]
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=yes]
-- --disable-dependency-tracking speeds up one-time build
-- --enable-dependency-tracking do not reject slow dependency extractors
- --disable-libtool-lock avoid locking (might break parallel builds)
- --enable-compile-warnings=[no/minimum/yes/maximum/error]
- Turn on compiler warnings
-@@ -1643,6 +1668,8 @@
+@@ -1647,6 +1670,8 @@
--enable-external-boo Use external Boo instead of the bundled one
--enable-external-ndesk-dbus
Use external NDesk DBus instead of the bundled one
@@ -17260,7 +17583,7 @@
--enable-ipod Enable iPod DAP support
--enable-njb Enable NJB DAP support
--enable-mtp Enable MTP DAP support
-@@ -1666,6 +1693,7 @@
+@@ -1670,6 +1695,7 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -17268,7 +17591,7 @@
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
-@@ -1709,6 +1737,10 @@
+@@ -1717,6 +1743,10 @@
C compiler flags for NDESK_DBUS, overriding pkg-config
NDESK_DBUS_LIBS
linker flags for NDESK_DBUS, overriding pkg-config
@@ -17279,25 +17602,25 @@
GTKSHARP_CFLAGS
C compiler flags for GTKSHARP, overriding pkg-config
GTKSHARP_LIBS
-@@ -1801,7 +1833,7 @@
+@@ -1809,7 +1839,7 @@
if $ac_init_version; then
cat <<\_ACEOF
- banshee configure 0.12.1
+ banshee configure 0.13.0
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1815,7 +1847,7 @@
+@@ -1823,7 +1853,7 @@
running configure, to aid debugging if configure makes a mistake.
- It was created by banshee $as_me 0.12.1, which was
+ It was created by banshee $as_me 0.13.0, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
-@@ -2325,7 +2357,8 @@
+@@ -2333,7 +2363,8 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
@@ -17307,7 +17630,7 @@
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
-@@ -2362,7 +2395,7 @@
+@@ -2370,7 +2401,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17316,7 +17639,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -2477,38 +2510,53 @@
+@@ -2485,38 +2516,53 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
@@ -17399,7 +17722,7 @@
for ac_prog in gawk mawk nawk awk
do
-@@ -2528,7 +2576,7 @@
+@@ -2536,7 +2582,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17408,7 +17731,7 @@
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2591,12 +2639,16 @@
+@@ -2599,12 +2645,16 @@
fi
rmdir .tst 2>/dev/null
@@ -17429,7 +17752,7 @@
fi
# test whether we have cygpath
-@@ -2639,7 +2691,7 @@
+@@ -2647,7 +2697,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
@@ -17438,7 +17761,7 @@
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
-@@ -2663,7 +2715,7 @@
+@@ -2671,7 +2721,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17447,7 +17770,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2703,7 +2755,7 @@
+@@ -2711,7 +2761,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17456,7 +17779,7 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -2743,7 +2795,7 @@
+@@ -2751,7 +2801,7 @@
fi
fi
@@ -17465,7 +17788,7 @@
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-@@ -2849,9 +2901,7 @@
+@@ -2857,9 +2907,7 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
@@ -17476,1279 +17799,374 @@
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
-@@ -2871,99 +2921,92 @@
-
- ac_config_headers="$ac_config_headers config.h"
-
-+DEPDIR="${am__leading_dot}deps"
-
--case "$am__api_version" in
-- 1.01234)
-- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- ;;
-- *)
-- ;;
--esac
--
--if test -n "0.21"; then
-- { echo "$as_me:$LINENO: checking for intltool >= 0.21" >&5
--echo $ECHO_N "checking for intltool >= 0.21... $ECHO_C" >&6; }
-+ac_config_commands="$ac_config_commands depfiles"
-
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.21 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-
-- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
--echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.21 or later." >&5
--echo "$as_me: error: Your intltool is too old. You need intltool 0.21 or later." >&2;}
-- { (exit 1); exit 1; }; }
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+ @echo done
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+ echo '.include "confinc"' > confmf
-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ fi
+@@ -2932,9 +2980,7 @@
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
fi
-
-- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-
--# Use the tools built into the package, not the ones that are installed.
--INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-+{ echo "$as_me:$LINENO: result: $_am_result" >&5
-+echo "${ECHO_T}$_am_result" >&6; }
-+rm -f confinc confmf
-
--INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-+# Check whether --enable-dependency-tracking was given.
-+if test "${enable_dependency_tracking+set}" = set; then
-+ enableval=$enable_dependency_tracking;
-+fi
-
--INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-+if test "x$enable_dependency_tracking" != xno; then
-+ am_depcomp="$ac_aux_dir/depcomp"
-+ AMDEPBACKSLASH='\'
-+fi
+-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
-+ AMDEP_TRUE=
-+ AMDEP_FALSE='#'
-+else
-+ AMDEP_TRUE='#'
-+ AMDEP_FALSE=
-+fi
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+ else
+@@ -2943,7 +2989,6 @@
+ fi
--# Extract the first word of "perl", so it can be a program name with args.
--set dummy perl; ac_word=$2
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_PERL in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -2966,7 +3011,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
- fi
-@@ -2971,62 +3014,39 @@
- done
- IFS=$as_save_IFS
-
-- ;;
--esac
- fi
--INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
--if test -n "$INTLTOOL_PERL"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
--echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
--if test -z "$INTLTOOL_PERL"; then
-- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
--echo "$as_me: error: perl not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
--echo "$as_me: error: perl 5.x required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
--fi
--if test "x" != "xno-xml"; then
-- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
--echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6; }
-- else
-- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
- fi
--
--# Extract the first word of "iconv", so it can be a program name with args.
--set dummy iconv; ac_word=$2
-+if test -z "$ac_cv_prog_CC"; then
-+ ac_ct_CC=$CC
-+ # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_ICONV in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
+@@ -3006,7 +3051,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_CC="gcc"
+ ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
- fi
-@@ -3034,40 +3054,56 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
-- ;;
--esac
- fi
--INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
--if test -n "$INTLTOOL_ICONV"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
--echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
--
--# Extract the first word of "msgfmt", so it can be a program name with args.
--set dummy msgfmt; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
-+else
-+ CC="$ac_cv_prog_CC"
-+fi
-+
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}cc; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_MSGFMT in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
+@@ -3063,7 +3108,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
- fi
-@@ -3075,40 +3111,44 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
-- ;;
--esac
- fi
--INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
--if test -n "$INTLTOOL_MSGFMT"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
--echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
--# Extract the first word of "msgmerge", so it can be a program name with args.
--set dummy msgmerge; ac_word=$2
-+ fi
-+fi
-+if test -z "$CC"; then
-+ # Extract the first word of "cc", so it can be a program name with args.
-+set dummy cc; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_MSGMERGE in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+ ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
+@@ -3104,7 +3149,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-+ ac_prog_rejected=yes
-+ continue
-+ fi
-+ ac_cv_prog_CC="cc"
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+@@ -3162,7 +3207,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
- fi
-@@ -3116,40 +3156,53 @@
- done
- IFS=$as_save_IFS
-
-- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
-- ;;
--esac
-+if test $ac_prog_rejected = yes; then
-+ # We found a bogon in the path, so make sure we never use it.
-+ set dummy $ac_cv_prog_CC
-+ shift
-+ if test $# != 0; then
-+ # We chose a different compiler from the bogus one.
-+ # However, it has the same basename, so the bogon will be chosen
-+ # first if we set CC to just the basename; use the full file name.
-+ shift
-+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+ fi
- fi
--INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
--if test -n "$INTLTOOL_MSGMERGE"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
--echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
--# Extract the first word of "xgettext", so it can be a program name with args.
--set dummy xgettext; ac_word=$2
-+fi
-+if test -z "$CC"; then
-+ if test -n "$ac_tool_prefix"; then
-+ for ac_prog in cl.exe
-+ 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
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- case $INTLTOOL_XGETTEXT in
-- [\\/]* | ?:[\\/]*)
-- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
-- ;;
-- *)
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+ if test -n "$CC"; then
-+ ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
+@@ -3206,7 +3251,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
- fi
-@@ -3157,948 +3210,1115 @@
- done
- IFS=$as_save_IFS
+@@ -3347,7 +3392,7 @@
+ # in a Makefile. We should not override ac_cv_exeext if it was cached,
+ # so that the user can short-circuit this test for compilers unknown to
+ # Autoconf.
+-for ac_file in $ac_files
++for ac_file in $ac_files ''
+ do
+ test -f "$ac_file" || continue
+ case $ac_file in
+@@ -3375,6 +3420,12 @@
+ test "$ac_cv_exeext" = no && ac_cv_exeext=
-- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
-- ;;
--esac
- fi
--INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
--if test -n "$INTLTOOL_XGETTEXT"; then
-- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
--echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- fi
-
-
-+ test -n "$CC" && break
-+ done
-+fi
-+if test -z "$CC"; then
-+ ac_ct_CC=$CC
-+ for ac_prog in cl.exe
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if test -n "$ac_ct_CC"; then
-+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_CC="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
--# Substitute ALL_LINGUAS so we can use it in po/Makefile
--
--
--
--
--
--ac_config_commands="$ac_config_commands intltool"
-+fi
-+fi
-+ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+if test -n "$ac_ct_CC"; then
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-
-
-+ test -n "$ac_ct_CC" && break
-+done
-
--# Check whether --enable-shared was given.
--if test "${enable_shared+set}" = set; then
-- enableval=$enable_shared; p=${PACKAGE-default}
-- case $enableval in
-- yes) enable_shared=yes ;;
-- no) enable_shared=no ;;
-- *)
-- enable_shared=no
-- # Look at the argument we got. We use all the common list separators.
-- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-- for pkg in $enableval; do
-- IFS="$lt_save_ifs"
-- if test "X$pkg" = "X$p"; then
-- enable_shared=yes
-- fi
-- done
-- IFS="$lt_save_ifs"
-- ;;
-- esac
--else
-- enable_shared=yes
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
--
--# Check whether --enable-static was given.
--if test "${enable_static+set}" = set; then
-- enableval=$enable_static; p=${PACKAGE-default}
-- case $enableval in
-- yes) enable_static=yes ;;
-- no) enable_static=no ;;
-- *)
-- enable_static=no
-- # Look at the argument we got. We use all the common list separators.
-- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-- for pkg in $enableval; do
-- IFS="$lt_save_ifs"
-- if test "X$pkg" = "X$p"; then
-- enable_static=yes
-- fi
-- done
-- IFS="$lt_save_ifs"
-- ;;
-- esac
--else
-- enable_static=yes
- fi
-
-
--# Check whether --enable-fast-install was given.
--if test "${enable_fast_install+set}" = set; then
-- enableval=$enable_fast_install; p=${PACKAGE-default}
-- case $enableval in
-- yes) enable_fast_install=yes ;;
-- no) enable_fast_install=no ;;
-- *)
-- enable_fast_install=no
-- # Look at the argument we got. We use all the common list separators.
-- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-- for pkg in $enableval; do
-- IFS="$lt_save_ifs"
-- if test "X$pkg" = "X$p"; then
-- enable_fast_install=yes
-+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+
-+# Provide some information about the compiler.
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+# Try to create an executable without -o first, disregard a.out.
-+# It will help us diagnose broken compilers, and finding out an intuition
-+# of exeext.
-+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+ esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link_default") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile. We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
-+do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-+ ;;
-+ [ab].out )
-+ # We found the default executable, but exeext='' is most
-+ # certainly right.
-+ break;;
-+ *.* )
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- fi
-- done
-- IFS="$lt_save_ifs"
-- ;;
-- esac
-+ # We set ac_cv_exeext here because the later test for it is not
-+ # safe: cross compilers may not add the suffix if given an `-o'
-+ # argument, so we may need to know it at that point already.
-+ # Even if this section looks crufty: it has the advantage of
-+ # actually working.
-+ break;;
-+ * )
-+ break;;
-+ esac
-+done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
-+else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: C compiler cannot create executables
-+See \`config.log' for more details." >&2;}
-+ { (exit 77); exit 77; }; }
-+fi
-+
-+ac_exeext=$ac_cv_exeext
-+
-+# Check that the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-+# If not cross compiling, check that we can run a simple program.
-+if test "$cross_compiling" != yes; then
-+ if { ac_try='./$ac_file'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ cross_compiling=no
-+ else
-+ if test "$cross_compiling" = maybe; then
-+ cross_compiling=yes
-+ else
-+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
-+# Check that the compiler produces executables we can run. If not, either
-+# the compiler is broken, or we cross compile.
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-+
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
-+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-+# work properly (i.e., refer to `conftest.exe'), while it won't with
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+ test -f "$ac_file" || continue
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ break;;
-+ * ) break;;
-+ esac
-+done
-+else
-+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest$ac_cv_exeext
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-+
-+rm -f conftest.$ac_ext
-+EXEEXT=$ac_cv_exeext
-+ac_exeext=$EXEEXT
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-+if test "${ac_cv_objext+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; then
-+ for ac_file in conftest.o conftest.obj conftest.*; do
-+ test -f "$ac_file" || continue;
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+ break;;
-+ esac
-+done
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
-+OBJEXT=$ac_cv_objext
-+ac_objext=$OBJEXT
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+ choke me
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+@@ -3386,8 +3437,6 @@
+ fi
+
+ ac_exeext=$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
+
+ # Check that the compiler produces executables we can run. If not, either
+ # the compiler is broken, or we cross compile.
+@@ -3565,27 +3614,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-+ ac_compiler_gnu=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_compiler_gnu=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-+GCC=`test $ac_compiler_gnu = yes && echo yes`
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ ac_compiler_gnu=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3640,27 +3672,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
+ ac_cv_prog_cc_g=yes
else
-- enable_fast_install=yes
--fi
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--DEPDIR="${am__leading_dot}deps"
-+int
-+main ()
-+{
-
--ac_config_commands="$ac_config_commands depfiles"
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+@@ -3695,27 +3710,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-
--am_make=${MAKE-make}
--cat > confinc << 'END'
--am__doit:
-- @echo done
--.PHONY: am__doit
--END
--# If we don't find an include directive, just comment out the code.
--{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# We grep out `Entering directory' and `Leaving directory'
--# messages which can occur if `w' ends up in MAKEFLAGS.
--# In particular we don't look at `^make:' because GNU make might
--# be invoked under some other name (usually "gmake"), in which
--# case it prints its new name instead of `make'.
--if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-- am__include=include
-- am__quote=
-- _am_result=GNU
--fi
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
-- echo '.include "confinc"' > confmf
-- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- fi
--fi
-+int
-+main ()
-+{
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ :
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3751,27 +3749,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ ac_cv_prog_cc_g=yes
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -3887,27 +3868,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -4011,6 +3975,7 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -4040,9 +4005,7 @@
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
--{ echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6; }
--rm -f confinc confmf
+-
+-
+-if
++ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+@@ -4099,6 +4062,8 @@
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++
--# Check whether --enable-dependency-tracking was given.
--if test "${enable_dependency_tracking+set}" = set; then
-- enableval=$enable_dependency_tracking;
- fi
--if test "x$enable_dependency_tracking" != xno; then
-- am_depcomp="$ac_aux_dir/depcomp"
-- AMDEPBACKSLASH='\'
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+@@ -4145,7 +4110,7 @@
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+@@ -4190,259 +4155,78 @@
+ fi
fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-
--if test "x$enable_dependency_tracking" != xno; then
-- AMDEP_TRUE=
-- AMDEP_FALSE='#'
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
- else
-- AMDEP_TRUE='#'
-- AMDEP_FALSE=
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
- fi
--
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-# Extract the first word of "iconv", so it can be a program name with args.
+-set dummy iconv; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$CC"; then
-- ac_cv_prog_CC="$CC" # Let the user override the test.
+-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+- case $INTLTOOL_ICONV in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
+- ;;
+- *)
+- 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-+ ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
+- ;;
++
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
+int
+main ()
+{
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr
+ ;
+ return 0;
+}
+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
-+esac
+ esac
+-fi
+-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
+-if test -n "$INTLTOOL_ICONV"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
+-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
++ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
@@ -18757,830 +18175,165 @@
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_prog_cc_c89=$ac_arg
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ DATADIRNAME=share
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
+-
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-
- fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-- # Extract the first word of "gcc", so it can be a program name with args.
--set dummy gcc; ac_word=$2
+-# Extract the first word of "msgfmt", so it can be a program name with args.
+-set dummy msgfmt; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
++ case $host in
++ *-*-solaris*)
++ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
++if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- case $INTLTOOL_MSGFMT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
+- ;;
+- *)
+- 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_CC="gcc"
+- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
+-done
-IFS=$as_save_IFS
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
++ For example, HP-UX 11i <limits.h> declares gettimeofday. */
++#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
- fi
+- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
+- ;;
+-esac
-fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
+-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
+-if test -n "$INTLTOOL_MSGFMT"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
+-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
++/* System header to define __stub macros and hopefully few prototypes,
++ which can conflict with char bind_textdomain_codeset (); below.
++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ <limits.h> exists even on freestanding compilers. */
+
-
-- if test "x$ac_ct_CC" = x; then
-- CC=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
--ac_tool_warned=yes ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-- CC=$ac_ct_CC
-- fi
--else
-- CC="$ac_cv_prog_CC"
--fi
-
--if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
--set dummy ${ac_tool_prefix}cc; ac_word=$2
+-# Extract the first word of "msgmerge", so it can be a program name with args.
+-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
+-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-- if test -n "$CC"; then
-- ac_cv_prog_CC="$CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+- case $INTLTOOL_MSGMERGE in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
+- ;;
+- *)
+- 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_CC="${ac_tool_prefix}cc"
+- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
+-
+- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
+- ;;
+-esac
-fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
+-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
+-if test -n "$INTLTOOL_MSGMERGE"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
+-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+depcc="$CC" am_compiler_list=
-
-- fi
--fi
--if test -z "$CC"; then
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$CC"; then
-- ac_cv_prog_CC="$CC" # Let the user override the test.
--else
-- ac_prog_rejected=no
--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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-- ac_prog_rejected=yes
-- continue
-- fi
-- ac_cv_prog_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+ # We make a subdir and do the tests there. Otherwise we can end up
-+ # making bogus files that we don't know about and never remove. For
-+ # instance it was reported that on HP-UX the gcc test will end up
-+ # making a dummy file named `D' -- because `-MD' means `put the output
-+ # in D'.
-+ mkdir conftest.dir
-+ # Copy depcomp to subdir because otherwise we won't find it if we're
-+ # using a relative directory.
-+ cp "$am_depcomp" conftest.dir
-+ cd conftest.dir
-+ # We will build objects and dependencies in a subdirectory because
-+ # it helps to detect inapplicable dependency modes. For instance
-+ # both Tru64's cc and ICC support -MD to output dependencies as a
-+ # side effect of compilation, but ICC will put the dependencies in
-+ # the current directory while Tru64 will put them in the object
-+ # directory.
-+ mkdir sub
-
--if test $ac_prog_rejected = yes; then
-- # We found a bogon in the path, so make sure we never use it.
-- set dummy $ac_cv_prog_CC
-- shift
-- if test $# != 0; then
-- # We chose a different compiler from the bogus one.
-- # However, it has the same basename, so the bogon will be chosen
-- # first if we set CC to just the basename; use the full file name.
-- shift
-- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+ am_cv_CC_dependencies_compiler_type=none
-+ if test "$am_compiler_list" = ""; then
-+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
--fi
--fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ for depmode in $am_compiler_list; do
-+ # Setup a source with many dependencies, because some compilers
-+ # like to wrap large dependency lists on column 80 (with \), and
-+ # we should not choose a depcomp mode which is confused by this.
-+ #
-+ # We need to recreate these files for each test, as the compiler may
-+ # overwrite some of them when testing with obscure command lines.
-+ # This happens at least with the AIX C compiler.
-+ : > sub/conftest.c
-+ for i in 1 2 3 4 5 6; do
-+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+ # Solaris 8's {/usr,}/bin/sh.
-+ touch sub/conftst$i.h
-+ done
-+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+ case $depmode in
-+ nosideeffect)
-+ # after this tag, mechanisms are not by side-effect, so they'll
-+ # only be used when explicitly requested
-+ if test "x$enable_dependency_tracking" = xyes; then
-+ continue
-+ else
-+ break
-+ fi
-+ ;;
-+ none) break ;;
-+ esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
-+ if depmode=$depmode \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+ >/dev/null 2>conftest.err &&
-+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+ # icc doesn't choke on unknown options, it will just issue warnings
-+ # or remarks (even with -Werror). So we grep stderr for any message
-+ # that says an option was ignored or not supported.
-+ # When given -MP, icc 7.0 and 7.1 complain thusly:
-+ # icc: Command line warning: ignoring option '-M'; no argument required
-+ # The diagnosis changed in icc 8.0:
-+ # icc: Command line remark: option '-MP' not supported
-+ if (grep 'ignoring option' conftest.err ||
-+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+ am_cv_CC_dependencies_compiler_type=$depmode
-+ break
-+ fi
-+ fi
-+ done
-+
-+ cd ..
-+ rm -rf conftest.dir
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ am_cv_CC_dependencies_compiler_type=none
- fi
-
-
- fi
--if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl.exe
-- 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
+-
+-# Extract the first word of "xgettext", so it can be a program name with args.
+-set dummy xgettext; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
+-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-- if test -n "$CC"; then
-- ac_cv_prog_CC="$CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+- case $INTLTOOL_XGETTEXT in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
+- ;;
+- *)
+- 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
+-
+- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
+- ;;
+-esac
-fi
--fi
--CC=$ac_cv_prog_CC
--if test -n "$CC"; then
-- { echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6; }
-+ if
-+ test "x$enable_dependency_tracking" != xno \
-+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+ am__fastdepCC_TRUE=
-+ am__fastdepCC_FALSE='#'
- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-+ am__fastdepCC_TRUE='#'
-+ am__fastdepCC_FALSE=
- fi
-
-
-- test -n "$CC" && break
-- done
--fi
--if test -z "$CC"; then
-- ac_ct_CC=$CC
-- for ac_prog in cl.exe
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
+-if test -n "$INTLTOOL_XGETTEXT"; then
+- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
+-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
-else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_CC="$ac_prog"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
-
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6; }
--else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-+case "$am__api_version" in
-+ 1.01234)
-+ { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ *)
-+ ;;
-+esac
-
-- test -n "$ac_ct_CC" && break
--done
-+if test -n "0.21"; then
-+ { echo "$as_me:$LINENO: checking for intltool >= 0.21" >&5
-+echo $ECHO_N "checking for intltool >= 0.21... $ECHO_C" >&6; }
-
-- if test "x$ac_ct_CC" = x; then
-- CC=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet. If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
--ac_tool_warned=yes ;;
--esac
-- CC=$ac_ct_CC
-- fi
--fi
-+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.21 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-+ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.21 or later." >&5
-+echo "$as_me: error: Your intltool is too old. You need intltool 0.21 or later." >&2;}
-+ { (exit 1); exit 1; }; }
- fi
-
-+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
-+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-
--# Provide some information about the compiler.
--echo "$as_me:$LINENO: checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compiler --version >&5") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compiler -v >&5") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compiler -V >&5") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
-
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--int
--main ()
--{
-
-- ;
-- return 0;
--}
--_ACEOF
--ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
--# Try to create an executable without -o first, disregard a.out.
--# It will help us diagnose broken compilers, and finding out an intuition
--# of exeext.
--{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
--ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--#
--# List of possible output files, starting from the most likely.
--# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
--# only as a last resort. b.out is created by i960 compilers.
--ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
--#
--# The IRIX 6 linker writes into existing files which may not be
--# executable, retaining their permissions. Remove them first so a
--# subsequent execution test works.
--ac_rmfiles=
--for ac_file in $ac_files
--do
-- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-- esac
--done
--rm -f $ac_rmfiles
-
--if { (ac_try="$ac_link_default"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link_default") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
--# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
--# in a Makefile. We should not override ac_cv_exeext if it was cached,
--# so that the user can short-circuit this test for compilers unknown to
--# Autoconf.
--for ac_file in $ac_files
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Use the tools built into the package, not the ones that are installed.
-+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-+
-+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-+
-+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-+
-+
-+# Extract the first word of "perl", so it can be a program name with args.
-+set dummy perl; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $INTLTOOL_PERL in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
- do
-- test -f "$ac_file" || continue
-- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-- ;;
-- [ab].out )
-- # We found the default executable, but exeext='' is most
-- # certainly right.
-- break;;
-- *.* )
-- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-- then :; else
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- fi
-- # We set ac_cv_exeext here because the later test for it is not
-- # safe: cross compilers may not add the suffix if given an `-o'
-- # argument, so we may need to know it at that point already.
-- # Even if this section looks crufty: it has the advantage of
-- # actually working.
-- break;;
-- * )
-- break;;
-- esac
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
- done
--test "$ac_cv_exeext" = no && ac_cv_exeext=
-+done
-+IFS=$as_save_IFS
-
-+ ;;
-+esac
-+fi
-+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-+if test -n "$INTLTOOL_PERL"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
--See \`config.log' for more details." >&5
--echo "$as_me: error: C compiler cannot create executables
--See \`config.log' for more details." >&2;}
-- { (exit 77); exit 77; }; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
--ac_exeext=$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
-
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
-- if { ac_try='./$ac_file'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- cross_compiling=no
-- else
-- if test "$cross_compiling" = maybe; then
-- cross_compiling=yes
-- else
-- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&2;}
-+if test -z "$INTLTOOL_PERL"; then
-+ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-+echo "$as_me: error: perl not found; required for intltool" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-- fi
- fi
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
--ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run. If not, either
--# the compiler is broken, or we cross compile.
--{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
--{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6; }
-
--{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_link") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- # If both `conftest.exe' and `conftest' are `present' (well, observable)
--# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
--# work properly (i.e., refer to `conftest.exe'), while it won't with
--# `rm'.
--for ac_file in conftest.exe conftest conftest.*; do
-- test -f "$ac_file" || continue
-- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- break;;
-- * ) break;;
-- esac
--done
--else
-- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-+echo "$as_me: error: perl 5.x required for intltool" >&2;}
- { (exit 1); exit 1; }; }
- fi
-+if test "x" != "xno-xml"; then
-+ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
-+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+ { echo "$as_me:$LINENO: result: ok" >&5
-+echo "${ECHO_T}ok" >&6; }
-+ else
-+ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-+echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+fi
-
--rm -f conftest$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6; }
+-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
--rm -f conftest.$ac_ext
--EXEEXT=$ac_cv_exeext
--ac_exeext=$EXEEXT
--{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
--if test "${ac_cv_objext+set}" = set; then
-+# Extract the first word of "iconv", so it can be a program name with args.
-+set dummy iconv; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--int
--main ()
--{
-+ case $INTLTOOL_ICONV in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.o conftest.obj
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
-+ test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
-+ ;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- for ac_file in conftest.o conftest.obj conftest.*; do
-- test -f "$ac_file" || continue;
-- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-- break;;
-- esac
--done
-+fi
-+INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-+if test -n "$INTLTOOL_ICONV"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-+echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
--rm -f conftest.$ac_cv_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6; }
--OBJEXT=$ac_cv_objext
--ac_objext=$OBJEXT
--{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+
-+# Extract the first word of "msgfmt", so it can be a program name with args.
-+set dummy msgfmt; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -19591,41 +18344,20 @@
-int
-main ()
-{
--#ifndef __GNUC__
-- choke me
--#endif
-+ case $INTLTOOL_MSGFMT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
+-extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
- ;
- return 0;
-}
-_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
+- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
@@ -19642,449 +18374,57 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-+ test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
-+ ;;
- esac
+-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_compiler_gnu=yes
-+fi
-+INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-+if test -n "$INTLTOOL_MSGFMT"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-+echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
- else
+- DATADIRNAME=share
+-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_compiler_gnu=no
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
--GCC=`test $ac_compiler_gnu = yes && echo yes`
--ac_test_CFLAGS=${CFLAGS+set}
--ac_save_CFLAGS=$CFLAGS
--{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+# Extract the first word of "msgmerge", so it can be a program name with args.
-+set dummy msgmerge; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_save_c_werror_flag=$ac_c_werror_flag
-- ac_c_werror_flag=yes
-- ac_cv_prog_cc_g=no
-- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
+- case $host in
+- *-*-solaris*)
+- { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
--int
--main ()
--{
-+ case $INTLTOOL_MSGMERGE in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
-+ test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
-+ ;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_g=yes
-+fi
-+INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-+if test -n "$INTLTOOL_MSGMERGE"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
-+echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-
-- CFLAGS=""
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--int
--main ()
--{
-+# Extract the first word of "xgettext", so it can be a program name with args.
-+set dummy xgettext; ac_word=$2
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ case $INTLTOOL_XGETTEXT in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
-+ test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
-+ ;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
-+fi
-+INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-+if test -n "$INTLTOOL_XGETTEXT"; then
-+ { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-+echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-
-- ac_c_werror_flag=$ac_save_c_werror_flag
-- CFLAGS="-g"
-- cat >conftest.$ac_ext <<_ACEOF
-+
-+
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+
-+
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -4108,323 +4328,212 @@
- int
- main ()
- {
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
-
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_g=yes
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ DATADIRNAME=share
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- ac_c_werror_flag=$ac_save_c_werror_flag
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
--if test "$ac_test_CFLAGS" = set; then
-- CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
-- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-- else
-- CFLAGS="-g"
-- fi
--else
-- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-- else
-- CFLAGS=
-- fi
--fi
--{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
--echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+ case $host in
-+ *-*-solaris*)
-+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
-+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_c89=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
-- char **p;
-- int i;
--{
-- return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
-- char *s;
-- va_list v;
-- va_start (v,p);
-- s = g (p, va_arg (v,int));
-- va_end (v);
-- return s;
--}
-+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-- function prototypes and stuff, but not '\xHH' hex character constants.
-- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std is added to get
-- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-- array size at least. It's necessary to write '\x00'==0 to get something
-- that's true only with -std. */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char bind_textdomain_codeset (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-
--/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-- inside strings and character constants. */
--#define FOO(x) 'x'
--int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-+
-+#undef bind_textdomain_codeset
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char bind_textdomain_codeset ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-+choke me
-+#endif
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
- int
- main ()
- {
--return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
-+return bind_textdomain_codeset ();
- ;
- return 0;
- }
- _ACEOF
--for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
-- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
-+ (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
+ #undef bind_textdomain_codeset
+
+@@ -4481,27 +4265,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20099,7 +18439,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
+- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
@@ -20109,240 +18449,56 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_c89=$ac_arg
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_func_bind_textdomain_codeset=yes
+ ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+ ac_cv_func_bind_textdomain_codeset=no
-+fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
-+if test $ac_cv_func_bind_textdomain_codeset = yes; then
-+ DATADIRNAME=share
-+else
-+ DATADIRNAME=lib
+@@ -4510,7 +4278,7 @@
+ ac_cv_func_bind_textdomain_codeset=no
fi
--rm -f core conftest.err conftest.$ac_objext
-- test "x$ac_cv_prog_cc_c89" != "xno" && break
--done
--rm -f conftest.$ac_ext
--CC=$ac_save_CC
-+ ;;
-+ *)
-+ DATADIRNAME=lib
-+ ;;
-+ esac
-+fi
-
+-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
+ conftest$ac_exeext conftest.$ac_ext
fi
--# AC_CACHE_VAL
--case "x$ac_cv_prog_cc_c89" in
-- x)
-- { echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6; } ;;
-- xno)
-- { echo "$as_me:$LINENO: result: unsupported" >&5
--echo "${ECHO_T}unsupported" >&6; } ;;
-- *)
-- CC="$CC $ac_cv_prog_cc_c89"
-- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
--esac
-
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--depcc="$CC" am_compiler_list=
-
--{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-- # We make a subdir and do the tests there. Otherwise we can end up
-- # making bogus files that we don't know about and never remove. For
-- # instance it was reported that on HP-UX the gcc test will end up
-- # making a dummy file named `D' -- because `-MD' means `put the output
-- # in D'.
-- mkdir conftest.dir
-- # Copy depcomp to subdir because otherwise we won't find it if we're
-- # using a relative directory.
-- cp "$am_depcomp" conftest.dir
-- cd conftest.dir
-- # We will build objects and dependencies in a subdirectory because
-- # it helps to detect inapplicable dependency modes. For instance
-- # both Tru64's cc and ICC support -MD to output dependencies as a
-- # side effect of compilation, but ICC will put the dependencies in
-- # the current directory while Tru64 will put them in the object
-- # directory.
-- mkdir sub
-
-- am_cv_CC_dependencies_compiler_type=none
-- if test "$am_compiler_list" = ""; then
-- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-- fi
-- for depmode in $am_compiler_list; do
-- # Setup a source with many dependencies, because some compilers
-- # like to wrap large dependency lists on column 80 (with \), and
-- # we should not choose a depcomp mode which is confused by this.
-- #
-- # We need to recreate these files for each test, as the compiler may
-- # overwrite some of them when testing with obscure command lines.
-- # This happens at least with the AIX C compiler.
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
-- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-- # Solaris 8's {/usr,}/bin/sh.
-- touch sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+ac_config_commands="$ac_config_commands intltool"
-
-- case $depmode in
-- nosideeffect)
-- # after this tag, mechanisms are not by side-effect, so they'll
-- # only be used when explicitly requested
-- if test "x$enable_dependency_tracking" = xyes; then
-- continue
-- else
-- break
-- fi
-+
-+
-+# Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+ enableval=$enable_shared; p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
- ;;
-- none) break ;;
+ { echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+@@ -4528,7 +4296,7 @@
esac
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this.
-- if depmode=$depmode \
-- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-- >/dev/null 2>conftest.err &&
-- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-- # icc doesn't choke on unknown options, it will just issue warnings
-- # or remarks (even with -Werror). So we grep stderr for any message
-- # that says an option was ignored or not supported.
-- # When given -MP, icc 7.0 and 7.1 complain thusly:
-- # icc: Command line warning: ignoring option '-M'; no argument required
-- # The diagnosis changed in icc 8.0:
-- # icc: Command line remark: option '-MP' not supported
-- if (grep 'ignoring option' conftest.err ||
-- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-- am_cv_CC_dependencies_compiler_type=$depmode
-- break
-- fi
-- fi
-- done
--
-- cd ..
-- rm -rf conftest.dir
- else
-- am_cv_CC_dependencies_compiler_type=none
-+ enable_shared=yes
fi
--fi
--{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
--CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+-rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ fi
-+# Check whether --enable-static was given.
-+if test "${enable_static+set}" = set; then
-+ enableval=$enable_static; p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac
-+else
-+ enable_static=yes
-+fi
-
-
--if
-- test "x$enable_dependency_tracking" != xno \
-- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-- am__fastdepCC_TRUE=
-- am__fastdepCC_FALSE='#'
-+# Check whether --enable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then
-+ enableval=$enable_fast_install; p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac
- else
-- am__fastdepCC_TRUE='#'
-- am__fastdepCC_FALSE=
-+ enable_fast_install=yes
+@@ -4626,12 +4394,13 @@
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+@@ -4666,6 +4435,7 @@
fi
+ SED=$lt_cv_path_SED
++
+ { echo "$as_me:$LINENO: result: $SED" >&5
+ echo "${ECHO_T}$SED" >&6; }
-@@ -4506,7 +4615,7 @@
+@@ -4690,7 +4460,7 @@
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -20351,7 +18507,7 @@
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
-@@ -4588,7 +4697,7 @@
+@@ -4772,7 +4542,7 @@
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -20360,7 +18516,36 @@
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
-@@ -4894,7 +5003,7 @@
+@@ -5027,8 +4797,8 @@
+ echo "${ECHO_T}no, using $LN_S" >&6; }
+ fi
+
+-{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -5069,16 +4839,22 @@
+
+ mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+- # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- lt_cv_file_magic_cmd='$OBJDUMP -f'
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ 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)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -20369,9 +18554,18 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -4948,11 +5057,11 @@
+@@ -5116,7 +4892,7 @@
+ esac
;;
+-interix3*)
++interix[3-9]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
+@@ -5132,11 +4908,11 @@
+ ;;
+
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
@@ -20383,24 +18577,57 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -5037,7 +5146,6 @@
- # Allow CC to be a program name with arguments.
- compiler=$CC
+@@ -5166,6 +4942,10 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
--
- # Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
- enableval=$enable_libtool_lock;
-@@ -5069,7 +5177,7 @@
++rdos*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
;;
+@@ -5252,7 +5032,7 @@
+ ;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 5072 "configure"' > conftest.$ac_ext
-+ echo '#line 5180 "configure"' > conftest.$ac_ext
+- echo '#line 5255 "configure"' > conftest.$ac_ext
++ echo '#line 5035 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5193,27 +5301,11 @@
+@@ -5287,7 +5067,8 @@
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -5298,6 +5079,9 @@
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+@@ -5314,6 +5098,9 @@
+ ;;
+ *64-bit*)
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+@@ -5376,27 +5163,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20433,7 +18660,7 @@
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5222,7 +5314,7 @@
+@@ -5405,7 +5176,7 @@
lt_cv_cc_needs_belf=no
fi
@@ -20442,7 +18669,7 @@
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5316,17 +5408,10 @@
+@@ -5499,17 +5270,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20464,7 +18691,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5360,17 +5445,10 @@
+@@ -5543,17 +5307,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20486,7 +18713,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5435,17 +5513,10 @@
+@@ -5618,17 +5375,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20508,7 +18735,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -5479,17 +5550,10 @@
+@@ -5662,17 +5412,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20530,7 +18757,7 @@
# Broken: success on invalid input.
continue
else
-@@ -5560,27 +5624,10 @@
+@@ -5743,27 +5486,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20562,7 +18789,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5756,27 +5803,10 @@
+@@ -5939,27 +5665,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20594,7 +18821,7 @@
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -5839,27 +5869,10 @@
+@@ -6022,27 +5731,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20626,7 +18853,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5895,17 +5908,10 @@
+@@ -6078,17 +5770,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20648,7 +18875,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -5992,7 +5998,7 @@
+@@ -6175,7 +5860,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20657,7 +18884,7 @@
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6036,7 +6042,7 @@
+@@ -6219,7 +5904,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20666,7 +18893,7 @@
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6149,27 +6155,10 @@
+@@ -6332,27 +6017,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20698,7 +18925,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6224,27 +6213,10 @@
+@@ -6407,27 +6075,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20730,23 +18957,22 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6268,38 +6240,21 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
--case "(($ac_try" in
+@@ -6462,27 +6113,10 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_compile") 2>conftest.er1
+- (eval "$ac_try") 2>&5
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
@@ -20755,21 +18981,6 @@
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (case "(($ac_try" in
-+case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-- (eval "$ac_try") 2>&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
@@ -20778,7 +18989,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6335,27 +6290,10 @@
+@@ -6518,27 +6152,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20810,7 +19021,7 @@
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6463,6 +6401,7 @@
+@@ -6646,6 +6263,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -20818,7 +19029,7 @@
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -6492,9 +6431,7 @@
+@@ -6675,9 +6293,7 @@
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -20829,7 +19040,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
-@@ -6558,17 +6495,10 @@
+@@ -6741,17 +6357,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20851,7 +19062,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6602,17 +6532,10 @@
+@@ -6785,17 +6394,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20873,7 +19084,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6677,17 +6600,10 @@
+@@ -6860,17 +6462,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20895,7 +19106,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -6721,17 +6637,10 @@
+@@ -6904,17 +6499,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20917,7 +19128,7 @@
# Broken: success on invalid input.
continue
else
-@@ -6772,7 +6681,7 @@
+@@ -6955,7 +6543,7 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -20926,7 +19137,7 @@
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
-@@ -6790,7 +6699,7 @@
+@@ -6973,7 +6561,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20935,7 +19146,7 @@
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6816,7 +6725,7 @@
+@@ -6999,7 +6587,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
@@ -20944,7 +19155,7 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -6834,7 +6743,7 @@
+@@ -7017,7 +6605,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -20953,7 +19164,7 @@
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -6941,27 +6850,10 @@
+@@ -7124,27 +6712,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -20985,7 +19196,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7004,27 +6896,10 @@
+@@ -7187,27 +6758,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21017,7 +19228,60 @@
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7222,7 +7097,7 @@
+@@ -7334,24 +6888,27 @@
+ fi
+ ;;
+ *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+- while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+ = "XX$teststring") >/dev/null 2>&1 &&
+- new_result=`expr "X$teststring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- teststring=$teststring$teststring
+- done
+- teststring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+
+@@ -7368,6 +6925,7 @@
+
+
+
++
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+ { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+ echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
+@@ -7405,7 +6963,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -21026,7 +19290,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -7479,7 +7354,7 @@
+@@ -7662,7 +7220,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21035,7 +19299,7 @@
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7519,7 +7394,7 @@
+@@ -7702,7 +7260,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21044,7 +19308,7 @@
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7575,7 +7450,7 @@
+@@ -7758,7 +7316,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21053,7 +19317,7 @@
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7615,7 +7490,7 @@
+@@ -7798,7 +7356,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21062,7 +19326,7 @@
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7671,7 +7546,7 @@
+@@ -7854,7 +7412,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21071,7 +19335,7 @@
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -7711,7 +7586,7 @@
+@@ -7894,7 +7452,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21080,21 +19344,104 @@
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -8028,11 +7903,11 @@
+@@ -7956,7 +7514,7 @@
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
+@@ -8156,10 +7714,10 @@
+ objext=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+
+ # If no C compiler was specified, use CC.
+@@ -8174,13 +7732,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -8200,7 +7758,7 @@
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8211,11 +7769,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8031: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7906: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8214: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7772: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8035: \$? = $ac_status" >&5
-+ echo "$as_me:7910: \$? = $ac_status" >&5
+- echo "$as_me:8218: \$? = $ac_status" >&5
++ echo "$as_me:7776: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8190,7 +8065,7 @@
+@@ -8266,13 +7824,15 @@
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ ;;
+
+@@ -8282,7 +7842,7 @@
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -8340,7 +7900,7 @@
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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='-DDLL_EXPORT'
+@@ -8373,7 +7933,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -21103,46 +19450,144 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -8296,11 +8171,11 @@
+@@ -8392,6 +7952,22 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -8401,6 +7977,10 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+@@ -8468,7 +8048,7 @@
+ else
+ lt_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -8479,11 +8059,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8299: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8174: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8482: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8062: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8303: \$? = $ac_status" >&5
-+ echo "$as_me:8178: \$? = $ac_status" >&5
+- echo "$as_me:8486: \$? = $ac_status" >&5
++ echo "$as_me:8066: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -8400,11 +8275,11 @@
+@@ -8532,7 +8112,7 @@
+ lt_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -8572,7 +8152,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -8583,11 +8163,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:8403: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8278: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8586: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8166: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:8407: \$? = $ac_status" >&5
-+ echo "$as_me:8282: \$? = $ac_status" >&5
+- echo "$as_me:8590: \$? = $ac_status" >&5
++ echo "$as_me:8170: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8629,7 +8504,7 @@
+@@ -8779,7 +8359,7 @@
+ 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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ 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'
+@@ -8797,7 +8377,7 @@
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+@@ -8812,7 +8392,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8655,12 +8530,13 @@
+@@ -8830,20 +8410,30 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; 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~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs=no
else
@@ -21155,7 +19600,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8880,27 +8756,11 @@
+@@ -8995,7 +8585,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+@@ -9063,33 +8653,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21180,16 +19634,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9097,7 +8678,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -8914,7 +8774,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -21197,7 +19669,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -8955,27 +8815,11 @@
+@@ -9138,33 +8719,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21222,16 +19694,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -9172,7 +8744,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -8989,7 +8833,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -21239,8 +19729,30 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -9120,7 +8964,7 @@
+@@ -9218,7 +8790,7 @@
+ # 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'
++ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes=yes
;;
+@@ -9260,10 +8832,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -9303,7 +8875,7 @@
+ ;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
@@ -21248,7 +19760,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -9222,7 +9066,7 @@
+@@ -9405,7 +8977,7 @@
link_all_deplibs=yes
;;
@@ -21257,7 +19769,173 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9712,18 +9556,6 @@
+@@ -9425,24 +8997,28 @@
+ ;;
+
+ openbsd*)
+- hardcode_direct=yes
+- hardcode_shlibpath_var=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct=yes
++ hardcode_shlibpath_var=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+- ;;
+- *)
+- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs=no
+ fi
+ ;;
+
+@@ -9501,17 +9077,16 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+@@ -9568,7 +9143,7 @@
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag='${wl}-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+@@ -9645,7 +9220,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -9703,17 +9278,55 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
+ if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ lt_search_path_spec=`echo "$lt_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"`
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[lt_foo]++; }
++ if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -9873,12 +9486,8 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -9895,18 +9504,6 @@
dynamic_linker=no
;;
@@ -21276,16 +19954,43 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -9879,7 +9711,7 @@
+@@ -9944,7 +9541,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -10007,7 +9604,7 @@
+ postinstall_cmds='chmod 555 $lib'
;;
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -10062,7 +9659,7 @@
+ ;;
+
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9908,7 +9740,7 @@
+@@ -10078,7 +9675,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -10091,7 +9688,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21294,7 +19999,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9917,7 +9749,7 @@
+@@ -10100,7 +9697,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -21303,7 +20008,26 @@
;;
netbsd*)
-@@ -10237,27 +10069,11 @@
+@@ -10184,6 +9781,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -10337,6 +9938,7 @@
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ else
+@@ -10420,27 +10022,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21336,7 +20060,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10266,7 +10082,7 @@
+@@ -10449,7 +10035,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -21345,7 +20069,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10348,27 +10164,11 @@
+@@ -10531,27 +10117,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21378,7 +20102,7 @@
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10377,7 +10177,7 @@
+@@ -10560,7 +10130,7 @@
ac_cv_func_shl_load=no
fi
@@ -21387,7 +20111,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-@@ -10427,27 +10227,11 @@
+@@ -10610,27 +10180,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21420,7 +20144,7 @@
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10456,7 +10240,7 @@
+@@ -10639,7 +10193,7 @@
ac_cv_lib_dld_shl_load=no
fi
@@ -21429,7 +20153,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10528,27 +10312,11 @@
+@@ -10711,27 +10265,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21462,7 +20186,7 @@
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10557,7 +10325,7 @@
+@@ -10740,7 +10278,7 @@
ac_cv_func_dlopen=no
fi
@@ -21471,7 +20195,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-@@ -10607,27 +10375,11 @@
+@@ -10790,27 +10328,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21504,7 +20228,7 @@
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10636,7 +10388,7 @@
+@@ -10819,7 +10341,7 @@
ac_cv_lib_dl_dlopen=no
fi
@@ -21513,7 +20237,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10687,27 +10439,11 @@
+@@ -10870,27 +10392,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21546,7 +20270,7 @@
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10716,7 +10452,7 @@
+@@ -10899,7 +10405,7 @@
ac_cv_lib_svld_dlopen=no
fi
@@ -21555,7 +20279,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10767,27 +10503,11 @@
+@@ -10950,27 +10456,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21588,7 +20312,7 @@
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
-@@ -10796,7 +10516,7 @@
+@@ -10979,7 +10469,7 @@
ac_cv_lib_dld_dld_link=no
fi
@@ -21597,25 +20321,89 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -10852,7 +10572,7 @@
+@@ -11035,7 +10525,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10855 "configure"
-+#line 10575 "configure"
+-#line 11038 "configure"
++#line 10528 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10952,7 +10672,7 @@
+@@ -11135,7 +10625,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 10955 "configure"
-+#line 10675 "configure"
+-#line 11138 "configure"
++#line 10628 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12039,27 +11759,11 @@
+@@ -11333,6 +10823,7 @@
+ module_cmds \
+ module_expsym_cmds \
+ lt_cv_prog_compiler_c_o \
++ fix_srcfile_path \
+ exclude_expsyms \
+ include_expsyms; do
+
+@@ -11377,7 +10868,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -11701,7 +11192,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+@@ -11870,10 +11361,10 @@
+ objext_CXX=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -11889,13 +11380,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -12154,7 +11645,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_CXX=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_CXX=unsupported
+@@ -12222,33 +11713,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21640,16 +20428,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12256,7 +11738,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -12073,7 +11777,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -21657,7 +20463,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12115,27 +11819,11 @@
+@@ -12298,33 +11780,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21682,16 +20488,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -12332,7 +11805,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -12149,7 +11837,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -21699,7 +20523,20 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -12297,7 +11985,7 @@
+@@ -12443,10 +11916,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -12480,7 +11953,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -21708,7 +20545,27 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12456,7 +12144,7 @@
+@@ -12529,9 +12002,7 @@
+ hardcode_libdir_separator_CXX=:
+
+ case $host_cpu in
+- hppa*64*|ia64*)
+- hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
+- ;;
++ hppa*64*|ia64*) ;;
+ *)
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ ;;
+@@ -12599,7 +12070,7 @@
+ ;;
+ esac
+ ;;
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_CXX=no
+ hardcode_shlibpath_var_CXX=no
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+@@ -12639,7 +12110,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -21717,25 +20574,200 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -12558,7 +12246,7 @@
+@@ -12719,6 +12190,29 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ no_undefined_flag_CXX=' -zdefs'
++ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ hardcode_libdir_flag_spec_CXX='-R$libdir'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
esac
;;
+ lynxos*)
+@@ -12741,7 +12235,7 @@
+ ;;
+ esac
+ ;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13125,7 +12813,7 @@
+@@ -12757,16 +12251,20 @@
+ ld_shlibs_CXX=no
+ ;;
+ openbsd*)
+- hardcode_direct_CXX=yes
+- hardcode_shlibpath_var_CXX=no
+- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+- export_dynamic_flag_spec_CXX='${wl}-E'
+- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_CXX=yes
++ hardcode_shlibpath_var_CXX=no
++ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ export_dynamic_flag_spec_CXX='${wl}-E'
++ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ ld_shlibs_CXX=no
+ fi
+- output_verbose_link_cmd='echo'
+ ;;
+ osf3*)
+ case $cc_basename in
+@@ -12928,15 +12426,10 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker. We must also pass each convience library through
+- # to the system linker between allextract/defaultextract.
+- # The C++ compiler will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++ whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
;;
esac
+ link_all_deplibs_CXX=yes
+@@ -12983,6 +12476,12 @@
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[0-5] | solaris2.[0-5].*) ;;
++ *)
++ whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
;;
+ esac
+@@ -13174,7 +12673,7 @@
+
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+-interix3*)
++interix[3-9]*)
+ # Interix 3.5 installs completely hosed .la files for C++, so rather than
+ # hack all around it, let's just trust "g++" to DTRT.
+ predep_objects_CXX=
+@@ -13182,13 +12681,46 @@
+ postdeps_CXX=
+ ;;
+
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ postdeps_CXX='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
+ solaris*)
+ case $cc_basename in
+ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
+ # Adding this requires a known-good setup of shared libraries for
+ # Sun compiler versions before 5.6, else PIC objects from an old
+ # archive will be linked into the output, leading to subtle bugs.
+- postdeps_CXX='-lCstd -lCrun'
++ if test "$solaris_use_stlport4" != yes; then
++ postdeps_CXX='-library=Cstd -library=Crun'
++ fi
+ ;;
+ esac
+ ;;
+@@ -13225,12 +12757,14 @@
+ # like `-m68040'.
+ lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # 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).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+@@ -13242,7 +12776,7 @@
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -13308,7 +12842,7 @@
+ ;;
+ esac
+ ;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13168,7 +12856,7 @@
+@@ -13351,7 +12885,7 @@
;;
esac
;;
@@ -21744,54 +20776,143 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13211,7 +12899,7 @@
+@@ -13378,6 +12912,14 @@
+ lt_prog_compiler_static_CXX='-non_shared'
;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ lt_prog_compiler_pic_CXX='-KPIC'
++ lt_prog_compiler_static_CXX='-Bstatic'
++ lt_prog_compiler_wl_CXX='-Qoption ld '
++ ;;
++ esac
+ ;;
esac
;;
+@@ -13394,7 +12936,7 @@
+ ;;
+ esac
+ ;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13320,11 +13008,11 @@
+@@ -13492,7 +13034,7 @@
+ else
+ lt_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -13503,11 +13045,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13323: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13011: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13506: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13048: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13327: \$? = $ac_status" >&5
-+ echo "$as_me:13015: \$? = $ac_status" >&5
+- echo "$as_me:13510: \$? = $ac_status" >&5
++ echo "$as_me:13052: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13424,11 +13112,11 @@
+@@ -13556,7 +13098,7 @@
+ lt_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -13596,7 +13138,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -13607,11 +13149,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13427: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13115: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13610: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13152: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13431: \$? = $ac_status" >&5
-+ echo "$as_me:13119: \$? = $ac_status" >&5
+- echo "$as_me:13614: \$? = $ac_status" >&5
++ echo "$as_me:13156: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13496,6 +13184,9 @@
+@@ -13677,7 +13219,10 @@
+ export_symbols_cmds_CXX="$ltdll_cmds"
+ ;;
cygwin* | mingw*)
- 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'
- ;;
+- 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'
++ 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'
++ ;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
-+ ;;
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -13708,7 +13253,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -13766,20 +13311,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- 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
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -13936,12 +13468,7 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13775,18 +13466,6 @@
+
+@@ -13958,18 +13485,6 @@
dynamic_linker=no
;;
@@ -21810,16 +20931,43 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -13942,7 +13621,7 @@
+@@ -14007,7 +13522,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -14070,7 +13585,7 @@
+ postinstall_cmds='chmod 555 $lib'
;;
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14125,7 +13640,7 @@
+ ;;
+
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13971,7 +13650,7 @@
+@@ -14141,7 +13656,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -14154,7 +13669,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -21828,7 +20976,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13980,7 +13659,7 @@
+@@ -14163,7 +13678,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -21837,7 +20985,107 @@
;;
netbsd*)
-@@ -14888,7 +14567,7 @@
+@@ -14247,6 +13762,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -14441,6 +13960,7 @@
+ module_cmds_CXX \
+ module_expsym_cmds_CXX \
+ lt_cv_prog_compiler_c_o_CXX \
++ fix_srcfile_path_CXX \
+ exclude_expsyms_CXX \
+ include_expsyms_CXX; do
+
+@@ -14761,7 +14281,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_CXX
+@@ -14852,10 +14372,17 @@
+ objext_F77=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -14871,13 +14398,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -14964,13 +14491,15 @@
+ lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_F77='-DDLL_EXPORT'
+ ;;
+
+@@ -14980,7 +14509,7 @@
+ lt_prog_compiler_pic_F77='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -15038,7 +14567,7 @@
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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_F77='-DDLL_EXPORT'
+@@ -15071,7 +14600,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -21846,46 +21094,144 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -14994,11 +14673,11 @@
+@@ -15090,6 +14619,22 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic_F77='-KPIC'
++ lt_prog_compiler_static_F77='-Bstatic'
++ lt_prog_compiler_wl_F77='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic_F77='-KPIC'
++ lt_prog_compiler_static_F77='-Bstatic'
++ lt_prog_compiler_wl_F77=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -15099,6 +14644,10 @@
+ lt_prog_compiler_static_F77='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static_F77='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic_F77='-KPIC'
+ lt_prog_compiler_static_F77='-Bstatic'
+@@ -15166,7 +14715,7 @@
+ else
+ lt_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -15177,11 +14726,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14997: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14676: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15180: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15001: \$? = $ac_status" >&5
-+ echo "$as_me:14680: \$? = $ac_status" >&5
+- echo "$as_me:15184: \$? = $ac_status" >&5
++ echo "$as_me:14733: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -15098,11 +14777,11 @@
+@@ -15230,7 +14779,7 @@
+ lt_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -15270,7 +14819,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -15281,11 +14830,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:15101: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14780: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15284: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14833: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15105: \$? = $ac_status" >&5
-+ echo "$as_me:14784: \$? = $ac_status" >&5
+- echo "$as_me:15288: \$? = $ac_status" >&5
++ echo "$as_me:14837: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15327,7 +15006,7 @@
+@@ -15477,7 +15026,7 @@
+ allow_undefined_flag_F77=unsupported
+ always_export_symbols_F77=no
+ enable_shared_with_static_runtimes_F77=yes
+- export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -15495,7 +15044,7 @@
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_F77=no
+ hardcode_shlibpath_var_F77=no
+ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+@@ -15510,7 +15059,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -15353,12 +15032,13 @@
+@@ -15528,20 +15077,30 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_F77=no
else
@@ -21898,7 +21244,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15568,27 +15248,11 @@
+@@ -15693,7 +15252,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_F77=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_F77=unsupported
+@@ -15751,33 +15310,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21923,16 +21278,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15785,7 +15335,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -15602,7 +15266,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -21940,7 +21313,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15633,27 +15297,11 @@
+@@ -15816,33 +15366,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -21965,16 +21338,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15850,7 +15391,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -15667,7 +15315,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -21982,8 +21373,30 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -15798,7 +15446,7 @@
+@@ -15896,7 +15437,7 @@
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds_F77='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_F77=yes
;;
+@@ -15938,10 +15479,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -15981,7 +15522,7 @@
+ ;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
@@ -21991,7 +21404,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -15900,7 +15548,7 @@
+@@ -16083,7 +15624,7 @@
link_all_deplibs_F77=yes
;;
@@ -22000,7 +21413,134 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16390,18 +16038,6 @@
+@@ -16103,24 +15644,28 @@
+ ;;
+
+ openbsd*)
+- hardcode_direct_F77=yes
+- hardcode_shlibpath_var_F77=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_F77='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_F77=yes
++ hardcode_shlibpath_var_F77=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_F77='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_F77='-R$libdir'
++ ;;
++ *)
++ archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_F77='-R$libdir'
+- ;;
+- *)
+- archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_F77=no
+ fi
+ ;;
+
+@@ -16179,17 +15724,16 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs_F77=yes
+ ;;
+@@ -16246,7 +15790,7 @@
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_F77='${wl}-z,text'
+ archive_cmds_need_lc_F77=no
+ hardcode_shlibpath_var_F77=no
+@@ -16323,7 +15867,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -16381,20 +15925,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- 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
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -16551,12 +16082,7 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -16573,18 +16099,6 @@
dynamic_linker=no
;;
@@ -22019,16 +21559,43 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -16557,7 +16193,7 @@
+@@ -16622,7 +16136,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -16685,7 +16199,7 @@
+ postinstall_cmds='chmod 555 $lib'
;;
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -16740,7 +16254,7 @@
+ ;;
+
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16586,7 +16222,7 @@
+@@ -16756,7 +16270,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -16769,7 +16283,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22037,7 +21604,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16595,7 +16231,7 @@
+@@ -16778,7 +16292,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -22046,21 +21613,123 @@
;;
netbsd*)
-@@ -17328,11 +16964,11 @@
+@@ -16862,6 +16376,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -17056,6 +16574,7 @@
+ module_cmds_F77 \
+ module_expsym_cmds_F77 \
+ lt_cv_prog_compiler_c_o_F77 \
++ fix_srcfile_path_F77 \
+ exclude_expsyms_F77 \
+ include_expsyms_F77; do
+
+@@ -17376,7 +16895,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_F77
+@@ -17434,10 +16953,10 @@
+ objext_GCJ=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+@@ -17453,13 +16972,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -17500,7 +17019,7 @@
+ else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17511,11 +17030,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17331: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16967: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17514: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17033: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17335: \$? = $ac_status" >&5
-+ echo "$as_me:16971: \$? = $ac_status" >&5
+- echo "$as_me:17518: \$? = $ac_status" >&5
++ echo "$as_me:17037: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17490,7 +17126,7 @@
+@@ -17566,13 +17085,15 @@
+ lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
+ ;;
+
+@@ -17582,7 +17103,7 @@
+ lt_prog_compiler_pic_GCJ='-fno-common'
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+@@ -17640,7 +17161,7 @@
+ esac
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # 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_GCJ='-DDLL_EXPORT'
+@@ -17673,7 +17194,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -22069,46 +21738,144 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -17596,11 +17232,11 @@
+@@ -17692,6 +17213,22 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ lt_prog_compiler_wl_GCJ='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic_GCJ='-KPIC'
++ lt_prog_compiler_static_GCJ='-Bstatic'
++ lt_prog_compiler_wl_GCJ=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -17701,6 +17238,10 @@
+ lt_prog_compiler_static_GCJ='-non_shared'
+ ;;
+
++ rdos*)
++ lt_prog_compiler_static_GCJ='-non_shared'
++ ;;
++
+ solaris*)
+ lt_prog_compiler_pic_GCJ='-KPIC'
+ lt_prog_compiler_static_GCJ='-Bstatic'
+@@ -17768,7 +17309,7 @@
+ else
+ lt_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -17779,11 +17320,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17599: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17235: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17782: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17323: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17603: \$? = $ac_status" >&5
-+ echo "$as_me:17239: \$? = $ac_status" >&5
+- echo "$as_me:17786: \$? = $ac_status" >&5
++ echo "$as_me:17327: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17700,11 +17336,11 @@
+@@ -17832,7 +17373,7 @@
+ lt_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+@@ -17872,7 +17413,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -17883,11 +17424,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17703: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17339: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17886: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17427: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17707: \$? = $ac_status" >&5
-+ echo "$as_me:17343: \$? = $ac_status" >&5
+- echo "$as_me:17890: \$? = $ac_status" >&5
++ echo "$as_me:17431: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17929,7 +17565,7 @@
+@@ -18079,7 +17620,7 @@
+ allow_undefined_flag_GCJ=unsupported
+ always_export_symbols_GCJ=no
+ enable_shared_with_static_runtimes_GCJ=yes
+- export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++ export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+@@ -18097,7 +17638,7 @@
+ fi
+ ;;
+
+- interix3*)
++ interix[3-9]*)
+ hardcode_direct_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+@@ -18112,7 +17653,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
-+ linux* | k*bsd*-gnu)
++ gnu* | linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17955,12 +17591,13 @@
+@@ -18130,20 +17671,30 @@
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ esac
+- archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+ if test $supports_anon_versioning = yes; then
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+- $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ link_all_deplibs_GCJ=no
else
@@ -22121,7 +21888,16 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18180,27 +17817,11 @@
+@@ -18295,7 +17846,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- hardcode_direct_GCJ=yes
++ :
+ else
+ # We have old collect2
+ hardcode_direct_GCJ=unsupported
+@@ -18363,33 +17914,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22146,16 +21922,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18397,7 +17939,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -18214,7 +17835,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -22163,7 +21957,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18255,27 +17876,11 @@
+@@ -18438,33 +17980,24 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22188,16 +21982,34 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+-
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; 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 '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -18472,7 +18005,7 @@
- aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
- }'`
-@@ -18289,7 +17894,7 @@
-
fi
-rm -f core conftest.err conftest.$ac_objext \
@@ -22205,8 +22017,30 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -18420,7 +18025,7 @@
+@@ -18518,7 +18051,7 @@
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_From_new_cmds_GCJ='true'
+ # FIXME: Should let the user specify the lib program.
+- old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++ old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
+ enable_shared_with_static_runtimes_GCJ=yes
;;
+@@ -18560,10 +18093,10 @@
+ case $cc_basename in
+ xlc*)
+ output_verbose_link_cmd='echo'
+- archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++ archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
+ module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ ;;
+ *)
+@@ -18603,7 +18136,7 @@
+ ;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
@@ -22214,7 +22048,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -18522,7 +18127,7 @@
+@@ -18705,7 +18238,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -22223,7 +22057,134 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19012,18 +18617,6 @@
+@@ -18725,24 +18258,28 @@
+ ;;
+
+ openbsd*)
+- hardcode_direct_GCJ=yes
+- hardcode_shlibpath_var_GCJ=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- export_dynamic_flag_spec_GCJ='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ hardcode_direct_GCJ=yes
++ hardcode_shlibpath_var_GCJ=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ export_dynamic_flag_spec_GCJ='${wl}-E'
++ else
++ case $host_os in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ hardcode_libdir_flag_spec_GCJ='-R$libdir'
++ ;;
++ *)
++ archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+- archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- hardcode_libdir_flag_spec_GCJ='-R$libdir'
+- ;;
+- *)
+- archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
+- ;;
+- esac
++ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+@@ -18801,17 +18338,16 @@
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+- # The compiler driver will combine linker options so we
+- # cannot just pass the convience library names through
+- # without $wl, iff we do not link with $LD.
+- # Luckily, gcc supports the same syntax we need for Sun Studio.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- case $wlarc in
+- '')
+- whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+- *)
+- whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+- esac ;;
++ if test "$GCC" = yes; then
++ whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ link_all_deplibs_GCJ=yes
+ ;;
+@@ -18868,7 +18404,7 @@
+ fi
+ ;;
+
+- sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag_GCJ='${wl}-z,text'
+ archive_cmds_need_lc_GCJ=no
+ hardcode_shlibpath_var_GCJ=no
+@@ -18945,7 +18481,7 @@
+ { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+@@ -19003,20 +18539,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
+- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
+- # if the path contains ";" then we assume it to be the separator
+- # otherwise default to the standard path separator (i.e. ":") - it is
+- # assumed that no part of a normal pathname contains ";" but that should
+- # okay in the real world where ";" in dirpaths is itself problematic.
+- 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
+-else
+- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+-fi
++
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -19173,12 +18696,7 @@
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -19195,18 +18713,6 @@
dynamic_linker=no
;;
@@ -22242,16 +22203,43 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19179,7 +18772,7 @@
+@@ -19244,7 +18750,7 @@
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+- freebsd*) # from 4.6 on
++ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+@@ -19307,7 +18813,7 @@
+ postinstall_cmds='chmod 555 $lib'
;;
+-interix3*)
++interix[3-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -19362,7 +18868,7 @@
+ ;;
+
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19208,7 +18801,7 @@
+@@ -19378,7 +18884,7 @@
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+@@ -19391,7 +18897,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -22260,7 +22248,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19217,7 +18810,7 @@
+@@ -19400,7 +18906,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -22269,7 +22257,77 @@
;;
netbsd*)
-@@ -20430,7 +20023,7 @@
+@@ -19484,6 +18990,10 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
++rdos*)
++ dynamic_linker=no
++ ;;
++
+ solaris*)
+ version_type=linux
+ need_lib_prefix=no
+@@ -19678,6 +19188,7 @@
+ module_cmds_GCJ \
+ module_expsym_cmds_GCJ \
+ lt_cv_prog_compiler_c_o_GCJ \
++ fix_srcfile_path_GCJ \
+ exclude_expsyms_GCJ \
+ include_expsyms_GCJ; do
+
+@@ -19998,7 +19509,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_GCJ
+@@ -20055,7 +19566,7 @@
+ objext_RC=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -20074,13 +19585,13 @@
+
+ # save warnings/boilerplate of simple test code
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+ eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_compiler_boilerplate=`cat conftest.err`
+ $rm conftest*
+
+ ac_outfile=conftest.$ac_objext
+-printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+ $rm conftest*
+@@ -20158,6 +19669,7 @@
+ module_cmds_RC \
+ module_expsym_cmds_RC \
+ lt_cv_prog_compiler_c_o_RC \
++ fix_srcfile_path_RC \
+ exclude_expsyms_RC \
+ include_expsyms_RC; do
+
+@@ -20478,7 +19990,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_RC"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols_RC
+@@ -20613,7 +20125,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22278,7 +22336,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -20538,27 +20131,10 @@
+@@ -20721,27 +20233,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22310,20 +22368,11 @@
has_option=yes
else
echo "$as_me: failed program was:" >&5
-@@ -20616,134 +20192,14 @@
- *) complCFLAGS="$complCFLAGS -pedantic" ;;
- esac
- fi
-- fi
-- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--echo "${ECHO_T}$complCFLAGS" >&6; }
+@@ -20808,126 +20303,6 @@
+
+
+
-
-- WARN_CFLAGS="$warning_flags $complCFLAGS"
--
--
--
--
--
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -22440,19 +22489,13 @@
-echo "${ECHO_T}no" >&6; }
- PKG_CONFIG=""
- fi
-+ fi
-+ { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
-+echo "${ECHO_T}$complCFLAGS" >&6; }
-+
-+ WARN_CFLAGS="$warning_flags $complCFLAGS"
-+
-+
-
+-
-fi
-
+-
{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
-@@ -20793,27 +20249,11 @@
+ if test "${ac_cv_search_strerror+set}" = set; then
+@@ -20976,27 +20351,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22485,7 +22528,7 @@
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
-@@ -20822,7 +20262,7 @@
+@@ -21005,7 +20364,7 @@
fi
@@ -22494,7 +22537,7 @@
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
-@@ -20866,7 +20306,7 @@
+@@ -21049,7 +20408,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22503,7 +22546,7 @@
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -20906,7 +20346,7 @@
+@@ -21089,7 +20448,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22512,7 +22555,7 @@
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -20963,7 +20403,7 @@
+@@ -21146,7 +20505,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22521,7 +22564,7 @@
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21004,7 +20444,7 @@
+@@ -21187,7 +20546,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22530,7 +22573,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -21062,7 +20502,7 @@
+@@ -21245,7 +20604,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22539,7 +22582,7 @@
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21106,7 +20546,7 @@
+@@ -21289,7 +20648,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22548,7 +22591,7 @@
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21226,27 +20666,10 @@
+@@ -21409,27 +20768,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22580,7 +22623,7 @@
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
-@@ -21301,27 +20724,10 @@
+@@ -21484,27 +20826,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22612,7 +22655,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -21356,27 +20762,10 @@
+@@ -21539,27 +20864,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22644,7 +22687,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -21412,27 +20801,10 @@
+@@ -21595,27 +20903,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22676,7 +22719,7 @@
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
-@@ -21548,27 +20920,10 @@
+@@ -21731,27 +21022,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22708,7 +22751,7 @@
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
-@@ -21672,6 +21027,7 @@
+@@ -21855,6 +21129,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -22716,7 +22759,7 @@
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -21701,9 +21057,7 @@
+@@ -21884,9 +21159,7 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -22727,7 +22770,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -21752,27 +21106,10 @@
+@@ -21935,27 +21208,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22759,7 +22802,7 @@
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -21934,8 +21271,12 @@
+@@ -22117,8 +21373,12 @@
esac
done
@@ -22774,7 +22817,7 @@
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-@@ -21952,7 +21293,7 @@
+@@ -22135,7 +21395,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22783,7 +22826,7 @@
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -21961,7 +21302,6 @@
+@@ -22144,7 +21404,6 @@
done
IFS=$as_save_IFS
@@ -22791,11 +22834,16 @@
;;
esac
fi
-@@ -21975,19 +21315,88 @@
- fi
-
-
+@@ -22155,22 +21414,91 @@
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+-fi
+-
+fi
++
++
++fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
@@ -22824,8 +22872,7 @@
+done
+done
+IFS=$as_save_IFS
-
-- no_glib=""
++
+ ;;
+esac
+fi
@@ -22837,18 +22884,10 @@
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
-
-- if test x$PKG_CONFIG != xno ; then
-- if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
-- :
-- else
-- echo *** pkg-config too old; version 0.7 or better required.
-- no_glib=yes
-- PKG_CONFIG=no
-- fi
++
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
- else
++ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -22878,18 +22917,27 @@
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
-+
+
+fi
-+
-+ no_glib=""
-+
+
+ no_glib=""
+
+- if test x$PKG_CONFIG != xno ; then
+- if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
+- :
+- else
+- echo *** pkg-config too old; version 0.7 or better required.
+- no_glib=yes
+- PKG_CONFIG=no
+- fi
+- else
+ if test "x$PKG_CONFIG" = x ; then
no_glib=yes
+ PKG_CONFIG=no
fi
min_glib_version=2.0.0
-@@ -22196,27 +21605,11 @@
+@@ -22379,27 +21707,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -22922,7 +22970,7 @@
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GLIB or finding the wrong"
echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
-@@ -22234,7 +21627,7 @@
+@@ -22417,7 +21729,7 @@
echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
fi
@@ -22931,7 +22979,97 @@
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
-@@ -22921,7 +22314,9 @@
+@@ -22532,7 +21844,7 @@
+ and GLIB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22542,7 +21854,7 @@
+ and GLIB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -22652,7 +21964,7 @@
+ and DBUS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22662,7 +21974,7 @@
+ and DBUS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -22772,7 +22084,7 @@
+ and GTK_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22782,7 +22094,7 @@
+ and GTK_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -22892,7 +22204,7 @@
+ and GNOMEVFS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -22902,7 +22214,7 @@
+ and GNOMEVFS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -23012,7 +22324,7 @@
+ and MUSICBRAINZ_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23022,7 +22334,7 @@
+ and MUSICBRAINZ_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -23104,7 +22416,9 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBNAUTILUS_BURN_PKG_ERRORS" >&5
@@ -22942,7 +23080,7 @@
elif test $pkg_failed = untried; then
lnb15=no
else
-@@ -22993,7 +22388,9 @@
+@@ -23176,7 +22490,9 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBNAUTILUS_BURN_PKG_ERRORS" >&5
@@ -22953,7 +23091,7 @@
elif test $pkg_failed = untried; then
lnb13=no
else
-@@ -23065,7 +22462,9 @@
+@@ -23248,7 +22564,9 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBNAUTILUS_BURN_PKG_ERRORS" >&5
@@ -22964,10 +23102,39 @@
elif test $pkg_failed = untried; then
lnb12=no
else
-@@ -23262,50 +22661,6 @@
+@@ -23420,7 +22738,7 @@
+ and GST_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23430,7 +22748,7 @@
+ and GST_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -23500,7 +22818,9 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$GST_PBUTILS_PKG_ERRORS" >&5
+- gst_pbutils=no
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ gst_pbutils=no
+ elif test $pkg_failed = untried; then
+ gst_pbutils=no
+ else
+@@ -23527,49 +22847,6 @@
+
+
+
-
- gst_version=0.10
- gst_pkg_name="gstreamer-$gst_version"
@@ -22990,7 +23157,6 @@
-
- for element in $(echo "0.10,decodebin
- playbin
-- cdparanoia
- gnomevfssink
- gnomevfssrc
- audioconvert
@@ -23015,7 +23181,7 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -23324,7 +22679,7 @@
+@@ -23588,7 +22865,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23024,21 +23190,36 @@
ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23388,11 +22743,9 @@
- echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
- { (exit 1); exit 1; }; } ;;
+@@ -23654,9 +22931,7 @@
esac
--fi
+ fi
+
-
-
-+fi
-
-if test "$enable_schemas_install" != no; then
+ if test "$enable_schemas_install" != no; then
GCONF_SCHEMAS_INSTALL_TRUE=
GCONF_SCHEMAS_INSTALL_FALSE='#'
else
-@@ -23536,7 +22889,7 @@
+@@ -23758,7 +23033,7 @@
+ and MONO_MODULE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -23768,7 +23043,7 @@
+ and MONO_MODULE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -23800,7 +23075,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23047,7 +23228,7 @@
ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23589,7 +22942,7 @@
+@@ -23853,7 +23128,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23056,7 +23237,7 @@
ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23691,7 +23044,7 @@
+@@ -23942,7 +23217,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23065,7 +23246,7 @@
ac_cv_path_MONODOCER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23738,7 +23091,7 @@
+@@ -23989,7 +23264,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23074,7 +23255,7 @@
ac_cv_path_MDASSEMBLER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23769,9 +23122,7 @@
+@@ -24020,9 +23295,7 @@
DOCDIR=`$PKG_CONFIG monodoc --variable=sourcesdir`
@@ -23085,7 +23266,7 @@
BUILD_DOCS_TRUE=
BUILD_DOCS_FALSE='#'
else
-@@ -23782,9 +23133,7 @@
+@@ -24033,9 +23306,7 @@
else
{ echo "$as_me:$LINENO: not building Banshee API documentation" >&5
echo "$as_me: not building Banshee API documentation" >&6;}
@@ -23096,7 +23277,7 @@
BUILD_DOCS_TRUE=
BUILD_DOCS_FALSE='#'
else
-@@ -23855,7 +23204,9 @@
+@@ -24106,7 +23377,9 @@
# Put the nasty error message in config.log where it belongs
echo "$MONO_NUNIT_PKG_ERRORS" >&5
@@ -23107,7 +23288,7 @@
elif test $pkg_failed = untried; then
do_tests="no"
else
-@@ -23867,9 +23218,7 @@
+@@ -24118,9 +23391,7 @@
fi
@@ -23118,7 +23299,7 @@
ENABLE_TESTS_TRUE=
ENABLE_TESTS_FALSE='#'
else
-@@ -23944,7 +23293,9 @@
+@@ -24195,7 +23466,9 @@
# Put the nasty error message in config.log where it belongs
echo "$BOO_PKG_ERRORS" >&5
@@ -23129,7 +23310,7 @@
elif test $pkg_failed = untried; then
have_booc="no"
else
-@@ -23973,7 +23324,7 @@
+@@ -24224,7 +23497,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23138,7 +23319,7 @@
ac_cv_path_BOOC="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -23996,9 +23347,7 @@
+@@ -24247,9 +23520,7 @@
fi
@@ -23149,7 +23330,7 @@
HAVE_BOOC_TRUE=
HAVE_BOOC_FALSE='#'
else
-@@ -24010,9 +23359,7 @@
+@@ -24261,9 +23532,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@@ -23160,7 +23341,25 @@
HAVE_BOOC_TRUE=
HAVE_BOOC_FALSE='#'
else
-@@ -24143,9 +23490,7 @@
+@@ -24373,7 +23642,7 @@
+ and BOO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -24383,7 +23652,7 @@
+ and BOO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24394,9 +23663,7 @@
:
fi
@@ -23171,7 +23370,7 @@
EXTERNAL_BOO_TRUE=
EXTERNAL_BOO_FALSE='#'
else
-@@ -24154,9 +23499,7 @@
+@@ -24405,9 +23672,7 @@
fi
else
@@ -23182,7 +23381,25 @@
EXTERNAL_BOO_TRUE=
EXTERNAL_BOO_FALSE='#'
else
-@@ -24299,9 +23642,7 @@
+@@ -24529,7 +23794,7 @@
+ and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -24539,7 +23804,7 @@
+ and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24550,9 +23815,7 @@
:
fi
@@ -23193,7 +23410,7 @@
EXTERNAL_NDESK_DBUS_TRUE=
EXTERNAL_NDESK_DBUS_FALSE='#'
else
-@@ -24312,9 +23653,7 @@
+@@ -24563,9 +23826,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@@ -23204,7 +23421,7 @@
EXTERNAL_NDESK_DBUS_TRUE=
EXTERNAL_NDESK_DBUS_FALSE='#'
else
-@@ -24326,6 +23665,150 @@
+@@ -24577,6 +23838,150 @@
@@ -23308,7 +23525,7 @@
+and TAGLIB_SHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -23318,7 +23535,7 @@
+and TAGLIB_SHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
-+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
@@ -23355,7 +23572,43 @@
GTKSHARP_REQUIRED=2.7
pkg_failed=no
-@@ -24672,7 +24155,9 @@
+@@ -24709,7 +24114,7 @@
+ and GTKSHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -24719,7 +24124,7 @@
+ and GTKSHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24822,7 +24227,7 @@
+ and SQLITE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -24832,7 +24237,7 @@
+ and SQLITE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -24923,7 +24328,9 @@
# Put the nasty error message in config.log where it belongs
echo "$IPODSHARP_PKG_ERRORS" >&5
@@ -23366,7 +23619,7 @@
elif test $pkg_failed = untried; then
enable_ipodsharp=no
else
-@@ -24689,9 +24174,7 @@
+@@ -24940,9 +24347,7 @@
fi
@@ -23377,7 +23630,7 @@
ENABLE_IPOD_TRUE=
ENABLE_IPOD_FALSE='#'
else
-@@ -24772,7 +24255,9 @@
+@@ -25023,7 +24428,9 @@
# Put the nasty error message in config.log where it belongs
echo "$NJBSHARP_PKG_ERRORS" >&5
@@ -23388,7 +23641,7 @@
elif test $pkg_failed = untried; then
enable_njbsharp=no
else
-@@ -24804,9 +24289,7 @@
+@@ -25055,9 +24462,7 @@
echo "${ECHO_T}no" >&6; }
fi
@@ -23399,7 +23652,7 @@
ENABLE_NJB_TRUE=
ENABLE_NJB_FALSE='#'
else
-@@ -24887,7 +24370,9 @@
+@@ -25138,7 +24543,9 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBGPHOTO2SHARP_PKG_ERRORS" >&5
@@ -23410,7 +23663,7 @@
elif test $pkg_failed = untried; then
enable_mtp_dap=no
else
-@@ -24913,9 +24398,7 @@
+@@ -25164,9 +24571,7 @@
fi
@@ -23421,7 +23674,7 @@
ENABLE_MTP_TRUE=
ENABLE_MTP_FALSE='#'
else
-@@ -24996,7 +24479,9 @@
+@@ -25247,7 +24652,9 @@
# Put the nasty error message in config.log where it belongs
echo "$KARMASHARP_PKG_ERRORS" >&5
@@ -23432,7 +23685,7 @@
elif test $pkg_failed = untried; then
enable_karmasharp=no
else
-@@ -25016,9 +24501,7 @@
+@@ -25267,9 +24674,7 @@
fi
@@ -23443,7 +23696,7 @@
ENABLE_KARMA_TRUE=
ENABLE_KARMA_FALSE='#'
else
-@@ -25045,9 +24528,7 @@
+@@ -25296,9 +24701,7 @@
fi
@@ -23454,7 +23707,7 @@
ENABLE_MDNSD_TRUE=
ENABLE_MDNSD_FALSE='#'
else
-@@ -25085,7 +24566,7 @@
+@@ -25336,7 +24739,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23463,7 +23716,25 @@
ac_cv_path_MDNSRESPONDER="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -25231,9 +24712,7 @@
+@@ -25459,7 +24862,7 @@
+ and AVAHISHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&5
+ echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+@@ -25469,7 +24872,7 @@
+ and AVAHISHARP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+
+-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+ See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ else
+@@ -25482,9 +24885,7 @@
DAAPSHARP_FLAGS=$AVAHISHARP_LIBS
fi
@@ -23474,7 +23745,7 @@
DAAP_ENABLED_TRUE=
DAAP_ENABLED_FALSE='#'
else
-@@ -25242,9 +24721,7 @@
+@@ -25493,9 +24894,7 @@
fi
else
@@ -23485,7 +23756,7 @@
DAAP_ENABLED_TRUE=
DAAP_ENABLED_FALSE='#'
else
-@@ -25352,27 +24829,10 @@
+@@ -25603,27 +25002,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23517,7 +23788,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25408,17 +24868,10 @@
+@@ -25659,17 +25041,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23539,7 +23810,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25511,27 +24964,11 @@
+@@ -25762,27 +25137,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23572,7 +23843,7 @@
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25540,7 +24977,7 @@
+@@ -25791,7 +25150,7 @@
am_cv_val_LC_MESSAGES=no
fi
@@ -23581,7 +23852,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-@@ -25553,7 +24990,7 @@
+@@ -25804,7 +25163,7 @@
fi
fi
@@ -23590,10 +23861,22 @@
gt_cv_have_gettext=no
-@@ -25596,27 +25033,10 @@
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -25835,39 +25194,22 @@
+ #include <libintl.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
@@ -23607,13 +23890,19 @@
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
@@ -23622,7 +23911,7 @@
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25652,17 +25072,10 @@
+@@ -25903,17 +25245,10 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23644,7 +23933,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25753,27 +25166,11 @@
+@@ -26004,27 +25339,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23677,7 +23966,7 @@
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25782,7 +25179,7 @@
+@@ -26033,7 +25352,7 @@
gt_cv_func_ngettext_libc=no
fi
@@ -23686,7 +23975,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -25825,27 +25222,11 @@
+@@ -26076,27 +25395,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23719,7 +24008,7 @@
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -25854,7 +25235,7 @@
+@@ -26105,7 +25408,7 @@
gt_cv_func_dgettext_libc=no
fi
@@ -23728,13 +24017,10 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -25927,30 +25308,14 @@
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -26181,27 +25484,11 @@
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
@@ -23754,9 +24040,7 @@
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
-+ rm -f conftest.er1
-+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
@@ -23766,7 +24050,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -25959,7 +25324,7 @@
+@@ -26210,7 +25497,7 @@
eval "$as_ac_var=no"
fi
@@ -23775,7 +24059,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26024,27 +25389,11 @@
+@@ -26275,27 +25562,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23808,7 +24092,7 @@
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26053,7 +25402,7 @@
+@@ -26304,7 +25575,7 @@
ac_cv_lib_intl_bindtextdomain=no
fi
@@ -23817,7 +24101,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -26102,27 +25451,11 @@
+@@ -26353,27 +25624,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23850,7 +24134,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26131,7 +25464,7 @@
+@@ -26382,7 +25637,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -23859,7 +24143,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -26180,27 +25513,11 @@
+@@ -26431,27 +25686,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23892,7 +24176,7 @@
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26209,7 +25526,7 @@
+@@ -26460,7 +25699,7 @@
ac_cv_lib_intl_dgettext=no
fi
@@ -23901,7 +24185,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -26271,27 +25588,11 @@
+@@ -26522,27 +25761,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23934,7 +24218,7 @@
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26300,7 +25601,7 @@
+@@ -26551,7 +25774,7 @@
ac_cv_lib_intl_ngettext=no
fi
@@ -23943,7 +24227,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -26349,27 +25650,11 @@
+@@ -26600,27 +25823,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -23976,7 +24260,7 @@
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26378,7 +25663,7 @@
+@@ -26629,7 +25836,7 @@
ac_cv_lib_intl_dcgettext=no
fi
@@ -23985,7 +24269,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-@@ -26473,27 +25758,11 @@
+@@ -26724,27 +25931,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -24018,7 +24302,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26502,7 +25771,7 @@
+@@ -26753,7 +25944,7 @@
eval "$as_ac_var=no"
fi
@@ -24027,7 +24311,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26649,27 +25918,11 @@
+@@ -26900,27 +26091,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -24060,7 +24344,7 @@
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
-@@ -26678,7 +25931,7 @@
+@@ -26929,7 +26104,7 @@
eval "$as_ac_var=no"
fi
@@ -24069,7 +24353,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26692,6 +25945,35 @@
+@@ -26943,6 +26118,35 @@
fi
done
@@ -24089,8 +24373,8 @@
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
-+if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
-+ (msgfmt -c -o /dev/null conftest.foo) 2>&5
++if { (echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++ ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
@@ -24105,7 +24389,7 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -26710,7 +25992,7 @@
+@@ -26961,7 +26165,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24114,7 +24398,7 @@
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
-@@ -26798,27 +26080,11 @@
+@@ -27049,27 +26253,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -24147,7 +24431,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -26890,27 +26156,11 @@
+@@ -27141,27 +26329,11 @@
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -24180,7 +24464,7 @@
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
-@@ -26919,7 +26169,7 @@
+@@ -27170,7 +26342,7 @@
ac_cv_func_bind_textdomain_codeset=no
fi
@@ -24189,7 +24473,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-@@ -26940,7 +26190,7 @@
+@@ -27191,7 +26363,7 @@
esac
fi
@@ -24198,7 +24482,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -27032,6 +26282,15 @@
+@@ -27283,6 +26455,15 @@
fi
fi
@@ -24214,32 +24498,10 @@
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -27155,10 +26414,6 @@
+@@ -27508,6 +26689,20 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
--
-- ac_config_commands="$ac_config_commands po/stamp-it"
--
--
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -27173,6 +26428,10 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+
-+ ac_config_commands="$ac_config_commands po/stamp-it"
-+
-+
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -27257,6 +26516,20 @@
- Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
- fi
+if test -z "${EXTERNAL_TAGLIB_SHARP_TRUE}" && test -z "${EXTERNAL_TAGLIB_SHARP_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_TAGLIB_SHARP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
@@ -24257,7 +24519,7 @@
if test -z "${ENABLE_IPOD_TRUE}" && test -z "${ENABLE_IPOD_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ENABLE_IPOD\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -27330,7 +26603,8 @@
+@@ -27581,7 +26776,8 @@
## M4sh Initialization. ##
## --------------------- ##
@@ -24267,7 +24529,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
-@@ -27339,10 +26613,13 @@
+@@ -27590,10 +26786,13 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -24284,7 +24546,7 @@
# PATH needs CR
-@@ -27566,19 +26843,28 @@
+@@ -27817,19 +27016,28 @@
as_mkdir_p=false
fi
@@ -24324,16 +24586,16 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -27594,7 +26880,7 @@
+@@ -27845,7 +27053,7 @@
# values after options handling.
ac_log="
- This file was extended by banshee $as_me 0.12.1, which was
+ This file was extended by banshee $as_me 0.13.0, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -27623,7 +26909,7 @@
+@@ -27874,7 +27082,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -24342,16 +24604,16 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -27647,7 +26933,7 @@
+@@ -27898,7 +27106,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
- banshee config.status 0.12.1
+ banshee config.status 0.13.0
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
-@@ -27657,6 +26943,7 @@
+@@ -27908,6 +27116,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
@@ -24359,31 +24621,18 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -27749,12 +27036,12 @@
- #
- # INIT-COMMANDS
- #
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+@@ -28003,9 +27212,7 @@
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
- INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
- INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
- INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
--AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
+-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
+-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
++INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
_ACEOF
-@@ -27766,8 +27053,8 @@
- do
- case $ac_config_target in
- "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
- "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+ "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
- "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
-@@ -27948,6 +27235,7 @@
+@@ -28202,6 +27409,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -24391,59 +24640,62 @@
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
-@@ -27992,7 +27280,6 @@
+@@ -28243,10 +27451,9 @@
+ INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+ INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+ INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
++INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
- INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -28034,6 +27321,7 @@
+@@ -28288,10 +27495,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
+-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
+-INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
+-INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
++INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
- INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
- INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
- INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-@@ -28055,6 +27343,7 @@
- CCDEPMODE!$CCDEPMODE$ac_delim
+ ALL_LINGUAS!$ALL_LINGUAS$ac_delim
+ CC!$CC$ac_delim
+ CFLAGS!$CFLAGS$ac_delim
+@@ -28310,6 +27515,7 @@
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-+DATADIRNAME!$DATADIRNAME$ac_delim
+ DATADIRNAME!$DATADIRNAME$ac_delim
++SED!$SED$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
LN_S!$LN_S$ac_delim
-@@ -28126,11 +27415,9 @@
+@@ -28383,8 +27589,9 @@
NDESK_DBUS_LIBS!$NDESK_DBUS_LIBS$ac_delim
EXTERNAL_NDESK_DBUS_TRUE!$EXTERNAL_NDESK_DBUS_TRUE$ac_delim
EXTERNAL_NDESK_DBUS_FALSE!$EXTERNAL_NDESK_DBUS_FALSE$ac_delim
-GTKSHARP_CFLAGS!$GTKSHARP_CFLAGS$ac_delim
-GTKSHARP_LIBS!$GTKSHARP_LIBS$ac_delim
--SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
--SQLITE_LIBS!$SQLITE_LIBS$ac_delim
--IPODSHARP_CFLAGS!$IPODSHARP_CFLAGS$ac_delim
+TAGLIB_SHARP_CFLAGS!$TAGLIB_SHARP_CFLAGS$ac_delim
+TAGLIB_SHARP_LIBS!$TAGLIB_SHARP_LIBS$ac_delim
+EXTERNAL_TAGLIB_SHARP_TRUE!$EXTERNAL_TAGLIB_SHARP_TRUE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -28172,6 +27459,12 @@
+@@ -28426,6 +27633,9 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+EXTERNAL_TAGLIB_SHARP_FALSE!$EXTERNAL_TAGLIB_SHARP_FALSE$ac_delim
+GTKSHARP_CFLAGS!$GTKSHARP_CFLAGS$ac_delim
+GTKSHARP_LIBS!$GTKSHARP_LIBS$ac_delim
-+SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
-+SQLITE_LIBS!$SQLITE_LIBS$ac_delim
-+IPODSHARP_CFLAGS!$IPODSHARP_CFLAGS$ac_delim
- IPODSHARP_LIBS!$IPODSHARP_LIBS$ac_delim
- IPODSHARP_ASSEMBLIES!$IPODSHARP_ASSEMBLIES$ac_delim
- ENABLE_IPOD_TRUE!$ENABLE_IPOD_TRUE$ac_delim
-@@ -28205,11 +27498,11 @@
+ SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
+ SQLITE_LIBS!$SQLITE_LIBS$ac_delim
+ IPODSHARP_CFLAGS!$IPODSHARP_CFLAGS$ac_delim
+@@ -28462,6 +27672,7 @@
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
MSGFMT!$MSGFMT$ac_delim
@@ -24451,12 +24703,7 @@
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
CATALOGS!$CATALOGS$ac_delim
- CATOBJEXT!$CATOBJEXT$ac_delim
--DATADIRNAME!$DATADIRNAME$ac_delim
- GMOFILES!$GMOFILES$ac_delim
- INSTOBJEXT!$INSTOBJEXT$ac_delim
- INTLLIBS!$INTLLIBS$ac_delim
-@@ -28217,12 +27510,13 @@
+@@ -28473,12 +27684,13 @@
PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
@@ -24466,12 +24713,12 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -28449,6 +27743,11 @@
+@@ -28705,6 +27917,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
@@ -24483,7 +24730,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -28502,6 +27801,7 @@
+@@ -28758,6 +27975,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
@@ -24491,35 +24738,7 @@
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
-@@ -28658,27 +27958,6 @@
-
-
- case $ac_file$ac_mode in
-- "intltool":C)
--
--for file in intltool-extract intltool-merge intltool-update; do
-- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-- < ${ac_aux_dir}/${file}.in > ${file}.out
-- if cmp -s ${file} ${file}.out 2>/dev/null; then
-- rm -f ${file}.out
-- else
-- mv -f ${file}.out ${file}
-- fi
-- chmod ugo+x ${file}
-- chmod u+w ${file}
--done
--
-- ;;
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
-@@ -28687,8 +27966,9 @@
+@@ -28922,8 +28140,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -24531,37 +24750,20 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -28802,6 +28082,27 @@
- done
- done
- ;;
-+ "intltool":C)
-+
-+for file in intltool-extract intltool-merge intltool-update; do
-+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-+ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-+ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-+ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-+ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-+ < ${ac_aux_dir}/${file}.in > ${file}.out
-+ if cmp -s ${file} ${file}.out 2>/dev/null; then
-+ rm -f ${file}.out
-+ else
-+ mv -f ${file}.out ${file}
-+ fi
-+ chmod ugo+x ${file}
-+ chmod u+w ${file}
-+done
-+
-+ ;;
- "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac ;;
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/data/audio-profiles/Makefile.in banshee-0.12.1+dfsg/data/audio-profiles/Makefile.in
---- banshee-0.12.1+dfsg.old/data/audio-profiles/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/data/audio-profiles/Makefile.in 2007-06-14 23:26:51.000000000 +0200
+@@ -29042,10 +28261,6 @@
+ for file in intltool-extract intltool-merge intltool-update; do
+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
+- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
+- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
+- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+ < ${ac_aux_dir}/${file}.in > ${file}.out
+ if cmp -s ${file} ${file}.out 2>/dev/null; then
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/data/audio-profiles/Makefile.in banshee-0.13.0+dfsg/data/audio-profiles/Makefile.in
+--- banshee-0.13.0+dfsg.old/data/audio-profiles/Makefile.in 2007-08-05 23:42:28.000000000 +0200
++++ banshee-0.13.0+dfsg/data/audio-profiles/Makefile.in 2007-08-14 21:23:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -24589,7 +24791,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -52,8 +48,8 @@
+@@ -51,8 +47,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -24599,16 +24801,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -63,7 +59,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -80,8 +76,6 @@
+@@ -79,8 +75,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -24617,7 +24810,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -94,8 +88,6 @@
+@@ -93,8 +87,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -24626,7 +24819,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -110,8 +102,6 @@
+@@ -109,8 +101,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -24635,7 +24828,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -124,28 +114,10 @@
+@@ -123,28 +113,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -24664,7 +24857,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -166,8 +138,7 @@
+@@ -167,8 +139,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -24674,7 +24867,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -222,12 +193,12 @@
+@@ -179,14 +150,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -198,7 +167,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -223,12 +191,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24689,7 +24906,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -235,6 +206,7 @@
+@@ -236,6 +204,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -24697,7 +24914,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -261,17 +233,19 @@
+@@ -257,22 +226,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -24721,7 +24944,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -283,6 +257,7 @@
+@@ -284,6 +256,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -24729,7 +24952,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -313,12 +288,15 @@
+@@ -314,12 +287,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -24743,9 +24966,9 @@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
audioprofilesdir = $(pkgdatadir)/audio-profiles
- audioprofiles_in_files = $(wildcard *.xml.in)
- audioprofiles_DATA = $(audioprofiles_in_files:.xml.in=.xml)
-@@ -363,13 +341,9 @@
+ audioprofiles_in_files = \
+ base.xml.in \
+@@ -373,13 +349,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -24760,7 +24983,7 @@
@list='$(audioprofiles_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -392,22 +366,21 @@
+@@ -402,22 +374,21 @@
distdir: $(DISTFILES)
@@ -24796,7 +25019,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -423,7 +396,7 @@
+@@ -433,7 +404,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(audioprofilesdir)"; do \
@@ -24805,7 +25028,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -457,7 +430,7 @@
+@@ -467,7 +438,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -24814,7 +25037,7 @@
dvi: dvi-am
-@@ -471,12 +444,20 @@
+@@ -481,12 +452,20 @@
install-data-am: install-audioprofilesDATA
@@ -24835,7 +25058,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -495,18 +476,21 @@
+@@ -505,18 +484,21 @@
ps-am:
@@ -24862,9 +25085,9 @@
@INTLTOOL_XML_RULE@
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/data/images/Makefile.in banshee-0.12.1+dfsg/data/images/Makefile.in
---- banshee-0.12.1+dfsg.old/data/images/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/data/images/Makefile.in 2007-06-14 23:26:51.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/data/images/Makefile.in banshee-0.13.0+dfsg/data/images/Makefile.in
+--- banshee-0.13.0+dfsg.old/data/images/Makefile.in 2007-08-05 23:42:29.000000000 +0200
++++ banshee-0.13.0+dfsg/data/images/Makefile.in 2007-08-14 21:23:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -24892,7 +25115,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -24902,16 +25125,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,7 +58,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -70,8 +66,6 @@
+@@ -69,8 +65,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -24920,7 +25134,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -84,8 +78,6 @@
+@@ -83,8 +77,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -24929,7 +25143,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -100,8 +92,6 @@
+@@ -99,8 +91,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -24938,7 +25152,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -114,28 +104,10 @@
+@@ -113,28 +103,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -24967,7 +25181,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -156,8 +128,7 @@
+@@ -157,8 +129,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -24977,7 +25191,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -212,12 +183,12 @@
+@@ -169,14 +140,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -188,7 +157,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -213,12 +181,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -24992,7 +25230,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -225,6 +196,7 @@
+@@ -226,6 +194,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -25000,7 +25238,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -251,17 +223,19 @@
+@@ -247,22 +216,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -25024,7 +25268,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -273,6 +247,7 @@
+@@ -274,6 +246,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -25032,7 +25276,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -303,12 +278,15 @@
+@@ -304,12 +277,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -25048,7 +25292,7 @@
theme = hicolor
themedir = $(datadir)/icons/$(theme)
theme_icons = \
-@@ -366,10 +344,6 @@
+@@ -367,10 +343,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -25059,7 +25303,7 @@
tags: TAGS
TAGS:
-@@ -378,22 +352,21 @@
+@@ -379,22 +351,21 @@
distdir: $(DISTFILES)
@@ -25095,7 +25339,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -439,7 +412,7 @@
+@@ -440,7 +411,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -25104,7 +25348,7 @@
dvi: dvi-am
-@@ -453,12 +426,20 @@
+@@ -454,12 +425,20 @@
install-data-am: install-data-local
@@ -25125,7 +25369,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -477,19 +458,23 @@
+@@ -478,19 +457,23 @@
ps-am:
@@ -25153,9 +25397,9 @@
install-data-local:
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/data/Makefile.in banshee-0.12.1+dfsg/data/Makefile.in
---- banshee-0.12.1+dfsg.old/data/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/data/Makefile.in 2007-06-14 23:26:51.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/data/Makefile.in banshee-0.13.0+dfsg/data/Makefile.in
+--- banshee-0.13.0+dfsg.old/data/Makefile.in 2007-08-05 23:42:28.000000000 +0200
++++ banshee-0.13.0+dfsg/data/Makefile.in 2007-08-14 21:23:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -25183,7 +25427,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -25193,15 +25437,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,17 +60,18 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = org.gnome.Banshee.service
- SOURCES =
+@@ -70,10 +66,11 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -25217,7 +25453,7 @@
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -86,14 +83,14 @@
+@@ -85,14 +82,14 @@
dbusserviceDATA_INSTALL = $(INSTALL_DATA)
desktopDATA_INSTALL = $(INSTALL_DATA)
DATA = $(dbusservice_DATA) $(desktop_DATA)
@@ -25234,7 +25470,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -106,8 +103,6 @@
+@@ -105,8 +102,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -25243,7 +25479,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -122,8 +117,6 @@
+@@ -121,8 +116,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -25252,7 +25488,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -136,28 +129,10 @@
+@@ -135,28 +128,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -25281,7 +25517,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -178,8 +153,7 @@
+@@ -179,8 +154,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -25291,7 +25527,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -234,12 +208,12 @@
+@@ -191,14 +165,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -210,7 +182,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -235,12 +206,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -25306,7 +25566,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -247,6 +221,7 @@
+@@ -248,6 +219,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -25314,7 +25574,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -273,17 +248,19 @@
+@@ -269,22 +241,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -25338,7 +25604,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -295,6 +272,7 @@
+@@ -296,6 +271,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -25346,7 +25612,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -325,12 +303,15 @@
+@@ -326,12 +302,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -25362,7 +25628,7 @@
SUBDIRS = \
audio-profiles \
images
-@@ -403,13 +384,9 @@
+@@ -404,13 +383,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -25377,7 +25643,7 @@
@list='$(dbusservice_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -426,7 +403,7 @@
+@@ -427,7 +402,7 @@
done
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
@@ -25386,7 +25652,7 @@
@list='$(desktop_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -473,8 +450,7 @@
+@@ -474,8 +449,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -25396,7 +25662,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -575,22 +551,21 @@
+@@ -576,22 +550,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -25432,7 +25698,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -604,7 +579,7 @@
+@@ -605,7 +578,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -25441,7 +25707,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -612,6 +587,8 @@
+@@ -613,6 +586,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -25450,7 +25716,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -622,7 +599,7 @@
+@@ -623,7 +598,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(desktopdir)"; do \
@@ -25459,7 +25725,7 @@
done
install: install-recursive
install-exec: install-exec-recursive
-@@ -657,8 +634,7 @@
+@@ -658,8 +633,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -25469,7 +25735,7 @@
dvi: dvi-recursive
-@@ -672,12 +648,20 @@
+@@ -673,12 +647,20 @@
install-data-am: install-dbusserviceDATA install-desktopDATA
@@ -25490,7 +25756,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -696,25 +680,26 @@
+@@ -697,25 +679,26 @@
ps-am:
@@ -25530,9 +25796,9 @@
%.desktop.in: %.desktop.in.in
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/depcomp banshee-0.12.1+dfsg/depcomp
---- banshee-0.12.1+dfsg.old/depcomp 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/depcomp 2007-06-14 23:26:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/depcomp banshee-0.13.0+dfsg/depcomp
+--- banshee-0.13.0+dfsg.old/depcomp 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/depcomp 2007-08-14 21:23:08.000000000 +0200
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -25631,9 +25897,9 @@
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/docs/Makefile.in banshee-0.12.1+dfsg/docs/Makefile.in
---- banshee-0.12.1+dfsg.old/docs/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/docs/Makefile.in 2007-06-14 23:26:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/docs/Makefile.in banshee-0.13.0+dfsg/docs/Makefile.in
+--- banshee-0.13.0+dfsg.old/docs/Makefile.in 2007-08-05 23:42:29.000000000 +0200
++++ banshee-0.13.0+dfsg/docs/Makefile.in 2007-08-14 21:23:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -25661,7 +25927,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -52,8 +48,8 @@
+@@ -51,8 +47,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -25671,16 +25937,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -63,7 +59,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -80,8 +76,6 @@
+@@ -79,8 +75,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -25689,7 +25946,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -94,8 +88,6 @@
+@@ -93,8 +87,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -25698,7 +25955,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -110,8 +102,6 @@
+@@ -109,8 +101,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -25707,7 +25964,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -124,28 +114,10 @@
+@@ -123,28 +113,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -25736,7 +25993,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -166,8 +138,7 @@
+@@ -167,8 +139,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -25746,7 +26003,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -222,12 +193,12 @@
+@@ -179,14 +150,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -198,7 +167,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -223,12 +191,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -25761,7 +26042,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -235,6 +206,7 @@
+@@ -236,6 +204,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -25769,7 +26050,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -261,17 +233,19 @@
+@@ -257,22 +226,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -25793,7 +26080,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -283,6 +257,7 @@
+@@ -284,6 +256,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -25801,7 +26088,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -313,12 +288,15 @@
+@@ -314,12 +287,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -25817,7 +26104,7 @@
DOC_UPDATER = @MONODOCER@ -delete
DOC_ASSEMBLER = @MDASSEMBLER@ --out banshee-docs --ecma
ASSEMBLIES = \
-@@ -388,13 +366,9 @@
+@@ -389,13 +365,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -25832,7 +26119,7 @@
@list='$(monodoc_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -417,23 +391,21 @@
+@@ -418,23 +390,21 @@
distdir: $(DISTFILES)
@@ -25869,7 +26156,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -449,7 +421,7 @@
+@@ -450,7 +420,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(monodocdir)"; do \
@@ -25878,7 +26165,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -486,7 +458,7 @@
+@@ -487,7 +457,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -25887,7 +26174,7 @@
dvi: dvi-am
-@@ -502,12 +474,20 @@
+@@ -503,12 +473,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -25908,7 +26195,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -526,20 +506,24 @@
+@@ -527,20 +505,24 @@
ps-am:
@@ -25938,9 +26225,9 @@
@BUILD_DOCS_TRUE at all: MonodocNodeConfig.exe
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/ext/dbus-sharp/Makefile.in banshee-0.12.1+dfsg/ext/dbus-sharp/Makefile.in
---- banshee-0.12.1+dfsg.old/ext/dbus-sharp/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/ext/dbus-sharp/Makefile.in 2007-06-14 23:26:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/ext/dbus-sharp/Makefile.in banshee-0.13.0+dfsg/ext/dbus-sharp/Makefile.in
+--- banshee-0.13.0+dfsg.old/ext/dbus-sharp/Makefile.in 2007-08-05 23:42:29.000000000 +0200
++++ banshee-0.13.0+dfsg/ext/dbus-sharp/Makefile.in 2007-08-14 21:23:08.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -25968,7 +26255,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -54,8 +50,8 @@
+@@ -53,8 +49,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -25978,16 +26265,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -65,7 +61,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = NDesk.DBus.GLib.dll.config
- am__installdirs = "$(DESTDIR)$(dbusdir)"
-@@ -76,8 +72,6 @@
+@@ -75,8 +71,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -25996,7 +26274,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -90,8 +84,6 @@
+@@ -89,8 +83,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -26005,7 +26283,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -106,8 +98,6 @@
+@@ -105,8 +97,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -26014,7 +26292,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -120,28 +110,10 @@
+@@ -119,28 +109,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -26043,7 +26321,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -162,8 +134,7 @@
+@@ -163,8 +135,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -26053,7 +26331,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -218,12 +189,12 @@
+@@ -175,14 +146,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -194,7 +163,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -219,12 +187,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -26068,7 +26370,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -231,6 +202,7 @@
+@@ -232,6 +200,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -26076,7 +26378,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -257,17 +229,19 @@
+@@ -253,22 +222,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -26100,7 +26408,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -279,6 +253,7 @@
+@@ -280,6 +252,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -26108,7 +26416,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -309,12 +284,15 @@
+@@ -310,12 +283,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -26124,7 +26432,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -334,7 +312,6 @@
+@@ -335,7 +311,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -26132,7 +26440,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -349,6 +326,8 @@
+@@ -351,6 +326,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -26141,7 +26449,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -433,7 +412,7 @@
+@@ -435,7 +412,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-dbusSCRIPTS: $(dbus_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -26150,7 +26458,7 @@
@list='$(dbus_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -456,10 +435,6 @@
+@@ -458,10 +435,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26161,7 +26469,7 @@
tags: TAGS
TAGS:
-@@ -468,23 +443,21 @@
+@@ -470,23 +443,21 @@
distdir: $(DISTFILES)
@@ -26198,7 +26506,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -500,7 +473,7 @@
+@@ -502,7 +473,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(dbusdir)"; do \
@@ -26207,7 +26515,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -534,7 +507,7 @@
+@@ -536,7 +507,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -26216,7 +26524,7 @@
dvi: dvi-am
-@@ -548,12 +521,20 @@
+@@ -550,12 +521,20 @@
install-data-am: install-dbusSCRIPTS
@@ -26237,7 +26545,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -572,17 +553,21 @@
+@@ -574,17 +553,21 @@
ps-am:
@@ -26263,9 +26571,9 @@
@EXTERNAL_NDESK_DBUS_FALSE at all: $(DBUS_ASSEMBLY) $(DBUS_GLIB_ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/ext/hal-sharp/Makefile.in banshee-0.12.1+dfsg/ext/hal-sharp/Makefile.in
---- banshee-0.12.1+dfsg.old/ext/hal-sharp/Makefile.in 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/ext/hal-sharp/Makefile.in 2007-06-14 23:26:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/ext/hal-sharp/Makefile.in banshee-0.13.0+dfsg/ext/hal-sharp/Makefile.in
+--- banshee-0.13.0+dfsg.old/ext/hal-sharp/Makefile.in 2007-08-05 23:42:29.000000000 +0200
++++ banshee-0.13.0+dfsg/ext/hal-sharp/Makefile.in 2007-08-14 21:23:08.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -26293,7 +26601,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -26303,16 +26611,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(haldir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -26321,7 +26620,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -26330,7 +26629,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -26339,7 +26638,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -26368,7 +26667,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -26378,7 +26677,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -26393,7 +26716,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -26401,7 +26724,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -26425,7 +26754,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -26433,7 +26762,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -26449,7 +26778,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -26457,7 +26786,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -26466,7 +26795,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -428,7 +407,7 @@
+@@ -430,7 +407,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-halSCRIPTS: $(hal_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -26475,7 +26804,7 @@
@list='$(hal_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -451,10 +430,6 @@
+@@ -453,10 +430,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26486,7 +26815,7 @@
tags: TAGS
TAGS:
-@@ -463,23 +438,21 @@
+@@ -465,23 +438,21 @@
distdir: $(DISTFILES)
@@ -26523,7 +26852,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -495,7 +468,7 @@
+@@ -497,7 +468,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(haldir)"; do \
@@ -26532,7 +26861,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -529,7 +502,7 @@
+@@ -531,7 +502,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -26541,7 +26870,7 @@
dvi: dvi-am
-@@ -543,12 +516,20 @@
+@@ -545,12 +516,20 @@
install-data-am: install-halSCRIPTS
@@ -26562,7 +26891,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -567,17 +548,21 @@
+@@ -569,17 +548,21 @@
ps-am:
@@ -26588,9 +26917,9 @@
all: $(ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/ext/Makefile.in banshee-0.12.1+dfsg/ext/Makefile.in
---- banshee-0.12.1+dfsg.old/ext/Makefile.in 2007-04-01 07:44:00.000000000 +0200
-+++ banshee-0.12.1+dfsg/ext/Makefile.in 2007-06-14 23:26:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/ext/Makefile.in banshee-0.13.0+dfsg/ext/Makefile.in
+--- banshee-0.13.0+dfsg.old/ext/Makefile.in 2007-08-05 23:42:29.000000000 +0200
++++ banshee-0.13.0+dfsg/ext/Makefile.in 2007-08-14 21:23:07.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -26618,7 +26947,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -26628,15 +26957,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,25 +58,26 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -68,18 +64,19 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -26662,7 +26983,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -93,8 +90,6 @@
+@@ -92,8 +89,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -26671,7 +26992,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -109,8 +104,6 @@
+@@ -108,8 +103,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -26680,7 +27001,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -123,28 +116,10 @@
+@@ -122,28 +115,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -26709,7 +27030,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -165,8 +140,7 @@
+@@ -166,8 +141,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -26719,7 +27040,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,12 +195,12 @@
+@@ -178,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -197,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -222,12 +193,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -26734,7 +27079,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -234,6 +208,7 @@
+@@ -235,6 +206,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -26742,7 +27087,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -260,17 +235,19 @@
+@@ -256,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -26766,7 +27117,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -282,6 +259,7 @@
+@@ -283,6 +258,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -26774,7 +27125,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -312,12 +290,15 @@
+@@ -313,12 +289,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -26790,7 +27141,7 @@
SUBDIRS = \
taglib-sharp \
dbus-sharp \
-@@ -366,10 +347,6 @@
+@@ -367,10 +346,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -26801,7 +27152,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -401,8 +378,7 @@
+@@ -402,8 +377,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -26811,7 +27162,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -503,23 +479,21 @@
+@@ -504,23 +478,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -26848,7 +27199,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -533,7 +507,7 @@
+@@ -534,7 +506,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -26857,7 +27208,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -541,6 +515,8 @@
+@@ -542,6 +514,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -26866,7 +27217,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -581,8 +557,7 @@
+@@ -582,8 +556,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -26876,7 +27227,7 @@
dvi: dvi-recursive
-@@ -596,12 +571,20 @@
+@@ -597,12 +570,20 @@
install-data-am:
@@ -26897,7 +27248,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -620,22 +603,24 @@
+@@ -621,22 +602,24 @@
ps-am:
@@ -26934,9 +27285,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/ext/taglib-sharp/Makefile.in banshee-0.12.1+dfsg/ext/taglib-sharp/Makefile.in
---- banshee-0.12.1+dfsg.old/ext/taglib-sharp/Makefile.in 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/ext/taglib-sharp/Makefile.in 2007-06-14 23:26:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/ext/taglib-sharp/Makefile.in banshee-0.13.0+dfsg/ext/taglib-sharp/Makefile.in
+--- banshee-0.13.0+dfsg.old/ext/taglib-sharp/Makefile.in 2007-08-06 00:20:03.000000000 +0200
++++ banshee-0.13.0+dfsg/ext/taglib-sharp/Makefile.in 2007-08-14 21:23:08.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -26974,15 +27325,6 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(taglibdir)"
@@ -75,8 +71,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -27039,7 +27381,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -163,8 +135,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -27049,7 +27391,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -175,14 +146,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -194,7 +163,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -219,12 +187,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -27064,7 +27430,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -232,6 +200,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -27072,7 +27438,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -253,22 +222,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -27096,7 +27468,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -280,6 +252,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -27104,7 +27476,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -310,12 +283,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -27120,7 +27492,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -335,7 +311,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -27128,7 +27500,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -351,6 +326,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -27137,26 +27509,28 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -385,15 +364,15 @@
+@@ -388,8 +365,6 @@
ASSEMBLY_NAME = TagLib
ASSEMBLY = $(ASSEMBLY_NAME).dll
-taglibdir = $(pkglibdir)
-taglib_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
- ASSEMBLY_SOURCES = \
- $(srcdir)/TagLib/*.cs \
- $(srcdir)/TagLib/*/*.cs \
- $(srcdir)/TagLib/*/*/*.cs
+ TAGLIB_CSFILES = \
+ $(srcdir)/TagLib/Ape/Tag.cs \
+ $(srcdir)/TagLib/Ape/Item.cs \
+@@ -512,8 +487,10 @@
+ $(srcdir)/TagLib/FileTypes.cs \
+ $(srcdir)/TagLib/CorruptFileException.cs
+ at EXTERNAL_TAGLIB_SHARP_FALSE@taglibdir = $(pkglibdir)
+ at EXTERNAL_TAGLIB_SHARP_FALSE@taglib_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
- EXTRA_DIST = $(ASSEMBLY_SOURCES)
+ EXTRA_DIST = $(TAGLIB_CSFILES) $(srcdir)/TagLib/TagLib.sources
-CLEANFILES = $(taglib_SCRIPTS)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
MAINTAINERCLEANFILES = Makefile.in
all: all-am
-@@ -429,7 +408,7 @@
+@@ -549,7 +526,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-taglibSCRIPTS: $(taglib_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -27165,7 +27539,7 @@
@list='$(taglib_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -452,10 +431,6 @@
+@@ -572,10 +549,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -27176,11 +27550,11 @@
tags: TAGS
TAGS:
-@@ -464,23 +439,21 @@
+@@ -584,23 +557,21 @@
distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir)/TagLib $(distdir)/$(srcdir)/TagLib/* $(distdir)/$(srcdir)/TagLib/*/* $(distdir)/../../build
+- $(mkdir_p) $(distdir)/$(srcdir)/TagLib $(distdir)/$(srcdir)/TagLib/Ape $(distdir)/$(srcdir)/TagLib/Asf $(distdir)/$(srcdir)/TagLib/Flac $(distdir)/$(srcdir)/TagLib/Id3v1 $(distdir)/$(srcdir)/TagLib/Id3v2 $(distdir)/$(srcdir)/TagLib/Id3v2/Frames $(distdir)/$(srcdir)/TagLib/Mpc $(distdir)/$(srcdir)/TagLib/Mpeg $(distdir)/$(srcdir)/TagLib/Mpeg4 $(distdir)/$(srcdir)/TagLib/Mpeg4/Boxes $(distdir)/$(srcdir)/TagLib/NonContainer $(distdir)/$(srcdir)/TagLib/Ogg $(distdir)/$(srcdir)/TagLib/Ogg/Codecs $(distdir)/$(srcdir)/TagLib/Riff $(distdir)/$(srcdir)/TagLib/WavPack $(distdir)/../../build $(distdir)/TagLib
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
@@ -27213,7 +27587,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -496,7 +469,7 @@
+@@ -616,7 +587,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(taglibdir)"; do \
@@ -27222,7 +27596,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -530,7 +503,7 @@
+@@ -650,7 +621,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -27231,7 +27605,7 @@
dvi: dvi-am
-@@ -544,12 +517,20 @@
+@@ -664,12 +635,20 @@
install-data-am: install-taglibSCRIPTS
@@ -27252,7 +27626,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -568,24 +549,27 @@
+@@ -688,24 +667,27 @@
ps-am:
@@ -27281,16 +27655,712 @@
-all: $(ASSEMBLY)
+ at EXTERNAL_TAGLIB_SHARP_FALSE@all: $(ASSEMBLY)
--$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-- $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_TAGLIB_SHARP_FALSE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-+ at EXTERNAL_TAGLIB_SHARP_FALSE@ $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(ASSEMBLY_SOURCES)
+-$(ASSEMBLY): $(TAGLIB_CSFILES)
+- $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(TAGLIB_CSFILES)
++ at EXTERNAL_TAGLIB_SHARP_FALSE@$(ASSEMBLY): $(TAGLIB_CSFILES)
++ at EXTERNAL_TAGLIB_SHARP_FALSE@ $(BUILD_LIB) -out:$@ $(LINK_MONO_UNIX) $(TAGLIB_CSFILES)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/install-sh banshee-0.12.1+dfsg/install-sh
---- banshee-0.12.1+dfsg.old/install-sh 2007-04-01 07:43:59.000000000 +0200
-+++ banshee-0.12.1+dfsg/install-sh 2007-06-14 23:26:50.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/extras/Makefile.in banshee-0.13.0+dfsg/extras/Makefile.in
+--- banshee-0.13.0+dfsg.old/extras/Makefile.in 2007-08-05 23:42:29.000000000 +0200
++++ banshee-0.13.0+dfsg/extras/Makefile.in 2007-08-14 21:23:08.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -50,8 +46,8 @@
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+- $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+@@ -68,18 +64,19 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ASM_VERSION = @ASM_VERSION@
+@@ -92,8 +89,6 @@
+ BOOC = @BOOC@
+ BOO_CFLAGS = @BOO_CFLAGS@
+ BOO_LIBS = @BOO_LIBS@
+-BUILD_DOCS_FALSE = @BUILD_DOCS_FALSE@
+-BUILD_DOCS_TRUE = @BUILD_DOCS_TRUE@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -108,8 +103,6 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
+-DAAP_ENABLED_FALSE = @DAAP_ENABLED_FALSE@
+-DAAP_ENABLED_TRUE = @DAAP_ENABLED_TRUE@
+ DATADIRNAME = @DATADIRNAME@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+@@ -122,28 +115,10 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_IPOD_FALSE = @ENABLE_IPOD_FALSE@
+-ENABLE_IPOD_TRUE = @ENABLE_IPOD_TRUE@
+-ENABLE_KARMA_FALSE = @ENABLE_KARMA_FALSE@
+-ENABLE_KARMA_TRUE = @ENABLE_KARMA_TRUE@
+-ENABLE_MDNSD_FALSE = @ENABLE_MDNSD_FALSE@
+-ENABLE_MDNSD_TRUE = @ENABLE_MDNSD_TRUE@
+-ENABLE_MTP_FALSE = @ENABLE_MTP_FALSE@
+-ENABLE_MTP_TRUE = @ENABLE_MTP_TRUE@
+-ENABLE_NJB_FALSE = @ENABLE_NJB_FALSE@
+-ENABLE_NJB_TRUE = @ENABLE_NJB_TRUE@
+-ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
+-ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
+ EXEEXT = @EXEEXT@
+-EXTERNAL_BOO_FALSE = @EXTERNAL_BOO_FALSE@
+-EXTERNAL_BOO_TRUE = @EXTERNAL_BOO_TRUE@
+-EXTERNAL_NDESK_DBUS_FALSE = @EXTERNAL_NDESK_DBUS_FALSE@
+-EXTERNAL_NDESK_DBUS_TRUE = @EXTERNAL_NDESK_DBUS_TRUE@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -166,8 +141,7 @@
+ GTKSHARP_LIBS = @GTKSHARP_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_BOOC_FALSE = @HAVE_BOOC_FALSE@
+-HAVE_BOOC_TRUE = @HAVE_BOOC_TRUE@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -178,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -197,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -222,12 +193,12 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MDASSEMBLER = @MDASSEMBLER@
+ MDNSRESPONDER = @MDNSRESPONDER@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONODOCER = @MONODOCER@
+ MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+@@ -235,6 +206,7 @@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+ MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
+ MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+@@ -256,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SQLITE_CFLAGS = @SQLITE_CFLAGS@
+ SQLITE_LIBS = @SQLITE_LIBS@
+ STRIP = @STRIP@
++TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
++TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -283,6 +258,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -313,12 +289,15 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ SUBDIRS = tools
+ EXTRA_DIST = $(wildcard $(srcdir)/scripts/*.boo)
+ MAINTAINERCLEANFILES = \
+@@ -363,10 +342,6 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -398,8 +373,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -500,23 +474,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/$(srcdir)/scripts
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -530,7 +502,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -538,6 +510,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -578,8 +552,7 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+- distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -593,12 +566,20 @@
+
+ install-data-am:
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -617,22 +598,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am
++uninstall-am:
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-generic clean-libtool \
++ ctags ctags-recursive distclean distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
++ install-data-am install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-info-am
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/extras/tools/Makefile.in banshee-0.13.0+dfsg/extras/tools/Makefile.in
+--- banshee-0.13.0+dfsg.old/extras/tools/Makefile.in 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/extras/tools/Makefile.in 2007-08-14 21:23:08.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -52,8 +48,8 @@
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+- $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+@@ -71,8 +67,6 @@
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ASM_VERSION = @ASM_VERSION@
+@@ -85,8 +79,6 @@
+ BOOC = @BOOC@
+ BOO_CFLAGS = @BOO_CFLAGS@
+ BOO_LIBS = @BOO_LIBS@
+-BUILD_DOCS_FALSE = @BUILD_DOCS_FALSE@
+-BUILD_DOCS_TRUE = @BUILD_DOCS_TRUE@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -101,8 +93,6 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
+-DAAP_ENABLED_FALSE = @DAAP_ENABLED_FALSE@
+-DAAP_ENABLED_TRUE = @DAAP_ENABLED_TRUE@
+ DATADIRNAME = @DATADIRNAME@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+@@ -115,28 +105,10 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_IPOD_FALSE = @ENABLE_IPOD_FALSE@
+-ENABLE_IPOD_TRUE = @ENABLE_IPOD_TRUE@
+-ENABLE_KARMA_FALSE = @ENABLE_KARMA_FALSE@
+-ENABLE_KARMA_TRUE = @ENABLE_KARMA_TRUE@
+-ENABLE_MDNSD_FALSE = @ENABLE_MDNSD_FALSE@
+-ENABLE_MDNSD_TRUE = @ENABLE_MDNSD_TRUE@
+-ENABLE_MTP_FALSE = @ENABLE_MTP_FALSE@
+-ENABLE_MTP_TRUE = @ENABLE_MTP_TRUE@
+-ENABLE_NJB_FALSE = @ENABLE_NJB_FALSE@
+-ENABLE_NJB_TRUE = @ENABLE_NJB_TRUE@
+-ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
+-ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
+ EXEEXT = @EXEEXT@
+-EXTERNAL_BOO_FALSE = @EXTERNAL_BOO_FALSE@
+-EXTERNAL_BOO_TRUE = @EXTERNAL_BOO_TRUE@
+-EXTERNAL_NDESK_DBUS_FALSE = @EXTERNAL_NDESK_DBUS_FALSE@
+-EXTERNAL_NDESK_DBUS_TRUE = @EXTERNAL_NDESK_DBUS_TRUE@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -159,8 +131,7 @@
+ GTKSHARP_LIBS = @GTKSHARP_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_BOOC_FALSE = @HAVE_BOOC_FALSE@
+-HAVE_BOOC_TRUE = @HAVE_BOOC_TRUE@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -171,14 +142,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -190,7 +159,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -215,12 +183,12 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MDASSEMBLER = @MDASSEMBLER@
+ MDNSRESPONDER = @MDNSRESPONDER@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONODOCER = @MONODOCER@
+ MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+@@ -228,6 +196,7 @@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+ MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
+ MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+@@ -249,22 +218,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SQLITE_CFLAGS = @SQLITE_CFLAGS@
+ SQLITE_LIBS = @SQLITE_LIBS@
+ STRIP = @STRIP@
++TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
++TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -276,6 +248,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -306,12 +279,15 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ DIR_HAL = $(top_builddir)/ext/hal-sharp
+ DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
+ DIR_DBUS = $(top_builddir)/ext/dbus-sharp
+@@ -331,7 +307,6 @@
+ LINK_GTK = $(GTKSHARP_LIBS)
+ LINK_MONO_UNIX = -r:Mono.Posix
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+-LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+ LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
+@@ -347,6 +322,8 @@
+
+ @EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
+ LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
++ at EXTERNAL_TAGLIB_SHARP_FALSE@LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
++ at EXTERNAL_TAGLIB_SHARP_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
+ LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
+ LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
+ LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
+@@ -439,10 +416,6 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -451,23 +424,21 @@
+
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../build
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -515,7 +486,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -529,12 +500,20 @@
+
+ install-data-am:
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -553,17 +532,20 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
++ install-data install-data-am install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-info-am
++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+ all: $(BANSHEE_IMPORT_ASSEMBLY) $(DBUS_CLIENT_ASSEMBLY)
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/install-sh banshee-0.13.0+dfsg/install-sh
+--- banshee-0.13.0+dfsg.old/install-sh 2007-08-05 23:42:28.000000000 +0200
++++ banshee-0.13.0+dfsg/install-sh 2007-08-14 21:23:06.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -27760,383 +28830,322 @@
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/intltool-extract.in banshee-0.12.1+dfsg/intltool-extract.in
---- banshee-0.12.1+dfsg.old/intltool-extract.in 2007-04-01 07:43:50.000000000 +0200
-+++ banshee-0.12.1+dfsg/intltool-extract.in 2007-06-14 23:26:40.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/intltool-extract.in banshee-0.13.0+dfsg/intltool-extract.in
+--- banshee-0.13.0+dfsg.old/intltool-extract.in 2007-08-05 23:42:20.000000000 +0200
++++ banshee-0.13.0+dfsg/intltool-extract.in 2007-08-14 21:22:55.000000000 +0200
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
--my $VERSION = "0.35.0";
-+my $VERSION = "0.35.5";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.36.1";
## Loaded modules
use strict;
-@@ -114,6 +114,11 @@
- sub place_normal {
- $FILE = $ARGV[0];
- $OUTFILE = "$FILE.h";
-+
-+ my $dirname = dirname ($OUTFILE);
-+ if (! -d "$dirname" && $dirname ne "") {
-+ system ("mkdir -p $dirname");
-+ }
- }
+@@ -237,9 +237,9 @@
- sub place_local {
-@@ -156,7 +161,7 @@
- --type=TYPE Specify the file type of FILENAME. Currently supports:
- "gettext/glade", "gettext/ini", "gettext/keys"
- "gettext/rfc822deb", "gettext/schemas",
-- "gettext/scheme", "gettext/xml"
-+ "gettext/scheme", "gettext/xml", "gettext/quoted"
- -l, --local Writes output into current working directory
- (conflicts with --update)
- --update Writes output into the same directory the source file
-@@ -212,6 +217,7 @@
- &type_scheme if $gettext_type eq "scheme";
- &type_schemas if $gettext_type eq "schemas";
- &type_rfc822deb if $gettext_type eq "rfc822deb";
-+ &type_quoted if $gettext_type eq "quoted";
- }
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
+ s/>/>/g;
++ s/&/&/g;
- sub entity_decode_minimal
-@@ -242,7 +248,7 @@
- {
- return '\"' if $_ eq '"';
- return '\n' if $_ eq "\n";
-- return '\\' if $_ eq '\\';
-+ return '\\\\' if $_ eq '\\';
-
return $_;
}
-@@ -255,8 +261,11 @@
-
- sub type_ini {
- ### For generic translatable desktop files ###
-- while ($input =~ /^_.*=(.*)$/mg) {
-- $messages{$1} = [];
-+ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
-+ if (defined($2)) {
-+ $comments{$3} = $2;
-+ }
-+ $messages{$3} = [];
- }
- }
-
-@@ -711,6 +720,17 @@
- return @list;
- }
-
-+sub type_quoted {
-+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
-+ my $message = $1;
-+ my $before = $`;
-+ $message =~ s/\\\"/\"/g;
-+ $before =~ s/[^\n]//g;
-+ $messages{$message} = [];
-+ $loc{$message} = length ($before) + 2;
-+ }
-+}
-+
- sub type_glade {
- ### For translatable Glade XML files ###
-
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/intltool-merge.in banshee-0.12.1+dfsg/intltool-merge.in
---- banshee-0.12.1+dfsg.old/intltool-merge.in 2007-04-01 07:43:50.000000000 +0200
-+++ banshee-0.12.1+dfsg/intltool-merge.in 2007-06-14 23:26:40.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/intltool-merge.in banshee-0.13.0+dfsg/intltool-merge.in
+--- banshee-0.13.0+dfsg.old/intltool-merge.in 2007-08-05 23:42:20.000000000 +0200
++++ banshee-0.13.0+dfsg/intltool-merge.in 2007-08-14 21:22:55.000000000 +0200
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
--my $VERSION = "0.35.0";
-+my $VERSION = "0.35.5";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.36.1";
## Loaded modules
use strict;
-@@ -60,6 +60,7 @@
- my $DESKTOP_STYLE_ARG = 0;
- my $SCHEMAS_STYLE_ARG = 0;
- my $RFC822DEB_STYLE_ARG = 0;
-+my $QUOTED_STYLE_ARG = 0;
- my $QUIET_ARG = 0;
- my $PASS_THROUGH_ARG = 0;
- my $UTF8_ARG = 0;
-@@ -79,6 +80,7 @@
- "desktop-style|d" => \$DESKTOP_STYLE_ARG,
- "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
- "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
-+ "quoted-style" => \$QUOTED_STYLE_ARG,
- "pass-through|p" => \$PASS_THROUGH_ARG,
- "utf8|u" => \$UTF8_ARG,
- "multiple-output|m" => \$MULTIPLE_OUTPUT,
-@@ -157,6 +159,14 @@
- &rfc822deb_merge_translations;
- &finalize;
- }
-+elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
-+{
-+ &utf8_sanity_check;
-+ &preparation;
-+ &print_message;
-+ "ed_merge_translations;
-+ &finalize;
-+}
- else
- {
- &print_help;
-@@ -193,6 +203,7 @@
- -k, --keys-style includes translations in the keys style
- -s, --schemas-style includes translations in the schemas style
- -r, --rfc822deb-style includes translations in the RFC822 style
-+ --quoted-style includes translations in the quoted string style
- -x, --xml-style includes translations in the standard xml style
+@@ -93,9 +93,24 @@
- Other options:
-@@ -415,7 +426,7 @@
- {
- $nextfuzzy = 1 if /^#, fuzzy/;
-
-- if (/^msgid "((\\.|[^\\])*)"/ )
-+ if (/^msgid "((\\.|[^\\]+)*)"/ )
- {
- $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
- $msgid = "";
-@@ -431,14 +442,14 @@
- $nextfuzzy = 0;
- }
+ my %po_files_by_lang = ();
+ my %translations = ();
+-my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
++my $iconv = $ENV{"ICONV"} || "iconv";
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-- if (/^msgstr "((\\.|[^\\])*)"/)
-+ if (/^msgstr "((\\.|[^\\]+)*)"/)
- {
- $msgstr = unescape_po_string($1);
- $inmsgstr = 1;
- $inmsgid = 0;
- }
-
-- if (/^"((\\.|[^\\])*)"/)
-+ if (/^"((\\.|[^\\]+)*)"/)
- {
- $msgid .= unescape_po_string($1) if $inmsgid;
- $msgstr .= unescape_po_string($1) if $inmsgstr;
-@@ -1006,8 +1017,8 @@
-
- if ($MULTIPLE_OUTPUT) {
- for my $lang (sort keys %po_files_by_lang) {
-- if ( ! -e $lang ) {
-- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-+ if ( ! -d $lang ) {
-+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
- }
- open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
-@@ -1354,3 +1365,39 @@
- return @list;
- }
-
-+sub quoted_translation
++sub isProgramInPath
+{
-+ my ($lang, $string) = @_;
-+
-+ $string =~ s/\\\"/\"/g;
-+
-+ my $translation = $translations{$lang, $string};
-+ $translation = $string if !$translation;
-+
-+ $translation =~ s/\"/\\\"/g;
-+ return $translation
++ my ($file) = @_;
++ # If either a file exists, or when run it returns 0 exit status
++ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
++ return 0;
+}
+
-+sub quoted_merge_translations
++if (! isProgramInPath ("$iconv"))
+{
-+ if (!$MULTIPLE_OUTPUT) {
-+ print "Quoted only supports Multiple Output.\n";
-+ exit(1);
-+ }
++ print STDERR " *** iconv is not found on this system!\n".
++ " *** Without it, intltool-merge can not convert encodings.\n";
++ exit;
++}
+
-+ for my $lang (sort keys %po_files_by_lang) {
-+ if ( ! -d $lang ) {
-+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
-+ }
-+ open INPUT, "<${FILE}" or die;
-+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-+ binmode (OUTPUT) if $^O eq 'MSWin32';
-+ while (<INPUT>)
-+ {
-+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
-+ print OUTPUT;
-+ }
-+ close OUTPUT;
-+ close INPUT;
-+ }
-+}
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/intltool-update.in banshee-0.12.1+dfsg/intltool-update.in
---- banshee-0.12.1+dfsg.old/intltool-update.in 2007-04-01 07:43:50.000000000 +0200
-+++ banshee-0.12.1+dfsg/intltool-update.in 2007-06-14 23:26:40.000000000 +0200
+ # Use this instead of \w for XML files to handle more possible characters.
+ my $w = "[-A-Za-z0-9._:]";
+
+@@ -494,16 +509,15 @@
+ return $string;
+ }
+
+-## NOTE: deal with < - < but not > - > because it seems its ok to have
+-## > in the entity. For further info please look at #84738.
+ sub entity_decode
+ {
+ local ($_) = @_;
+
+ s/'/'/g; # '
+ s/"/"/g; # "
+- s/&/&/g;
+ s/</</g;
++ s/>/>/g;
++ s/&/&/g;
+
+ return $_;
+ }
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/intltool-update.in banshee-0.13.0+dfsg/intltool-update.in
+--- banshee-0.13.0+dfsg.old/intltool-update.in 2007-08-05 23:42:20.000000000 +0200
++++ banshee-0.13.0+dfsg/intltool-update.in 2007-08-14 21:22:55.000000000 +0200
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
--my $VERSION = "0.35.0";
-+my $VERSION = "0.35.5";
+-my $VERSION = "0.35.5";
++my $VERSION = "0.36.1";
my $PACKAGE = "intltool";
## Loaded modules
-@@ -90,10 +90,9 @@
- $| = 1;
+@@ -71,7 +71,8 @@
+ "sheet(?:\\.in)+|". # ?
+ "schemas(?:\\.in)+|". # GConf specific
+ "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+"; # GOK specific.
++"kbd(?:\\.in)+|". # GOK specific.
++"policy(?:\\.in)+"; # PolicyKit files
- ## Sometimes the source tree will be rooted somewhere else.
--my $SRCDIR = ".";
-+my $SRCDIR = $ENV{"srcdir"} || ".";
- my $POTFILES_in;
+ my $ini_support =
+ "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
+@@ -328,7 +329,12 @@
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+ }, "..";
+-
++ find sub {
++ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
++ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
++ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
++ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
++ }, "$SRCDIR/..";
--$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
- $POTFILES_in = "<$SRCDIR/POTFILES.in";
-
- my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-@@ -124,8 +123,10 @@
-
- &Console_Write_IntltoolHelp if $arg_count > 1;
-
-+my $PKGNAME = FindPackageName ();
-+
- # --version and --help don't require a module name
--my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
-+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
-
- if ($POT_ARG)
- {
-@@ -316,7 +317,8 @@
- @buf_potfiles_ignore,
- @buf_allfiles,
- @buf_allfiles_sorted,
-- @buf_potfiles_sorted
-+ @buf_potfiles_sorted,
-+ @buf_potfiles_ignore_sorted
- );
-
- ## Search and find all translatable files
-@@ -342,7 +344,7 @@
- ## comparing with POTFILES.in
- foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
+ open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
+ @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
+@@ -489,11 +495,15 @@
+ my %in2;
+ foreach (@buf_potfiles_sorted)
{
-- (-s $ignore) or next;
-+ (-s "$SRCDIR/$ignore") or next;
-
- if ("$ignore" eq "POTFILES.ignore")
- {
-@@ -351,7 +353,7 @@
- }
-
- print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-- open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
-+ open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
-
- while (<FILE>)
- {
-@@ -359,7 +361,7 @@
- }
- close FILE;
-
-- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
-+ @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
+ $in2{$_} = 1;
}
- foreach my $file (@buf_i18n_plain)
-@@ -417,7 +419,7 @@
- }
- }
-
-- if (/\.GetString ?\(QUOTEDTEXT/)
-+ if (/\w\.GetString *\(QUOTEDTEXT/)
- {
- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
- ## Remove the first 3 chars and add newline
-@@ -426,7 +428,8 @@
- last;
- }
-
-- if (/_\(QUOTEDTEXT/)
-+ ## N_ Q_ and _ are the three macros defined in gi8n.h
-+ if (/[NQ]?_ *\(QUOTEDTEXT/)
- {
- if (defined isNotValidMissing (unpack("x3 A*", $file))) {
- ## Remove the first 3 chars and add newline
-@@ -489,6 +492,11 @@
+ foreach (@buf_potfiles_ignore_sorted)
+ {
++ s#^$SRCDIR/../##;
++ s#^$SRCDIR/##;
$in2{$_} = 1;
}
-+ foreach (@buf_potfiles_ignore_sorted)
-+ {
-+ $in2{$_} = 1;
-+ }
-+
- my @result;
+@@ -501,9 +511,16 @@
foreach (@buf_allfiles_sorted)
-@@ -504,7 +512,7 @@
- foreach (@buf_potfiles_sorted)
{
- chomp (my $dummy = $_);
-- if ("$dummy" ne "" and ! -f "../$dummy")
-+ if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
+- if (!exists($in2{$_}))
++ my $dummy = $_;
++ my $srcdir = $SRCDIR;
++
++ $srcdir =~ s#^../##;
++ $dummy =~ s#^$srcdir/../##;
++ $dummy =~ s#^$srcdir/##;
++ $dummy =~ s#_build/##;
++ if (!exists($in2{$dummy}))
{
- push @buf_potfiles_notexist, $_;
+- push @result, $_
++ push @result, $dummy
}
-@@ -537,7 +545,7 @@
- warn "\n" if ($VERBOSE or @result);
- warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
- warn @buf_potfiles_notexist, "\n";
-- warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
-+ warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
- "containing this list of absent files has been written in the current directory.\n";
- }
}
-@@ -555,16 +563,21 @@
+
+@@ -563,13 +580,33 @@
exit 1;
}
--sub GenerateHeaders
-+sub isIntltoolExtractInPath
- {
-- my $EXTRACT = "@INTLTOOL_EXTRACT@";
-- chomp $EXTRACT;
++sub isProgramInPath
++{
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
-+ return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
++ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 0;
+}
-
-- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
-+sub GenerateHeaders
++
++sub isGNUGettextTool
+{
-+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
++ my ($file) = @_;
++ # Check that we are using GNU gettext tools
++ if (isProgramInPath ($file))
++ {
++ my $version = `$file --version`;
++ return 1 if ($version =~ m/.*\(GNU .*\).*/);
++ }
++ return 0;
++}
++
+ sub GenerateHeaders
+ {
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
## Generate the .h header files, so we can allow glade and
## xml translation support
-- if (! -x "$EXTRACT")
-+ if (! isIntltoolExtractInPath("$EXTRACT"))
+- if (0)
++ if (! isProgramInPath ("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
-@@ -671,12 +684,8 @@
+@@ -616,13 +653,13 @@
+ #
+ sub GeneratePOTemplate
+ {
+- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
++ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
+ my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
+ chomp $XGETTEXT;
+
+- if (! -x $XGETTEXT)
++ if (! isGNUGettextTool ("$XGETTEXT"))
+ {
+- print STDERR " *** xgettext is not found on this system!\n".
++ print STDERR " *** GNU xgettext is not found on this system!\n".
+ " *** Without it, intltool-update can not extract strings.\n";
+ exit;
+ }
+@@ -718,7 +755,23 @@
+ unlink "$MODULE.pot";
+ my @xgettext_argument=("$XGETTEXT",
+ "--add-comments",
+- "--directory\=\.",
++ "--directory\=.",
++ "--default-domain\=$MODULE",
++ "--flag\=g_strdup_printf:1:c-format",
++ "--flag\=g_string_printf:2:c-format",
++ "--flag\=g_string_append_printf:2:c-format",
++ "--flag\=g_error_new:3:c-format",
++ "--flag\=g_set_error:4:c-format",
++ "--flag\=g_markup_printf_escaped:1:c-format",
++ "--flag\=g_log:3:c-format",
++ "--flag\=g_print:1:c-format",
++ "--flag\=g_printerr:1:c-format",
++ "--flag\=g_printf:1:c-format",
++ "--flag\=g_fprintf:2:c-format",
++ "--flag\=g_sprintf:2:c-format",
++ "--flag\=g_snprintf:3:c-format",
++ "--flag\=g_scanner_error:2:c-format",
++ "--flag\=g_scanner_warn:2:c-format",
+ "--output\=$MODULE\.pot",
+ "--files-from\=\.\/POTFILES\.in\.temp");
+ my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
+@@ -785,9 +838,16 @@
+ {
+ -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
+
+- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
++ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
+ my ($lang, $outfile) = @_;
+
++ if (! isGNUGettextTool ("$MSGMERGE"))
++ {
++ print STDERR " *** GNU msgmerge is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
++
+ print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
+
+ my $infile = "$SRCDIR/$lang.po";
+@@ -828,7 +888,14 @@
+ sub Console_Write_TranslationStatus
+ {
+ my ($lang, $output_file) = @_;
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
+
+@@ -837,21 +904,28 @@
+
+ sub Console_Write_CoverageReport
+ {
+- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
++ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
++
++ if (! isGNUGettextTool ("$MSGFMT"))
++ {
++ print STDERR " *** GNU msgfmt is not found on this system!\n".
++ " *** Without it, intltool-update can not extract strings.\n";
++ exit;
++ }
+
+ &GatherPOFiles;
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ &POFile_Update ($lang, "");
+ }
+
+- print "\n\n * Current translation support in $MODULE \n\n";
++ print STDERR "\n\n * Current translation support in $MODULE \n\n";
+
+ foreach my $lang (@languages)
+ {
+- print "$lang: ";
++ print STDERR "$lang: ";
+ system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
+ }
+ }
+@@ -925,13 +999,13 @@
+
+ $conf_in || die "Cannot find top_builddir in Makevars.";
+ }
+- elsif (-f "../configure.ac")
++ elsif (-f "$SRCDIR/../configure.ac")
+ {
+- $conf_in = "../configure.ac";
++ $conf_in = "$SRCDIR/../configure.ac";
}
+- elsif (-f "../configure.in")
++ elsif (-f "$SRCDIR/../configure.in")
+ {
+- $conf_in = "../configure.in";
++ $conf_in = "$SRCDIR/../configure.in";
+ }
else
{
-- if ($SRCDIR eq ".") {
-- print OUTFILE "../$_\n";
-- } else {
-- print OUTFILE "$SRCDIR/../$_\n";
-- }
-- $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
-+ print OUTFILE "$SRCDIR/../$_\n";
-+ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
- }
-
- next if (! $gettext_support_nonascii);
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/libbanshee/Makefile.in banshee-0.12.1+dfsg/libbanshee/Makefile.in
---- banshee-0.12.1+dfsg.old/libbanshee/Makefile.in 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/libbanshee/Makefile.in 2007-06-14 23:26:52.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/libbanshee/Makefile.in banshee-0.13.0+dfsg/libbanshee/Makefile.in
+--- banshee-0.13.0+dfsg.old/libbanshee/Makefile.in 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/libbanshee/Makefile.in 2007-08-14 21:23:08.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -28164,7 +29173,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -52,8 +48,8 @@
+@@ -51,8 +47,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -28174,16 +29183,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -63,7 +59,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-@@ -82,17 +78,21 @@
+@@ -81,17 +77,21 @@
gst-playback-0.10.lo gst-misc-0.10.lo gst-transcode-0.10.lo \
gst-cd-rip-0.10.lo gst-mbtrm.lo
libbanshee_la_OBJECTS = $(am_libbanshee_la_OBJECTS)
@@ -28211,7 +29211,7 @@
SOURCES = $(libbanshee_la_SOURCES)
DIST_SOURCES = $(libbanshee_la_SOURCES)
ETAGS = etags
-@@ -100,8 +100,6 @@
+@@ -99,8 +99,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -28220,7 +29220,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -114,8 +112,6 @@
+@@ -113,8 +111,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -28229,7 +29229,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -130,8 +126,6 @@
+@@ -129,8 +125,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -28238,7 +29238,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -144,28 +138,10 @@
+@@ -143,28 +137,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -28267,7 +29267,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -186,8 +162,7 @@
+@@ -187,8 +163,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -28277,7 +29277,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -242,12 +217,12 @@
+@@ -199,14 +174,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -218,7 +191,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -243,12 +215,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -28292,7 +29316,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -255,6 +230,7 @@
+@@ -256,6 +228,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -28300,7 +29324,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -281,17 +257,19 @@
+@@ -277,22 +250,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -28324,7 +29354,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -303,6 +281,7 @@
+@@ -304,6 +280,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -28332,7 +29362,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -333,12 +312,15 @@
+@@ -334,12 +311,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -28348,7 +29378,7 @@
INCLUDES = \
-I$(top_srcdir) \
-Wall \
-@@ -409,7 +391,7 @@
+@@ -410,7 +390,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-bansheelibLTLIBRARIES: $(bansheelib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -28357,7 +29387,7 @@
@list='$(bansheelib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
-@@ -420,7 +402,7 @@
+@@ -421,7 +401,7 @@
uninstall-bansheelibLTLIBRARIES:
@$(NORMAL_UNINSTALL)
@@ -28366,7 +29396,7 @@
p=$(am__strip_dir) \
echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(bansheelibdir)/$$p'"; \
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bansheelibdir)/$$p"; \
-@@ -435,7 +417,7 @@
+@@ -436,7 +416,7 @@
rm -f "$${dir}/so_locations"; \
done
libbanshee.la: $(libbanshee_la_OBJECTS) $(libbanshee_la_DEPENDENCIES)
@@ -28375,7 +29405,7 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -453,22 +435,22 @@
+@@ -454,22 +434,22 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nautilus-burn.Plo at am__quote@
.c.o:
@@ -28404,7 +29434,7 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -479,10 +461,6 @@
+@@ -480,10 +460,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -28415,7 +29445,7 @@
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
-@@ -532,22 +510,21 @@
+@@ -533,22 +509,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -28451,7 +29481,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -563,7 +540,7 @@
+@@ -564,7 +539,7 @@
all-am: Makefile $(LTLIBRARIES)
installdirs:
for dir in "$(DESTDIR)$(bansheelibdir)"; do \
@@ -28460,7 +29490,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -599,7 +576,7 @@
+@@ -600,7 +575,7 @@
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -28469,7 +29499,7 @@
dvi: dvi-am
-@@ -613,12 +590,20 @@
+@@ -614,12 +589,20 @@
install-data-am: install-bansheelibLTLIBRARIES
@@ -28490,7 +29520,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -639,7 +624,9 @@
+@@ -640,7 +623,9 @@
ps-am:
@@ -28501,7 +29531,7 @@
.PHONY: CTAGS GTAGS all all-am check check-am clean \
clean-bansheelibLTLIBRARIES clean-generic clean-libtool ctags \
-@@ -647,12 +634,14 @@
+@@ -648,12 +633,14 @@
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am \
install-bansheelibLTLIBRARIES install-data install-data-am \
@@ -28519,19 +29549,223 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/ltmain.sh banshee-0.12.1+dfsg/ltmain.sh
---- banshee-0.12.1+dfsg.old/ltmain.sh 2006-11-25 12:34:55.000000000 +0100
-+++ banshee-0.12.1+dfsg/ltmain.sh 2006-06-19 20:36:49.000000000 +0200
-@@ -43,7 +43,7 @@
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/ltmain.sh banshee-0.13.0+dfsg/ltmain.sh
+--- banshee-0.13.0+dfsg.old/ltmain.sh 2006-11-25 12:34:55.000000000 +0100
++++ banshee-0.13.0+dfsg/ltmain.sh 2007-08-01 16:12:57.000000000 +0200
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007 Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -43,14 +43,22 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.22
-+VERSION="1.5.22 Debian 1.5.22-4"
- TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++VERSION="1.5.24 Debian 1.5.24-1"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
- # See if we are running on zsh, and set the options which allow our
-@@ -2082,7 +2082,10 @@
+-# See if we are running on zsh, and set the options which allow our
+-# commands through without removal of \ escapes.
+-if test -n "${ZSH_VERSION+set}" ; then
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
+ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
+
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+@@ -105,12 +113,14 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+- save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ $lt_var=C
++ export $lt_var
++ fi"
++done
+
+ # Make sure IFS has a sensible default
+ lt_nl='
+@@ -136,6 +146,8 @@
+ preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
+
+ #####################################
+ # Shell function definitions:
+@@ -196,7 +208,13 @@
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+- $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++ $SED -n -e '1,100{
++ / I /{
++ s,.*,import,
++ p
++ q
++ }
++ }'`
+ case $win32_nmres in
+ import*) win32_libid_type="x86 archive import";;
+ *) win32_libid_type="x86 archive static";;
+@@ -327,7 +345,17 @@
+ *) my_xabs=`pwd`"/$my_xlib" ;;
+ esac
+ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+- my_xdir="$my_gentop/$my_xlib"
++ my_xlib_u=$my_xlib
++ while :; do
++ case " $extracted_archives " in
++ *" $my_xlib_u "*)
++ extracted_serial=`expr $extracted_serial + 1`
++ my_xlib_u=lt$extracted_serial-$my_xlib ;;
++ *) break ;;
++ esac
++ done
++ extracted_archives="$extracted_archives $my_xlib_u"
++ my_xdir="$my_gentop/$my_xlib_u"
+
+ $show "${rm}r $my_xdir"
+ $run ${rm}r "$my_xdir"
+@@ -454,11 +482,12 @@
+ ;;
+
+ --version)
+- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- $echo
+- $echo "Copyright (C) 2005 Free Software Foundation, Inc."
+- $echo "This is free software; see the source for copying conditions. There is NO"
+- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++ echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007 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."
+ exit $?
+ ;;
+
+@@ -755,9 +784,10 @@
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+- *.f90) xform=f90 ;;
++ *.[fF][09]?) xform=[fF][09]. ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
++ *.obj) xform=obj ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -1138,8 +1168,9 @@
+ for arg
+ do
+ case $arg in
+- -all-static | -static)
+- if test "X$arg" = "X-all-static"; then
++ -all-static | -static | -static-libtool-libs)
++ case $arg in
++ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+@@ -1147,12 +1178,20 @@
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+- else
++ ;;
++ -static)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=built
+- fi
++ ;;
++ -static-libtool-libs)
++ if test -z "$pic_flag" && test -n "$link_static_flag"; then
++ dlopen_self=$dlopen_self_static
++ fi
++ prefer_static_libs=yes
++ ;;
++ esac
+ build_libtool_libs=no
+ build_old_libs=yes
+ break
+@@ -1600,7 +1639,7 @@
+ continue
+ ;;
+
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ compiler_flags="$compiler_flags $arg"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+@@ -1620,10 +1659,11 @@
+ # -m* pass through architecture-specific compiler args for GCC
+ # -m*, -t[45]*, -txscale* pass through architecture-specific
+ # compiler args for GCC
+- # -pg pass through profiling flag for GCC
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
+ # @file GCC response files
+- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+- -t[45]*|-txscale*|@*)
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+@@ -1651,9 +1691,9 @@
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ # The PATH hackery in wrapper scripts is required on Windows
+- # in order for the loader to find any dlls it needs.
++ # and Darwin in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+@@ -1712,7 +1752,7 @@
+ continue
+ ;;
+
+- -static)
++ -static | -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+@@ -2082,7 +2122,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -28543,21 +29777,337 @@
esac
fi
if test "$pass" = dlopen; then
-@@ -3201,6 +3204,11 @@
+@@ -2094,7 +2137,7 @@
+ lib=
+ found=no
+ case $deplib in
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+@@ -2490,7 +2533,9 @@
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
++ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+@@ -3186,7 +3231,7 @@
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|none)
+ current=`expr $number_major + $number_minor`
age="$number_minor"
+ revision="$number_revision"
+@@ -3197,9 +3242,15 @@
+ age="0"
+ ;;
+ irix|nonstopux)
+- current=`expr $number_major + $number_minor - 1`
++ current=`expr $number_major + $number_minor`
+ age="$number_minor"
revision="$number_minor"
- ;;
++ lt_irix_increment=no
++ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
-+ ;;
+ ;;
esac
;;
- no)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/Makefile.in banshee-0.12.1+dfsg/Makefile.in
---- banshee-0.12.1+dfsg.old/Makefile.in 2007-04-01 07:44:05.000000000 +0200
-+++ banshee-0.12.1+dfsg/Makefile.in 2007-06-14 23:26:59.000000000 +0200
+@@ -3258,7 +3309,8 @@
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+- verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+@@ -3272,8 +3324,11 @@
+ ;;
+
+ irix | nonstopux)
+- major=`expr $current - $age + 1`
+-
++ if test "X$lt_irix_increment" = "Xno"; then
++ major=`expr $current - $age`
++ else
++ major=`expr $current - $age + 1`
++ fi
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+@@ -3410,11 +3465,11 @@
+ fi
+
+ # Eliminate all temporary directories.
+- for path in $notinst_path; do
+- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+- done
++ #for path in $notinst_path; do
++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -3515,13 +3570,12 @@
+ int main() { return 0; }
+ EOF
+ $rm conftest
+- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test "$name" != "" && test "$name" -ne "0"; then
++ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+@@ -3560,9 +3614,7 @@
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+- $LTCC $LTCFLAGS -o conftest conftest.c $i
+- # Did it work?
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+@@ -3594,7 +3646,7 @@
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+- $echo "*** make it link in! You will probably need to install it or some"
++ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+@@ -3880,7 +3932,10 @@
+ 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\"
++ case $archive_cmds in
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++ esac
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+@@ -4239,12 +4294,14 @@
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+- # -Wl from whole_archive_flag_spec
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+ generated="$generated $gentop"
+@@ -4692,16 +4749,16 @@
+ case $host in
+ *cygwin* | *mingw* )
+ if test -f "$output_objdir/${outputname}.def" ; then
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ else
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ fi
+ ;;
+ * )
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ ;;
+ esac
+ ;;
+@@ -4716,13 +4773,13 @@
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ fi
+
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+@@ -4809,7 +4866,7 @@
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -4846,7 +4903,7 @@
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ fi
+
+ # Quote $echo for shipping.
+@@ -5253,6 +5310,20 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+@@ -5395,7 +5466,7 @@
+ ;;
+ esac
+ $echo >> $output "\
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
++ \$echo \"\$0: cannot exec \$program \$*\"
+ exit $EXIT_FAILURE
+ fi
+ else
+@@ -5581,7 +5652,7 @@
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+@@ -5926,9 +5997,9 @@
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -6137,7 +6208,7 @@
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -6348,8 +6419,10 @@
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit $EXIT_FAILURE
++ if test ! -f "$dir/$dlname"; then
++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++ exit $EXIT_FAILURE
++ fi
+ fi
+ ;;
+
+@@ -6413,12 +6486,12 @@
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ do
++ eval "if test \"\${save_$lt_var+set}\" = set; then
++ $lt_var=\$save_$lt_var; export $lt_var
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+@@ -6775,9 +6848,9 @@
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+- try to export only the symbols listed in SYMFILE
++ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+- try to export only the symbols matching REGEX
++ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+@@ -6791,9 +6864,11 @@
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+- -static do not do any dynamic linking of libtool libraries
++ -static do not do any dynamic linking of uninstalled libtool libraries
++ -static-libtool-libs
++ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+- specify library version info [each variable defaults to 0]
++ specify library version info [each variable defaults to 0]
+
+ All other options (arguments beginning with \`-') are ignored.
+
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/Makefile.in banshee-0.13.0+dfsg/Makefile.in
+--- banshee-0.13.0+dfsg.old/Makefile.in 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/Makefile.in 2007-08-14 21:23:15.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -28585,7 +30135,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -36,11 +32,12 @@
+@@ -36,12 +32,12 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@@ -28593,14 +30143,13 @@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-- config.guess config.sub depcomp install-sh ltmain.sh missing
+ config.guess config.sub depcomp install-sh ltmain.sh missing \
+ mkinstalldirs
-subdir = .
-+ config.guess config.sub depcomp install-sh ltmain.sh missing \
-+ mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/build/m4/banshee/boo.m4 \
$(top_srcdir)/build/m4/banshee/daap.m4 \
-@@ -54,8 +51,8 @@
+@@ -54,8 +50,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -28610,17 +30159,16 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -66,18 +63,21 @@
+@@ -66,7 +62,7 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
--mkinstalldirs = $(install_sh) -d
+ configure.lineno config.status.lineno
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -74,10 +70,13 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -28638,7 +30186,7 @@
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
-@@ -94,8 +94,6 @@
+@@ -94,8 +93,6 @@
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -28647,7 +30195,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -108,8 +106,6 @@
+@@ -108,8 +105,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -28656,7 +30204,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -124,8 +120,6 @@
+@@ -124,8 +119,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -28665,7 +30213,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -138,28 +132,10 @@
+@@ -138,28 +131,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -28694,7 +30242,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -180,8 +156,7 @@
+@@ -182,8 +157,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -28704,7 +30252,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -236,12 +211,12 @@
+@@ -194,14 +168,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -213,7 +185,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -238,12 +209,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -28719,7 +30291,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -249,6 +224,7 @@
+@@ -251,6 +222,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -28727,7 +30299,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -275,17 +251,19 @@
+@@ -272,22 +244,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -28751,7 +30329,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -297,6 +275,7 @@
+@@ -299,6 +274,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -28759,7 +30337,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -327,12 +306,15 @@
+@@ -329,12 +305,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -28775,7 +30353,7 @@
SUBDIRS = \
build \
data \
-@@ -422,7 +404,7 @@
+@@ -424,7 +403,7 @@
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
@@ -28784,7 +30362,7 @@
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -444,7 +426,6 @@
+@@ -446,7 +425,6 @@
distclean-libtool:
-rm -f libtool
@@ -28792,7 +30370,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
-@@ -477,8 +458,7 @@
+@@ -479,8 +457,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -28802,12 +30380,12 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -580,24 +560,22 @@
+@@ -582,24 +559,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
-- $(mkdir_p) $(distdir)/build $(distdir)/build/m4/banshee $(distdir)/build/m4/shamrock $(distdir)/data $(distdir)/ext/dbus-sharp $(distdir)/po $(distdir)/src $(distdir)/src/Core/Banshee $(distdir)/src/Core/Banshee.Base $(distdir)/src/Core/Banshee.Widgets $(distdir)/src/Dap/Banshee.Dap.Ipod $(distdir)/src/Dap/Banshee.Dap.Njb $(distdir)/src/Extras/MusicBrainz $(distdir)/src/Plugins/Banshee.Plugins.Audioscrobbler $(distdir)/src/Plugins/Banshee.Plugins.Daap $(distdir)/src/Plugins/Banshee.Plugins.MMKeys $(distdir)/src/Plugins/Banshee.Plugins.MetadataSearch $(distdir)/src/Plugins/Banshee.Plugins.NotificationAreaIcon $(distdir)/tools
+- $(mkdir_p) $(distdir)/build $(distdir)/build/m4/banshee $(distdir)/build/m4/shamrock $(distdir)/data $(distdir)/ext/dbus-sharp $(distdir)/extras/tools $(distdir)/po $(distdir)/src $(distdir)/src/Core/Banshee $(distdir)/src/Core/Banshee.Base $(distdir)/src/Core/Banshee.Widgets $(distdir)/src/Dap/Banshee.Dap.Ipod $(distdir)/src/Dap/Banshee.Dap.Njb $(distdir)/src/Extras/MusicBrainz $(distdir)/src/Plugins/Banshee.Plugins.Audioscrobbler $(distdir)/src/Plugins/Banshee.Plugins.Daap $(distdir)/src/Plugins/Banshee.Plugins.MMKeys $(distdir)/src/Plugins/Banshee.Plugins.MetadataSearch $(distdir)/src/Plugins/Banshee.Plugins.NotificationAreaIcon
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
@@ -28841,7 +30419,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -611,7 +589,7 @@
+@@ -613,7 +588,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -28850,7 +30428,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -619,6 +597,8 @@
+@@ -621,6 +596,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -28859,7 +30437,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -626,7 +606,7 @@
+@@ -628,7 +605,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -28868,7 +30446,7 @@
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-@@ -701,7 +681,7 @@
+@@ -703,7 +680,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
@@ -28877,7 +30455,7 @@
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -774,12 +754,20 @@
+@@ -776,12 +753,20 @@
install-data-am:
@@ -28898,7 +30476,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -800,27 +788,28 @@
+@@ -802,27 +787,28 @@
ps-am:
@@ -28943,9 +30521,9 @@
run:
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/missing banshee-0.12.1+dfsg/missing
---- banshee-0.12.1+dfsg.old/missing 2007-04-01 07:43:59.000000000 +0200
-+++ banshee-0.12.1+dfsg/missing 2007-06-14 23:26:50.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/missing banshee-0.13.0+dfsg/missing
+--- banshee-0.13.0+dfsg.old/missing 2007-08-05 23:42:28.000000000 +0200
++++ banshee-0.13.0+dfsg/missing 2007-08-14 21:23:06.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -29128,9 +30706,9 @@
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/mkinstalldirs banshee-0.12.1+dfsg/mkinstalldirs
---- banshee-0.12.1+dfsg.old/mkinstalldirs 2007-04-01 07:44:17.000000000 +0200
-+++ banshee-0.12.1+dfsg/mkinstalldirs 2007-06-14 23:26:59.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/mkinstalldirs banshee-0.13.0+dfsg/mkinstalldirs
+--- banshee-0.13.0+dfsg.old/mkinstalldirs 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/mkinstalldirs 2007-08-14 21:23:15.000000000 +0200
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -29150,105 +30728,21 @@
errstatus=0
dirmode=
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/po/Makefile.in.in banshee-0.12.1+dfsg/po/Makefile.in.in
---- banshee-0.12.1+dfsg.old/po/Makefile.in.in 2007-04-01 07:43:50.000000000 +0200
-+++ banshee-0.12.1+dfsg/po/Makefile.in.in 2007-06-14 23:26:40.000000000 +0200
-@@ -25,7 +25,7 @@
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/po/Makefile.in.in banshee-0.13.0+dfsg/po/Makefile.in.in
+--- banshee-0.13.0+dfsg.old/po/Makefile.in.in 2007-08-05 23:42:20.000000000 +0200
++++ banshee-0.13.0+dfsg/po/Makefile.in.in 2007-08-14 21:22:55.000000000 +0200
+@@ -133,7 +133,7 @@
+ dvi info tags TAGS ID:
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
--top_builddir = ..
-+top_builddir = @top_builddir@
- VPATH = @srcdir@
+ # Define this as empty until I found a useful application.
+-installcheck:
++install-exec installcheck:
- prefix = @prefix@
-@@ -56,15 +56,19 @@
-
- PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-
--POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-
- DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
- EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-
- POTFILES = \
--#This Gets Replace for some reason
-+# This comment gets stripped out
-
--CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-
- .SUFFIXES:
- .SUFFIXES: .po .pox .gmo .mo .msg .cat
-@@ -98,11 +102,7 @@
- install-data-no: all
- install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(itlocaledir)
-- if test -n "$(PO_LINGUAS)"; then \
-- linguas="$(PO_LINGUAS)"; \
-- else \
-- linguas="$(ALL_LINGUAS)"; \
-- fi; \
-+ linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
- $(mkdir_p) $$dir; \
-@@ -136,17 +136,18 @@
- installcheck:
-
uninstall:
-- if test -n "$(PO_LINGUAS)"; then \
-- linguas="$(PO_LINGUAS)"; \
-- else \
-- linguas="$(ALL_LINGUAS)"; \
-- fi; \
-+ linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- done
-
- check: all $(GETTEXT_PACKAGE).pot
-+ rm -f missing notexist
-+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+ if [ -r missing -o -r notexist ]; then \
-+ exit 1; \
-+ fi
-
- mostlyclean:
- rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-@@ -179,11 +180,7 @@
- update-po: Makefile
- $(MAKE) $(GETTEXT_PACKAGE).pot
- tmpdir=`pwd`; \
-- if test -n "$(PO_LINGUAS)"; then \
-- linguas="$(PO_LINGUAS)"; \
-- else \
-- linguas="$(ALL_LINGUAS)"; \
-- fi; \
-+ linguas="$(USE_LINGUAS)"; \
- for lang in $$linguas; do \
- echo "$$lang:"; \
- result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-@@ -211,8 +208,8 @@
- $(MAKE) stamp-it; \
- fi
-
--stamp-it: Makefile.in.in ../config.status POTFILES.in
-- cd .. \
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+ cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
- $(SHELL) ./config.status
-
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Core/Banshee/Makefile.in banshee-0.12.1+dfsg/src/Core/Banshee/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Core/Banshee/Makefile.in 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Core/Banshee/Makefile.in 2007-06-14 23:26:53.000000000 +0200
+ linguas="$(USE_LINGUAS)"; \
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Core/Banshee/Makefile.in banshee-0.13.0+dfsg/src/Core/Banshee/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Core/Banshee/Makefile.in 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Core/Banshee/Makefile.in 2007-08-14 21:23:09.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -29276,7 +30770,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -56,8 +52,8 @@
+@@ -55,8 +51,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -29286,16 +30780,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -67,7 +63,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = banshee banshee.exe.config
- am__installdirs = "$(DESTDIR)$(bansheedir)" "$(DESTDIR)$(bindir)" \
-@@ -88,8 +84,6 @@
+@@ -87,8 +83,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -29304,7 +30789,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -102,8 +96,6 @@
+@@ -101,8 +95,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -29313,7 +30798,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -118,8 +110,6 @@
+@@ -117,8 +109,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -29322,7 +30807,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -132,28 +122,10 @@
+@@ -131,28 +121,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -29351,7 +30836,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -174,8 +146,7 @@
+@@ -175,8 +147,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -29361,7 +30846,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -230,12 +201,12 @@
+@@ -187,14 +158,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -206,7 +175,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -231,12 +199,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -29376,7 +30885,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -243,6 +214,7 @@
+@@ -244,6 +212,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -29384,7 +30893,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -269,17 +241,19 @@
+@@ -265,22 +234,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -29408,7 +30923,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -291,6 +265,7 @@
+@@ -292,6 +264,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -29416,7 +30931,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -321,12 +296,15 @@
+@@ -322,12 +295,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -29432,7 +30947,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -346,7 +324,6 @@
+@@ -347,7 +323,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -29440,7 +30955,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -361,6 +338,8 @@
+@@ -363,6 +338,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -29449,7 +30964,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -526,7 +505,7 @@
+@@ -530,7 +507,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-bansheeSCRIPTS: $(banshee_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -29458,7 +30973,7 @@
@list='$(banshee_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -545,7 +524,7 @@
+@@ -549,7 +526,7 @@
done
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -29467,7 +30982,7 @@
@list='$(bin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -568,13 +547,9 @@
+@@ -572,13 +549,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -29482,7 +30997,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -597,23 +572,21 @@
+@@ -601,23 +574,21 @@
distdir: $(DISTFILES)
@@ -29519,7 +31034,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -629,7 +602,7 @@
+@@ -633,7 +604,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(bansheedir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(schemadir)"; do \
@@ -29528,7 +31043,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -665,7 +638,7 @@
+@@ -669,7 +640,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -29537,7 +31052,7 @@
dvi: dvi-am
-@@ -680,12 +653,20 @@
+@@ -684,12 +655,20 @@
install-data-am: install-bansheeSCRIPTS install-data-local \
install-schemaDATA
@@ -29558,7 +31073,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -705,19 +686,23 @@
+@@ -709,19 +688,23 @@
ps-am:
uninstall-am: uninstall-bansheeSCRIPTS uninstall-binSCRIPTS \
@@ -29590,26 +31105,9 @@
$(ASSEMBLY): $(BANSHEE_SOURCE_BUILD) $(BANSHEE_EXPANDED_RESOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Core/Banshee.Base/ConfigureDefines.cs banshee-0.12.1+dfsg/src/Core/Banshee.Base/ConfigureDefines.cs
---- banshee-0.12.1+dfsg.old/src/Core/Banshee.Base/ConfigureDefines.cs 2007-04-01 07:44:14.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Core/Banshee.Base/ConfigureDefines.cs 1970-01-01 01:00:00.000000000 +0100
-@@ -1,13 +0,0 @@
--namespace Banshee.Base
--{
-- public sealed class ConfigureDefines
-- {
-- public const string SystemDataDir = "/usr/share/banshee/";
-- public const string LOCALE_DIR = "/usr/share/locale/";
-- public const string InstallDir = "/usr/lib/banshee/";
-- public const string PACKAGE = "banshee";
-- public const string VERSION = "0.12.1";
-- public const string GETTEXT_PACKAGE = "banshee";
-- public const string ICON_THEME_DIR = "/usr/share/icons/hicolor/";
-- }
--}
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Core/Banshee.Base/Makefile.in banshee-0.12.1+dfsg/src/Core/Banshee.Base/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Core/Banshee.Base/Makefile.in 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Core/Banshee.Base/Makefile.in 2007-06-14 23:26:53.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Core/Banshee.Base/Makefile.in banshee-0.13.0+dfsg/src/Core/Banshee.Base/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Core/Banshee.Base/Makefile.in 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Core/Banshee.Base/Makefile.in 2007-08-14 21:23:09.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -29637,7 +31135,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -56,8 +52,8 @@
+@@ -55,8 +51,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -29647,16 +31145,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -67,7 +63,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = Banshee.Base.dll.config ConfigureDefines.cs
- am__installdirs = "$(DESTDIR)$(bansheebasedir)" \
-@@ -87,8 +83,6 @@
+@@ -86,8 +82,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -29665,7 +31154,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -101,8 +95,6 @@
+@@ -100,8 +94,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -29674,7 +31163,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -117,8 +109,6 @@
+@@ -116,8 +108,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -29683,7 +31172,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -131,28 +121,10 @@
+@@ -130,28 +120,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -29712,7 +31201,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -173,8 +145,7 @@
+@@ -174,8 +146,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -29722,7 +31211,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -229,12 +200,12 @@
+@@ -186,14 +157,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -205,7 +174,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -230,12 +198,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -29737,7 +31250,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -242,6 +213,7 @@
+@@ -243,6 +211,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -29745,7 +31258,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -268,17 +240,19 @@
+@@ -264,22 +233,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -29769,7 +31288,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -290,6 +264,7 @@
+@@ -291,6 +263,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -29777,7 +31296,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -320,12 +295,15 @@
+@@ -321,12 +294,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -29793,7 +31312,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -345,7 +323,6 @@
+@@ -346,7 +322,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -29801,7 +31320,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -360,6 +337,8 @@
+@@ -362,6 +337,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -29810,7 +31329,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -783,7 +762,7 @@
+@@ -801,7 +778,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-bansheebaseSCRIPTS: $(bansheebase_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -29819,7 +31338,7 @@
@list='$(bansheebase_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -806,13 +785,9 @@
+@@ -824,13 +801,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -29834,11 +31353,11 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -835,23 +810,21 @@
+@@ -853,23 +826,21 @@
distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/AudioCd $(distdir)/$(srcdir)/Banshee.AudioProfiles $(distdir)/$(srcdir)/Banshee.AudioProfiles.Gui $(distdir)/$(srcdir)/Banshee.Burner $(distdir)/$(srcdir)/Banshee.Cdrom $(distdir)/$(srcdir)/Banshee.Cdrom.Gui $(distdir)/$(srcdir)/Banshee.Cdrom.Iso $(distdir)/$(srcdir)/Banshee.Cdrom.Iso.Mkisofs $(distdir)/$(srcdir)/Banshee.Cdrom.Nautilus $(distdir)/$(srcdir)/Banshee.Cdrom.Nautilus.Interop $(distdir)/$(srcdir)/Banshee.Configuration $(distdir)/$(srcdir)/Banshee.Configuration.Schema $(distdir)/$(srcdir)/Banshee.Equalizer $(distdir)/$(srcdir)/Banshee.Equalizer.Gui $(distdir)/$(srcdir)/Banshee.Gui.DragDrop $(distdir)/$(srcdir)/Banshee.Kernel $(distdir)/$(srcdir)/Banshee.Library $(distdir)/$(srcdir)/Banshee.Metadata $(distdir)/$(srcdir)/Banshee.Metadata.Embedded $(distdir)/$(srcdir)/Banshee.Metadata.MusicBrainz $(distdir)/$(srcdir)/Banshee.Metadata.Rhapsody $(distdir)/$(srcdir)/Banshee.Playlists.Formats $(distdir)/$(srcdir)/Banshee.Playlists.Formats.Xspf $(distdir)/$(srcdir)/Banshee.SmartPlaylist $(distdir)/$(srcdir)/Banshee.Web $(distdir)/$(srcdir)/Dap $(distdir)/$(srcdir)/Gui $(distdir)/$(srcdir)/IO $(distdir)/$(srcdir)/MediaEngine $(distdir)/$(srcdir)/NetworkManager $(distdir)/$(srcdir)/Notifications $(distdir)/$(srcdir)/Plugins $(distdir)/$(srcdir)/Sources $(distdir)/$(top_srcdir)/ext/sexp-engine/src/SExpEngine $(distdir)/$(top_srcdir)/src $(distdir)/../../../build
+- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(srcdir)/AudioCd $(distdir)/$(srcdir)/Banshee.AudioProfiles $(distdir)/$(srcdir)/Banshee.AudioProfiles.Gui $(distdir)/$(srcdir)/Banshee.Burner $(distdir)/$(srcdir)/Banshee.Cdrom $(distdir)/$(srcdir)/Banshee.Cdrom.Gui $(distdir)/$(srcdir)/Banshee.Cdrom.Iso $(distdir)/$(srcdir)/Banshee.Cdrom.Iso.Mkisofs $(distdir)/$(srcdir)/Banshee.Cdrom.Nautilus $(distdir)/$(srcdir)/Banshee.Cdrom.Nautilus.Interop $(distdir)/$(srcdir)/Banshee.Configuration $(distdir)/$(srcdir)/Banshee.Configuration.Schema $(distdir)/$(srcdir)/Banshee.Equalizer $(distdir)/$(srcdir)/Banshee.Equalizer.Gui $(distdir)/$(srcdir)/Banshee.Gui.DragDrop $(distdir)/$(srcdir)/Banshee.Kernel $(distdir)/$(srcdir)/Banshee.Library $(distdir)/$(srcdir)/Banshee.Metadata $(distdir)/$(srcdir)/Banshee.Metadata.Embedded $(distdir)/$(srcdir)/Banshee.Metadata.MusicBrainz $(distdir)/$(srcdir)/Banshee.Metadata.Rhapsody $(distdir)/$(srcdir)/Banshee.PlayerMigration $(distdir)/$(srcdir)/Banshee.Playlists $(distdir)/$(srcdir)/Banshee.Playlists.Formats $(distdir)/$(srcdir)/Banshee.Playlists.Formats.Xspf $(distdir)/$(srcdir)/Banshee.SmartPlaylist $(distdir)/$(srcdir)/Banshee.Web $(distdir)/$(srcdir)/Dap $(distdir)/$(srcdir)/Gui $(distdir)/$(srcdir)/IO $(distdir)/$(srcdir)/MediaEngine $(distdir)/$(srcdir)/NetworkManager $(distdir)/$(srcdir)/Notifications $(distdir)/$(srcdir)/Plugins $(distdir)/$(srcdir)/Sources $(distdir)/$(top_srcdir)/ext/sexp-engine/src/SExpEngine $(distdir)/$(top_srcdir)/src $(distdir)/../../../build
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
@@ -29871,7 +31390,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -867,7 +840,7 @@
+@@ -885,7 +856,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(bansheebasedir)" "$(DESTDIR)$(schemadir)"; do \
@@ -29880,7 +31399,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -903,7 +876,7 @@
+@@ -921,7 +892,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -29889,7 +31408,7 @@
dvi: dvi-am
-@@ -918,12 +891,20 @@
+@@ -936,12 +907,20 @@
install-data-am: install-bansheebaseSCRIPTS install-data-local \
install-schemaDATA
@@ -29910,7 +31429,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -942,20 +923,22 @@
+@@ -960,20 +939,22 @@
ps-am:
@@ -29939,9 +31458,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(Banshee_Base_EXPANDED_RESOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Core/Banshee.Hyena/Makefile.in banshee-0.12.1+dfsg/src/Core/Banshee.Hyena/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Core/Banshee.Hyena/Makefile.in 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Core/Banshee.Hyena/Makefile.in 2007-06-14 23:26:53.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Core/Banshee.Hyena/Makefile.in banshee-0.13.0+dfsg/src/Core/Banshee.Hyena/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Core/Banshee.Hyena/Makefile.in 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Core/Banshee.Hyena/Makefile.in 2007-08-14 21:23:09.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -29969,7 +31488,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -52,8 +48,8 @@
+@@ -51,8 +47,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -29979,16 +31498,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -63,7 +59,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -71,8 +67,6 @@
+@@ -70,8 +66,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -29997,7 +31507,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -85,8 +79,6 @@
+@@ -84,8 +78,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -30006,7 +31516,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -101,8 +93,6 @@
+@@ -100,8 +92,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -30015,7 +31525,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -115,28 +105,10 @@
+@@ -114,28 +104,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -30044,7 +31554,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -157,8 +129,7 @@
+@@ -158,8 +130,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -30054,7 +31564,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -213,12 +184,12 @@
+@@ -170,14 +141,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -189,7 +158,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -214,12 +182,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -30069,7 +31603,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -226,6 +197,7 @@
+@@ -227,6 +195,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -30077,7 +31611,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -252,17 +224,19 @@
+@@ -248,22 +217,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -30101,7 +31641,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -274,6 +248,7 @@
+@@ -275,6 +247,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -30109,7 +31649,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -304,12 +279,15 @@
+@@ -305,12 +278,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -30125,7 +31665,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -329,7 +307,6 @@
+@@ -330,7 +306,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -30133,7 +31673,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -344,6 +321,8 @@
+@@ -346,6 +321,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -30142,7 +31682,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -436,10 +415,6 @@
+@@ -438,10 +415,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -30153,7 +31693,7 @@
tags: TAGS
TAGS:
-@@ -448,23 +423,21 @@
+@@ -450,23 +423,21 @@
distdir: $(DISTFILES)
@@ -30190,7 +31730,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -511,7 +484,7 @@
+@@ -513,7 +484,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -30199,7 +31739,7 @@
dvi: dvi-am
-@@ -525,12 +498,20 @@
+@@ -527,12 +498,20 @@
install-data-am:
@@ -30220,7 +31760,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -549,17 +530,20 @@
+@@ -551,17 +530,20 @@
ps-am:
@@ -30246,9 +31786,9 @@
all: $(HYENA_ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Core/Banshee.Widgets/Makefile.in banshee-0.12.1+dfsg/src/Core/Banshee.Widgets/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Core/Banshee.Widgets/Makefile.in 2007-04-01 07:44:01.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Core/Banshee.Widgets/Makefile.in 2007-06-14 23:26:53.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Core/Banshee.Widgets/Makefile.in banshee-0.13.0+dfsg/src/Core/Banshee.Widgets/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Core/Banshee.Widgets/Makefile.in 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Core/Banshee.Widgets/Makefile.in 2007-08-14 21:23:09.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -30276,7 +31816,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -54,8 +50,8 @@
+@@ -53,8 +49,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -30286,16 +31826,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -65,7 +61,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = Banshee.Widgets.dll.config
- am__installdirs = "$(DESTDIR)$(banshee_widgetsdir)"
-@@ -76,8 +72,6 @@
+@@ -75,8 +71,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -30304,7 +31835,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -90,8 +84,6 @@
+@@ -89,8 +83,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -30313,7 +31844,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -106,8 +98,6 @@
+@@ -105,8 +97,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -30322,7 +31853,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -120,28 +110,10 @@
+@@ -119,28 +109,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -30351,7 +31882,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -162,8 +134,7 @@
+@@ -163,8 +135,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -30361,7 +31892,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -218,12 +189,12 @@
+@@ -175,14 +146,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -194,7 +163,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -219,12 +187,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -30376,7 +31931,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -231,6 +202,7 @@
+@@ -232,6 +200,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -30384,7 +31939,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -257,17 +229,19 @@
+@@ -253,22 +222,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -30408,7 +31969,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -279,6 +253,7 @@
+@@ -280,6 +252,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -30416,7 +31977,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -309,12 +284,15 @@
+@@ -310,12 +283,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -30432,7 +31993,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -334,7 +312,6 @@
+@@ -335,7 +311,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -30440,7 +32001,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -349,6 +326,8 @@
+@@ -351,6 +326,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -30449,7 +32010,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -468,7 +447,7 @@
+@@ -473,7 +450,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-banshee_widgetsSCRIPTS: $(banshee_widgets_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -30458,7 +32019,7 @@
@list='$(banshee_widgets_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -491,10 +470,6 @@
+@@ -496,10 +473,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -30469,7 +32030,7 @@
tags: TAGS
TAGS:
-@@ -503,23 +478,21 @@
+@@ -508,23 +481,21 @@
distdir: $(DISTFILES)
@@ -30506,7 +32067,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -535,7 +508,7 @@
+@@ -540,7 +511,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(banshee_widgetsdir)"; do \
@@ -30515,7 +32076,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -570,7 +543,7 @@
+@@ -575,7 +546,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -30524,7 +32085,7 @@
dvi: dvi-am
-@@ -584,12 +557,20 @@
+@@ -589,12 +560,20 @@
install-data-am: install-banshee_widgetsSCRIPTS
@@ -30545,7 +32106,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -608,18 +589,22 @@
+@@ -613,18 +592,22 @@
ps-am:
@@ -30572,9 +32133,9 @@
all: $(ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Core/Makefile.in banshee-0.12.1+dfsg/src/Core/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Core/Makefile.in 2007-04-01 07:44:02.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Core/Makefile.in 2007-06-14 23:26:53.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Core/Makefile.in banshee-0.13.0+dfsg/src/Core/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Core/Makefile.in 2007-08-05 23:42:30.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Core/Makefile.in 2007-08-14 21:23:09.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -30602,7 +32163,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -30612,15 +32173,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,25 +58,26 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -68,18 +64,19 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -30646,7 +32199,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -93,8 +90,6 @@
+@@ -92,8 +89,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -30655,7 +32208,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -109,8 +104,6 @@
+@@ -108,8 +103,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -30664,7 +32217,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -123,28 +116,10 @@
+@@ -122,28 +115,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -30693,7 +32246,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -165,8 +140,7 @@
+@@ -166,8 +141,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -30703,7 +32256,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,12 +195,12 @@
+@@ -178,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -197,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -222,12 +193,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -30718,7 +32295,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -234,6 +208,7 @@
+@@ -235,6 +206,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -30726,7 +32303,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -260,17 +235,19 @@
+@@ -256,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -30750,7 +32333,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -282,6 +259,7 @@
+@@ -283,6 +258,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -30758,7 +32341,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -312,12 +290,15 @@
+@@ -313,12 +289,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -30774,7 +32357,7 @@
SUBDIRS = \
Banshee.Widgets \
Banshee.Base \
-@@ -366,10 +347,6 @@
+@@ -367,10 +346,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -30785,7 +32368,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -401,8 +378,7 @@
+@@ -402,8 +377,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -30795,7 +32378,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -503,22 +479,21 @@
+@@ -504,22 +478,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -30831,7 +32414,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -532,7 +507,7 @@
+@@ -533,7 +506,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -30840,7 +32423,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -540,6 +515,8 @@
+@@ -541,6 +514,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -30849,7 +32432,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -580,8 +557,7 @@
+@@ -581,8 +556,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -30859,7 +32442,7 @@
dvi: dvi-recursive
-@@ -595,12 +571,20 @@
+@@ -596,12 +570,20 @@
install-data-am:
@@ -30880,7 +32463,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -619,22 +603,24 @@
+@@ -620,22 +602,24 @@
ps-am:
@@ -30917,9 +32500,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in 2007-04-01 07:44:02.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in 2007-06-14 23:26:54.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Ipod/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Ipod/Makefile.in 2007-08-14 21:23:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -30947,7 +32530,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -54,8 +50,8 @@
+@@ -53,8 +49,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -30957,16 +32540,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -65,7 +61,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = ipod-sharp.dll.config
- am__installdirs = "$(DESTDIR)$(bansheedapdir)"
-@@ -76,8 +72,6 @@
+@@ -75,8 +71,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -30975,7 +32549,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -90,8 +84,6 @@
+@@ -89,8 +83,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -30984,7 +32558,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -106,8 +98,6 @@
+@@ -105,8 +97,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -30993,7 +32567,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -120,28 +110,10 @@
+@@ -119,28 +109,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -31022,7 +32596,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -162,8 +134,7 @@
+@@ -163,8 +135,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -31032,7 +32606,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -218,12 +189,12 @@
+@@ -175,14 +146,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -194,7 +163,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -219,12 +187,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -31047,7 +32645,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -231,6 +202,7 @@
+@@ -232,6 +200,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -31055,7 +32653,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -257,17 +229,19 @@
+@@ -253,22 +222,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -31079,7 +32683,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -279,6 +253,7 @@
+@@ -280,6 +252,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -31087,7 +32691,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -309,12 +284,15 @@
+@@ -310,12 +283,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -31103,7 +32707,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -334,7 +312,6 @@
+@@ -335,7 +311,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -31111,7 +32715,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -349,6 +326,8 @@
+@@ -351,6 +326,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -31120,7 +32724,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -437,7 +416,7 @@
+@@ -439,7 +416,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-bansheedapSCRIPTS: $(bansheedap_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -31129,7 +32733,7 @@
@list='$(bansheedap_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -460,10 +439,6 @@
+@@ -462,10 +439,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -31140,7 +32744,7 @@
tags: TAGS
TAGS:
-@@ -472,23 +447,21 @@
+@@ -474,23 +447,21 @@
distdir: $(DISTFILES)
@@ -31177,7 +32781,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -504,7 +477,7 @@
+@@ -506,7 +477,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bansheedapdir)"; do \
@@ -31186,7 +32790,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -539,7 +512,7 @@
+@@ -541,7 +512,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -31195,7 +32799,7 @@
dvi: dvi-am
-@@ -555,12 +528,20 @@
+@@ -557,12 +528,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -31216,7 +32820,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -579,20 +560,24 @@
+@@ -581,20 +560,24 @@
ps-am:
@@ -31245,9 +32849,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in 2007-04-01 07:44:02.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in 2007-06-14 23:26:54.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Karma/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Karma/Makefile.in 2007-08-14 21:23:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -31275,7 +32879,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -31285,16 +32889,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(bansheedapdir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -31303,7 +32898,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -31312,7 +32907,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -31321,7 +32916,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -31350,7 +32945,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -31360,7 +32955,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -31375,7 +32994,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -31383,7 +33002,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -31407,7 +33032,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -31415,7 +33040,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -31431,7 +33056,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -31439,7 +33064,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -31448,7 +33073,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -429,7 +408,7 @@
+@@ -431,7 +408,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-bansheedapSCRIPTS: $(bansheedap_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -31457,7 +33082,7 @@
@list='$(bansheedap_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -452,10 +431,6 @@
+@@ -454,10 +431,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -31468,7 +33093,7 @@
tags: TAGS
TAGS:
-@@ -464,23 +439,21 @@
+@@ -466,23 +439,21 @@
distdir: $(DISTFILES)
@@ -31505,7 +33130,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -496,7 +469,7 @@
+@@ -498,7 +469,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bansheedapdir)"; do \
@@ -31514,7 +33139,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -531,7 +504,7 @@
+@@ -533,7 +504,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -31523,7 +33148,7 @@
dvi: dvi-am
-@@ -547,12 +520,20 @@
+@@ -549,12 +520,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -31544,7 +33169,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -571,20 +552,24 @@
+@@ -573,20 +552,24 @@
ps-am:
@@ -31573,9 +33198,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2007-04-01 07:44:02.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2007-06-14 23:26:54.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.MassStorage/Makefile.in 2007-08-14 21:23:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -31603,7 +33228,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -31613,16 +33238,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(bansheedapdir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -31631,7 +33247,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -31640,7 +33256,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -31649,7 +33265,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -31678,7 +33294,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -31688,7 +33304,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -31703,7 +33343,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -31711,7 +33351,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -31735,7 +33381,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -31743,7 +33389,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -31759,7 +33405,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -31767,7 +33413,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -31776,7 +33422,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -430,7 +409,7 @@
+@@ -432,7 +409,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-bansheedapSCRIPTS: $(bansheedap_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -31785,7 +33431,7 @@
@list='$(bansheedap_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -453,10 +432,6 @@
+@@ -455,10 +432,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -31796,7 +33442,7 @@
tags: TAGS
TAGS:
-@@ -465,23 +440,21 @@
+@@ -467,23 +440,21 @@
distdir: $(DISTFILES)
@@ -31833,7 +33479,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -497,7 +470,7 @@
+@@ -499,7 +470,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bansheedapdir)"; do \
@@ -31842,7 +33488,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -532,7 +505,7 @@
+@@ -534,7 +505,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -31851,7 +33497,7 @@
dvi: dvi-am
-@@ -546,12 +519,20 @@
+@@ -548,12 +519,20 @@
install-data-am: install-bansheedapSCRIPTS
@@ -31872,7 +33518,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -570,18 +551,21 @@
+@@ -572,18 +551,21 @@
ps-am:
@@ -31899,9 +33545,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in 2007-04-01 07:44:02.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in 2007-06-14 23:26:54.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Mtp/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Mtp/Makefile.in 2007-08-14 21:23:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -31929,7 +33575,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -31939,16 +33585,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(bansheedapdir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -31957,7 +33594,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -31966,7 +33603,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -31975,7 +33612,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -32004,7 +33641,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -32014,7 +33651,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -32029,7 +33690,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -32037,7 +33698,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -32061,7 +33728,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -32069,7 +33736,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -32085,7 +33752,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -32093,7 +33760,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -32102,7 +33769,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -432,7 +411,7 @@
+@@ -434,7 +411,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-bansheedapSCRIPTS: $(bansheedap_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -32111,7 +33778,7 @@
@list='$(bansheedap_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -455,10 +434,6 @@
+@@ -457,10 +434,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -32122,7 +33789,7 @@
tags: TAGS
TAGS:
-@@ -467,23 +442,21 @@
+@@ -469,23 +442,21 @@
distdir: $(DISTFILES)
@@ -32159,7 +33826,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -499,7 +472,7 @@
+@@ -501,7 +472,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bansheedapdir)"; do \
@@ -32168,7 +33835,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -534,7 +507,7 @@
+@@ -536,7 +507,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -32177,7 +33844,7 @@
dvi: dvi-am
-@@ -550,12 +523,20 @@
+@@ -552,12 +523,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -32198,7 +33865,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -574,20 +555,24 @@
+@@ -576,20 +555,24 @@
ps-am:
@@ -32227,9 +33894,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in 2007-04-01 07:44:02.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in 2007-06-14 23:26:54.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Dap/Banshee.Dap.Njb/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Dap/Banshee.Dap.Njb/Makefile.in 2007-08-14 21:23:10.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -32257,7 +33924,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -54,8 +50,8 @@
+@@ -53,8 +49,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -32267,16 +33934,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -65,7 +61,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = njb-sharp.dll.config
- am__installdirs = "$(DESTDIR)$(bansheedapdir)"
-@@ -76,8 +72,6 @@
+@@ -75,8 +71,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -32285,7 +33943,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -90,8 +84,6 @@
+@@ -89,8 +83,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -32294,7 +33952,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -106,8 +98,6 @@
+@@ -105,8 +97,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -32303,7 +33961,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -120,28 +110,10 @@
+@@ -119,28 +109,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -32332,7 +33990,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -162,8 +134,7 @@
+@@ -163,8 +135,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -32342,7 +34000,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -218,12 +189,12 @@
+@@ -175,14 +146,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -194,7 +163,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -219,12 +187,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -32357,7 +34039,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -231,6 +202,7 @@
+@@ -232,6 +200,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -32365,7 +34047,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -257,17 +229,19 @@
+@@ -253,22 +222,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -32389,7 +34077,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -279,6 +253,7 @@
+@@ -280,6 +252,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -32397,7 +34085,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -309,12 +284,15 @@
+@@ -310,12 +283,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -32413,7 +34101,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -334,7 +312,6 @@
+@@ -335,7 +311,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -32421,7 +34109,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -349,6 +326,8 @@
+@@ -351,6 +326,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -32430,7 +34118,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -433,7 +412,7 @@
+@@ -435,7 +412,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-bansheedapSCRIPTS: $(bansheedap_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -32439,7 +34127,7 @@
@list='$(bansheedap_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -456,10 +435,6 @@
+@@ -458,10 +435,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -32450,7 +34138,7 @@
tags: TAGS
TAGS:
-@@ -468,23 +443,21 @@
+@@ -470,23 +443,21 @@
distdir: $(DISTFILES)
@@ -32487,7 +34175,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -500,7 +473,7 @@
+@@ -502,7 +473,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bansheedapdir)"; do \
@@ -32496,7 +34184,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -535,7 +508,7 @@
+@@ -537,7 +508,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -32505,7 +34193,7 @@
dvi: dvi-am
-@@ -551,12 +524,20 @@
+@@ -553,12 +524,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -32526,7 +34214,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -575,20 +556,24 @@
+@@ -577,20 +556,24 @@
ps-am:
@@ -32555,9 +34243,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Dap/Makefile.in banshee-0.12.1+dfsg/src/Dap/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Dap/Makefile.in 2007-04-01 07:44:02.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Dap/Makefile.in 2007-06-14 23:26:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Dap/Makefile.in banshee-0.13.0+dfsg/src/Dap/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Dap/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Dap/Makefile.in 2007-08-14 21:23:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -32585,7 +34273,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -32595,15 +34283,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,25 +58,26 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -68,18 +64,19 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -32629,7 +34309,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -93,8 +90,6 @@
+@@ -92,8 +89,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -32638,7 +34318,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -109,8 +104,6 @@
+@@ -108,8 +103,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -32647,7 +34327,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -123,28 +116,10 @@
+@@ -122,28 +115,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -32676,7 +34356,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -165,8 +140,7 @@
+@@ -166,8 +141,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -32686,7 +34366,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,12 +195,12 @@
+@@ -178,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -197,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -222,12 +193,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -32701,7 +34405,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -234,6 +208,7 @@
+@@ -235,6 +206,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -32709,7 +34413,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -260,17 +235,19 @@
+@@ -256,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -32733,7 +34443,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -282,6 +259,7 @@
+@@ -283,6 +258,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -32741,7 +34451,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -312,12 +290,15 @@
+@@ -313,12 +289,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -32757,7 +34467,7 @@
SUBDIRS = \
Banshee.Dap.Ipod \
Banshee.Dap.Karma \
-@@ -365,10 +346,6 @@
+@@ -366,10 +345,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -32768,7 +34478,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -400,8 +377,7 @@
+@@ -401,8 +376,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -32778,7 +34488,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -502,22 +478,21 @@
+@@ -503,22 +477,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -32814,7 +34524,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -531,7 +506,7 @@
+@@ -532,7 +505,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -32823,7 +34533,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -539,6 +514,8 @@
+@@ -540,6 +513,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -32832,7 +34542,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -579,8 +556,7 @@
+@@ -580,8 +555,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -32842,7 +34552,7 @@
dvi: dvi-recursive
-@@ -594,12 +570,20 @@
+@@ -595,12 +569,20 @@
install-data-am:
@@ -32863,7 +34573,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -618,24 +602,26 @@
+@@ -619,24 +601,26 @@
ps-am:
@@ -32902,9 +34612,9 @@
uninstall-hook:
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in banshee-0.12.1+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2007-06-14 23:26:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in banshee-0.13.0+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Engines/Banshee.MediaEngine.GStreamer/Makefile.in 2007-08-14 21:23:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -32932,7 +34642,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -32942,16 +34652,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(gstenginelibdir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -32960,7 +34661,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -32969,7 +34670,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -32978,7 +34679,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -33007,7 +34708,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -33017,7 +34718,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -33032,7 +34757,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -33040,7 +34765,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -33064,7 +34795,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -33072,7 +34803,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -33088,7 +34819,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -33096,7 +34827,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -33105,7 +34836,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -428,7 +407,7 @@
+@@ -430,7 +407,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-gstenginelibSCRIPTS: $(gstenginelib_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -33114,7 +34845,7 @@
@list='$(gstenginelib_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -451,10 +430,6 @@
+@@ -453,10 +430,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -33125,7 +34856,7 @@
tags: TAGS
TAGS:
-@@ -463,23 +438,21 @@
+@@ -465,23 +438,21 @@
distdir: $(DISTFILES)
@@ -33162,7 +34893,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -495,7 +468,7 @@
+@@ -497,7 +468,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(gstenginelibdir)"; do \
@@ -33171,7 +34902,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -529,7 +502,7 @@
+@@ -531,7 +502,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -33180,7 +34911,7 @@
dvi: dvi-am
-@@ -543,12 +516,20 @@
+@@ -545,12 +516,20 @@
install-data-am: install-gstenginelibSCRIPTS
@@ -33201,7 +34932,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -567,18 +548,21 @@
+@@ -569,18 +548,21 @@
ps-am:
@@ -33229,9 +34960,9 @@
all: $(ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Engines/Makefile.in banshee-0.12.1+dfsg/src/Engines/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Engines/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Engines/Makefile.in 2007-06-14 23:26:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Engines/Makefile.in banshee-0.13.0+dfsg/src/Engines/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Engines/Makefile.in 2007-08-05 23:42:31.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Engines/Makefile.in 2007-08-14 21:23:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -33259,7 +34990,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -33269,15 +35000,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,25 +58,26 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -68,18 +64,19 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -33303,7 +35026,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -93,8 +90,6 @@
+@@ -92,8 +89,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -33312,7 +35035,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -109,8 +104,6 @@
+@@ -108,8 +103,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -33321,7 +35044,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -123,28 +116,10 @@
+@@ -122,28 +115,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -33350,7 +35073,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -165,8 +140,7 @@
+@@ -166,8 +141,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -33360,7 +35083,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,12 +195,12 @@
+@@ -178,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -197,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -222,12 +193,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -33375,7 +35122,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -234,6 +208,7 @@
+@@ -235,6 +206,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -33383,7 +35130,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -260,17 +235,19 @@
+@@ -256,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -33407,7 +35160,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -282,6 +259,7 @@
+@@ -283,6 +258,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -33415,7 +35168,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -312,12 +290,15 @@
+@@ -313,12 +289,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -33431,7 +35184,7 @@
SUBDIRS = Banshee.MediaEngine.GStreamer
MAINTAINERCLEANFILES = Makefile.in
all: all-recursive
-@@ -359,10 +340,6 @@
+@@ -360,10 +339,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -33442,7 +35195,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -394,8 +371,7 @@
+@@ -395,8 +370,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -33452,7 +35205,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -496,22 +472,21 @@
+@@ -497,22 +471,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -33488,7 +35241,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -525,7 +500,7 @@
+@@ -526,7 +499,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -33497,7 +35250,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -533,6 +508,8 @@
+@@ -534,6 +507,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -33506,7 +35259,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -573,8 +550,7 @@
+@@ -574,8 +549,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -33516,7 +35269,7 @@
dvi: dvi-recursive
-@@ -588,12 +564,20 @@
+@@ -589,12 +563,20 @@
install-data-am:
@@ -33537,7 +35290,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -612,24 +596,26 @@
+@@ -613,24 +595,26 @@
ps-am:
@@ -33576,9 +35329,9 @@
uninstall-hook:
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Extras/Boo/Makefile.in banshee-0.12.1+dfsg/src/Extras/Boo/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Extras/Boo/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Extras/Boo/Makefile.in 2007-06-14 23:26:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Extras/Boo/Makefile.in banshee-0.13.0+dfsg/src/Extras/Boo/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Extras/Boo/Makefile.in 2007-08-05 23:42:32.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Extras/Boo/Makefile.in 2007-08-14 21:23:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -33606,7 +35359,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -52,8 +48,8 @@
+@@ -51,8 +47,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -33616,16 +35369,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -63,7 +59,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(bansheedir)"
-@@ -74,8 +70,6 @@
+@@ -73,8 +69,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -33634,7 +35378,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -88,8 +82,6 @@
+@@ -87,8 +81,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -33643,7 +35387,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -104,8 +96,6 @@
+@@ -103,8 +95,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -33652,7 +35396,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -118,28 +108,10 @@
+@@ -117,28 +107,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -33681,7 +35425,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -160,8 +132,7 @@
+@@ -161,8 +133,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -33691,7 +35435,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -216,12 +187,12 @@
+@@ -173,14 +144,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -192,7 +161,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -217,12 +185,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -33706,7 +35474,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -229,6 +200,7 @@
+@@ -230,6 +198,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -33714,7 +35482,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -255,17 +227,19 @@
+@@ -251,22 +220,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -33738,7 +35512,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -277,6 +251,7 @@
+@@ -278,6 +250,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -33746,7 +35520,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -307,12 +282,15 @@
+@@ -308,12 +281,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -33762,7 +35536,7 @@
@EXTERNAL_BOO_FALSE at bansheedir = $(pkglibdir)
@EXTERNAL_BOO_FALSE at banshee_SCRIPTS = $(srcdir)/*.dll
EXTRA_DIST = $(banshee_SCRIPTS)
-@@ -351,7 +329,7 @@
+@@ -352,7 +328,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-bansheeSCRIPTS: $(banshee_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -33771,7 +35545,7 @@
@list='$(banshee_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -374,10 +352,6 @@
+@@ -375,10 +351,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -33782,7 +35556,7 @@
tags: TAGS
TAGS:
-@@ -386,23 +360,21 @@
+@@ -387,23 +359,21 @@
distdir: $(DISTFILES)
@@ -33819,7 +35593,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -418,7 +390,7 @@
+@@ -419,7 +389,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(bansheedir)"; do \
@@ -33828,7 +35602,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -451,7 +423,7 @@
+@@ -452,7 +422,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -33837,7 +35611,7 @@
dvi: dvi-am
-@@ -465,12 +437,20 @@
+@@ -466,12 +436,20 @@
install-data-am: install-bansheeSCRIPTS
@@ -33858,7 +35632,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -489,18 +469,21 @@
+@@ -490,18 +468,21 @@
ps-am:
@@ -33885,9 +35659,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Extras/BooBuddy/Makefile.in banshee-0.12.1+dfsg/src/Extras/BooBuddy/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Extras/BooBuddy/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Extras/BooBuddy/Makefile.in 2007-06-14 23:26:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Extras/BooBuddy/Makefile.in banshee-0.13.0+dfsg/src/Extras/BooBuddy/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Extras/BooBuddy/Makefile.in 2007-08-05 23:42:32.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Extras/BooBuddy/Makefile.in 2007-08-14 21:23:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -33915,7 +35689,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -33925,16 +35699,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(boobuddydir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -33943,7 +35708,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -33952,7 +35717,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -33961,7 +35726,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -33990,7 +35755,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -34000,7 +35765,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -34015,7 +35804,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -34023,7 +35812,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -34047,7 +35842,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -34055,7 +35850,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -34071,7 +35866,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -34079,7 +35874,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -34088,7 +35883,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -437,7 +416,7 @@
+@@ -439,7 +416,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-boobuddySCRIPTS: $(boobuddy_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -34097,7 +35892,7 @@
@list='$(boobuddy_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -460,10 +439,6 @@
+@@ -462,10 +439,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -34108,7 +35903,7 @@
tags: TAGS
TAGS:
-@@ -472,23 +447,21 @@
+@@ -474,23 +447,21 @@
distdir: $(DISTFILES)
@@ -34145,7 +35940,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -504,7 +477,7 @@
+@@ -506,7 +477,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(boobuddydir)"; do \
@@ -34154,7 +35949,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -538,7 +511,7 @@
+@@ -540,7 +511,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -34163,7 +35958,7 @@
dvi: dvi-am
-@@ -552,12 +525,20 @@
+@@ -554,12 +525,20 @@
install-data-am: install-boobuddySCRIPTS
@@ -34184,7 +35979,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -576,18 +557,21 @@
+@@ -578,18 +557,21 @@
ps-am:
@@ -34211,9 +36006,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(BOO_MACRO_SRC)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in banshee-0.12.1+dfsg/src/Extras/Gnome.Keyring/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Extras/Gnome.Keyring/Makefile.in 2007-06-14 23:26:55.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in banshee-0.13.0+dfsg/src/Extras/Gnome.Keyring/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Extras/Gnome.Keyring/Makefile.in 2007-08-05 23:42:32.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Extras/Gnome.Keyring/Makefile.in 2007-08-14 21:23:11.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -34241,7 +36036,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -34251,16 +36046,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(gnome_keyringdir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -34269,7 +36055,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -34278,7 +36064,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -34287,7 +36073,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -34316,7 +36102,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -34326,7 +36112,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -34341,7 +36151,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -34349,7 +36159,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -34373,7 +36189,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -34381,7 +36197,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -34397,7 +36213,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -34405,7 +36221,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -34414,7 +36230,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -426,7 +405,7 @@
+@@ -428,7 +405,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-gnome_keyringSCRIPTS: $(gnome_keyring_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -34423,7 +36239,7 @@
@list='$(gnome_keyring_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -449,10 +428,6 @@
+@@ -451,10 +428,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -34434,7 +36250,7 @@
tags: TAGS
TAGS:
-@@ -461,23 +436,21 @@
+@@ -463,23 +436,21 @@
distdir: $(DISTFILES)
@@ -34471,7 +36287,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -493,7 +466,7 @@
+@@ -495,7 +466,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(gnome_keyringdir)"; do \
@@ -34480,7 +36296,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -528,7 +501,7 @@
+@@ -530,7 +501,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -34489,7 +36305,7 @@
dvi: dvi-am
-@@ -542,12 +515,20 @@
+@@ -544,12 +515,20 @@
install-data-am: install-gnome_keyringSCRIPTS
@@ -34510,7 +36326,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -566,18 +547,21 @@
+@@ -568,18 +547,21 @@
ps-am:
@@ -34538,9 +36354,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Extras/Last.FM/Makefile.in banshee-0.12.1+dfsg/src/Extras/Last.FM/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Extras/Last.FM/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Extras/Last.FM/Makefile.in 2007-06-14 23:26:56.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Extras/Last.FM/Makefile.in banshee-0.13.0+dfsg/src/Extras/Last.FM/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Extras/Last.FM/Makefile.in 2007-08-05 23:42:32.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Extras/Last.FM/Makefile.in 2007-08-14 21:23:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -34568,7 +36384,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -52,8 +48,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -34578,16 +36394,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(last_fmdir)"
-@@ -75,8 +71,6 @@
+@@ -74,8 +70,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -34596,7 +36403,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -89,8 +83,6 @@
+@@ -88,8 +82,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -34605,7 +36412,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -105,8 +97,6 @@
+@@ -104,8 +96,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -34614,7 +36421,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -119,28 +109,10 @@
+@@ -118,28 +108,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -34643,7 +36450,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -161,8 +133,7 @@
+@@ -162,8 +134,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -34653,7 +36460,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -217,12 +188,12 @@
+@@ -174,14 +145,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -193,7 +162,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -218,12 +186,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -34668,7 +36499,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -230,6 +201,7 @@
+@@ -231,6 +199,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -34676,7 +36507,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -256,17 +228,19 @@
+@@ -252,22 +221,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -34700,7 +36537,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -278,6 +252,7 @@
+@@ -279,6 +251,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -34708,7 +36545,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -308,12 +283,15 @@
+@@ -309,12 +282,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -34724,7 +36561,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -333,7 +311,6 @@
+@@ -334,7 +310,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -34732,7 +36569,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -348,6 +325,8 @@
+@@ -350,6 +325,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -34741,7 +36578,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -439,7 +418,7 @@
+@@ -441,7 +418,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-last_fmSCRIPTS: $(last_fm_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -34750,7 +36587,7 @@
@list='$(last_fm_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -462,10 +441,6 @@
+@@ -464,10 +441,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -34761,7 +36598,7 @@
tags: TAGS
TAGS:
-@@ -474,23 +449,21 @@
+@@ -476,23 +449,21 @@
distdir: $(DISTFILES)
@@ -34798,7 +36635,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -506,7 +479,7 @@
+@@ -508,7 +479,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(last_fmdir)"; do \
@@ -34807,7 +36644,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -541,7 +514,7 @@
+@@ -543,7 +514,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -34816,7 +36653,7 @@
dvi: dvi-am
-@@ -555,12 +528,20 @@
+@@ -557,12 +528,20 @@
install-data-am: install-last_fmSCRIPTS
@@ -34837,7 +36674,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -579,18 +560,21 @@
+@@ -581,18 +560,21 @@
ps-am:
@@ -34864,9 +36701,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(srcdir)/badge.png $(srcdir)/badge-hover.png
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Extras/Makefile.in banshee-0.12.1+dfsg/src/Extras/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Extras/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Extras/Makefile.in 2007-06-14 23:26:56.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Extras/Makefile.in banshee-0.13.0+dfsg/src/Extras/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Extras/Makefile.in 2007-08-05 23:42:32.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Extras/Makefile.in 2007-08-14 21:23:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -34894,7 +36731,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -34904,15 +36741,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,25 +58,26 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -68,18 +64,19 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -34938,7 +36767,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -93,8 +90,6 @@
+@@ -92,8 +89,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -34947,7 +36776,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -109,8 +104,6 @@
+@@ -108,8 +103,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -34956,7 +36785,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -123,28 +116,10 @@
+@@ -122,28 +115,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -34985,7 +36814,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -165,8 +140,7 @@
+@@ -166,8 +141,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -34995,7 +36824,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,12 +195,12 @@
+@@ -178,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -197,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -222,12 +193,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -35010,7 +36863,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -234,6 +208,7 @@
+@@ -235,6 +206,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -35018,7 +36871,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -260,17 +235,19 @@
+@@ -256,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -35042,7 +36901,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -282,6 +259,7 @@
+@@ -283,6 +258,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -35050,7 +36909,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -312,12 +290,15 @@
+@@ -313,12 +289,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -35066,7 +36925,7 @@
SUBDIRS = \
Boo \
BooBuddy \
-@@ -367,10 +348,6 @@
+@@ -368,10 +347,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -35077,7 +36936,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -402,8 +379,7 @@
+@@ -403,8 +378,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -35087,7 +36946,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -504,22 +480,21 @@
+@@ -505,22 +479,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -35123,7 +36982,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -533,7 +508,7 @@
+@@ -534,7 +507,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -35132,7 +36991,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -541,6 +516,8 @@
+@@ -542,6 +515,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -35141,7 +37000,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -581,8 +558,7 @@
+@@ -582,8 +557,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -35151,7 +37010,7 @@
dvi: dvi-recursive
-@@ -596,12 +572,20 @@
+@@ -597,12 +571,20 @@
install-data-am:
@@ -35172,7 +37031,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -620,22 +604,24 @@
+@@ -621,22 +603,24 @@
ps-am:
@@ -35209,9 +37068,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Extras/MusicBrainz/Makefile.in banshee-0.12.1+dfsg/src/Extras/MusicBrainz/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Extras/MusicBrainz/Makefile.in 2007-04-01 07:44:03.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Extras/MusicBrainz/Makefile.in 2007-06-14 23:26:56.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Extras/MusicBrainz/Makefile.in banshee-0.13.0+dfsg/src/Extras/MusicBrainz/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Extras/MusicBrainz/Makefile.in 2007-08-05 23:42:32.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Extras/MusicBrainz/Makefile.in 2007-08-14 21:23:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -35239,7 +37098,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -54,8 +50,8 @@
+@@ -53,8 +49,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -35249,16 +37108,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -65,7 +61,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = MusicBrainz.dll.config
- am__installdirs = "$(DESTDIR)$(musicbrainzdir)"
-@@ -76,8 +72,6 @@
+@@ -75,8 +71,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -35267,7 +37117,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -90,8 +84,6 @@
+@@ -89,8 +83,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -35276,7 +37126,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -106,8 +98,6 @@
+@@ -105,8 +97,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -35285,7 +37135,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -120,28 +110,10 @@
+@@ -119,28 +109,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -35314,7 +37164,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -162,8 +134,7 @@
+@@ -163,8 +135,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -35324,7 +37174,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -218,12 +189,12 @@
+@@ -175,14 +146,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -194,7 +163,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -219,12 +187,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -35339,7 +37213,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -231,6 +202,7 @@
+@@ -232,6 +200,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -35347,7 +37221,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -257,17 +229,19 @@
+@@ -253,22 +222,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -35371,7 +37251,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -279,6 +253,7 @@
+@@ -280,6 +252,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -35379,7 +37259,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -309,12 +284,15 @@
+@@ -310,12 +283,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -35395,7 +37275,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -334,7 +312,6 @@
+@@ -335,7 +311,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -35403,7 +37283,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -349,6 +326,8 @@
+@@ -351,6 +326,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -35412,7 +37292,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -445,7 +424,7 @@
+@@ -447,7 +424,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-musicbrainzSCRIPTS: $(musicbrainz_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -35421,7 +37301,7 @@
@list='$(musicbrainz_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -468,10 +447,6 @@
+@@ -470,10 +447,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -35432,7 +37312,7 @@
tags: TAGS
TAGS:
-@@ -480,23 +455,21 @@
+@@ -482,23 +455,21 @@
distdir: $(DISTFILES)
@@ -35469,7 +37349,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -512,7 +485,7 @@
+@@ -514,7 +485,7 @@
all-am: Makefile $(SCRIPTS)
installdirs:
for dir in "$(DESTDIR)$(musicbrainzdir)"; do \
@@ -35478,7 +37358,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -547,7 +520,7 @@
+@@ -549,7 +520,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -35487,7 +37367,7 @@
dvi: dvi-am
-@@ -561,12 +534,20 @@
+@@ -563,12 +534,20 @@
install-data-am: install-musicbrainzSCRIPTS
@@ -35508,7 +37388,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -585,18 +566,22 @@
+@@ -587,18 +566,22 @@
ps-am:
@@ -35535,9 +37415,9 @@
@ENABLE_TESTS_TRUE at all: $(ASSEMBLY) test
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Makefile.in banshee-0.12.1+dfsg/src/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Makefile.in 2007-04-01 07:44:04.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Makefile.in 2007-06-14 23:26:56.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Makefile.in banshee-0.13.0+dfsg/src/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Makefile.in 2007-08-05 23:42:32.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Makefile.in 2007-08-14 21:23:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -35565,7 +37445,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -52,8 +48,8 @@
+@@ -51,8 +47,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -35575,15 +37455,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -63,25 +59,26 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = AssemblyInfo.cs
- SOURCES =
+@@ -69,18 +65,19 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
@@ -35609,7 +37481,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -94,8 +91,6 @@
+@@ -93,8 +90,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -35618,7 +37490,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -110,8 +105,6 @@
+@@ -109,8 +104,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -35627,7 +37499,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -124,28 +117,10 @@
+@@ -123,28 +116,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -35656,7 +37528,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -166,8 +141,7 @@
+@@ -167,8 +142,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -35666,7 +37538,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -222,12 +196,12 @@
+@@ -179,14 +153,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -198,7 +170,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -223,12 +194,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -35681,7 +37577,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -235,6 +209,7 @@
+@@ -236,6 +207,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -35689,7 +37585,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -261,17 +236,19 @@
+@@ -257,22 +229,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -35713,7 +37615,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -283,6 +260,7 @@
+@@ -284,6 +259,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -35721,7 +37623,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -313,12 +291,15 @@
+@@ -314,12 +290,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -35737,7 +37639,7 @@
SUBDIRS = \
Extras \
Core \
-@@ -372,10 +353,6 @@
+@@ -373,10 +352,6 @@
clean-libtool:
-rm -rf .libs _libs
@@ -35748,7 +37650,7 @@
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
-@@ -407,8 +384,7 @@
+@@ -408,8 +383,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
@@ -35758,7 +37660,7 @@
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
-@@ -509,22 +485,21 @@
+@@ -510,22 +484,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@@ -35794,7 +37696,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -538,7 +513,7 @@
+@@ -539,7 +512,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
@@ -35803,7 +37705,7 @@
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -546,6 +521,8 @@
+@@ -547,6 +520,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
@@ -35812,7 +37714,7 @@
distdir) \
|| exit 1; \
fi; \
-@@ -587,8 +564,7 @@
+@@ -588,8 +563,7 @@
distclean: distclean-recursive
-rm -f Makefile
@@ -35822,7 +37724,7 @@
dvi: dvi-recursive
-@@ -602,12 +578,20 @@
+@@ -603,12 +577,20 @@
install-data-am:
@@ -35843,7 +37745,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-@@ -626,22 +610,24 @@
+@@ -627,22 +609,24 @@
ps-am:
@@ -35880,9 +37782,9 @@
run:
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2007-04-01 07:44:04.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2007-06-14 23:26:56.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2007-08-05 23:42:33.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Audioscrobbler/Makefile.in 2007-08-14 21:23:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -35910,7 +37812,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -56,8 +52,8 @@
+@@ -55,8 +51,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -35920,16 +37822,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -67,7 +63,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = Banshee.Plugins.Audioscrobbler.dll.config
- am__installdirs = "$(DESTDIR)$(audioscrobblerdir)" \
-@@ -87,8 +83,6 @@
+@@ -86,8 +82,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -35938,7 +37831,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -101,8 +95,6 @@
+@@ -100,8 +94,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -35947,7 +37840,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -117,8 +109,6 @@
+@@ -116,8 +108,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -35956,7 +37849,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -131,28 +121,10 @@
+@@ -130,28 +120,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -35985,7 +37878,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -173,8 +145,7 @@
+@@ -174,8 +146,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -35995,7 +37888,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -229,12 +200,12 @@
+@@ -186,14 +157,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -205,7 +174,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -230,12 +198,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -36010,7 +37927,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -242,6 +213,7 @@
+@@ -243,6 +211,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -36018,7 +37935,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -268,17 +240,19 @@
+@@ -264,22 +233,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -36042,7 +37965,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -290,6 +264,7 @@
+@@ -291,6 +263,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -36050,7 +37973,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -320,12 +295,15 @@
+@@ -321,12 +294,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -36066,7 +37989,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -345,7 +323,6 @@
+@@ -346,7 +322,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -36074,7 +37997,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -360,6 +337,8 @@
+@@ -362,6 +337,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -36083,7 +38006,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -457,7 +436,7 @@
+@@ -459,7 +436,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-audioscrobblerSCRIPTS: $(audioscrobbler_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -36092,7 +38015,7 @@
@list='$(audioscrobbler_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -480,13 +459,9 @@
+@@ -482,13 +459,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -36107,7 +38030,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -509,23 +484,21 @@
+@@ -511,23 +484,21 @@
distdir: $(DISTFILES)
@@ -36144,7 +38067,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -541,7 +514,7 @@
+@@ -543,7 +514,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(audioscrobblerdir)" "$(DESTDIR)$(schemadir)"; do \
@@ -36153,7 +38076,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -577,7 +550,7 @@
+@@ -579,7 +550,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -36162,7 +38085,7 @@
dvi: dvi-am
-@@ -592,12 +565,20 @@
+@@ -594,12 +565,20 @@
install-data-am: install-audioscrobblerSCRIPTS install-data-local \
install-schemaDATA
@@ -36183,7 +38106,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -616,20 +597,22 @@
+@@ -618,20 +597,22 @@
ps-am:
@@ -36212,9 +38135,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(MENU_RESOURCE)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2007-04-01 07:44:04.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2007-06-14 23:26:56.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2007-08-05 23:42:33.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Bookmarks/Makefile.in 2007-08-14 21:23:12.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -36242,7 +38165,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -56,8 +52,8 @@
+@@ -54,8 +50,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -36252,16 +38175,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -67,7 +63,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = Banshee.Plugins.Daap.dll.config
- am__installdirs = "$(DESTDIR)$(daapdir)" "$(DESTDIR)$(schemadir)"
-@@ -86,8 +82,6 @@
+@@ -83,8 +79,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -36270,7 +38184,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -100,8 +94,6 @@
+@@ -97,8 +91,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -36279,7 +38193,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -116,8 +108,6 @@
+@@ -113,8 +105,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -36288,7 +38202,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -130,28 +120,10 @@
+@@ -127,28 +117,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -36317,7 +38231,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -172,8 +144,7 @@
+@@ -171,8 +143,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -36327,7 +38241,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -228,12 +199,12 @@
+@@ -183,14 +154,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -202,7 +171,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -227,12 +195,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -36342,7 +38280,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -241,6 +212,7 @@
+@@ -240,6 +208,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -36350,7 +38288,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -267,17 +239,19 @@
+@@ -261,22 +230,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -36374,7 +38318,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -289,6 +263,7 @@
+@@ -288,6 +260,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -36382,7 +38326,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -319,12 +294,15 @@
+@@ -318,12 +291,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -36395,10 +38339,364 @@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ DIR_HAL = $(top_builddir)/ext/hal-sharp
+ DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
+ DIR_DBUS = $(top_builddir)/ext/dbus-sharp
+@@ -343,7 +319,6 @@
+ LINK_GTK = $(GTKSHARP_LIBS)
+ LINK_MONO_UNIX = -r:Mono.Posix
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+-LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+ LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
+@@ -359,6 +334,8 @@
+
+ @EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
+ LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
++ at EXTERNAL_TAGLIB_SHARP_FALSE@LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
++ at EXTERNAL_TAGLIB_SHARP_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
+ LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
+ LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
+ LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
+@@ -444,7 +421,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pluginSCRIPTS: $(plugin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+ @list='$(plugin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+@@ -467,13 +444,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-schemaDATA: $(schema_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(schemadir)" || $(mkdir_p) "$(DESTDIR)$(schemadir)"
++ test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
+ @list='$(schema_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -496,23 +469,21 @@
+
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(top_srcdir)/src $(distdir)/../../../build
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -528,7 +499,7 @@
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -564,7 +535,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -579,12 +550,20 @@
+ install-data-am: install-data-local install-pluginSCRIPTS \
+ install-schemaDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -603,19 +582,22 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-pluginSCRIPTS \
+- uninstall-schemaDATA
++uninstall-am: uninstall-pluginSCRIPTS uninstall-schemaDATA
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-local install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-pluginSCRIPTS install-schemaDATA install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
++ install-data install-data-am install-data-local install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-pluginSCRIPTS install-ps \
++ install-ps-am install-schemaDATA install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-info-am uninstall-pluginSCRIPTS uninstall-schemaDATA
++ uninstall-pluginSCRIPTS uninstall-schemaDATA
+
+
+ all: $(ASSEMBLY)
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2007-08-05 23:42:33.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Daap/Makefile.in 2007-08-14 21:23:13.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -55,8 +51,8 @@
+ $(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
+ $(top_srcdir)/build/m4/banshee/libbanshee.m4 \
+ $(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
++ $(top_srcdir)/build/m4/banshee/taglib.m4 \
+ $(top_srcdir)/build/m4/shamrock/expansions.m4 \
+- $(top_srcdir)/build/m4/shamrock/gstreamer.m4 \
+ $(top_srcdir)/build/m4/shamrock/i18n.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
+ $(top_srcdir)/build/m4/shamrock/mono.m4 \
+@@ -85,8 +81,6 @@
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ ASM_VERSION = @ASM_VERSION@
+@@ -99,8 +93,6 @@
+ BOOC = @BOOC@
+ BOO_CFLAGS = @BOO_CFLAGS@
+ BOO_LIBS = @BOO_LIBS@
+-BUILD_DOCS_FALSE = @BUILD_DOCS_FALSE@
+-BUILD_DOCS_TRUE = @BUILD_DOCS_TRUE@
+ CATALOGS = @CATALOGS@
+ CATOBJEXT = @CATOBJEXT@
+ CC = @CC@
+@@ -115,8 +107,6 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
+-DAAP_ENABLED_FALSE = @DAAP_ENABLED_FALSE@
+-DAAP_ENABLED_TRUE = @DAAP_ENABLED_TRUE@
+ DATADIRNAME = @DATADIRNAME@
+ DBUS_CFLAGS = @DBUS_CFLAGS@
+ DBUS_LIBS = @DBUS_LIBS@
+@@ -129,28 +119,10 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_IPOD_FALSE = @ENABLE_IPOD_FALSE@
+-ENABLE_IPOD_TRUE = @ENABLE_IPOD_TRUE@
+-ENABLE_KARMA_FALSE = @ENABLE_KARMA_FALSE@
+-ENABLE_KARMA_TRUE = @ENABLE_KARMA_TRUE@
+-ENABLE_MDNSD_FALSE = @ENABLE_MDNSD_FALSE@
+-ENABLE_MDNSD_TRUE = @ENABLE_MDNSD_TRUE@
+-ENABLE_MTP_FALSE = @ENABLE_MTP_FALSE@
+-ENABLE_MTP_TRUE = @ENABLE_MTP_TRUE@
+-ENABLE_NJB_FALSE = @ENABLE_NJB_FALSE@
+-ENABLE_NJB_TRUE = @ENABLE_NJB_TRUE@
+-ENABLE_TESTS_FALSE = @ENABLE_TESTS_FALSE@
+-ENABLE_TESTS_TRUE = @ENABLE_TESTS_TRUE@
+ EXEEXT = @EXEEXT@
+-EXTERNAL_BOO_FALSE = @EXTERNAL_BOO_FALSE@
+-EXTERNAL_BOO_TRUE = @EXTERNAL_BOO_TRUE@
+-EXTERNAL_NDESK_DBUS_FALSE = @EXTERNAL_NDESK_DBUS_FALSE@
+-EXTERNAL_NDESK_DBUS_TRUE = @EXTERNAL_NDESK_DBUS_TRUE@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ GCONFTOOL = @GCONFTOOL@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+@@ -173,8 +145,7 @@
+ GTKSHARP_LIBS = @GTKSHARP_LIBS@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+-HAVE_BOOC_FALSE = @HAVE_BOOC_FALSE@
+-HAVE_BOOC_TRUE = @HAVE_BOOC_TRUE@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -185,14 +156,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -204,7 +173,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -229,12 +197,12 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MCS = @MCS@
+ MDASSEMBLER = @MDASSEMBLER@
+ MDNSRESPONDER = @MDNSRESPONDER@
++MKDIR_P = @MKDIR_P@
++MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO = @MONO@
+ MONODOCER = @MONODOCER@
+ MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
+@@ -242,6 +210,7 @@
+ MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+ MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
+ MSGFMT = @MSGFMT@
++MSGFMT_OPTS = @MSGFMT_OPTS@
+ MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
+ MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
+ NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
+@@ -263,22 +232,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SQLITE_CFLAGS = @SQLITE_CFLAGS@
+ SQLITE_LIBS = @SQLITE_LIBS@
+ STRIP = @STRIP@
++TAGLIB_SHARP_CFLAGS = @TAGLIB_SHARP_CFLAGS@
++TAGLIB_SHARP_LIBS = @TAGLIB_SHARP_LIBS@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -290,6 +262,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -320,12 +293,15 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target = @target@
+ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
@DAAP_ENABLED_TRUE at DIR_HAL = $(top_builddir)/ext/hal-sharp
@DAAP_ENABLED_TRUE at DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
@DAAP_ENABLED_TRUE at DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -344,7 +322,6 @@
+@@ -345,7 +321,6 @@
@DAAP_ENABLED_TRUE at LINK_GTK = $(GTKSHARP_LIBS)
@DAAP_ENABLED_TRUE at LINK_MONO_UNIX = -r:Mono.Posix
@DAAP_ENABLED_TRUE at LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -36406,7 +38704,7 @@
@DAAP_ENABLED_TRUE at LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
@DAAP_ENABLED_TRUE at LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
@DAAP_ENABLED_TRUE at LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -359,6 +336,8 @@
+@@ -361,6 +336,8 @@
@DAAP_ENABLED_TRUE@@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
@DAAP_ENABLED_TRUE at LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -36415,7 +38713,7 @@
@DAAP_ENABLED_TRUE at LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
@DAAP_ENABLED_TRUE at LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
@DAAP_ENABLED_TRUE at LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -464,7 +443,7 @@
+@@ -466,7 +443,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-daapSCRIPTS: $(daap_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -36424,7 +38722,7 @@
@list='$(daap_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -487,13 +466,9 @@
+@@ -489,13 +466,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -36439,7 +38737,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -516,23 +491,21 @@
+@@ -518,23 +491,21 @@
distdir: $(DISTFILES)
@@ -36476,7 +38774,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -548,7 +521,7 @@
+@@ -550,7 +521,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(daapdir)" "$(DESTDIR)$(schemadir)"; do \
@@ -36485,7 +38783,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -585,7 +558,7 @@
+@@ -587,7 +558,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -36494,7 +38792,7 @@
dvi: dvi-am
-@@ -600,12 +573,20 @@
+@@ -602,12 +573,20 @@
install-data-am: install-daapSCRIPTS install-data-local \
install-schemaDATA
@@ -36515,7 +38813,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -624,19 +605,22 @@
+@@ -626,19 +605,22 @@
ps-am:
@@ -36543,9 +38841,9 @@
@DAAP_ENABLED_TRUE@$(ASSEMBLY): $(ASSEMBLY_SOURCES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2007-04-01 07:44:04.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2007-06-14 23:26:57.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2007-08-05 23:42:33.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.MetadataSearch/Makefile.in 2007-08-14 21:23:13.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -36573,7 +38871,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -56,8 +52,8 @@
+@@ -55,8 +51,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -36583,16 +38881,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -67,7 +63,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = Banshee.Plugins.MetadataSearch.dll.config
- am__installdirs = "$(DESTDIR)$(fsmondir)" "$(DESTDIR)$(schemadir)"
-@@ -86,8 +82,6 @@
+@@ -85,8 +81,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -36601,7 +38890,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -100,8 +94,6 @@
+@@ -99,8 +93,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -36610,7 +38899,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -116,8 +108,6 @@
+@@ -115,8 +107,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -36619,7 +38908,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -130,28 +120,10 @@
+@@ -129,28 +119,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -36648,7 +38937,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -172,8 +144,7 @@
+@@ -173,8 +145,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -36658,7 +38947,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -228,12 +199,12 @@
+@@ -185,14 +156,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -204,7 +173,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -229,12 +197,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -36673,7 +38986,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -241,6 +212,7 @@
+@@ -242,6 +210,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -36681,7 +38994,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -267,17 +239,19 @@
+@@ -263,22 +232,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -36705,7 +39024,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -289,6 +263,7 @@
+@@ -290,6 +262,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -36713,7 +39032,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -319,12 +294,15 @@
+@@ -320,12 +293,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -36729,7 +39048,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -344,7 +322,6 @@
+@@ -345,7 +321,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -36737,7 +39056,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -359,6 +336,8 @@
+@@ -361,6 +336,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -36746,7 +39065,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -451,7 +430,7 @@
+@@ -453,7 +430,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-fsmonSCRIPTS: $(fsmon_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -36755,7 +39074,7 @@
@list='$(fsmon_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -474,13 +453,9 @@
+@@ -476,13 +453,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -36770,7 +39089,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -503,23 +478,21 @@
+@@ -505,23 +478,21 @@
distdir: $(DISTFILES)
@@ -36807,7 +39126,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -535,7 +508,7 @@
+@@ -537,7 +508,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(fsmondir)" "$(DESTDIR)$(schemadir)"; do \
@@ -36816,7 +39135,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -571,7 +544,7 @@
+@@ -573,7 +544,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -36825,7 +39144,7 @@
dvi: dvi-am
-@@ -586,12 +559,20 @@
+@@ -588,12 +559,20 @@
install-data-am: install-data-local install-fsmonSCRIPTS \
install-schemaDATA
@@ -36846,7 +39165,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -610,19 +591,22 @@
+@@ -612,19 +591,22 @@
ps-am:
@@ -36875,9 +39194,9 @@
$(ASSEMBLY): $(ASSEMBLY_SOURCES) MetadataSearchMenu.xml
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2007-04-01 07:44:04.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2007-06-14 23:26:57.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2007-08-05 23:42:33.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.MiniMode/Makefile.in 2007-08-14 21:23:13.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -36905,7 +39224,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -55,8 +51,8 @@
+@@ -54,8 +50,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -36915,16 +39234,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -66,7 +62,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"
-@@ -84,8 +80,6 @@
+@@ -83,8 +79,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -36933,7 +39243,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -98,8 +92,6 @@
+@@ -97,8 +91,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -36942,7 +39252,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -114,8 +106,6 @@
+@@ -113,8 +105,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -36951,7 +39261,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -128,28 +118,10 @@
+@@ -127,28 +117,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -36980,7 +39290,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -170,8 +142,7 @@
+@@ -171,8 +143,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -36990,7 +39300,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -226,12 +197,12 @@
+@@ -183,14 +154,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -202,7 +171,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -227,12 +195,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -37005,7 +39339,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -239,6 +210,7 @@
+@@ -240,6 +208,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -37013,7 +39347,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -265,17 +237,19 @@
+@@ -261,22 +230,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -37037,7 +39377,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -287,6 +261,7 @@
+@@ -288,6 +260,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -37045,7 +39385,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -317,12 +292,15 @@
+@@ -318,12 +291,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -37061,7 +39401,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -342,7 +320,6 @@
+@@ -343,7 +319,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -37069,7 +39409,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -357,6 +334,8 @@
+@@ -359,6 +334,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -37078,7 +39418,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -445,7 +424,7 @@
+@@ -447,7 +424,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-pluginSCRIPTS: $(plugin_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -37087,7 +39427,7 @@
@list='$(plugin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -468,13 +447,9 @@
+@@ -470,13 +447,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -37102,7 +39442,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -497,23 +472,21 @@
+@@ -499,23 +472,21 @@
distdir: $(DISTFILES)
@@ -37139,7 +39479,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -529,7 +502,7 @@
+@@ -531,7 +502,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \
@@ -37148,7 +39488,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -565,7 +538,7 @@
+@@ -567,7 +538,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -37157,7 +39497,7 @@
dvi: dvi-am
-@@ -580,12 +553,20 @@
+@@ -582,12 +553,20 @@
install-data-am: install-data-local install-pluginSCRIPTS \
install-schemaDATA
@@ -37178,7 +39518,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -604,19 +585,22 @@
+@@ -606,19 +585,22 @@
ps-am:
@@ -37208,9 +39548,9 @@
all: $(ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2007-04-01 07:44:04.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2007-06-14 23:26:57.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2007-08-05 23:42:33.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.MMKeys/Makefile.in 2007-08-14 21:23:13.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -37238,7 +39578,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -56,8 +52,8 @@
+@@ -55,8 +51,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -37248,16 +39588,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -67,7 +63,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = Banshee.Plugins.MMKeys.dll.config
- am__installdirs = "$(DESTDIR)$(fsmondir)" "$(DESTDIR)$(schemadir)"
-@@ -86,8 +82,6 @@
+@@ -85,8 +81,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -37266,7 +39597,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -100,8 +94,6 @@
+@@ -99,8 +93,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -37275,7 +39606,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -116,8 +108,6 @@
+@@ -115,8 +107,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -37284,7 +39615,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -130,28 +120,10 @@
+@@ -129,28 +119,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -37313,7 +39644,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -172,8 +144,7 @@
+@@ -173,8 +145,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -37323,7 +39654,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -228,12 +199,12 @@
+@@ -185,14 +156,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -204,7 +173,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -229,12 +197,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -37338,7 +39693,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -241,6 +212,7 @@
+@@ -242,6 +210,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -37346,7 +39701,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -267,17 +239,19 @@
+@@ -263,22 +232,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -37370,7 +39731,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -289,6 +263,7 @@
+@@ -290,6 +262,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -37378,7 +39739,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -319,12 +294,15 @@
+@@ -320,12 +293,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -37394,7 +39755,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -344,7 +322,6 @@
+@@ -345,7 +321,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -37402,7 +39763,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -359,6 +336,8 @@
+@@ -361,6 +336,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -37411,7 +39772,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -451,7 +430,7 @@
+@@ -453,7 +430,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-fsmonSCRIPTS: $(fsmon_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -37420,7 +39781,7 @@
@list='$(fsmon_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -474,13 +453,9 @@
+@@ -476,13 +453,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -37435,7 +39796,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -503,23 +478,21 @@
+@@ -505,23 +478,21 @@
distdir: $(DISTFILES)
@@ -37472,7 +39833,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -535,7 +508,7 @@
+@@ -537,7 +508,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(fsmondir)" "$(DESTDIR)$(schemadir)"; do \
@@ -37481,7 +39842,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -571,7 +544,7 @@
+@@ -573,7 +544,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -37490,7 +39851,7 @@
dvi: dvi-am
-@@ -586,12 +559,20 @@
+@@ -588,12 +559,20 @@
install-data-am: install-data-local install-fsmonSCRIPTS \
install-schemaDATA
@@ -37511,7 +39872,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -610,23 +591,26 @@
+@@ -612,23 +591,26 @@
ps-am:
@@ -37545,9 +39906,9 @@
$(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2007-04-01 07:44:04.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2007-06-14 23:26:57.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2007-08-05 23:42:33.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.NotificationAreaIcon/Makefile.in 2007-08-14 21:23:13.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -37575,7 +39936,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -57,8 +53,8 @@
+@@ -56,8 +52,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -37585,16 +39946,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -68,7 +64,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = Banshee.Plugins.NotificationAreaIcon.dll.config
- am__installdirs = "$(DESTDIR)$(notificationareaicondir)" \
-@@ -88,8 +84,6 @@
+@@ -87,8 +83,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -37603,7 +39955,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -102,8 +96,6 @@
+@@ -101,8 +95,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -37612,7 +39964,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -118,8 +110,6 @@
+@@ -117,8 +109,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -37621,7 +39973,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -132,28 +122,10 @@
+@@ -131,28 +121,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -37650,7 +40002,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -174,8 +146,7 @@
+@@ -175,8 +147,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -37660,7 +40012,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -230,12 +201,12 @@
+@@ -187,14 +158,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -206,7 +175,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -231,12 +199,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -37675,7 +40051,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -243,6 +214,7 @@
+@@ -244,6 +212,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -37683,7 +40059,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -269,17 +241,19 @@
+@@ -265,22 +234,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -37707,7 +40089,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -291,6 +265,7 @@
+@@ -292,6 +264,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -37715,7 +40097,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -321,12 +296,15 @@
+@@ -322,12 +295,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -37731,7 +40113,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -346,7 +324,6 @@
+@@ -347,7 +323,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -37739,7 +40121,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -361,6 +338,8 @@
+@@ -363,6 +338,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -37748,7 +40130,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -456,7 +435,7 @@
+@@ -458,7 +435,7 @@
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-notificationareaiconSCRIPTS: $(notificationareaicon_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -37757,7 +40139,7 @@
@list='$(notificationareaicon_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -479,13 +458,9 @@
+@@ -481,13 +458,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -37772,7 +40154,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -508,23 +483,21 @@
+@@ -510,23 +483,21 @@
distdir: $(DISTFILES)
@@ -37809,7 +40191,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -540,7 +513,7 @@
+@@ -542,7 +513,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(notificationareaicondir)" "$(DESTDIR)$(schemadir)"; do \
@@ -37818,7 +40200,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -576,7 +549,7 @@
+@@ -578,7 +549,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -37827,7 +40209,7 @@
dvi: dvi-am
-@@ -591,12 +564,20 @@
+@@ -593,12 +564,20 @@
install-data-am: install-data-local \
install-notificationareaiconSCRIPTS install-schemaDATA
@@ -37848,7 +40230,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -615,19 +596,22 @@
+@@ -617,19 +596,22 @@
ps-am:
@@ -37879,9 +40261,9 @@
uninstall-notificationareaiconSCRIPTS uninstall-schemaDATA
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2007-04-01 07:44:05.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2007-06-14 23:26:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Podcast/Makefile.in 2007-08-14 21:23:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -37909,7 +40291,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -55,8 +51,8 @@
+@@ -54,8 +50,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -37919,16 +40301,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -66,7 +62,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"
-@@ -84,8 +80,6 @@
+@@ -83,8 +79,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -37937,7 +40310,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -98,8 +92,6 @@
+@@ -97,8 +91,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -37946,7 +40319,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -114,8 +106,6 @@
+@@ -113,8 +105,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -37955,7 +40328,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -128,28 +118,10 @@
+@@ -127,28 +117,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -37984,7 +40357,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -170,8 +142,7 @@
+@@ -171,8 +143,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -37994,7 +40367,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -226,12 +197,12 @@
+@@ -183,14 +154,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -202,7 +171,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -227,12 +195,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -38009,7 +40406,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -239,6 +210,7 @@
+@@ -240,6 +208,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -38017,7 +40414,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -265,17 +237,19 @@
+@@ -261,22 +230,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -38041,7 +40444,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -287,6 +261,7 @@
+@@ -288,6 +260,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -38049,7 +40452,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -317,12 +292,15 @@
+@@ -318,12 +291,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -38065,7 +40468,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -342,7 +320,6 @@
+@@ -343,7 +319,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -38073,7 +40476,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -357,6 +334,8 @@
+@@ -359,6 +334,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -38082,7 +40485,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -463,7 +442,7 @@
+@@ -465,7 +442,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-pluginSCRIPTS: $(plugin_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -38091,7 +40494,7 @@
@list='$(plugin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -486,13 +465,9 @@
+@@ -488,13 +465,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -38106,7 +40509,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -515,23 +490,21 @@
+@@ -517,23 +490,21 @@
distdir: $(DISTFILES)
@@ -38143,7 +40546,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -547,7 +520,7 @@
+@@ -549,7 +520,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \
@@ -38152,7 +40555,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -583,7 +556,7 @@
+@@ -585,7 +556,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -38161,7 +40564,7 @@
dvi: dvi-am
-@@ -598,12 +571,20 @@
+@@ -600,12 +571,20 @@
install-data-am: install-data-local install-pluginSCRIPTS \
install-schemaDATA
@@ -38182,7 +40585,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -622,19 +603,22 @@
+@@ -624,19 +603,22 @@
ps-am:
@@ -38212,9 +40615,9 @@
all: $(ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2007-04-01 07:44:05.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2007-06-14 23:26:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Radio/Makefile.in 2007-08-14 21:23:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -38242,7 +40645,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -55,8 +51,8 @@
+@@ -54,8 +50,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -38252,16 +40655,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -66,7 +62,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"
-@@ -84,8 +80,6 @@
+@@ -83,8 +79,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -38270,7 +40664,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -98,8 +92,6 @@
+@@ -97,8 +91,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -38279,7 +40673,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -114,8 +106,6 @@
+@@ -113,8 +105,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -38288,7 +40682,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -128,28 +118,10 @@
+@@ -127,28 +117,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -38317,7 +40711,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -170,8 +142,7 @@
+@@ -171,8 +143,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -38327,7 +40721,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -226,12 +197,12 @@
+@@ -183,14 +154,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -202,7 +171,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -227,12 +195,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -38342,7 +40760,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -239,6 +210,7 @@
+@@ -240,6 +208,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -38350,7 +40768,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -265,17 +237,19 @@
+@@ -261,22 +230,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -38374,7 +40798,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -287,6 +261,7 @@
+@@ -288,6 +260,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -38382,7 +40806,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -317,12 +292,15 @@
+@@ -318,12 +291,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -38398,7 +40822,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -342,7 +320,6 @@
+@@ -343,7 +319,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -38406,7 +40830,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -357,6 +334,8 @@
+@@ -359,6 +334,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -38415,7 +40839,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -458,7 +437,7 @@
+@@ -460,7 +437,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-pluginSCRIPTS: $(plugin_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -38424,7 +40848,7 @@
@list='$(plugin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -481,13 +460,9 @@
+@@ -483,13 +460,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -38439,7 +40863,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -510,23 +485,21 @@
+@@ -512,23 +485,21 @@
distdir: $(DISTFILES)
@@ -38476,7 +40900,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -542,7 +515,7 @@
+@@ -544,7 +515,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \
@@ -38485,7 +40909,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -578,7 +551,7 @@
+@@ -580,7 +551,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -38494,7 +40918,7 @@
dvi: dvi-am
-@@ -593,12 +566,20 @@
+@@ -595,12 +566,20 @@
install-data-am: install-data-local install-pluginSCRIPTS \
install-schemaDATA
@@ -38515,7 +40939,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -617,19 +598,22 @@
+@@ -619,19 +598,22 @@
ps-am:
@@ -38545,9 +40969,9 @@
all: $(ASSEMBLY)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2007-04-01 07:44:05.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2007-06-14 23:26:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Recommendation/Makefile.in 2007-08-14 21:23:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -38575,7 +40999,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -55,8 +51,8 @@
+@@ -54,8 +50,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -38585,16 +41009,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -66,7 +62,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"
-@@ -84,8 +80,6 @@
+@@ -83,8 +79,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -38603,7 +41018,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -98,8 +92,6 @@
+@@ -97,8 +91,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -38612,7 +41027,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -114,8 +106,6 @@
+@@ -113,8 +105,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -38621,7 +41036,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -128,28 +118,10 @@
+@@ -127,28 +117,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -38650,7 +41065,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -170,8 +142,7 @@
+@@ -171,8 +143,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -38660,7 +41075,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -226,12 +197,12 @@
+@@ -183,14 +154,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -202,7 +171,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -227,12 +195,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -38675,7 +41114,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -239,6 +210,7 @@
+@@ -240,6 +208,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -38683,7 +41122,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -265,17 +237,19 @@
+@@ -261,22 +230,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -38707,7 +41152,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -287,6 +261,7 @@
+@@ -288,6 +260,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -38715,7 +41160,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -317,12 +292,15 @@
+@@ -318,12 +291,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -38731,7 +41176,7 @@
DIR_HAL = $(top_builddir)/ext/hal-sharp
DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -342,7 +320,6 @@
+@@ -343,7 +319,6 @@
LINK_GTK = $(GTKSHARP_LIBS)
LINK_MONO_UNIX = -r:Mono.Posix
LINK_HAL = -r:$(DIR_HAL)/Hal.dll
@@ -38739,7 +41184,7 @@
LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -357,6 +334,8 @@
+@@ -359,6 +334,8 @@
@EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
@@ -38748,22 +41193,7 @@
LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -400,8 +379,12 @@
- $(srcdir)/RecommendationPane.cs \
- $(srcdir)/RecommendationUtilities.cs
-
--MENU_RESOURCE = RecommendationMenu.xml
--NO_RESULTS_RESOURCE = no-results.png
-+RESOURCES = \
-+ RecommendationMenu.xml \
-+ no-results.png \
-+ generic-artist.png
-+
-+RESOURCES_BUILD = $(foreach resource,$(RESOURCES),$(addprefix -resource:,$(resource)),$(notdir $(resource)))
- plugindir = $(pkglibdir)/Banshee.Plugins
- plugin_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
- schema_in_files = $(ASSEMBLY_GCONF_SCHEMA)
-@@ -445,7 +428,7 @@
+@@ -451,7 +428,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-pluginSCRIPTS: $(plugin_SCRIPTS)
@$(NORMAL_INSTALL)
@@ -38772,7 +41202,7 @@
@list='$(plugin_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
-@@ -468,13 +451,9 @@
+@@ -474,13 +451,9 @@
clean-libtool:
-rm -rf .libs _libs
@@ -38787,7 +41217,7 @@
@list='$(schema_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
-@@ -497,23 +476,21 @@
+@@ -503,23 +476,21 @@
distdir: $(DISTFILES)
@@ -38824,7 +41254,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -529,7 +506,7 @@
+@@ -535,7 +506,7 @@
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemadir)"; do \
@@ -38833,7 +41263,7 @@
done
install: install-am
install-exec: install-exec-am
-@@ -565,7 +542,7 @@
+@@ -571,7 +542,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -38842,7 +41272,7 @@
dvi: dvi-am
-@@ -580,12 +557,20 @@
+@@ -586,12 +557,20 @@
install-data-am: install-data-local install-pluginSCRIPTS \
install-schemaDATA
@@ -38863,7 +41293,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -604,25 +589,28 @@
+@@ -610,19 +589,22 @@
ps-am:
@@ -38893,17 +41323,9 @@
all: $(ASSEMBLY)
-
--$(ASSEMBLY): $(SOURCES)
-- $(BUILD_LIB_BANSHEE_CORE) -out:$@ -resource:$(srcdir)/$(MENU_RESOURCE),$(MENU_RESOURCE) -resource:$(srcdir)/$(NO_RESULTS_RESOURCE),$(NO_RESULTS_RESOURCE) $(SOURCES) $(LINK_GTK) $(LINK_MONO_UNIX) -r:System.Web
-+$(ASSEMBLY): $(SOURCES) $(RESOURCES)
-+ $(BUILD_LIB_BANSHEE_CORE) -out:$@ $(RESOURCES_BUILD) $(SOURCES) $(LINK_GTK) $(LINK_MONO_UNIX) -r:System.Web
-
- $(srcdir)/$(ASSEMBLY_GCONF_SCHEMA): $(ASSEMBLY)
- if test -w $@ -o \( ! -e $@ -a -w $(srcdir) \); then \
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/src/Plugins/Makefile.in banshee-0.12.1+dfsg/src/Plugins/Makefile.in
---- banshee-0.12.1+dfsg.old/src/Plugins/Makefile.in 2007-04-01 07:44:05.000000000 +0200
-+++ banshee-0.12.1+dfsg/src/Plugins/Makefile.in 2007-06-14 23:26:58.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Banshee.Plugins.Sample/Makefile.in 2007-08-14 21:23:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -38925,7 +41347,7 @@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
+-top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -38941,32 +41363,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,25 +58,26 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
-- install-exec-recursive install-info-recursive \
-- install-recursive installcheck-recursive installdirs-recursive \
-- pdf-recursive ps-recursive uninstall-info-recursive \
-- uninstall-recursive
-+ install-dvi-recursive install-exec-recursive \
-+ install-html-recursive install-info-recursive \
-+ install-pdf-recursive install-ps-recursive install-recursive \
-+ installcheck-recursive installdirs-recursive pdf-recursive \
-+ ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
-+ distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = $(SUBDIRS)
+@@ -69,8 +65,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -38975,7 +41372,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -93,8 +90,6 @@
+@@ -83,8 +77,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -38984,7 +41381,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -109,8 +104,6 @@
+@@ -99,8 +91,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -38993,7 +41390,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -123,28 +116,10 @@
+@@ -113,28 +103,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -39022,7 +41419,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -165,8 +140,7 @@
+@@ -157,8 +129,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -39032,7 +41429,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -221,12 +195,12 @@
+@@ -169,14 +140,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -188,7 +157,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -213,12 +181,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -39047,7 +41468,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -234,6 +208,7 @@
+@@ -226,6 +194,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -39055,7 +41476,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -260,17 +235,19 @@
+@@ -247,22 +216,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -39079,7 +41506,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -282,6 +259,7 @@
+@@ -274,6 +246,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -39087,7 +41514,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -312,12 +290,15 @@
+@@ -304,12 +277,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -39100,34 +41527,42 @@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- SUBDIRS = \
- Banshee.Plugins.Audioscrobbler \
- Banshee.Plugins.Daap \
-@@ -371,10 +352,6 @@
+ DIR_HAL = $(top_builddir)/ext/hal-sharp
+ DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
+ DIR_DBUS = $(top_builddir)/ext/dbus-sharp
+@@ -329,7 +305,6 @@
+ LINK_GTK = $(GTKSHARP_LIBS)
+ LINK_MONO_UNIX = -r:Mono.Posix
+ LINK_HAL = -r:$(DIR_HAL)/Hal.dll
+-LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
+ LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
+ LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
+ LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
+@@ -345,6 +320,8 @@
+
+ @EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
+ LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
++ at EXTERNAL_TAGLIB_SHARP_FALSE@LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
++ at EXTERNAL_TAGLIB_SHARP_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
+ LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
+ LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
+ LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
+@@ -426,10 +403,6 @@
+
clean-libtool:
-rm -rf .libs _libs
-
+-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -406,8 +383,7 @@
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
+ tags: TAGS
+ TAGS:
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
-@@ -508,22 +484,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@@ -438,23 +411,21 @@
+
distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/$(top_srcdir)/src $(distdir)/../../../build
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
@@ -39160,97 +41595,65 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -537,7 +512,7 @@
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
-- || $(mkdir_p) "$(distdir)/$$subdir" \
-+ || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -545,6 +520,8 @@
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
-+ am__remove_distdir=: \
-+ am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
-@@ -585,8 +562,7 @@
+@@ -501,7 +472,7 @@
- distclean: distclean-recursive
+ distclean: distclean-am
-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
-- distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
- dvi: dvi-recursive
+ dvi: dvi-am
-@@ -600,12 +576,20 @@
+@@ -515,12 +486,20 @@
install-data-am:
-+install-dvi: install-dvi-recursive
++install-dvi: install-dvi-am
+
install-exec-am:
-+install-html: install-html-recursive
++install-html: install-html-am
+
- install-info: install-info-recursive
+ install-info: install-info-am
install-man:
-+install-pdf: install-pdf-recursive
++install-pdf: install-pdf-am
+
-+install-ps: install-ps-recursive
++install-ps: install-ps-am
+
installcheck-am:
- maintainer-clean: maintainer-clean-recursive
-@@ -624,24 +608,26 @@
+ maintainer-clean: maintainer-clean-am
+@@ -539,17 +518,20 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
++
++.MAKE: install-am install-strip
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+ install-strip uninstall-am
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
++ install-data install-data-am install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-info-am
++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-- clean clean-generic clean-libtool clean-recursive ctags \
-- ctags-recursive distclean distclean-generic distclean-libtool \
-- distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+ all all-am check check-am clean clean-generic clean-libtool \
-+ ctags ctags-recursive distclean distclean-generic \
-+ distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
-- maintainer-clean-generic maintainer-clean-recursive \
-- mostlyclean mostlyclean-generic mostlyclean-libtool \
-- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-- uninstall uninstall-am uninstall-hook uninstall-info-am
-+ maintainer-clean-generic mostlyclean mostlyclean-generic \
-+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+ uninstall uninstall-am uninstall-hook
-
- uninstall-hook:
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/tests/Makefile.in banshee-0.12.1+dfsg/tests/Makefile.in
---- banshee-0.12.1+dfsg.old/tests/Makefile.in 2007-04-01 07:44:05.000000000 +0200
-+++ banshee-0.12.1+dfsg/tests/Makefile.in 2007-06-14 23:26:58.000000000 +0200
+ all: $(ASSEMBLY)
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/src/Plugins/Makefile.in banshee-0.13.0+dfsg/src/Plugins/Makefile.in
+--- banshee-0.13.0+dfsg.old/src/Plugins/Makefile.in 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/src/Plugins/Makefile.in 2007-08-14 21:23:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -39272,13 +41675,13 @@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
+-top_builddir = ../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -51,8 +47,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -39288,16 +41691,24 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -62,7 +58,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
-@@ -70,8 +66,6 @@
+@@ -68,18 +64,19 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -39306,7 +41717,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -84,8 +78,6 @@
+@@ -92,8 +89,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -39315,7 +41726,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -100,8 +92,6 @@
+@@ -108,8 +103,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -39324,7 +41735,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -114,28 +104,10 @@
+@@ -122,28 +115,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -39353,7 +41764,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -156,8 +128,7 @@
+@@ -166,8 +141,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -39363,7 +41774,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -212,12 +183,12 @@
+@@ -178,14 +152,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -197,7 +169,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -222,12 +193,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -39378,7 +41813,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -225,6 +196,7 @@
+@@ -235,6 +206,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -39386,7 +41821,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -251,17 +223,19 @@
+@@ -256,22 +228,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -39410,7 +41851,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -273,6 +247,7 @@
+@@ -283,6 +258,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -39418,7 +41859,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -303,12 +278,15 @@
+@@ -313,12 +289,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -39431,23 +41872,33 @@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- MCS_FLAGS = -debug
- NUNIT_FLAGS = @MONO_NUNIT_LIBS@
- ASSEMBLY_NAME = banshee-tests
-@@ -363,10 +341,6 @@
-
+ SUBDIRS = \
+ Banshee.Plugins.Audioscrobbler \
+ Banshee.Plugins.Bookmarks \
+@@ -374,10 +353,6 @@
clean-libtool:
-rm -rf .libs _libs
--
+
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
- tags: TAGS
- TAGS:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -409,8 +384,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
-@@ -375,22 +349,21 @@
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -511,22 +485,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
@@ -39481,65 +41932,97 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -438,7 +411,7 @@
+@@ -540,7 +513,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -548,6 +521,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -588,8 +563,7 @@
- distclean: distclean-am
+ distclean: distclean-recursive
-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
+-distclean-am: clean-am distclean-generic distclean-libtool \
+- distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
- dvi: dvi-am
+ dvi: dvi-recursive
-@@ -452,12 +425,20 @@
+@@ -603,12 +577,20 @@
install-data-am:
-+install-dvi: install-dvi-am
++install-dvi: install-dvi-recursive
+
install-exec-am:
-+install-html: install-html-am
++install-html: install-html-recursive
+
- install-info: install-info-am
+ install-info: install-info-recursive
install-man:
-+install-pdf: install-pdf-am
++install-pdf: install-pdf-recursive
+
-+install-ps: install-ps-am
++install-ps: install-ps-recursive
+
installcheck-am:
- maintainer-clean: maintainer-clean-am
-@@ -476,17 +457,20 @@
+ maintainer-clean: maintainer-clean-recursive
+@@ -627,24 +609,26 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
-+
-+.MAKE: install-am install-strip
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
-- install-data install-data-am install-exec install-exec-am \
-- install-info install-info-am install-man install-strip \
-+ install-data install-data-am install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-pdf \
-+ install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
-- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-- uninstall-info-am
-+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip uninstall-am
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-generic clean-libtool \
++ ctags ctags-recursive distclean distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
++ install-data-am install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-hook uninstall-info-am
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am uninstall-hook
- $(ASSEMBLY): $(ASSEMBLY_CSFILES)
-diff -x'*AssemblyInfo.cs' -x'*config.guess' -x'*config.sub' -x'*.exe' -Naur banshee-0.12.1+dfsg.old/tools/Makefile.in banshee-0.12.1+dfsg/tools/Makefile.in
---- banshee-0.12.1+dfsg.old/tools/Makefile.in 2007-04-01 07:44:05.000000000 +0200
-+++ banshee-0.12.1+dfsg/tools/Makefile.in 2007-06-14 23:26:58.000000000 +0200
+
+ uninstall-hook:
+diff -x'*config.sub' -x'*config.guess' -Naur banshee-0.13.0+dfsg.old/tests/Makefile.in banshee-0.13.0+dfsg/tests/Makefile.in
+--- banshee-0.13.0+dfsg.old/tests/Makefile.in 2007-08-05 23:42:34.000000000 +0200
++++ banshee-0.13.0+dfsg/tests/Makefile.in 2007-08-14 21:23:14.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
@@ -39567,7 +42050,7 @@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-@@ -53,8 +49,8 @@
+@@ -50,8 +46,8 @@
$(top_srcdir)/build/m4/banshee/gtk-sharp.m4 \
$(top_srcdir)/build/m4/banshee/libbanshee.m4 \
$(top_srcdir)/build/m4/banshee/nautilus-burn.m4 \
@@ -39577,16 +42060,7 @@
$(top_srcdir)/build/m4/shamrock/i18n.m4 \
$(top_srcdir)/build/m4/shamrock/mono-nunit.m4 \
$(top_srcdir)/build/m4/shamrock/mono.m4 \
-@@ -64,7 +60,7 @@
- $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = banshee-import
- SOURCES =
-@@ -72,8 +68,6 @@
+@@ -69,8 +65,6 @@
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -39595,7 +42069,7 @@
AMTAR = @AMTAR@
AR = @AR@
ASM_VERSION = @ASM_VERSION@
-@@ -86,8 +80,6 @@
+@@ -83,8 +77,6 @@
BOOC = @BOOC@
BOO_CFLAGS = @BOO_CFLAGS@
BOO_LIBS = @BOO_LIBS@
@@ -39604,7 +42078,7 @@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
-@@ -102,8 +94,6 @@
+@@ -99,8 +91,6 @@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DAAPSHARP_FLAGS = @DAAPSHARP_FLAGS@
@@ -39613,7 +42087,7 @@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
-@@ -116,28 +106,10 @@
+@@ -113,28 +103,10 @@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
@@ -39642,7 +42116,7 @@
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-@@ -158,8 +130,7 @@
+@@ -157,8 +129,7 @@
GTKSHARP_LIBS = @GTKSHARP_LIBS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
@@ -39652,7 +42126,31 @@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -214,12 +185,12 @@
+@@ -169,14 +140,12 @@
+ INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+ INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_ICONV = @INTLTOOL_ICONV@
+ INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+ INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+ INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
++INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+ INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+@@ -188,7 +157,6 @@
+ INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+ INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+ INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+ IPODSHARP_ASSEMBLIES = @IPODSHARP_ASSEMBLIES@
+@@ -213,12 +181,12 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -39667,7 +42165,7 @@
MONO = @MONO@
MONODOCER = @MONODOCER@
MONO_MODULE_CFLAGS = @MONO_MODULE_CFLAGS@
-@@ -227,6 +198,7 @@
+@@ -226,6 +194,7 @@
MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
MSGFMT = @MSGFMT@
@@ -39675,7 +42173,13 @@
MUSICBRAINZ_CFLAGS = @MUSICBRAINZ_CFLAGS@
MUSICBRAINZ_LIBS = @MUSICBRAINZ_LIBS@
NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-@@ -253,17 +225,19 @@
+@@ -247,22 +216,25 @@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+ RANLIB = @RANLIB@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@
STRIP = @STRIP@
@@ -39699,7 +42203,7 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
-@@ -275,6 +249,7 @@
+@@ -274,6 +246,7 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
@@ -39707,7 +42211,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
-@@ -305,12 +280,15 @@
+@@ -304,12 +277,15 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
@@ -39720,28 +42224,11 @@
target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
- DIR_HAL = $(top_builddir)/ext/hal-sharp
- DIR_TAGLIB = $(top_builddir)/ext/taglib-sharp
- DIR_DBUS = $(top_builddir)/ext/dbus-sharp
-@@ -330,7 +308,6 @@
- LINK_GTK = $(GTKSHARP_LIBS)
- LINK_MONO_UNIX = -r:Mono.Posix
- LINK_HAL = -r:$(DIR_HAL)/Hal.dll
--LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
- LINK_LAST_FM = -r:$(DIR_LAST_FM)/Last.FM.dll
- LINK_MUSICBRAINZ = -r:$(DIR_MUSICBRAINZ)/MusicBrainz.dll
- LINK_GNOME_KEYRING = -r:$(DIR_GNOME_KEYRING)/Gnome.Keyring.dll
-@@ -345,6 +322,8 @@
+ MCS_FLAGS = -debug
+ NUNIT_FLAGS = @MONO_NUNIT_LIBS@
+ ASSEMBLY_NAME = banshee-tests
+@@ -364,10 +340,6 @@
- @EXTERNAL_BOO_TRUE at LINK_BOO = $(BOO_LIBS)
- LINK_BOOBUDDY = -r:$(DIR_BOOBUDDY)/BooBuddy.dll
-+ at EXTERNAL_TAGLIB_SHARP_FALSE@LINK_TAGLIB = -r:$(DIR_TAGLIB)/TagLib.dll
-+ at EXTERNAL_TAGLIB_SHARP_TRUE@LINK_TAGLIB = $(TAGLIB_SHARP_LIBS)
- LINK_BANSHEE_BASE = -r:$(DIR_BANSHEE_BASE)/Banshee.Base.dll
- LINK_BANSHEE_WIDGETS = -r:$(DIR_BANSHEE_WIDGETS)/Banshee.Widgets.dll
- LINK_BANSHEE_CORE = $(LINK_BANSHEE_BASE) $(LINK_BANSHEE_WIDGETS)
-@@ -437,10 +416,6 @@
-
clean-libtool:
-rm -rf .libs _libs
-
@@ -39751,11 +42238,10 @@
tags: TAGS
TAGS:
-@@ -449,23 +424,21 @@
+@@ -376,22 +348,21 @@
distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../build
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
@@ -39788,7 +42274,7 @@
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
-@@ -513,7 +486,7 @@
+@@ -439,7 +410,7 @@
distclean: distclean-am
-rm -f Makefile
@@ -39797,7 +42283,7 @@
dvi: dvi-am
-@@ -527,12 +500,20 @@
+@@ -453,12 +424,20 @@
install-data-am:
@@ -39818,7 +42304,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
-@@ -551,17 +532,20 @@
+@@ -477,17 +456,20 @@
ps-am:
@@ -39843,4 +42329,4 @@
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
- all: $(BANSHEE_IMPORT_ASSEMBLY) $(DBUS_CLIENT_ASSEMBLY)
+ $(ASSEMBLY): $(ASSEMBLY_CSFILES)
Modified: non-group/banshee/trunk/debian/rules
===================================================================
--- non-group/banshee/trunk/debian/rules 2007-08-10 09:38:48 UTC (rev 3282)
+++ non-group/banshee/trunk/debian/rules 2007-08-14 19:25:31 UTC (rev 3283)
@@ -16,9 +16,6 @@
--enable-external-taglib-sharp
-makebuilddir::
- uudecode debian/generic-artist.png.uue -o src/Plugins/Banshee.Plugins.Recommendation/generic-artist.png
-
install/banshee::
find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
find debian/ -type f -name "*.exe" | xargs chmod +x
@@ -37,5 +34,4 @@
clean::
rm -rf $(MONO_SHARED_DIR)/.wapi
rm -f build/mcs-test-79698.exe
- rm -f src/Plugins/Banshee.Plugins.Recommendation/generic-artist.png
More information about the Pkg-mono-svn-commits
mailing list