diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml index ac0b48dee6..541d1603ad 100644 --- a/.github/workflows/ci-macvim.yaml +++ b/.github/workflows/ci-macvim.yaml @@ -74,9 +74,20 @@ jobs: - name: Set up legacy build if: matrix.legacy run: | + # Set the correct build env vars to target the correct architectures and min OS targets. echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET_LEGACY" >> $GITHUB_ENV echo "MACVIM_ARCHS=$MACVIM_ARCHS_LEGACY" >> $GITHUB_ENV + - name: Set up Sparkle 1 + if: matrix.legacy || !matrix.publish + run: | + # Use Sparkle 1 because Sparkle 2 requires newer OS version than our legacy build. + # Later, we pass the --enable-sparkle_1 flag to configure to set the corresponding ifdef. + # + # We also do this for non-publish builds, because those are usually run on older versions + # of Xcode, and they cannot handle the Sparkle 2 framework as it's built using newer Xcode. + ln -fhs Sparkle_1.framework src/MacVim/Sparkle.framework + # Set up, install, and cache gettext library for localization. # # Instead of using the default binary installed by Homebrew, need to build our own because gettext is statically @@ -161,6 +172,12 @@ jobs: else CONFOPT+=( --with-macarchs=x86_64 + --disable-sparkle # Disable Sparkle for testing that this flag builds and works + ) + fi + if ${{ matrix.legacy == true }}; then + CONFOPT+=( + --enable-sparkle_1 ) fi echo "CONFOPT: ${CONFOPT[@]}" diff --git a/runtime/doc/gui_mac.txt b/runtime/doc/gui_mac.txt index b8f8c9728f..e7902617b5 100644 --- a/runtime/doc/gui_mac.txt +++ b/runtime/doc/gui_mac.txt @@ -305,6 +305,7 @@ KEY VALUE ~ *MMUseMouseTime* use mousetime to detect multiple clicks [bool] *MMVerticalSplit* files open in vertical splits [bool] *MMZoomBoth* zoom button maximizes both directions [bool] +*MMUpdaterPrereleaseChannel* opt-in to pre-release software update [bool] As an example, if you have more than one mouse button and would wish to free up Ctrl-click so you can bind it to something else, then the appropriate diff --git a/runtime/doc/tags b/runtime/doc/tags index f6c1ae467f..8078b30fd7 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5454,6 +5454,7 @@ MMTextInsetTop gui_mac.txt /*MMTextInsetTop* MMTexturedWindow gui_mac.txt /*MMTexturedWindow* MMTitlebarAppearsTransparent gui_mac.txt /*MMTitlebarAppearsTransparent* MMTranslateCtrlClick gui_mac.txt /*MMTranslateCtrlClick* +MMUpdaterPrereleaseChannel gui_mac.txt /*MMUpdaterPrereleaseChannel* MMUseMouseTime gui_mac.txt /*MMUseMouseTime* MMVerticalSplit gui_mac.txt /*MMVerticalSplit* MMZoomBoth gui_mac.txt /*MMZoomBoth* diff --git a/src/MacVim/Base.lproj/Preferences.xib b/src/MacVim/Base.lproj/Preferences.xib index 0a47ce71ee..d9e24bfcda 100644 --- a/src/MacVim/Base.lproj/Preferences.xib +++ b/src/MacVim/Base.lproj/Preferences.xib @@ -15,6 +15,8 @@ + + @@ -538,11 +540,22 @@ - + + - + @@ -552,7 +565,7 @@ - + @@ -573,7 +586,7 @@ - + @@ -595,7 +608,7 @@ + + + + + + Opt-in to the pre-release software update channel. Sofware updater will now also download early pre-release builds that will get new features faster, but will be less tested and occasionally have stability issues or incomplete features. Use this if you want to try out new features and help provide feedbacks early on, but don't use this if you need to rely on MacVim. + + + + - + diff --git a/src/MacVim/MMAppController.h b/src/MacVim/MMAppController.h index 1e0782cbdd..d3e2fae121 100644 --- a/src/MacVim/MMAppController.h +++ b/src/MacVim/MMAppController.h @@ -16,7 +16,12 @@ @class MMVimController; #if !DISABLE_SPARKLE +#if USE_SPARKLE_1 @class SUUpdater; +#else +@class SPUStandardUpdaterController; +@class MMSparkle2Delegate; +#endif #endif @@ -46,7 +51,12 @@ int processingFlag; #if !DISABLE_SPARKLE +#if USE_SPARKLE_1 SUUpdater *updater; +#else + SPUStandardUpdaterController *updater; + MMSparkle2Delegate *sparkle2delegate; ///< Sparkle 2 delegate which allows us to customize the updater's behavior. +#endif #endif FSEventStreamRef fsEventStream; diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index 776e54c12a..12e743f482 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -44,12 +44,16 @@ #import "MMWindowController.h" #import "MMTextView.h" #import "Miscellaneous.h" -#import "Sparkle.framework/Headers/Sparkle.h" #import #import // Need Carbon for TIS...() functions #import +#if !DISABLE_SPARKLE +#import "MMSparkle2Delegate.h" +#import "Sparkle.framework/Headers/Sparkle.h" +#endif + #define MM_HANDLE_XCODE_MOD_EVENT 0 @@ -257,6 +261,7 @@ + (void)initialize [NSNumber numberWithBool:NO], MMSmoothResizeKey, [NSNumber numberWithBool:NO], MMCmdLineAlignBottomKey, [NSNumber numberWithBool:YES], MMAllowForceClickLookUpKey, + [NSNumber numberWithBool:NO], MMUpdaterPrereleaseChannelKey, nil]; [[NSUserDefaults standardUserDefaults] registerDefaults:dict]; @@ -312,7 +317,12 @@ - (id)init #if !DISABLE_SPARKLE // Sparkle is enabled (this is the default). Initialize it. It will // automatically check for update. +#if USE_SPARKLE_1 updater = [[SUUpdater alloc] init]; +#else + sparkle2delegate = [[MMSparkle2Delegate alloc] init]; + updater = [[SPUStandardUpdaterController alloc] initWithUpdaterDelegate:sparkle2delegate userDriverDelegate:sparkle2delegate]; +#endif #endif return self; @@ -334,6 +344,9 @@ - (void)dealloc [appMenuItemTemplate release]; appMenuItemTemplate = nil; #if !DISABLE_SPARKLE [updater release]; updater = nil; +#if !USE_SPARKLE_1 + [sparkle2delegate release]; sparkle2delegate = nil; +#endif #endif [super dealloc]; diff --git a/src/MacVim/MMPreferenceController.h b/src/MacVim/MMPreferenceController.h index 9edaf9631b..d06dc47515 100644 --- a/src/MacVim/MMPreferenceController.h +++ b/src/MacVim/MMPreferenceController.h @@ -24,6 +24,10 @@ // Input pane IBOutlet NSButton *allowForceClickLookUpButton; + + // Advanced pane + IBOutlet NSView *sparklePrereleaseButton; + IBOutlet NSView *sparklePrereleaseDesc; } // General pane diff --git a/src/MacVim/MMPreferenceController.m b/src/MacVim/MMPreferenceController.m index fcc590dd8e..e93540df16 100644 --- a/src/MacVim/MMPreferenceController.m +++ b/src/MacVim/MMPreferenceController.m @@ -17,15 +17,35 @@ @implementation MMPreferenceController - (void)windowDidLoad { #if DISABLE_SPARKLE - // If Sparkle is disabled in config, we don't want to show the preference pane - // which could be confusing as it won't do anything. - // After hiding the Sparkle subview, shorten the height of the General pane - // and move its other subviews down. - [sparkleUpdaterPane setHidden:YES]; - CGFloat sparkleHeight = NSHeight(sparkleUpdaterPane.frame); - NSRect frame = generalPreferences.frame; - frame.size.height -= sparkleHeight; - generalPreferences.frame = frame; + { + // If Sparkle is disabled in config, we don't want to show the preference pane + // which could be confusing as it won't do anything. + // After hiding the Sparkle subview, shorten the height of the General pane + // and move its other subviews down. + [sparkleUpdaterPane setHidden:YES]; + CGFloat sparkleHeight = NSHeight(sparkleUpdaterPane.frame); + NSRect frame = generalPreferences.frame; + frame.size.height -= sparkleHeight; + generalPreferences.frame = frame; + } +#endif + +#if DISABLE_SPARKLE || USE_SPARKLE_1 + { + // Also hide the pre-release update channel pane, if we disabled Sparkle, or + // we are using Sparkle 1 still (since it doesn't support this feature). + [sparklePrereleaseButton setHidden:YES]; + CGFloat sparkleHeight = NSHeight(sparklePrereleaseButton.frame); + NSRect frame = advancedPreferences.frame; + frame.size.height -= sparkleHeight; + advancedPreferences.frame = frame; + + [sparklePrereleaseDesc setHidden:YES]; + sparkleHeight = NSHeight(sparklePrereleaseDesc.frame); + frame = advancedPreferences.frame; + frame.size.height -= sparkleHeight; + advancedPreferences.frame = frame; + } #endif [super windowDidLoad]; diff --git a/src/MacVim/MMSparkle2Delegate.h b/src/MacVim/MMSparkle2Delegate.h new file mode 100644 index 0000000000..bf3640903c --- /dev/null +++ b/src/MacVim/MMSparkle2Delegate.h @@ -0,0 +1,21 @@ +// +// MMSparkle2Delegate.h +// +// Delegate class to interface with Sparkle 2 +// + +#if !DISABLE_SPARKLE && !USE_SPARKLE_1 + +#import "Sparkle.framework/Headers/Sparkle.h" + +@interface MMSparkle2Delegate : NSObject ; + +// SPUUpdaterDelegate +- (nonnull NSSet *)allowedChannelsForUpdater:(nonnull SPUUpdater *)updater; + +// SPUStandardUserDriverDelegate +// No need to implement anything for now. Default behaviors work fine. + +@end + +#endif diff --git a/src/MacVim/MMSparkle2Delegate.m b/src/MacVim/MMSparkle2Delegate.m new file mode 100644 index 0000000000..57644ac6fa --- /dev/null +++ b/src/MacVim/MMSparkle2Delegate.m @@ -0,0 +1,29 @@ +// +// MMSparkle2Delegate.m +// +// This file contains code to interface with Sparkle 2 and customize it. +// + +#if !DISABLE_SPARKLE && !USE_SPARKLE_1 + +#import "MMSparkle2Delegate.h" + +#import "Miscellaneous.h" + +#import + +@implementation MMSparkle2Delegate; + +/// If the user has opted in, return the pre-release channel to Sparkle so pre- +/// release builds will be available for update as well. +- (nonnull NSSet *)allowedChannelsForUpdater:(nonnull SPUUpdater *)updater +{ + if ([[NSUserDefaults standardUserDefaults] boolForKey:MMUpdaterPrereleaseChannelKey]) { + return [NSSet setWithObject:@"prerelease"]; + } + return [NSSet set]; +} + +@end; + +#endif diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj index a26f1882a6..010838316e 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj @@ -72,6 +72,7 @@ 907FF7512521BCE200BADACB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 907FF74F2521BCE200BADACB /* MainMenu.xib */; }; 907FF7542521BDA600BADACB /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 907FF7522521BDA600BADACB /* Preferences.xib */; }; 907FF7572521BDC300BADACB /* FindAndReplace.xib in Resources */ = {isa = PBXBuildFile; fileRef = 907FF7552521BDC200BADACB /* FindAndReplace.xib */; }; + 90A33BEA28D563DF003A2E2F /* MMSparkle2Delegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 90A33BE928D563DF003A2E2F /* MMSparkle2Delegate.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -414,6 +415,8 @@ 90922ABC221D42F700F1E1F4 /* MMBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMBackend.h; sourceTree = ""; }; 90922ABD221D42F700F1E1F4 /* gui_macvim.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = gui_macvim.m; sourceTree = ""; }; 90922ABE221D42F700F1E1F4 /* MMBackend.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMBackend.m; sourceTree = ""; }; + 90A33BE928D563DF003A2E2F /* MMSparkle2Delegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MMSparkle2Delegate.m; sourceTree = ""; }; + 90A33BEC28D56423003A2E2F /* MMSparkle2Delegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MMSparkle2Delegate.h; sourceTree = ""; }; 90F84F1E2521F2270000268B /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/MainMenu.strings; sourceTree = ""; }; 90F84F232521F6480000268B /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/MainMenu.strings; sourceTree = ""; }; 90F84F242521F6590000268B /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/MainMenu.strings; sourceTree = ""; }; @@ -502,6 +505,8 @@ 1D1474960C56703C0038FA2B /* MacVim.m */, 32CA4F630368D1EE00C91783 /* MacVim_Prefix.pch */, 29B97316FDCFA39411CA2CEA /* main.m */, + 90A33BE928D563DF003A2E2F /* MMSparkle2Delegate.m */, + 90A33BEC28D56423003A2E2F /* MMSparkle2Delegate.h */, ); name = "MacVim Source"; sourceTree = ""; @@ -1089,6 +1094,7 @@ 1D1474B60C56796D0038FA2B /* MMVimController.m in Sources */, 1D1474BC0C567A910038FA2B /* MMWindowController.m in Sources */, 1D09AB420C6A4D520045497E /* MMTypesetter.m in Sources */, + 90A33BEA28D563DF003A2E2F /* MMSparkle2Delegate.m in Sources */, 1DD66ECE0C803D3600EBDAB3 /* MMApplication.m in Sources */, 1D80FBD40CBBD3B700102A1C /* MMFullScreenWindow.m in Sources */, 1D80FBD60CBBD3B700102A1C /* MMVimView.m in Sources */, diff --git a/src/MacVim/Miscellaneous.h b/src/MacVim/Miscellaneous.h index 0000a26f54..3a244c6f1f 100644 --- a/src/MacVim/Miscellaneous.h +++ b/src/MacVim/Miscellaneous.h @@ -62,6 +62,7 @@ extern NSString *MMNonNativeFullScreenSafeAreaBehaviorKey; extern NSString *MMSmoothResizeKey; extern NSString *MMCmdLineAlignBottomKey; extern NSString *MMAllowForceClickLookUpKey; +extern NSString *MMUpdaterPrereleaseChannelKey; // Enum for MMUntitledWindowKey diff --git a/src/MacVim/Miscellaneous.m b/src/MacVim/Miscellaneous.m index 0fdf96cd92..6b8406bef9 100644 --- a/src/MacVim/Miscellaneous.m +++ b/src/MacVim/Miscellaneous.m @@ -58,6 +58,7 @@ NSString *MMSmoothResizeKey = @"MMSmoothResize"; NSString *MMCmdLineAlignBottomKey = @"MMCmdLineAlignBottom"; NSString *MMAllowForceClickLookUpKey = @"MMAllowForceClickLookUp"; +NSString *MMUpdaterPrereleaseChannelKey = @"MMUpdaterPrereleaseChannel"; @implementation NSIndexSet (MMExtras) diff --git a/src/MacVim/Sparkle.framework b/src/MacVim/Sparkle.framework new file mode 120000 index 0000000000..a985a6eb7d --- /dev/null +++ b/src/MacVim/Sparkle.framework @@ -0,0 +1 @@ +Sparkle_2.framework \ No newline at end of file diff --git a/src/MacVim/Sparkle.framework/Headers b/src/MacVim/Sparkle_1.framework/Headers similarity index 100% rename from src/MacVim/Sparkle.framework/Headers rename to src/MacVim/Sparkle_1.framework/Headers diff --git a/src/MacVim/Sparkle.framework/Modules b/src/MacVim/Sparkle_1.framework/Modules similarity index 100% rename from src/MacVim/Sparkle.framework/Modules rename to src/MacVim/Sparkle_1.framework/Modules diff --git a/src/MacVim/Sparkle.framework/PrivateHeaders b/src/MacVim/Sparkle_1.framework/PrivateHeaders similarity index 100% rename from src/MacVim/Sparkle.framework/PrivateHeaders rename to src/MacVim/Sparkle_1.framework/PrivateHeaders diff --git a/src/MacVim/Sparkle.framework/Resources b/src/MacVim/Sparkle_1.framework/Resources similarity index 100% rename from src/MacVim/Sparkle.framework/Resources rename to src/MacVim/Sparkle_1.framework/Resources diff --git a/src/MacVim/Sparkle.framework/Sparkle b/src/MacVim/Sparkle_1.framework/Sparkle similarity index 100% rename from src/MacVim/Sparkle.framework/Sparkle rename to src/MacVim/Sparkle_1.framework/Sparkle diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloadData.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloadData.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloader.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloader.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloader.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloader.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloaderDelegate.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloaderDelegate.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloaderDelegate.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloaderProtocol.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloaderProtocol.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloaderProtocol.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloaderSession.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SPUDownloaderSession.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUDownloaderSession.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUURLRequest.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SPUURLRequest.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SPUURLRequest.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUAppcast.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUAppcast.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUAppcast.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUAppcast.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUAppcastItem.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUAppcastItem.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUCodeSigningVerifier.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUCodeSigningVerifier.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUCodeSigningVerifier.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUErrors.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUErrors.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUErrors.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUErrors.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUExport.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUExport.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUExport.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUExport.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUStandardVersionComparator.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUStandardVersionComparator.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUUpdater.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUUpdater.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUUpdater.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUUpdater.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUUpdaterDelegate.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUUpdaterDelegate.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUVersionComparisonProtocol.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUVersionComparisonProtocol.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUVersionDisplayProtocol.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/SUVersionDisplayProtocol.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Headers/Sparkle.h b/src/MacVim/Sparkle_1.framework/Versions/A/Headers/Sparkle.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Headers/Sparkle.h rename to src/MacVim/Sparkle_1.framework/Versions/A/Headers/Sparkle.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Modules/module.modulemap b/src/MacVim/Sparkle_1.framework/Versions/A/Modules/module.modulemap similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Modules/module.modulemap rename to src/MacVim/Sparkle_1.framework/Versions/A/Modules/module.modulemap diff --git a/src/MacVim/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h b/src/MacVim/Sparkle_1.framework/Versions/A/PrivateHeaders/SUUnarchiver.h similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/PrivateHeaders/SUUnarchiver.h rename to src/MacVim/Sparkle_1.framework/Versions/A/PrivateHeaders/SUUnarchiver.h diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Info.plist diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/Autoupdate diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/PkgInfo diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/AppIcon.icns diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/Base.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/Base.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/Base.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/Base.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects-101300.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects-101300.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects-101300.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects-101300.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/SUStatus.nib/keyedobjects.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ar.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ca.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/cs.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/da.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/de.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/el.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/es.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fi.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/fr.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/he.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hr.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/hu.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/is.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/it.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ja.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ko.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nb.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/nl.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pl.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_BR.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/pt_PT.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ro.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/ru.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sk.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sl.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/sv.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/th.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/tr.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/uk.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_CN.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/Resources/zh_TW.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Autoupdate.app/Contents/_CodeSignature/CodeResources diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects-101300.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects-101300.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects-101300.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects-101300.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUAutomaticUpdateAlert.nib/keyedobjects.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects-101300.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects-101300.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects-101300.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects-101300.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdateAlert.nib/keyedobjects.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Base.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Base.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/Info.plist b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/Info.plist similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/Info.plist rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/Info.plist diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ReleaseNotesColorStyle.css b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ReleaseNotesColorStyle.css similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ReleaseNotesColorStyle.css rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ReleaseNotesColorStyle.css diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/SUModelTranslation.plist similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/SUModelTranslation.plist diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects-101300.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/SUStatus.nib/keyedobjects-101300.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects-101300.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/SUStatus.nib/keyedobjects-101300.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/SUStatus.nib/keyedobjects.nib diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ar.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ca.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ca.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ca.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ca.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ca.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ca.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ca.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ca.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ca.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ca.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/cs.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/da.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/de.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/el.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/en.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/es.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fi.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/fr.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/he.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/he.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/he.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/he.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/he.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/he.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/he.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/he.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/he.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/he.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hr.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hr.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/hu.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/hu.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/is.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/it.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ja.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ko.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nb.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/nl.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pl.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_PT.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ro.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/ru.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sk.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sl.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/sv.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/th.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/tr.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/uk.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/uk.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/SUAutomaticUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings b/src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings rename to src/MacVim/Sparkle_1.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings diff --git a/src/MacVim/Sparkle.framework/Versions/A/Sparkle b/src/MacVim/Sparkle_1.framework/Versions/A/Sparkle similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/Sparkle rename to src/MacVim/Sparkle_1.framework/Versions/A/Sparkle diff --git a/src/MacVim/Sparkle.framework/Versions/A/_CodeSignature/CodeResources b/src/MacVim/Sparkle_1.framework/Versions/A/_CodeSignature/CodeResources similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/A/_CodeSignature/CodeResources rename to src/MacVim/Sparkle_1.framework/Versions/A/_CodeSignature/CodeResources diff --git a/src/MacVim/Sparkle.framework/Versions/Current b/src/MacVim/Sparkle_1.framework/Versions/Current similarity index 100% rename from src/MacVim/Sparkle.framework/Versions/Current rename to src/MacVim/Sparkle_1.framework/Versions/Current diff --git a/src/MacVim/Sparkle_2.framework/Autoupdate b/src/MacVim/Sparkle_2.framework/Autoupdate new file mode 120000 index 0000000000..1a4fc02ca6 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Autoupdate @@ -0,0 +1 @@ +Versions/Current/Autoupdate \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/Headers b/src/MacVim/Sparkle_2.framework/Headers new file mode 120000 index 0000000000..a177d2a6b9 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/Modules b/src/MacVim/Sparkle_2.framework/Modules new file mode 120000 index 0000000000..5736f3186e --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Modules @@ -0,0 +1 @@ +Versions/Current/Modules \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/PrivateHeaders b/src/MacVim/Sparkle_2.framework/PrivateHeaders new file mode 120000 index 0000000000..d8e5645269 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/PrivateHeaders @@ -0,0 +1 @@ +Versions/Current/PrivateHeaders \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/Resources b/src/MacVim/Sparkle_2.framework/Resources new file mode 120000 index 0000000000..953ee36f3b --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/Sparkle b/src/MacVim/Sparkle_2.framework/Sparkle new file mode 120000 index 0000000000..b2c52731ea --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Sparkle @@ -0,0 +1 @@ +Versions/Current/Sparkle \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/Updater.app b/src/MacVim/Sparkle_2.framework/Updater.app new file mode 120000 index 0000000000..18f322355e --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Updater.app @@ -0,0 +1 @@ +Versions/Current/Updater.app \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Autoupdate b/src/MacVim/Sparkle_2.framework/Versions/B/Autoupdate new file mode 100755 index 0000000000..95608f8384 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Autoupdate differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUDownloadData.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUDownloadData.h new file mode 100644 index 0000000000..680b39897a --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUDownloadData.h @@ -0,0 +1,52 @@ +// +// SPUDownloadData.h +// Sparkle +// +// Created by Mayur Pawashe on 8/10/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import + +#ifdef BUILDING_SPARKLE_DOWNLOADER_SERVICE +// Ignore incorrect warning +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header" +#import "SUExport.h" +#pragma clang diagnostic pop +#else +#import +#endif + +NS_ASSUME_NONNULL_BEGIN + +/** + * A class for containing downloaded data along with some information about it. + */ +SU_EXPORT @interface SPUDownloadData : NSObject + +/** + * The raw data that was downloaded. + */ +@property (nonatomic, readonly) NSData *data; + +/** + * The URL that was fetched from. + * + * This may be different from the URL in the request if there were redirects involved. + */ +@property (nonatomic, readonly, copy) NSURL *URL; + +/** + * The IANA charset encoding name if available. Eg: "utf-8" + */ +@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName; + +/** + * The MIME type if available. Eg: "text/plain" + */ +@property (nonatomic, readonly, nullable, copy) NSString *MIMEType; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUpdaterController.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUpdaterController.h new file mode 100644 index 0000000000..a34100dc6c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUpdaterController.h @@ -0,0 +1,112 @@ +// +// SPUStandardUpdaterController.h +// Sparkle +// +// Created by Mayur Pawashe on 2/28/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@class SPUUpdater; +@class SPUStandardUserDriver; +@class NSMenuItem; +@protocol SPUUserDriver, SPUUpdaterDelegate, SPUStandardUserDriverDelegate; + +/** + A controller class that instantiates a `SPUUpdater` and allows binding UI to its updater settings. + + This class can be instantiated in a nib or created programatically using `-initWithUpdaterDelegate:userDriverDelegate:` or `-initWithStartingUpdater:updaterDelegate:userDriverDelegate:`. + + The controller's updater targets the application's main bundle and uses Sparkle's standard user interface. + Typically, this class is used by sticking it as a custom NSObject subclass in an Interface Builder nib (probably in MainMenu) but it works well programatically too. + + The controller creates an `SPUUpdater` instance using a `SPUStandardUserDriver` and allows hooking up the check for updates action and handling menu item validation. + It also allows hooking up the updater's and user driver's delegates. + + If you need more control over what bundle you want to update, or you want to provide a custom user interface (via `SPUUserDriver`), please use `SPUUpdater` directly instead. + */ +SU_EXPORT @interface SPUStandardUpdaterController : NSObject +{ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-interface-ivars" + /** + * Interface builder outlet for the updater's delegate. + */ + IBOutlet __weak id updaterDelegate; + + /** + * Interface builder outlet for the user driver's delegate. + */ + IBOutlet __weak id userDriverDelegate; +#pragma clang diagnostic pop +} + +/** + Accessible property for the updater. Some properties on the updater can be binded via KVO + + When instantiated from a nib, don't perform update checks before the application has finished launching in a MainMenu nib (i.e applicationDidFinishLaunching:) or before the corresponding window/view controller has been loaded (i.e, windowDidLoad or viewDidLoad). The updater is not guaranteed to be started yet before these points. + */ +@property (nonatomic, readonly) SPUUpdater *updater; + +/** + Accessible property for the updater's user driver. + */ +@property (nonatomic, readonly) SPUStandardUserDriver *userDriver; + +/** + Create a new `SPUStandardUpdaterController` from a nib. + + You cannot call this initializer directly. You must instantiate a `SPUStandardUpdaterController` inside of a nib (typically the MainMenu nib) to use it. + + To create a `SPUStandardUpdaterController` programatically, use `-initWithUpdaterDelegate:userDriverDelegate:` or `-initWithStartingUpdater:updaterDelegate:userDriverDelegate:` instead. + */ +- (instancetype)init NS_UNAVAILABLE; + +/** + Create a new `SPUStandardUpdaterController` programmatically. + + The updater is started automatically. See `-startUpdater` for more information. + */ +- (instancetype)initWithUpdaterDelegate:(nullable id)updaterDelegate userDriverDelegate:(nullable id)userDriverDelegate; + +/** + Create a new `SPUStandardUpdaterController` programmatically allowing you to specify whether or not to start the updater immediately. + + You can specify whether or not you want to start the updater immediately. + If you do not start the updater, you must invoke `-startUpdater` at a later time to start it. + */ +- (instancetype)initWithStartingUpdater:(BOOL)startUpdater updaterDelegate:(nullable id)updaterDelegate userDriverDelegate:(nullable id)userDriverDelegate; + +/** + Starts the updater if it has not already been started. + + You should only call this method yourself if you opted out of starting the updater on initialization. + Hence, do not call this yourself if you are instantiating this controller from a nib. + + This invokes `-[SPUUpdater startUpdater:]`. If the application is misconfigured with Sparkle, an error is logged and an alert is shown to the user (after a few seconds) to contact the developer. + If you want more control over this behavior, you can create your own `SPUUpdater` instead of using `SPUStandardUpdaterController`. + */ +- (void)startUpdater; + +/** + Explicitly checks for updates and displays a progress dialog while doing so. + + This method is meant for a main menu item. + Connect any NSMenuItem to this action in Interface Builder or programmatically, + and Sparkle will check for updates and report back its findings verbosely when it is invoked. + + When the target/action of the menu item is set to this controller and this method, + this controller also handles enabling/disabling the menu item by checking + `-[SPUUpdater canCheckForUpdates]` + + This action checks updates by invoking `-[SPUUpdater checkForUpdates]` + */ +- (IBAction)checkForUpdates:(nullable id)sender; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUserDriver.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUserDriver.h new file mode 100644 index 0000000000..36eda90750 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUserDriver.h @@ -0,0 +1,37 @@ +// +// SPUStandardUserDriver.h +// Sparkle +// +// Created by Mayur Pawashe on 2/14/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol SPUStandardUserDriverDelegate; + +/** + Sparkle's standard built-in user driver for updater interactions + */ +SU_EXPORT @interface SPUStandardUserDriver : NSObject + +/** + Initializes a Sparkle's standard user driver for user update interactions + + @param hostBundle The target bundle of the host that is being updated. + @param delegate The optional delegate to this user driver. + */ +- (instancetype)initWithHostBundle:(NSBundle *)hostBundle delegate:(nullable id)delegate; + +/** + Use initWithHostBundle:delegate: instead. + */ +- (instancetype)init NS_UNAVAILABLE; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUserDriverDelegate.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUserDriverDelegate.h new file mode 100644 index 0000000000..934486495e --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUStandardUserDriverDelegate.h @@ -0,0 +1,172 @@ +// +// SPUStandardUserDriverDelegate.h +// Sparkle +// +// Created by Mayur Pawashe on 3/3/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol SUVersionDisplay; +@class SUAppcastItem; +@class SPUUserUpdateState; + +/** + A protocol for Sparkle's standard user driver's delegate + + This includes methods related to UI interactions + */ +SU_EXPORT @protocol SPUStandardUserDriverDelegate + +@optional + +/** + Called before showing a modal alert window, + to give the opportunity to hide attached windows that may get in the way. + */ +- (void)standardUserDriverWillShowModalAlert; + +/** + Called after showing a modal alert window, + to give the opportunity to hide attached windows that may get in the way. + */ +- (void)standardUserDriverDidShowModalAlert; + +/** + Returns an object that formats version numbers for display to the user. + If you don't implement this method or return @c nil, the standard version formatter will be used. + */ +- (_Nullable id )standardUserDriverRequestsVersionDisplayer; + +/** + Handles showing the full release notes to the user. + + When a user checks for new updates and no new update is found, Sparkle will offer to show the application's version history to the user + by providing a "Version History" button in the no new update available alert. + + If this delegate method is not implemented, Sparkle will instead offer to open the + `fullReleaseNotesLink` (or `releaseNotesLink` if the former is unavailable) from the appcast's latest `item` in the user's web browser. + + If this delegate method is implemented, Sparkle will instead ask the delegate to show the full release notes to the user. + A delegate may want to implement this method if they want to show in-app or offline release notes. + + @param item The appcast item corresponding to the latest version available. + */ +- (void)standardUserDriverShowVersionHistoryForAppcastItem:(SUAppcastItem *)item; + +/** + Specifies whether or not the download, extraction, and installing status windows allows to be minimized. + + By default, the status window showing the current status of the update (download, extraction, ready to install) is allowed to be minimized + for regular application bundle updates. + + @return @c YES if the status window is allowed to be minimized (default behavior), otherwise @c NO. + */ +- (BOOL)standardUserDriverAllowsMinimizableStatusWindow; + +/** + Declares whether or not gentle scheduled update reminders are supported. + + The delegate may implement scheduled update reminders that are presented in a gentle manner by implementing one or both of: + `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:` and `-standardUserDriverShouldHandleShowingScheduledUpdate:andInImmediateFocus:` + + Visit https://sparkle-project.org/documentation/gentle-reminders for more information and examples. + + @return @c YES if gentle scheduled update reminders are implemented by standard user driver delegate, otherwise @c NO (default). + */ +@property (nonatomic, readonly) BOOL supportsGentleScheduledUpdateReminders; + +/** + Specifies if the standard user driver should handle showing a new scheduled update, or if its delegate should handle showing the update instead. + + If you implement this method and return @c NO the delegate is then responsible for showing the update, + which must be implemented and done in `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:` + The motivation for the delegate being responsible for showing updates is to override Sparkle's default behavior + and add gentle reminders for new updates. + + Returning @c YES is the default behavior and allows the standard user driver to handle showing the update. + + If the standard user driver handles showing the update, `immediateFocus` reflects whether or not it will show the update in immediate and utmost focus. + The standard user driver may choose to show the update in immediate and utmost focus when the app was launched recently + or the system has been idle for some time. + + If `immediateFocus` is @c NO the standard user driver may want to defer showing the update until the user comes back to the app. + For background running applications, when `immediateFocus` is @c NO the standard user driver will always want to show + the update alert immediately, but behind other running applications or behind the app's own windows if it's currently active. + + There should be no side effects made when implementing this method so you should just return @c YES or @c NO + You will also want to implement `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:` for adding additional update reminders. + + This method is not called for user-initiated update checks. The standard user driver always handles those. + + Visit https://sparkle-project.org/documentation/gentle-reminders for more information and examples. + + @param update The update the standard user driver should show. + @param immediateFocus If @c immediateFocus is @c YES, then the standard user driver proposes to show the update in immediate and utmost focus. See discussion for more details. + + @return @c YES if the standard user should handle showing the scheduled update (default behavior), otherwise @c NO if the delegate handles showing it. + */ +- (BOOL)standardUserDriverShouldHandleShowingScheduledUpdate:(SUAppcastItem *)update andInImmediateFocus:(BOOL)immediateFocus; + +/** + Called before an update will be shown to the user. + + If the standard user driver handles showing the update, `handleShowingUpdate` will be `YES`. + Please see `-standardUserDriverShouldHandleShowingScheduledUpdate:andInImmediateFocus:` for how the standard user driver + may handle showing scheduled updates when `handleShowingUpdate` is `YES` and `state.userInitiated` is `NO`. + + If the delegate declared it handles showing the update by returning @c NO in `-standardUserDriverShouldHandleShowingScheduledUpdate:andInImmediateFocus:` + then the delegate should handle showing update reminders in this method, or at some later point. + In this case, `handleShowingUpdate` will be @c NO. + To bring the update alert in focus, you may call `-[SPUStandardUpdaterController checkForUpdates:]` or `-[SPUUpdater checkForUpdates]`. + You may want to show additional UI indicators in your application that will show this update in focus + and want to dismiss additional UI indicators in `-standardUserDriverWillFinishUpdateSession` or `-standardUserDriverDidReceiveUserAttentionForUpdate:` + + If `state.userInitiated` is @c YES then the standard user driver always handles showing the new update and `handleShowingUpdate` will be @c YES. + In this case, it may still be useful for the delegate to intercept this method right before a new update will be shown. + + This method is not called when bringing an update that has already been presented back in focus. + + Visit https://sparkle-project.org/documentation/gentle-reminders for more information and examples. + + @param handleShowingUpdate @c YES if the standard user driver handles showing the update, otherwise @c NO if the delegate handles showing the update. + @param update The update that will be shown. + @param state The user state of the update which includes if the update check was initiated by the user. + */ +- (void)standardUserDriverWillHandleShowingUpdate:(BOOL)handleShowingUpdate forUpdate:(SUAppcastItem *)update state:(SPUUserUpdateState *)state; + +/** + Called when a new update first receives attention from the user. + + This occurs either when the user first brings the update alert in utmost focus or when the user makes a choice to install an update or dismiss/skip it. + + This may be useful to intercept for dismissing custom attention-based UI indicators (e.g, user notifications) introduced when implementing + `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:` + + For custom UI indicators that need to still be on screen after the user has started to install an update, please see `-standardUserDriverWillFinishUpdateSession`. + + @param update The new update that the user gave attention to. + */ +- (void)standardUserDriverDidReceiveUserAttentionForUpdate:(SUAppcastItem *)update; + +/** + Called before the standard user driver session will finish its current update session. + + This may occur after the user has dismissed / skipped a new update or after an update error has occurred. + For updaters updating external/other bundles, this may also be called after an update has been successfully installed. + + This may be useful to intercept for dismissing custom UI indicators introduced when implementing + `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:` + + For UI indicators that need to be dismissed when the user has given attention to a new update alert, + please see `-standardUserDriverDidReceiveUserAttentionForUpdate:` + */ +- (void)standardUserDriverWillFinishUpdateSession; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdateCheck.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdateCheck.h new file mode 100644 index 0000000000..80a2001961 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdateCheck.h @@ -0,0 +1,33 @@ +// +// SPUUpdateCheck.h +// SPUUpdateCheck +// +// Created by Mayur Pawashe on 8/28/21. +// Copyright © 2021 Sparkle Project. All rights reserved. +// + +#ifndef SPUUpdateCheck_h +#define SPUUpdateCheck_h + +/** + Describes the type of update check being performed. + + Each update check corresponds to an update check method on `SPUUpdater`. + */ +typedef NS_ENUM(NSInteger, SPUUpdateCheck) +{ + /** + The user-initiated update check corresponding to `-[SPUUpdater checkForUpdates]`. + */ + SPUUpdateCheckUpdates = 0, + /** + The background scheduled update check corresponding to `-[SPUUpdater checkForUpdatesInBackground]`. + */ + SPUUpdateCheckUpdatesInBackground = 1, + /** + The informational probe update check corresponding to `-[SPUUpdater checkForUpdateInformation]`. + */ + SPUUpdateCheckUpdateInformation = 2 +}; + +#endif /* SPUUpdateCheck_h */ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdatePermissionRequest.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdatePermissionRequest.h new file mode 100644 index 0000000000..010e50bf18 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdatePermissionRequest.h @@ -0,0 +1,33 @@ +// +// SPUUpdatePermissionRequest.h +// Sparkle +// +// Created by Mayur Pawashe on 8/14/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +/** + This class represents information needed to make a permission request for checking updates. + */ +SU_EXPORT @interface SPUUpdatePermissionRequest : NSObject + +/** + Initializes a new update permission request instance. + + @param systemProfile The system profile information. + */ +- (instancetype)initWithSystemProfile:(NSArray *> *)systemProfile; + +/** + A read-only property for the user's system profile. + */ +@property (nonatomic, readonly) NSArray *> *systemProfile; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdater.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdater.h new file mode 100644 index 0000000000..17a6493826 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdater.h @@ -0,0 +1,312 @@ +// +// SPUUpdater.h +// Sparkle +// +// Created by Andy Matuschak on 1/4/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#import +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@class SUAppcastItem, SUAppcast; + +@protocol SPUUpdaterDelegate; + +/** + The main API in Sparkle for controlling the update mechanism. + + This class is used to configure the update parameters as well as manually and automatically schedule and control checks for updates. + + For convenience, you can create a standard or nib instantiable updater by using `SPUStandardUpdaterController`. + + Prefer to set initial properties in your bundle's Info.plist as described in [Customizing Sparkle](https://sparkle-project.org/documentation/customization/). + + Otherwise only if you need dynamic behavior for user settings should you set properties on the updater such as: + - `automaticallyChecksForUpdates` + - `updateCheckInterval` + - `automaticallyDownloadsUpdates` + - `feedURL` + + Please view the documentation on each of these properties for more detail if you are to configure them dynamically. + */ +SU_EXPORT @interface SPUUpdater : NSObject + +/** + Initializes a new `SPUUpdater` instance + + This creates an updater, but to start it and schedule update checks `-startUpdater:` needs to be invoked first. + + Related: See `SPUStandardUpdaterController` which wraps a `SPUUpdater` instance and is suitable for instantiating inside of nib files. + + @param hostBundle The bundle that should be targetted for updating. + @param applicationBundle The application bundle that should be waited for termination and relaunched (unless overridden). Usually this can be the same as hostBundle. This may differ when updating a plug-in or other non-application bundle. + @param userDriver The user driver that Sparkle uses for user update interaction. + @param delegate The delegate for `SPUUpdater`. + */ +- (instancetype)initWithHostBundle:(NSBundle *)hostBundle applicationBundle:(NSBundle *)applicationBundle userDriver:(id )userDriver delegate:(nullable id)delegate; + +/** + Use `-initWithHostBundle:applicationBundle:userDriver:delegate:` or `SPUStandardUpdaterController` standard adapter instead. + + If you want to drop an updater into a nib, use `SPUStandardUpdaterController`. + */ +- (instancetype)init NS_UNAVAILABLE; + +/** + Starts the updater. + + This method first checks if Sparkle is configured properly. A valid feed URL should be set before this method is invoked. + + If the configuration is valid, an update cycle is started in the next main runloop cycle. + During this cycle, a permission prompt may be brought up (if needed) for checking if the user wants automatic update checking. + Otherwise if automatic update checks are enabled, a scheduled update alert may be brought up if enough time has elapsed since the last check. + See `automaticallyChecksForUpdates` for more information. + + After starting the updater and before the next runloop cycle, one of `-checkForUpdates`, `-checkForUpdatesInBackground`, or `-checkForUpdateInformation` can be invoked. + This may be useful if you want to check for updates immediately or without showing a potential permission prompt. + + If the updater cannot be started (i.e, due to a configuration issue in the application), you may want to fall back appropriately. + For example, the standard updater controller (`SPUStandardUpdaterController`) alerts the user that the app is misconfigured and to contact the developer. + + This must be called on the main thread. + + @param error The error that is populated if this method fails. Pass NULL if not interested in the error information. + @return YES if the updater started otherwise NO with a populated error + */ +- (BOOL)startUpdater:(NSError * __autoreleasing *)error; + +/** + Checks for updates, and displays progress while doing so if needed. + + This is meant for users initiating a new update check or checking the current update progress. + + If an update hasn't started, the user may be shown that a new check for updates is occurring. + If an update has already been downloaded or begun installing from a previous session, the user may be presented to install that update. + If the user is already being presented with an update, that update will be shown to the user in active focus. + + This will find updates that the user has previously opted into skipping. + + See `canCheckForUpdates` property which can determine when this method may be invoked. + */ +- (void)checkForUpdates; + +/** + Checks for updates, but does not show any UI unless an update is found. + + You usually do not need to call this method directly. If `automaticallyChecksForUpdates` is @c YES, + Sparkle calls this method automatically according to its update schedule using the `updateCheckInterval` + and the `lastUpdateCheckDate`. Therefore, you should typically only consider calling this method directly if you + opt out of automatic update checks. + + This is meant for programmatically initating a check for updates in the background without the user initiating it. + This check will not show UI if no new updates are found. + + If a new update is found, the updater's user driver may handle showing it at an appropriate (but not necessarily immediate) time. + If you want control over when and how a new update is shown, please see https://sparkle-project.org/documentation/gentle-reminders/ + + Note if automated updating is turned on, either a new update may be downloaded in the background to be installed silently, + or an already downloaded update may be shown. + + This will not find updates that the user has opted into skipping. + + This method does not do anything if there is a `sessionInProgress`. + */ +- (void)checkForUpdatesInBackground; + +/** + Begins a "probing" check for updates which will not actually offer to + update to that version. + + However, the delegate methods + `-[SPUUpdaterDelegate updater:didFindValidUpdate:]` and + `-[SPUUpdaterDelegate updaterDidNotFindUpdate:]` will be called, + so you can use that information in your UI. + + `-[SPUUpdaterDelegate updater:didFinishUpdateCycleForUpdateCheck:error:]` will be called when + this probing check is completed. + + Updates that have been skipped by the user will not be found. + + This method does not do anything if there is a `sessionInProgress`. + */ +- (void)checkForUpdateInformation; + +/** + A property indicating whether or not updates can be checked by the user. + + An update check can be made by the user when an update session isn't in progress, or when an update or its progress is being shown to the user. + A user cannot check for updates when data (such as the feed or an update) is still being downloaded automatically in the background. + + This property is suitable to use for menu item validation for seeing if `-checkForUpdates` can be invoked. + + This property is also KVO-compliant. + + Note this property does not reflect whether or not an update session is in progress. Please see `sessionInProgress` property instead. + */ +@property (nonatomic, readonly) BOOL canCheckForUpdates; + +/** + A property indicating whether or not an update session is in progress. + + An update session is in progress when the appcast is being downloaded, an update is being downloaded, + an update is being shown, update permission is being requested, or the installer is being started. + + An active session is when Sparkle's fired scheduler is running. + + Note an update session may not be running even though Sparkle's installer (ran as a separate process) may be running, + or even though the update has been downloaded but the installation has been deferred. In both of these cases, a new update session + may be activated with the update resumed at a later point (automatically or manually). + + See also: + - `canCheckForUpdates` property which is more suited for menu item validation and deciding if the user can initiate update checks. + - `-[SPUUpdaterDelegate updater:didFinishUpdateCycleForUpdateCheck:error:]` which lets the updater delegate know when an update cycle and session finishes. + */ +@property (nonatomic, readonly) BOOL sessionInProgress; + +/** + A property indicating whether or not to check for updates automatically. + + By default, Sparkle asks users on second launch for permission if they want automatic update checks enabled + and sets this property based on their response. If `SUEnableAutomaticChecks` is set in the Info.plist, + this permission request is not performed however. + + Setting this property will persist in the host bundle's user defaults. + Hence developers shouldn't maintain an additional user default for this property. + Only set this property if the user wants to change the default via a user settings option. + Do not always set it on launch unless you want to ignore the user's preference. + For testing environments, you can disable update checks by passing `-SUEnableAutomaticChecks NO` + to your app's command line arguments instead of setting this property. + + The update schedule cycle will be reset in a short delay after the property's new value is set. + This is to allow reverting this property without kicking off a schedule change immediately + */ +@property (nonatomic) BOOL automaticallyChecksForUpdates; + +/** + A property indicating the current automatic update check interval in seconds. + + Prefer to set SUScheduledCheckInterval directly in your Info.plist for setting the initial value. + + Setting this property will persist in the host bundle's user defaults. + Hence developers shouldn't maintain an additional user default for this property. + Only set this property if the user wants to change the default via a user settings option. + Do not always set it on launch unless you want to ignore the user's preference. + + The update schedule cycle will be reset in a short delay after the property's new value is set. + This is to allow reverting this property without kicking off a schedule change immediately + */ +@property (nonatomic) NSTimeInterval updateCheckInterval; + +/** + A property indicating whether or not updates can be automatically downloaded in the background. + + By default, updates are not automatically downloaded. + + Note that the developer can disallow automatic downloading of updates from being enabled (via `SUAllowsAutomaticUpdates` Info.plist key). + In this case, this property will return NO regardless of how this property is set. + + Prefer to set SUAutomaticallyUpdate directly in your Info.plist for setting the initial value. + + Setting this property will persist in the host bundle's user defaults. + Hence developers shouldn't maintain an additional user default for this property. + Only set this property if the user wants to change the default via a user settings option. + Do not always set it on launch unless you want to ignore the user's preference. + */ +@property (nonatomic) BOOL automaticallyDownloadsUpdates; + +/** + The URL of the appcast used to download update information. + + If the updater's delegate implements `-[SPUUpdaterDelegate feedURLStringForUpdater:]`, this will return that feed URL. + Otherwise if the feed URL has been set before, the feed URL returned will be retrieved from the host bundle's user defaults. + Otherwise the feed URL in the host bundle's Info.plist will be returned. + If no feed URL can be retrieved, returns nil. + + For setting a primary feed URL, please set the `SUFeedURL` property in your Info.plist. + For setting an alternative feed URL, please prefer `-[SPUUpdaterDelegate feedURLStringForUpdater:]` over `-setFeedURL:` + + This property must be called on the main thread; calls from background threads will return nil. + */ +@property (nonatomic, readonly, nullable) NSURL *feedURL; + +/** + Set the URL of the appcast used to download update information. Using this method is discouraged. + + Setting this property will persist in the host bundle's user defaults. + To avoid this, you should consider implementing + `-[SPUUpdaterDelegate feedURLStringForUpdater:]` instead of using this method. + + Passing nil will remove any feed URL that has been set in the host bundle's user defaults. + If you do not need to alternate between multiple feeds, set the SUFeedURL in your Info.plist instead of invoking this method. + + For beta updates, you may consider migrating to `-[SPUUpdaterDelegate allowedChannelsForUpdater:]` in the future. + + This method must be called on the main thread; calls from background threads will have no effect. + */ +- (void)setFeedURL:(nullable NSURL *)feedURL; + +/** + The host bundle that is being updated. + */ +@property (nonatomic, readonly) NSBundle *hostBundle; + +/** + The user agent used when checking for updates. + + By default the user agent string returned is in the format: + $(BundleDisplayName)/$(BundleDisplayVersion) Sparkle/$(SparkleDisplayVersion) + + BundleDisplayVersion is derived from the main application's Info.plist's CFBundleShortVersionString. + + Note if Sparkle is being used to update another application, the bundle information retrieved is from the main application performing the updating. + + This default implementation can be overrided. + */ +@property (nonatomic, copy) NSString *userAgentString; + +/** + The HTTP headers used when checking for updates, downloading release notes, and downloading updates. + + The keys of this dictionary are HTTP header fields and values are corresponding values. + */ +@property (nonatomic, copy, nullable) NSDictionary *httpHeaders; + +/** + A property indicating whether or not the user's system profile information is sent when checking for updates. + + Setting this property will persist in the host bundle's user defaults. + */ +@property (nonatomic) BOOL sendsSystemProfile; + +/** + The date of the last update check or nil if no check has been performed yet. + + For testing purposes, the last update check is stored in the `SULastCheckTime` key in the host bundle's user defaults. + For example, `defaults delete my-bundle-id SULastCheckTime` can be invoked to clear the last update check time and test + if update checks are automatically scheduled. + */ +@property (nonatomic, readonly, copy, nullable) NSDate *lastUpdateCheckDate; + +/** + Appropriately schedules or cancels the update checking timer according to the settings for the time interval and automatic checks. + + If you change the `updateCheckInterval` or `automaticallyChecksForUpdates` properties, the update cycle will be reset automatically after a short delay. + The update cycle is also started automatically after the updater is started. In all these cases, this method should not be called directly. + + This call does not change the date of the next check, but only the internal timer. + */ +- (void)resetUpdateCycle; + + +/** + The system profile information that is sent when checking for updates. + */ +@property (nonatomic, readonly, copy) NSArray *> *systemProfileArray; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdaterDelegate.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdaterDelegate.h new file mode 100644 index 0000000000..a18e967f8b --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdaterDelegate.h @@ -0,0 +1,465 @@ +// +// SPUUpdaterDelegate.h +// Sparkle +// +// Created by Mayur Pawashe on 8/12/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import +#import +#import +#import + +@protocol SUVersionComparison; +@class SPUUpdater, SUAppcast, SUAppcastItem, SPUUserUpdateState; + +NS_ASSUME_NONNULL_BEGIN + +// ----------------------------------------------------------------------------- +// SUUpdater Notifications for events that might be interesting to more than just the delegate +// The updater will be the notification object +// ----------------------------------------------------------------------------- +SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification; +SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification; +SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification; +SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification; +#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification; +#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification; + +// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo +SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey; +// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo +SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey; + +// ----------------------------------------------------------------------------- +// System Profile Keys +// ----------------------------------------------------------------------------- + +SU_EXPORT extern NSString *const SUSystemProfilerApplicationNameKey; +SU_EXPORT extern NSString *const SUSystemProfilerApplicationVersionKey; +SU_EXPORT extern NSString *const SUSystemProfilerCPU64bitKey; +SU_EXPORT extern NSString *const SUSystemProfilerCPUCountKey; +SU_EXPORT extern NSString *const SUSystemProfilerCPUFrequencyKey; +SU_EXPORT extern NSString *const SUSystemProfilerCPUTypeKey; +SU_EXPORT extern NSString *const SUSystemProfilerCPUSubtypeKey; +SU_EXPORT extern NSString *const SUSystemProfilerHardwareModelKey; +SU_EXPORT extern NSString *const SUSystemProfilerMemoryKey; +SU_EXPORT extern NSString *const SUSystemProfilerOperatingSystemVersionKey; +SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey; + +// ----------------------------------------------------------------------------- +// SPUUpdater Delegate: +// ----------------------------------------------------------------------------- + +/** + Provides delegation methods to control the behavior of an `SPUUpdater` object. + */ +@protocol SPUUpdaterDelegate +@optional + +/** + Returns whether to allow Sparkle to check for updates. + + For example, this may be used to prevent Sparkle from interrupting a setup assistant. + Alternatively, you may want to consider starting the updater after eg: the setup assistant finishes. + + Note in Swift, this method returns Void and is marked with the throws keyword. If this method + doesn't throw an error, the updater may perform an update check. Otherwise if an error is thrown (we recommend using an NSError), + then the updater may not perform an update check. + + @param updater The updater instance. + @param updateCheck The type of update check that will be performed if the updater is allowed to check for updates. + @param error The populated error object if the updater may not perform a new update check. The @c NSLocalizedDescriptionKey user info key should be populated indicating a description of the error. + @return @c YES if the updater is allowed to check for updates, otherwise @c NO +*/ +- (BOOL)updater:(SPUUpdater *)updater mayPerformUpdateCheck:(SPUUpdateCheck)updateCheck error:(NSError * __autoreleasing *)error; + +/** + Returns the set of Sparkle channels the updater is allowed to find new updates from. + + An appcast item can specify a channel the update is posted to. Without specifying a channel, the appcast item is posted to the default channel. + For instance: + ``` + + 2.0 Beta 1 + beta + + ``` + + This example posts an update to the @c beta channel, so only updaters that are allowed to use the @c beta channel can find this update. + + If the @c element is not present, the update item is posted to the default channel and can be found by any updater. + + You can pick any name you'd like for the channel. The valid characters for channel names are letters, numbers, dashes, underscores, and periods. + + Note to use this feature, all app versions that your users may update from in your feed must use a version of Sparkle that supports this feature. + This feature was added in Sparkle 2. + + @return The set of channel names the updater is allowed to find new updates in. An empty set is the default behavior, + which means the updater will only look for updates in the default channel. + */ +- (NSSet *)allowedChannelsForUpdater:(SPUUpdater *)updater; + +/** + Returns a custom appcast URL used for checking for new updates. + + Override this to dynamically specify the feed URL. + + @param updater The updater instance. + @return An appcast feed URL to check for new updates in, or @c nil for the default behavior and if you don't want to be delegated this task. + */ +- (nullable NSString *)feedURLStringForUpdater:(SPUUpdater *)updater; + +/** + Returns additional parameters to append to the appcast URL's query string. + + This is potentially based on whether or not Sparkle will also be sending along the system profile. + + @param updater The updater instance. + @param sendingProfile Whether the system profile will also be sent. + + @return An array of dictionaries with keys: `key`, `value`, `displayKey`, `displayValue`, the latter two being specifically for display to the user. + */ +- (NSArray *> *)feedParametersForUpdater:(SPUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + +/** + Returns whether Sparkle should prompt the user about checking for new updates automatically. + + Use this to override the default behavior. + + @param updater The updater instance. + @return @c YES if the updater should prompt for permission to check for new updates automatically, otherwise @c NO + */ +- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SPUUpdater *)updater; + +/** + Returns an allowed list of system profile keys to be appended to the appcast URL's query string. + + By default all keys will be included. This method allows overriding which keys should only be allowed. + + @param updater The updater instance. + + @return An array of system profile keys to include in the appcast URL's query string. Elements must be one of the `SUSystemProfiler*Key` constants. Return @c nil for the default behavior and if you don't want to be delegated this task. + */ +- (nullable NSArray *)allowedSystemProfileKeysForUpdater:(SPUUpdater *)updater; + +/** + Called after Sparkle has downloaded the appcast from the remote server. + + Implement this if you want to do some special handling with the appcast once it finishes loading. + + @param updater The updater instance. + @param appcast The appcast that was downloaded from the remote server. + */ +- (void)updater:(SPUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + +/** + Called when a new valid update is found by the update driver. + + @param updater The updater instance. + @param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SPUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item; + +/** + Called when a valid new update is not found. + + There are various reasons a new update is unavailable and can't be installed. + + The userInfo dictionary on the error is populated with three keys: + - `SPULatestAppcastItemFoundKey`: if available, this may provide the latest `SUAppcastItem` that was found. This will be @c nil if it's unavailable. + - `SPUNoUpdateFoundReasonKey`: This will provide the `SPUNoUpdateFoundReason`. + For example the reason could be because the latest version in the feed requires a newer OS version or could be because the user is already on the latest version. + - `SPUNoUpdateFoundUserInitiatedKey`: A boolean that indicates if a new update was not found when the user intitiated an update check manually. + + @param updater The updater instance. + @param error An error containing information on why a new valid update was not found + */ +- (void)updaterDidNotFindUpdate:(SPUUpdater *)updater error:(NSError *)error; + +/** + Called when a valid new update is not found. + + If more information is needed on why an update was not found, use `-[SPUUpdaterDelegate updaterDidNotFindUpdate:error:]` instead. + + @param updater The updater instance. + */ +- (void)updaterDidNotFindUpdate:(SPUUpdater *)updater; + +/** + Returns the item in the appcast corresponding to the update that should be installed. + + Please consider using or migrating to other supported features before adopting this method. + Specifically: + - If you want to filter out certain tagged updates (like beta updates), consider `-[SPUUpdaterDelegate allowedChannelsForUpdater:]` instead. + - If you want to treat certain updates as informational-only, consider supplying @c with a set of affected versions users are updating from. + + If you're using special logic or extensions in your appcast, implement this to use your own logic for finding a valid update, if any, in the given appcast. + + Do not base your logic by filtering out items with a minimum or maximum OS version or minimum autoupdate version + because Sparkle already has logic for determining whether or not those items should be filtered out. + + Also do not return a non-top level item from the appcast such as a delta item. Delta items will be ignored. + Sparkle picks the delta item from your selection if the appropriate one is available. + + This method will not be invoked with an appcast that has zero items. Pick the best item from the appcast. + If an item is available that has the same version as the application or bundle to update, do not pick an item that is worse than that version. + + This method may be called multiple times for different selections and filters. This method should be efficient. + + Return `+[SUAppcastItem emptyAppcastItem]` if no appcast item is valid. + + Return @c nil if you don't want to be delegated this task and want to let Sparkle handle picking the best valid update. + + @param appcast The appcast that was downloaded from the remote server. + @param updater The updater instance. + @return The best valid appcast item. + */ +- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SPUUpdater *)updater; + +/** + Returns whether or not the updater should proceed with the new chosen update from the appcast. + + By default, the updater will always proceed with the best selected update found in an appcast. Override this to override this behavior. + + If you return @c NO and populate the @c error, the user is not shown this @c updateItem nor is the update downloaded or installed. + + Note in Swift, this method returns Void and is marked with the throws keyword. If this method doesn't throw an error, the updater will proceed with the update. + Otherwise if an error is thrown (we recommend using an NSError), then the will not proceed with the update. + + @param updater The updater instance. + @param updateItem The selected update item to proceed with. + @param updateCheck The type of update check that would be performed if proceeded. + @param error An error object that must be populated by the delegate if the updater should not proceed with the update. The @c NSLocalizedDescriptionKey user info key should be populated indicating a description of the error. + @return @c YES if the updater should proceed with @c updateItem, otherwise @c NO if the updater should not proceed with the update with an @c error populated. + */ +- (BOOL)updater:(SPUUpdater *)updater shouldProceedWithUpdate:(SUAppcastItem *)updateItem updateCheck:(SPUUpdateCheck)updateCheck error:(NSError * __autoreleasing *)error; + +/** + Called when a user makes a choice to install, dismiss, or skip an update. + + If the @c choice is `SPUUserUpdateChoiceDismiss` and @c state.stage is `SPUUserUpdateStageDownloaded` the downloaded update is kept + around until the next time Sparkle reminds the user of the update. + + If the @c choice is `SPUUserUpdateChoiceDismiss` and @c state.stage is `SPUUserUpdateStageInstalling` the update is still set to install on application termination. + + If the @c choice is `SPUUserUpdateChoiceSkip` the user will not be reminded in the future for this update unless they initiate an update check themselves. + + If @c updateItem.isInformationOnlyUpdate is @c YES the @c choice cannot be `SPUUserUpdateChoiceInstall`. + + @param updater The updater instance. + @param choice The choice (install, dismiss, or skip) the user made for this @c updateItem + @param updateItem The appcast item corresponding to the update that the user made a choice on. + @param state The current state for the update which includes if the update has already been downloaded or already installing. + */ +- (void)updater:(SPUUpdater *)updater userDidMakeChoice:(SPUUserUpdateChoice)choice forUpdate:(SUAppcastItem *)updateItem state:(SPUUserUpdateState *)state; + +/** + Returns whether the release notes (if available) should be downloaded after an update is found and shown. + + This is specifically for the @c element in the appcast item. + + @param updater The updater instance. + @param updateItem The update item to download and show release notes from. + + @return @c YES to download and show the release notes if available, otherwise @c NO. The default behavior is @c YES. + */ +- (BOOL)updater:(SPUUpdater *)updater shouldDownloadReleaseNotesForUpdate:(SUAppcastItem *)updateItem; + +/** + Called immediately before downloading the specified update. + + @param updater The updater instance. + @param item The appcast item corresponding to the update that is proposed to be downloaded. + @param request The mutable URL request that will be used to download the update. + */ +- (void)updater:(SPUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request; + +/** + Called immediately after succesfull download of the specified update. + + @param updater The SUUpdater instance. + @param item The appcast item corresponding to the update that has been downloaded. + */ +- (void)updater:(SPUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item; + +/** + Called after the specified update failed to download. + + @param updater The updater instance. + @param item The appcast item corresponding to the update that failed to download. + @param error The error generated by the failed download. + */ +- (void)updater:(SPUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error; + +/** + Called when the user cancels an update while it is being downloaded. + + @param updater The updater instance. + */ +- (void)userDidCancelDownload:(SPUUpdater *)updater; + +/** + Called immediately before extracting the specified downloaded update. + + @param updater The SUUpdater instance. + @param item The appcast item corresponding to the update that is proposed to be extracted. + */ +- (void)updater:(SPUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item; + +/** + Called immediately after extracting the specified downloaded update. + + @param updater The SUUpdater instance. + @param item The appcast item corresponding to the update that has been extracted. + */ +- (void)updater:(SPUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item; + +/** + Called immediately before installing the specified update. + + @param updater The updater instance. + @param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SPUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item; + +/** + Returns whether the relaunch should be delayed in order to perform other tasks. + + This is not called if the user didn't relaunch on the previous update, + in that case it will immediately restart. + + This may also not be called if the application is not going to relaunch after it terminates. + + @param updater The updater instance. + @param item The appcast item corresponding to the update that is proposed to be installed. + @param installHandler The install handler that must be completed before continuing with the relaunch. + + @return @c YES to delay the relaunch until @c installHandler is invoked. + */ +- (BOOL)updater:(SPUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvokingBlock:(void (^)(void))installHandler; + +/** + Returns whether the application should be relaunched at all. + + Some apps **cannot** be relaunched under certain circumstances. + This method can be used to explicitly prevent a relaunch. + + @param updater The updater instance. + @return @c YES if the updater should be relaunched, otherwise @c NO if it shouldn't. + */ +- (BOOL)updaterShouldRelaunchApplication:(SPUUpdater *)updater; + +/** + Called immediately before relaunching. + + @param updater The updater instance. + */ +- (void)updaterWillRelaunchApplication:(SPUUpdater *)updater; + +/** + Returns an object that compares version numbers to determine their arithmetic relation to each other. + + This method allows you to provide a custom version comparator. + If you don't implement this method or return @c nil, + the standard version comparator will be used. + + Note that the standard version comparator may be used during installation for preventing a downgrade, + even if you provide a custom comparator here. + + @param updater The updater instance. + @return The custom version comparator or @c nil if you don't want to be delegated this task. + */ +- (nullable id)versionComparatorForUpdater:(SPUUpdater *)updater; + +/** + Called when a background update will be scheduled after a delay. + + Automatic update checks need to be enabled for this to trigger. + + @param delay The delay in seconds until the next scheduled update will occur. This is an approximation and may vary due to system state. + + @param updater The updater instance. + */ +- (void)updater:(SPUUpdater *)updater willScheduleUpdateCheckAfterDelay:(NSTimeInterval)delay; + +/** + Called when no update checks will be scheduled in the future. + + This may later change if automatic update checks become enabled. + + @param updater The updater instance. + */ +- (void)updaterWillNotScheduleUpdateCheck:(SPUUpdater *)updater; + +/** + Returns the decryption password (if any) which is used to extract the update archive DMG. + + Return @c nil if no password should be used. + + @param updater The updater instance. + @return The password used for decrypting the archive, or @c nil if no password should be used. + */ +- (nullable NSString *)decryptionPasswordForUpdater:(SPUUpdater *)updater; + +/** + Called when an update is scheduled to be silently installed on quit after downloading the update automatically. + + If the updater is given responsibility, it can later remind the user an update is available if they have not terminated the application for a long time. + + Also if the updater is given responsibility and the update item is marked critical, the new update will be presented to the user immediately after. + + Even if the @c immediateInstallHandler is not invoked, the installer will attempt to install the update on termination. + + @param updater The updater instance. + @param item The appcast item corresponding to the update that is proposed to be installed. + @param immediateInstallHandler The install handler for the delegate to immediately install the update. No UI interaction will be shown and the application will be relaunched after installation. This handler can only be used if @c YES is returned and the delegate handles installing the update. For Sparkle 2.3 onwards, this handler can be invoked multiple times in case the application cancels the termination request. + @return @c YES if the delegate will handle installing the update or @c NO if the updater should be given responsibility. + */ +- (BOOL)updater:(SPUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))immediateInstallHandler; + +/** + Called after the update driver aborts due to an error. + + The update driver runs when checking for updates. This delegate method is called an error occurs during this process. + + Some special possible values of `error.code` are: + + - `SUNoUpdateError`: No new update was found. + - `SUInstallationCanceledError`: The user canceled installing the update when requested for authorization. + + @param updater The updater instance. + @param error The error that caused the update driver to abort. + */ +- (void)updater:(SPUUpdater *)updater didAbortWithError:(NSError *)error; + +/** + Called after the update driver finishes. + + The update driver runs when checking for updates. This delegate method is called when that check is finished. + + An update may be scheduled to be installed during the update cycle, or no updates may be found, or an available update may be dismissed or skipped (which is the same as no error). + + If the @c error is @c nil, no error has occurred. + + Some special possible values of `error.code` are: + + - `SUNoUpdateError`: No new update was found. + - `SUInstallationCanceledError`: The user canceled installing the update when requested for authorization. + + @param updater The updater instance. + @param updateCheck The type of update check was performed. + @param error The error that caused the update driver to abort. This is @c nil if the update driver finished normally and there is no error. + */ +- (void)updater:(SPUUpdater *)updater didFinishUpdateCycleForUpdateCheck:(SPUUpdateCheck)updateCheck error:(nullable NSError *)error; + +/* Deprecated methods */ + +- (BOOL)updaterMayCheckForUpdates:(SPUUpdater *)updater __deprecated_msg("Please use -[SPUUpdaterDelegate updater:mayPerformUpdateCheck:error:] instead."); + +- (void)updater:(SPUUpdater *)updater userDidSkipThisVersion:(SUAppcastItem *)item __deprecated_msg("Please use -[SPUUpdaterDelegate updater:userDidMakeChoice:forUpdate:state:] instead."); + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdaterSettings.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdaterSettings.h new file mode 100644 index 0000000000..a480a42aaf --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUpdaterSettings.h @@ -0,0 +1,60 @@ +// +// SPUUpdaterSettings.h +// Sparkle +// +// Created by Mayur Pawashe on 3/27/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +/** + This class can be used for reading certain updater settings. + + It retrieves the settings by first looking into the host's user defaults. + If the setting is not found in there, then the host's Info.plist file is looked at. + */ +SU_EXPORT @interface SPUUpdaterSettings : NSObject + +- (instancetype)initWithHostBundle:(NSBundle *)hostBundle; + +/** + * Indicates whether or not automatic update checks are enabled. + */ +@property (readonly, nonatomic) BOOL automaticallyChecksForUpdates; + +/** + * The regular update check interval. + */ +@property (readonly, nonatomic) NSTimeInterval updateCheckInterval; + +/** + * Indicates whether or not automatically downloading updates is allowed to be turned on by the user. + * If this value is nil, the developer has not explicitly specified this option. + */ +@property (readonly, nonatomic, nullable) NSNumber *allowsAutomaticUpdatesOption; + +/** + * Indicates whether or not automatically downloading updates is allowed to be turned on by the user. + */ +@property (readonly, nonatomic) BOOL allowsAutomaticUpdates; + +/** + * Indicates whether or not automatically downloading updates is enabled by the user or developer. + * + * Note this does not indicate whether or not automatic downloading of updates is allowable. + * See `-allowsAutomaticUpdates` property for that. + */ +@property (readonly, nonatomic) BOOL automaticallyDownloadsUpdates; + +/** + * Indicates whether or not anonymous system profile information is sent when checking for updates. + */ +@property (readonly, nonatomic) BOOL sendsSystemProfile; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUserDriver.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUserDriver.h new file mode 100644 index 0000000000..22cc1670bc --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUserDriver.h @@ -0,0 +1,287 @@ +// +// SPUUserDriver.h +// Sparkle +// +// Created by Mayur Pawashe on 2/14/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@class SPUUpdatePermissionRequest, SUUpdatePermissionResponse, SUAppcastItem, SPUDownloadData; + +/** + The API in Sparkle for controlling the user interaction. + + This protocol is used for implementing a user interface for the Sparkle updater. Sparkle's internal drivers tell + an object that implements this protocol what actions to take and show to the user. + + Every method in this protocol can be assumed to be called from the main thread. + */ +SU_EXPORT @protocol SPUUserDriver + +/** + * Show an updater permission request to the user + * + * Ask the user for their permission regarding update checks. + * This is typically only called once per app installation. + * + * @param request The update permission request. + * @param reply A reply with a update permission response. + */ +- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply; + +/** + * Show the user initating an update check + * + * Respond to the user initiating an update check. Sparkle uses this to show the user a window with an indeterminate progress bar. + * + * @param cancellation Invoke this cancellation block to cancel the update check before the update check is completed. + */ +- (void)showUserInitiatedUpdateCheckWithCancellation:(void (^)(void))cancellation; + +/** + * Show the user a new update is found. + * + * Let the user know a new update is found and ask them what they want to do. + * Before this point, `-showUserInitiatedUpdateCheckWithCancellation:` may be called. + * + * The potential `stage`s on the updater @c state are: + * + * `SPUUpdateStateNotDownloaded` - Update has not been downloaded yet. + * + * `SPUUpdateStateDownloaded` - Update has already been downloaded but not started installing yet. + * + * `SPUUpdateStateInstalling` - Update has been downloaded and already started installing. + * + * The `userIntiated` property on the @c state indicates if the update was initiated by the user or if it was automatically scheduled in the background. + * + * Additionally, these properties on the @c appcastItem are of importance: + * + * @c appcastItem.informationOnlyUpdate indicates if the update is only informational and should not be downloaded. You can direct the user to the infoURL property of the appcastItem in their web browser. Sometimes information only updates are used as a fallback in case a bad update is shipped, so you'll want to support this case. + * + * @c appcastItem.majorUpgrade indicates if the update is a major or paid upgrade. + * + * @c appcastItem.criticalUpdate indicates if the update is a critical update. + * + * A reply of `SPUUserUpdateChoiceInstall` begins or resumes downloading or installing the update. + * If the state.stage is `SPUUserUpdateStateInstalling`, this may send a quit event to the application and relaunch it immediately (in this state, this behaves as a fast "install and Relaunch"). + * Do not use this reply if @c appcastItem.informationOnlyUpdate is YES. + * + * A reply of `SPUUserUpdateChoiceDismiss` dismisses the update for the time being. The user may be reminded of the update at a later point. + * If the state.stage is `SPUUserUpdateStateDownloaded`, the downloaded update is kept after dismissing until the next time an update is shown to the user. + * If the state.stage is `SPUUserUpdateStateInstalling`, the installing update is also preserved after dismissing. In this state however, the update will also still be installed after the application is terminated. + * + * A reply of `SPUUserUpdateChoiceSkip` skips this particular version and won't notify the user again, unless they initiate an update check themselves. + * If @c appcastItem.majorUpgrade is YES, the major update and any future minor updates to that major release are skipped, unless a future minor update specifies a `` requirement. + * If the state.stage is `SPUUpdateStateInstalling`, the installation is also canceled when the update is skipped. + * + * @param appcastItem The Appcast Item containing information that reflects the new update. + * @param state The current state of the user update. See above discussion for notable properties. + * @param reply The reply which indicates if the update should be installed, dismissed, or skipped. See above discussion for more details. + */ +- (void)showUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem state:(SPUUserUpdateState *)state reply:(void (^)(SPUUserUpdateChoice))reply; + +/** + * Show the user the release notes for the new update + * + * Display the release notes to the user. This will be called after showing the new update. + * This is only applicable if the release notes are linked from the appcast, and are not directly embedded inside of the appcast file. + * That is, this may be invoked if the releaseNotesURL from the appcast item is non-nil. + * + * @param downloadData The data for the release notes that was downloaded from the new update's appcast. + */ +- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData; + +/** + * Show the user that the new update's release notes could not be downloaded + * + * This will be called after showing the new update. + * This is only applicable if the release notes are linked from the appcast, and are not directly embedded inside of the appcast file. + * That is, this may be invoked if the releaseNotesURL from the appcast item is non-nil. + * + * @param error The error associated with why the new update's release notes could not be downloaded. + */ +- (void)showUpdateReleaseNotesFailedToDownloadWithError:(NSError *)error; + +/** + * Show the user a new update was not found + * + * Let the user know a new update was not found after they tried initiating an update check. + * Before this point, `-showUserInitiatedUpdateCheckWithCancellation:` may be called. + * + * There are various reasons a new update is unavailable and can't be installed. + * The @c error object is populated with recovery and suggestion strings suitable to be shown in an alert. + * + * The @c userInfo dictionary on the @c error is also populated with two keys: + * + * `SPULatestAppcastItemFoundKey`: if available, this may provide the latest SUAppcastItem that was found. + * + * `SPUNoUpdateFoundReasonKey`: if available, this will provide the `SUNoUpdateFoundReason`. For example the reason could be because + * the latest version in the feed requires a newer OS version or could be because the user is already on the latest version. + * + * @param error The error associated with why a new update was not found. See above discussion for more details. + * @param acknowledgement Acknowledge to the updater that no update found error was shown. + */ +- (void)showUpdateNotFoundWithError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement; + +/** + * Show the user an update error occurred + * + * Let the user know that the updater failed with an error. This will not be invoked without the user having been + * aware that an update was in progress. + * + * Before this point, any of the non-error user driver methods may have been invoked. + * + * @param error The error associated with what update error occurred. + * @param acknowledgement Acknowledge to the updater that the error was shown. + */ +- (void)showUpdaterError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement; + +/** + * Show the user that downloading the new update initiated + * + * Let the user know that downloading the new update started. + * + * @param cancellation Invoke this cancellation block to cancel the download at any point before `-showDownloadDidStartExtractingUpdate` is invoked. + */ +- (void)showDownloadInitiatedWithCancellation:(void (^)(void))cancellation; + +/** + * Show the user the content length of the new update that will be downloaded + * + * @param expectedContentLength The expected content length of the new update being downloaded. + * An implementor should be able to handle if this value is invalid (more or less than actual content length downloaded). + * Additionally, this method may be called more than once for the same download in rare scenarios. + */ +- (void)showDownloadDidReceiveExpectedContentLength:(uint64_t)expectedContentLength; + +/** + * Show the user that the update download received more data + * + * This may be an appropriate time to advance a visible progress indicator of the download + * @param length The length of the data that was just downloaded + */ +- (void)showDownloadDidReceiveDataOfLength:(uint64_t)length; + +/** + * Show the user that the update finished downloading and started extracting + * + * Sparkle uses this to show an indeterminate progress bar. + * + * Note that an update can resume at this point after having been downloaded before, + * so this may be called without any of the download callbacks being invoked prior. + */ +- (void)showDownloadDidStartExtractingUpdate; + +/** + * Show the user that the update is extracting with progress + * + * Let the user know how far along the update extraction is. + * + * Before this point, `-showDownloadDidStartExtractingUpdate` is called. + * + * @param progress The progress of the extraction from a 0.0 to 1.0 scale + */ +- (void)showExtractionReceivedProgress:(double)progress; + +/** + * Show the user that the update is ready to install & relaunch + * + * Let the user know that the update is ready to install and relaunch, and ask them whether they want to proceed. + * Note if the target application has already terminated, this method may not be invoked. + * + * A reply of `SPUUserUpdateChoiceInstall` installs the update the new update immediately. The application is relaunched only if it is still running by the time this reply is invoked. If the application terminates on its own, Sparkle will attempt to automatically install the update. + * + * A reply of `SPUUserUpdateChoiceDismiss` dismisses the update installation for the time being. Note the update may still be installed automatically after the application terminates. + * + * A reply of `SPUUserUpdateChoiceSkip` cancels the current update that has begun installing and dismisses the update. In this circumstance, the update is canceled but this update version is not skipped in the future. + * + * Before this point, `-showExtractionReceivedProgress:` or `-showUpdateFoundWithAppcastItem:state:reply:` may be called. + * + * @param reply The reply which indicates if the update should be installed, dismissed, or skipped. See above discussion for more details. + */ +- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))reply; + +/** + * Show the user that the update is installing + * + * Let the user know that the update is currently installing. + * + * Before this point, `-showReadyToInstallAndRelaunch:` or `-showUpdateFoundWithAppcastItem:state:reply:` will be called. + * + * @param applicationTerminated Indicates if the application has been terminated already. + * If the application hasn't been terminated, a quit event is sent to the running application before installing the update. + * If the application or user delays or cancels termination, there may be an indefinite period of time before the application fully quits. + * It is up to the implementor whether or not to decide to continue showing installation progress in this case. + * + * @param retryTerminatingApplication This handler gives a chance for the application to re-try sending a quit event to the running application before installing the update. + * The application may cancel or delay termination. This handler gives the user driver another chance to allow the user to try terminating the application again. + * If the application does not delay or cancel application termination, there is no need to invoke this handler. This handler may be invoked multiple times. + * Note this handler should not be invoked if @c applicationTerminated is already @c YES + */ +- (void)showInstallingUpdateWithApplicationTerminated:(BOOL)applicationTerminated retryTerminatingApplication:(void (^)(void))retryTerminatingApplication; + +/** + * Show the user that the update installation finished + * + * Let the user know that the update finished installing. + * + * This will only be invoked if the updater process is still alive, which is typically not the case if + * the updater's lifetime is tied to the application it is updating. This implementation must not try to reference + * the old bundle prior to the installation, which will no longer be around. + * + * Before this point, `-showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication:` will be called. + * + * @param relaunched Indicates if the update was relaunched. + * @param acknowledgement Acknowledge to the updater that the finished installation was shown. + */ +- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement; + +/** + * Show the user the current presented update or its progress in utmost focus + * + * The user wishes to check for updates while the user is being shown update progress. + * Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc). + */ +- (void)showUpdateInFocus; + +/** + * Dismiss the current update installation + * + * Stop and tear down everything. + * Dismiss all update windows, alerts, progress, etc from the user. + * Basically, stop everything that could have been started. Sparkle may invoke this when aborting or finishing an update. + */ +- (void)dismissUpdateInstallation; + +/* + * Below are deprecated methods that have been replaced by better alternatives. + * The deprecated methods will be used if the alternatives have not been implemented yet. + * In the future support for using these deprecated methods may be removed however. + */ +@optional + +// Clients should move to non-deprecated methods +// Deprecated methods are only (temporarily) kept around for compatibility reasons + +- (void)showUpdateNotFoundWithAcknowledgement:(void (^)(void))acknowledgement __deprecated_msg("Implement -showUpdateNotFoundWithError:acknowledgement: instead"); + +- (void)showUpdateInstallationDidFinishWithAcknowledgement:(void (^)(void))acknowledgement __deprecated_msg("Implement -showUpdateInstalledAndRelaunched:acknowledgement: instead"); + +- (void)dismissUserInitiatedUpdateCheck __deprecated_msg("Transition to new UI appropriately when a new update is shown, when no update is found, or when an update error occurs."); + +- (void)showInstallingUpdate __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead."); + +- (void)showSendingTerminationSignal __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead."); + +- (void)showInstallingUpdateWithApplicationTerminated:(BOOL)applicationTerminated __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead.");; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUserUpdateState.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUserUpdateState.h new file mode 100644 index 0000000000..f7fcc1e832 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SPUUserUpdateState.h @@ -0,0 +1,77 @@ +// +// SPUUserUpdateState.h +// Sparkle +// +// Created by Mayur Pawashe on 2/29/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#ifndef SPUUserUpdateState_h +#define SPUUserUpdateState_h + +#import + +#import + +NS_ASSUME_NONNULL_BEGIN + +/** + A choice made by the user when prompted with a new update. + */ +typedef NS_ENUM(NSInteger, SPUUserUpdateChoice) { + /** + Dismisses the update and skips being notified of it in the future. + */ + SPUUserUpdateChoiceSkip, + /** + Downloads (if needed) and installs the update. + */ + SPUUserUpdateChoiceInstall, + /** + Dismisses the update until Sparkle reminds the user of it at a later time. + */ + SPUUserUpdateChoiceDismiss, +}; + +/** + Describes the current stage an update is undergoing. + */ +typedef NS_ENUM(NSInteger, SPUUserUpdateStage) { + /** + The update has not been downloaded. + */ + SPUUserUpdateStageNotDownloaded, + /** + The update has already been downloaded but not begun installing. + */ + SPUUserUpdateStageDownloaded, + /** + The update has already been downloaded and began installing in the background. + */ + SPUUserUpdateStageInstalling +}; + +/** + This represents the user's current update state. + */ +SU_EXPORT @interface SPUUserUpdateState : NSObject + +- (instancetype)init NS_UNAVAILABLE; + +/** + The current update stage. + + This stage indicates if data has been already downloaded or not, or if an update is currently being installed. + */ +@property (nonatomic, readonly) SPUUserUpdateStage stage; + +/** + Indicates whether or not the update check was initiated by the user. + */ +@property (nonatomic, readonly) BOOL userInitiated; + +@end + +NS_ASSUME_NONNULL_END + +#endif /* SPUUserUpdateState_h */ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUAppcast.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUAppcast.h new file mode 100644 index 0000000000..3454b1b0f6 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUAppcast.h @@ -0,0 +1,37 @@ +// +// SUAppcast.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCAST_H +#define SUAPPCAST_H + +#import +#import + +NS_ASSUME_NONNULL_BEGIN + +@class SUAppcastItem; + +/** + The appcast representing a collection of `SUAppcastItem` items in the feed. + */ +SU_EXPORT @interface SUAppcast : NSObject + +- (instancetype)init NS_UNAVAILABLE; + +/** + The collection of update items. + + These `SUAppcastItem` items are in the same order as specified in the appcast XML feed and are thus not sorted by version. + */ +@property (readonly, copy) NSArray *items; + +@end + +NS_ASSUME_NONNULL_END + +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUAppcastItem.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUAppcastItem.h new file mode 100644 index 0000000000..c53c87ca06 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUAppcastItem.h @@ -0,0 +1,391 @@ +// +// SUAppcastItem.h +// Sparkle +// +// Created by Andy Matuschak on 3/12/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUAPPCASTITEM_H +#define SUAPPCASTITEM_H + +#import + +#ifdef BUILDING_SPARKLE_TESTS +// Ignore incorrect warning +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header" +#import "SUExport.h" +#pragma clang diagnostic pop +#else +#import +#endif + +NS_ASSUME_NONNULL_BEGIN + +/** + The appcast item describing an update in the application's appcast feed. + + An appcast item represents a single update item in the `SUAppcast` contained within the @c element. + + Every appcast item must have a `versionString`, and either a `fileURL` or an `infoURL`. + All the remaining properties describing an update to the application are optional. + + Extended documentation and examples on using appcast item features are available at: + https://sparkle-project.org/documentation/publishing/ + */ +SU_EXPORT @interface SUAppcastItem : NSObject + +/** + The version of the update item. + + Sparkle uses this property to compare update items and determine the best available update item in the `SUAppcast`. + + This corresponds to the application update's @c CFBundleVersion + + This is extracted from the @c element, or the @c sparkle:version attribute from the @c element. + */ +@property (copy, readonly) NSString *versionString; + +/** + The human-readable display version of the update item if provided. + + This is the version string shown to the user when they are notified of a new update. + + This corresponds to the application update's @c CFBundleShortVersionString + + This is extracted from the @c element, or the @c sparkle:shortVersionString attribute from the @c element. + + If no short version string is available, this falls back to the update's `versionString`. + */ +@property (copy, readonly) NSString *displayVersionString; + +/** + The file URL to the update item if provided. + + This download contains the actual update Sparkle will attempt to install. + In cases where a download cannot be provided, an `infoURL` must be provided instead. + + A file URL should have an accompanying `contentLength` provided. + + This is extracted from the @c url attribute in the @c element. + */ +@property (readonly, nullable) NSURL *fileURL; + +/** + The content length of the download in bytes. + + This property is used as a fallback when the server doesn't report the content length of the download. + In that case, it is used to report progress of the downloading update to the user. + + A warning is outputted if this property is not equal the server's expected content length (if provided). + + This is extracted from the @c length attribute in the @c element. + It should be specified if a `fileURL` is provided. + */ +@property (nonatomic, readonly) uint64_t contentLength; + +/** + The info URL to the update item if provided. + + This informational link is used to direct the user to learn more about an update they cannot download/install directly from within the application. + The link should point to the product's web page. + + The informational link will be used if `informationOnlyUpdate` is @c YES + + This is extracted from the @c element. + */ +@property (readonly, nullable) NSURL *infoURL; + +/** + Indicates whether or not the update item is only informational and has no download. + + If `infoURL` is not present, this is @c NO + + If `fileURL` is not present, this is @c YES + + Otherwise this is determined based on the contents extracted from the @c element. + */ +@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate; + +/** + The title of the appcast item if provided. + + This is extracted from the @c element. + */ +@property (copy, readonly, nullable) NSString *title; + +/** + The date string of the appcast item if provided. + + The `date` property is constructed from this property and expects this string to comply with the following date format: + `E, dd MMM yyyy HH:mm:ss Z` + + This is extracted from the @c <pubDate> element. + */ +@property (copy, readonly, nullable) NSString *dateString; + +/** + The date constructed from the `dateString` property if provided. + + Sparkle by itself only uses this property for phased group rollouts specified via `phasedRolloutInterval`, but clients may query this property too. + + This date is constructed using the @c en_US locale. + */ +@property (copy, readonly, nullable) NSDate *date; + +/** + The release notes URL of the appcast item if provided. + + This external link points to an HTML file that Sparkle downloads and renders to show the user a new or old update item's changelog. + + An alternative to using an external release notes link is providing an embedded `itemDescription`. + + This is extracted from the @c <sparkle:releaseNotesLink> element. + */ +@property (readonly, nullable) NSURL *releaseNotesURL; + +/** + The description of the appcast item if provided. + + A description may be provided for inline/embedded release notes for new updates using @c <![CDATA[...]]> + This is an alternative to providing a `releaseNotesURL`. + + This is extracted from the @c <description> element. + */ +@property (copy, readonly, nullable) NSString *itemDescription; + +/** + The full release notes URL of the appcast item if provided. + + The link should point to the product's full changelog. + + Sparkle's standard user interface offers to show these full release notes when a user checks for a new update and no new update is available. + + This is extracted from the @c <sparkle:fullReleaseNotesLink> element. + */ +@property (readonly, nullable) NSURL *fullReleaseNotesURL; + +/** + The required minimum system operating version string for this update if provided. + + This version string should contain three period-separated components. + + Example: @c 10.13.0 + + Use `minimumOperatingSystemVersionIsOK` property to test if the current running system passes this requirement. + + This is extracted from the @c <sparkle:minimumSystemVersion> element. + */ +@property (copy, readonly, nullable) NSString *minimumSystemVersion; + +/** + Indicates whether or not the current running system passes the `minimumSystemVersion` requirement. + */ +@property (nonatomic, readonly) BOOL minimumOperatingSystemVersionIsOK; + +/** + The required maximum system operating version string for this update if provided. + + A maximum system operating version requirement should only be made in unusual scenarios. + + This version string should contain three period-separated components. + + Example: @c 10.14.0 + + Use `maximumOperatingSystemVersionIsOK` property to test if the current running system passes this requirement. + + This is extracted from the @c <sparkle:maximumSystemVersion> element. + */ +@property (copy, readonly, nullable) NSString *maximumSystemVersion; + +/** + Indicates whether or not the current running system passes the `maximumSystemVersion` requirement. + */ +@property (nonatomic, readonly) BOOL maximumOperatingSystemVersionIsOK; + +/** + The channel the update item is on if provided. + + An update item may specify a custom channel name (such as @c beta) that can only be found by updaters that filter for that channel. + If no channel is provided, the update item is assumed to be on the default channel. + + This is extracted from the @c <sparkle:channel> element. + Old applications must be using Sparkle 2 or later to interpret the channel element and to ignore unmatched channels. + */ +@property (nonatomic, readonly, nullable) NSString *channel; + +/** + The installation type of the update at `fileURL` + + This may be: + - @c application - indicates this is a regular application update. + - @c package - indicates this is a guided package installer update. + - @c interactive-package - indicates this is an interactive package installer update (deprecated; use "package" instead) + + This is extracted from the @c sparkle:installationType attribute in the @c <enclosure> element. + + If no installation type is provided in the enclosure, the installation type is inferred from the `fileURL` file extension instead. + + If the file extension is @c pkg or @c mpkg, the installation type is @c package otherwise it is @c application + + Hence, the installation type in the enclosure element only needs to be specified for package based updates distributed inside of a @c zip or other archive format. + + Old applications must be using Sparkle 1.26 or later to support downloading bare package updates (`pkg` or `mpkg`) that are not additionally archived inside of a @c zip or other archive format. + */ +@property (nonatomic, copy, readonly) NSString *installationType; + +/** + The phased rollout interval of the update item in seconds if provided. + + This is the interval between when different groups of users are notified of a new update. + + For this property to be used by Sparkle, the published `date` on the update item must be present as well. + + After each interval after the update item's `date`, a new group of users become eligible for being notified of the new update. + + This is extracted from the @c <sparkle:phasedRolloutInterval> element. + + Old applications must be using Sparkle 1.25 or later to support phased rollout intervals, otherwise they may assume updates are immediately available. + */ +@property (copy, readonly, nullable) NSNumber* phasedRolloutInterval; + +/** + The minimum bundle version string this update requires for automatically downloading and installing updates if provided. + + If an application's bundle version meets this version requirement, it can install the new update item in the background automatically. + + Otherwise if the requirement is not met, the user is always prompted to install the update. In this case, the update is assumed to be a `majorUpgrade`. + + If the update is a `majorUpgrade` and the update is skipped by the user, other future update alerts with the same `minimumAutoupdateVersion` will also be skipped automatically unless an update specifies `ignoreSkippedUpgradesBelowVersion`. + + This version string corresponds to the application's @c CFBundleVersion + + This is extracted from the @c <sparkle:minimumAutoupdateVersion> element. + */ +@property (copy, readonly, nullable) NSString *minimumAutoupdateVersion; + +/** + Indicates whether or not the update item is a major upgrade. + + An update is a major upgrade if the application's bundle version doesn't meet the `minimumAutoupdateVersion` requirement. + */ +@property (getter=isMajorUpgrade, readonly) BOOL majorUpgrade; + +/** + Previously skipped upgrades by the user will be ignored if they skipped an update whose version precedes this version. + + This can only be applied if the update is a `majorUpgrade`. + + This version string corresponds to the application's @c CFBundleVersion + + This is extracted from the @c <sparkle:ignoreSkippedUpgradesBelowVersion> element. + + Old applications must be using Sparkle 2.1 or later, otherwise this property will be ignored. + */ +@property (nonatomic, readonly, nullable) NSString *ignoreSkippedUpgradesBelowVersion; + +/** + Indicates whether or not the update item is critical. + + Critical updates are shown to the user more promptly. Sparkle's standard user interface also does not allow them to be skipped. + + This is determined and extracted from a top-level @c <sparkle:criticalUpdate> element or a @c sparkle:criticalUpdate element inside of a @c sparkle:tags element. + + Old applications must be using Sparkle 2 or later to support the top-level @c <sparkle:criticalUpdate> element. + */ +@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate; + +/** + Specifies the operating system the download update is available for if provided. + + If this property is not provided, then the supported operating system is assumed to be macOS. + + Known potential values for this string are @c macos and @c windows + + Sparkle on Mac ignores update items that are for other operating systems. + This is only useful for sharing appcasts between Sparkle on Mac and Sparkle on other operating systems. + + Use `macOsUpdate` property to test if this update item is for macOS. + + This is extracted from the @c sparkle:os attribute in the @c <enclosure> element. + */ +@property (copy, readonly, nullable) NSString *osString; + +/** + Indicates whether or not this update item is for macOS. + + This is determined from the `osString` property. + */ +@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate; + +/** + The delta updates for this update item. + + Sparkle uses these to download and apply a smaller update based on the version the user is updating from. + + The key is based on the @c sparkle:version of the update. + The value is an update item that will have `deltaUpdate` be @c YES + + Clients typically should not need to examine the contents of the delta updates. + + This is extracted from the @c <sparkle:deltas> element. + */ +@property (copy, readonly, nullable) NSDictionary<NSString *, SUAppcastItem *> *deltaUpdates; + +/** + The expected size of the Sparkle executable file before applying this delta update. + + This attribute is used to test if the delta item can still be applied. If Sparkle's executable file has changed (e.g. from having an architecture stripped), + then the delta item cannot be applied. + + This is extracted from the @c sparkle:deltaFromSparkleExecutableSize attribute from the @c <enclosure> element of a @c sparkle:deltas item. + This attribute is optional for delta update items. + */ +@property (nonatomic, readonly, nullable) NSNumber *deltaFromSparkleExecutableSize; + +/** + An expected set of Sparkle's locales present on disk before applying this delta update. + + This attribute is used to test if the delta item can still be applied. If Sparkle's list of locales present on disk (.lproj directories) do not contain any items from this set, + (e.g. from having localization files stripped) then the delta item cannot be applied. This set does not need to be a complete list of locales. Sparkle may even decide + to not process all them. 1-10 should be a decent amount. + + This is extracted from the @c sparkle:deltaFromSparkleLocales attribute from the @c <enclosure> element of a @c sparkle:deltas item. + The locales extracted from this attribute are delimited by a comma (e.g. "en,ca,fr,hr,hu"). This attribute is optional for delta update items. + */ +@property (nonatomic, readonly, nullable) NSSet<NSString *> *deltaFromSparkleLocales; + +/** + Indicates whether or not the update item is a delta update. + + An update item is a delta update if it is in the `deltaUpdates` of another update item. + */ +@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate; + +/** + The dictionary representing the entire appcast item. + + This is useful for querying custom extensions or elements from the appcast item. + */ +@property (readonly, copy) NSDictionary *propertiesDictionary; + +- (instancetype)init NS_UNAVAILABLE; + +/** + An empty appcast item. + + This may be used as a potential return value in `-[SPUUpdaterDelegate bestValidUpdateInAppcast:forUpdater:]` + */ ++ (instancetype)emptyAppcastItem; + +// Deprecated initializers +- (nullable instancetype)initWithDictionary:(NSDictionary *)dict __deprecated_msg("Properties that depend on the system or application version are not supported when used with this initializer. The designated initializer is available in SUAppcastItem+Private.h. Please first explore other APIs or contact us to describe your use case."); +- (nullable instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error __deprecated_msg("Properties that depend on the system or application version are not supported when used with this initializer. The designated initializer is available in SUAppcastItem+Private.h. Please first explore other APIs or contact us to describe your use case."); +- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error __deprecated_msg("Properties that depend on the system or application version are not supported when used with this initializer. The designated initializer is available in SUAppcastItem+Private.h. Please first explore other APIs or contact us to describe your use case."); + +@end + +NS_ASSUME_NONNULL_END + +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUErrors.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUErrors.h new file mode 100644 index 0000000000..22bf606644 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUErrors.h @@ -0,0 +1,106 @@ +// +// SUErrors.h +// Sparkle +// +// Created by C.W. Betts on 10/13/14. +// Copyright (c) 2014 Sparkle Project. All rights reserved. +// + +#ifndef SUERRORS_H +#define SUERRORS_H + +#import <Foundation/Foundation.h> + +#if defined(BUILDING_SPARKLE_TOOL) || defined(BUILDING_SPARKLE_TESTS) +// Ignore incorrect warning +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header" +#import "SUExport.h" +#pragma clang diagnostic pop +#else +#import <Sparkle/SUExport.h> +#endif + +/** + * Error domain used by Sparkle + */ +SU_EXPORT extern NSString *const SUSparkleErrorDomain; + +typedef NS_ENUM(OSStatus, SUError) { + // Configuration phase errors + SUNoPublicDSAFoundError = 0001, + SUInsufficientSigningError = 0002, + SUInsecureFeedURLError = 0003, + SUInvalidFeedURLError = 0004, + SUInvalidUpdaterError = 0005, + SUInvalidHostBundleIdentifierError = 0006, + SUInvalidHostVersionError = 0007, + + // Appcast phase errors. + SUAppcastParseError = 1000, + SUNoUpdateError = 1001, + SUAppcastError = 1002, + SURunningFromDiskImageError = 1003, + SUResumeAppcastError = 1004, + SURunningTranslocated = 1005, + SUWebKitTerminationError = 1006, + + // Download phase errors. + SUTemporaryDirectoryError = 2000, + SUDownloadError = 2001, + + // Extraction phase errors. + SUUnarchivingError = 3000, + SUSignatureError = 3001, + SUValidationError = 3002, + + // Installation phase errors. + SUFileCopyFailure = 4000, + SUAuthenticationFailure = 4001, + SUMissingUpdateError = 4002, + SUMissingInstallerToolError = 4003, + SURelaunchError = 4004, + SUInstallationError = 4005, + SUDowngradeError = 4006, + SUInstallationCanceledError = 4007, + SUInstallationAuthorizeLaterError = 4008, + SUNotValidUpdateError = 4009, + SUAgentInvalidationError = 4010, + SUInstallationRootInteractiveError = 4011, + SUInstallationWriteNoPermissionError = 4012, + + // API misuse errors. + SUIncorrectAPIUsageError = 5000 +}; + +/** + The reason why a new update is not available. + */ +typedef NS_ENUM(OSStatus, SPUNoUpdateFoundReason) { + /** + A new update is unavailable for an unknown reason. + */ + SPUNoUpdateFoundReasonUnknown, + /** + A new update is unavailable because the user is on the latest known version in the appcast feed. + */ + SPUNoUpdateFoundReasonOnLatestVersion, + /** + A new update is unavailable because the user is on a version newer than the latest known version in the appcast feed. + */ + SPUNoUpdateFoundReasonOnNewerThanLatestVersion, + /** + A new update is unavailable because the user's operating system version is too old for the update. + */ + SPUNoUpdateFoundReasonSystemIsTooOld, + /** + A new update is unavailable because the user's operating system version is too new for the update. + */ + SPUNoUpdateFoundReasonSystemIsTooNew +}; + +SU_EXPORT extern NSString *const SPUNoUpdateFoundReasonKey; +SU_EXPORT extern NSString *const SPULatestAppcastItemFoundKey; +SU_EXPORT extern NSString *const SPUNoUpdateFoundUserInitiatedKey; + +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUExport.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUExport.h new file mode 100644 index 0000000000..3e3f8a1646 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUExport.h @@ -0,0 +1,18 @@ +// +// SUExport.h +// Sparkle +// +// Created by Jake Petroules on 2014-08-23. +// Copyright (c) 2014 Sparkle Project. All rights reserved. +// + +#ifndef SUEXPORT_H +#define SUEXPORT_H + +#ifdef BUILDING_SPARKLE +#define SU_EXPORT __attribute__((visibility("default"))) +#else +#define SU_EXPORT +#endif + +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUStandardVersionComparator.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUStandardVersionComparator.h new file mode 100644 index 0000000000..b9cfae6f96 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUStandardVersionComparator.h @@ -0,0 +1,63 @@ +// +// SUStandardVersionComparator.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUSTANDARDVERSIONCOMPARATOR_H +#define SUSTANDARDVERSIONCOMPARATOR_H + +#import <Foundation/Foundation.h> + +#ifdef BUILDING_SPARKLE_TOOL +// Ignore incorrect warning +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header" +#import "SUExport.h" +#import "SUVersionComparisonProtocol.h" +#pragma clang diagnostic pop +#else +#import <Sparkle/SUExport.h> +#import <Sparkle/SUVersionComparisonProtocol.h> +#endif + +NS_ASSUME_NONNULL_BEGIN + +/** + Sparkle's default version comparator. + + This comparator is adapted from MacPAD, by Kevin Ballard. + It's "dumb" in that it does essentially string comparison, + in components split by character type. +*/ +SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison> + +/** + Initializes a new instance of the standard version comparator. +*/ +- (instancetype)init; + +/** + A singleton instance of the comparator. + */ +@property (nonatomic, class, readonly) SUStandardVersionComparator *defaultComparator; + +/** + Compares two version strings through textual analysis. + + These version strings should be in the format of x, x.y, or x.y.z where each component is a number. + For example, valid version strings include "1.5.3", "500", or "4000.1" + These versions that are compared correspond to the @c CFBundleVersion values of the updates. + + @param versionA The first version string to compare. + @param versionB The second version string to compare. + @return A comparison result between @c versionA and @c versionB +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; + +@end + +NS_ASSUME_NONNULL_END +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdatePermissionResponse.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdatePermissionResponse.h new file mode 100644 index 0000000000..770d754081 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdatePermissionResponse.h @@ -0,0 +1,40 @@ +// +// SUUpdatePermissionResponse.h +// Sparkle +// +// Created by Mayur Pawashe on 2/8/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import <Sparkle/SUExport.h> + +/** + This class represents a response for permission to check updates. +*/ +SU_EXPORT @interface SUUpdatePermissionResponse : NSObject<NSSecureCoding> + +/** + Initializes a new update permission response instance. + + @param automaticUpdateChecks Flag for whether to allow automatic update checks. + @param sendSystemProfile Flag for if system profile information should be sent to the server hosting the appcast. + */ +- (instancetype)initWithAutomaticUpdateChecks:(BOOL)automaticUpdateChecks sendSystemProfile:(BOOL)sendSystemProfile; + +/* + Use -initWithAutomaticUpdateChecks:sendSystemProfile: instead. + */ +- (instancetype)init NS_UNAVAILABLE; + +/** + A read-only property indicating whether automatic update checks are allowed or not. + */ +@property (nonatomic, readonly) BOOL automaticUpdateChecks; + +/** + A read-only property indicating if system profile should be sent or not. + */ +@property (nonatomic, readonly) BOOL sendSystemProfile; + +@end diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdater.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdater.h new file mode 100644 index 0000000000..f268324509 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdater.h @@ -0,0 +1,200 @@ +// +// SUUpdater.h +// Sparkle +// +// Created by Andy Matuschak on 1/4/06. +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SUUPDATER_H +#define SUUPDATER_H + +#import <Foundation/Foundation.h> +#import <Sparkle/SUExport.h> +#import <Sparkle/SUVersionComparisonProtocol.h> +#import <Sparkle/SUVersionDisplayProtocol.h> +#import <Sparkle/SUUpdaterDelegate.h> + +@class SUAppcastItem, SUAppcast, NSMenuItem; + +@protocol SUUpdaterDelegate; + +/** + The legacy API in Sparkle for controlling the update mechanism. + + This class is now deprecated and acts as a thin wrapper around `SPUUpdater` and `SPUStandardUserDriver`. + + If you are migrating to Sparkle 2, use `SPUStandardUpdaterController` instead, or `SPUUpdater` if you need more control. + */ +__deprecated_msg("Deprecated in Sparkle 2. Use SPUStandardUpdaterController instead, or SPUUpdater if you need more control.") +SU_EXPORT @interface SUUpdater : NSObject + +@property (unsafe_unretained, nonatomic) IBOutlet id<SUUpdaterDelegate> delegate; + +/*! + The shared updater for the main bundle. + + This is equivalent to passing [NSBundle mainBundle] to SUUpdater::updaterForBundle: + */ ++ (SUUpdater *)sharedUpdater; + +/*! + The shared updater for a specified bundle. + If an updater has already been initialized for the provided bundle, that shared instance will be returned. + */ ++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle; + +/*! + Designated initializer for SUUpdater. + + If an updater has already been initialized for the provided bundle, that shared instance will be returned. + */ +- (instancetype)initForBundle:(NSBundle *)bundle; + +/*! + Explicitly checks for updates and displays a progress dialog while doing so. + + This method is meant for a main menu item. + Connect any menu item to this action in Interface Builder, + and Sparkle will check for updates and report back its findings verbosely + when it is invoked. + + This will find updates that the user has opted into skipping. + */ +- (IBAction)checkForUpdates:(id)sender; + +/*! + The menu item validation used for the -checkForUpdates: action + */ +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem; + +/*! + Checks for updates, but does not display any UI unless an update is found. + + This is meant for programmatically initating a check for updates. That is, + it will display no UI unless it actually finds an update, in which case it + proceeds as usual. + + If automatic downloading of updates it turned on and allowed, however, + this will invoke that behavior, and if an update is found, it will be downloaded + in the background silently and will be prepped for installation. + + This will not find updates that the user has opted into skipping. + */ +- (void)checkForUpdatesInBackground; + +/*! + A property indicating whether or not to check for updates automatically. + + Setting this property will persist in the host bundle's user defaults. + The update schedule cycle will be reset in a short delay after the property's new value is set. + This is to allow reverting this property without kicking off a schedule change immediately + */ +@property (nonatomic) BOOL automaticallyChecksForUpdates; + +/*! + A property indicating whether or not updates can be automatically downloaded in the background. + + Note that automatic downloading of updates can be disallowed by the developer. + In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set. + + Setting this property will persist in the host bundle's user defaults. + */ +@property (nonatomic) BOOL automaticallyDownloadsUpdates; + +/*! + A property indicating the current automatic update check interval. + + Setting this property will persist in the host bundle's user defaults. + The update schedule cycle will be reset in a short delay after the property's new value is set. + This is to allow reverting this property without kicking off a schedule change immediately + */ +@property (nonatomic) NSTimeInterval updateCheckInterval; + +/*! + Begins a "probing" check for updates which will not actually offer to + update to that version. + + However, the delegate methods + SUUpdaterDelegate::updater:didFindValidUpdate: and + SUUpdaterDelegate::updaterDidNotFindUpdate: will be called, + so you can use that information in your UI. + + Updates that have been skipped by the user will not be found. + */ +- (void)checkForUpdateInformation; + +/*! + The URL of the appcast used to download update information. + + Setting this property will persist in the host bundle's user defaults. + If you don't want persistence, you may want to consider instead implementing + SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile: + + This property must be called on the main thread. + */ +@property (nonatomic, copy) NSURL *feedURL; + +/*! + The host bundle that is being updated. + */ +@property (readonly, nonatomic) NSBundle *hostBundle; + +/*! + The bundle this class (SUUpdater) is loaded into. + */ +@property (nonatomic, readonly) NSBundle *sparkleBundle; + +/*! + The user agent used when checking for and downloading updates. + + The default implementation can be overrided. + */ +@property (nonatomic, copy) NSString *userAgentString; + +/*! + The HTTP headers used when checking for and downloading updates. + + The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString) + */ +@property (copy) NSDictionary<NSString *, NSString *> *httpHeaders; + +/*! + A property indicating whether or not the user's system profile information is sent when checking for updates. + + Setting this property will persist in the host bundle's user defaults. + */ +@property (nonatomic) BOOL sendsSystemProfile; + +/*! + A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg) + */ +@property (nonatomic, copy) NSString *decryptionPassword; + +/*! + Returns the date of last update check. + + \returns \c nil if no check has been performed. + */ +@property (nonatomic, readonly, copy) NSDate *lastUpdateCheckDate; + +/*! + Appropriately schedules or cancels the update checking timer according to + the preferences for time interval and automatic checks. + + This call does not change the date of the next check, + but only the internal NSTimer. + */ +- (void)resetUpdateCycle; + +/*! + A property indicating whether or not an update is in progress. + + Note this property is not indicative of whether or not user initiated updates can be performed. + Use SUUpdater::validateMenuItem: for that instead. + */ +@property (nonatomic, readonly) BOOL updateInProgress; + +@end + +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdaterDelegate.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdaterDelegate.h new file mode 100644 index 0000000000..466a92a418 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUUpdaterDelegate.h @@ -0,0 +1,354 @@ +// +// SUUpdaterDelegate.h +// Sparkle +// +// Created by Mayur Pawashe on 3/12/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import <Sparkle/SUExport.h> + +@protocol SUVersionComparison, SUVersionDisplay; +@class SUUpdater, SUAppcast, SUAppcastItem; + +NS_ASSUME_NONNULL_BEGIN + +// ----------------------------------------------------------------------------- +// SUUpdater Notifications for events that might be interesting to more than just the delegate +// The updater will be the notification object +// ----------------------------------------------------------------------------- +SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification; +SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification; +SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification; +SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification; +#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification; +#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification; + +// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo +SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey; +// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo +SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey; + +// ----------------------------------------------------------------------------- +// SUUpdater Delegate: +// ----------------------------------------------------------------------------- + +/*! + Provides methods to control the behavior of an SUUpdater object. + */ +__deprecated_msg("Deprecated in Sparkle 2. See SPUUpdaterDelegate instead") +@protocol SUUpdaterDelegate <NSObject> +@optional + +/*! + Returns whether to allow Sparkle to pop up. + + For example, this may be used to prevent Sparkle from interrupting a setup assistant. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater; + +/*! + Returns additional parameters to append to the appcast URL's query string. + + This is potentially based on whether or not Sparkle will also be sending along the system profile. + + \param updater The SUUpdater instance. + \param sendingProfile Whether the system profile will also be sent. + + \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user. + */ +- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile; + +/*! + Returns a custom appcast URL. + + Override this to dynamically specify the entire URL. + + An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile: + and let the server handle what kind of feed to provide. + + \param updater The SUUpdater instance. + */ +- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater; + +/*! + Returns whether Sparkle should prompt the user about automatic update checks. + + Use this to override the default behavior. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater; + +/*! + Called after Sparkle has downloaded the appcast from the remote server. + + Implement this if you want to do some special handling with the appcast once it finishes loading. + + \param updater The SUUpdater instance. + \param appcast The appcast that was downloaded from the remote server. + */ +- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast; + +/*! + Returns the item in the appcast corresponding to the update that should be installed. + + If you're using special logic or extensions in your appcast, + implement this to use your own logic for finding a valid update, if any, + in the given appcast. + + \param appcast The appcast that was downloaded from the remote server. + \param updater The SUUpdater instance. + */ +- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater; + +/*! + Called when a valid update is found by the update driver. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item; + +/*! + Called when a valid update is not found. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidNotFindUpdate:(SUUpdater *)updater; + +/*! + Called just before the scheduled update driver prompts the user to install an update. + + \param updater The SUUpdater instance. + + \return YES to allow the update prompt to be shown (the default behavior), or NO to suppress it. + */ + - (BOOL)updaterShouldShowUpdateAlertForScheduledUpdate:(SUUpdater *)updater forItem:(SUAppcastItem *)item; + + /*! + Called after the user dismisses the update alert. + + \param updater The SUUpdater instance. + \param permanently YES if the alert will not appear again for this update; NO if it may reappear. + */ + - (void)updater:(SUUpdater *)updater didDismissUpdateAlertPermanently:(BOOL)permanently forItem:(SUAppcastItem *)item; + +/*! + Called immediately before downloading the specified update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be downloaded. + \param request The mutable URL request that will be used to download the update. + */ +- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request; + +/*! + Called immediately after succesfull download of the specified update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that has been downloaded. + */ +- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item; + +/*! + Called after the specified update failed to download. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that failed to download. + \param error The error generated by the failed download. + */ +- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error; + +/*! + Called when the user clicks the cancel button while and update is being downloaded. + + \param updater The SUUpdater instance. + */ +- (void)userDidCancelDownload:(SUUpdater *)updater; + +/*! + Called immediately before extracting the specified downloaded update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be extracted. + */ +- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item; + +/*! + Called immediately after extracting the specified downloaded update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that has been extracted. + */ +- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item; + +/*! + Called immediately before installing the specified update. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + */ +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item; + +/*! + Called when an update is skipped by the user. + + \param updater The updater instance. + \param item The appcast item corresponding to the update that the user skipped. + */ +- (void)updater:(SUUpdater *)updater userDidSkipThisVersion:(SUAppcastItem *)item; + +/*! + Returns whether the relaunch should be delayed in order to perform other tasks. + + This is not called if the user didn't relaunch on the previous update, + in that case it will immediately restart. + + This may also not be called if the application is not going to relaunch after it terminates. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + \param invocation The invocation that must be completed with `[invocation invoke]` before continuing with the relaunch. + + \return \c YES to delay the relaunch until \p invocation is invoked. + */ +- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation; + +/*! + Returns whether the relaunch should be delayed in order to perform other tasks. + + This is not called if the user didn't relaunch on the previous update, + in that case it will immediately restart. + + This method acts as a simpler alternative to SUUpdaterDelegate::updater:shouldPostponeRelaunchForUpdate:untilInvoking: avoiding usage of NSInvocation, which is not available in Swift environments. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + + \return \c YES to delay the relaunch. + */ +- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item; + +/*! + Returns whether the application should be relaunched at all. + + Some apps \b cannot be relaunched under certain circumstances. + This method can be used to explicitly prevent a relaunch. + + \param updater The SUUpdater instance. + */ +- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater; + +/*! + Called immediately before relaunching. + + \param updater The SUUpdater instance. + */ +- (void)updaterWillRelaunchApplication:(SUUpdater *)updater; + +/*! + Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidRelaunchApplication:(SUUpdater *)updater; + +/*! + Returns an object that compares version numbers to determine their arithmetic relation to each other. + + This method allows you to provide a custom version comparator. + If you don't implement this method or return \c nil, + the standard version comparator will be used. Note that the + standard version comparator may be used during installation for preventing + a downgrade, even if you provide a custom comparator here. + + \sa SUStandardVersionComparator + + \param updater The SUUpdater instance. + */ +- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater; + +/*! + Returns an object that formats version numbers for display to the user. + If you don't implement this method or return \c nil, the standard version formatter will be used. + + \sa SUUpdateAlert + \param updater The SUUpdater instance. + */ +- (nullable id <SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater; + +/*! + Returns the path to the application which is used to relaunch after the update is installed. + + The installer also waits for the termination of the application at this path. + + The default is the path of the host bundle. + + \param updater The SUUpdater instance. + */ +- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater; + +/*! + Called before an updater shows a modal alert window, + to give the host the opportunity to hide attached windows that may get in the way. + + \param updater The SUUpdater instance. + */ +- (void)updaterWillShowModalAlert:(SUUpdater *)updater; + +/*! + Called after an updater shows a modal alert window, + to give the host the opportunity to hide attached windows that may get in the way. + + \param updater The SUUpdater instance. + */ +- (void)updaterDidShowModalAlert:(SUUpdater *)updater; + +/*! + Called when an update is scheduled to be silently installed on quit. + + This is after an update has been automatically downloaded in the background. + (i.e. SUUpdater::automaticallyDownloadsUpdates is YES) + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + \param invocation Can be used to trigger an immediate silent install and relaunch. + */ +- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation; + +/*! + Called when an update is scheduled to be silently installed on quit. + This is after an update has been automatically downloaded in the background. + (i.e. SUUpdater::automaticallyDownloadsUpdates is YES) + This method acts as a more modern alternative to SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation: using a block instead of NSInvocation, which is not available in Swift environments. + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that is proposed to be installed. + \param installationBlock Can be used to trigger an immediate silent install and relaunch. + */ +- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))installationBlock; + +/*! + Calls after an update that was scheduled to be silently installed on quit has been canceled. + + \param updater The SUUpdater instance. + \param item The appcast item corresponding to the update that was proposed to be installed. + + \deprecated This method is no longer invoked. The installer will try to its best ability to install the update. + */ +- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item __deprecated; + +/*! + Called after an update is aborted due to an error. + + \param updater The SUUpdater instance. + \param error The error that caused the abort + */ +- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUVersionComparisonProtocol.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUVersionComparisonProtocol.h new file mode 100644 index 0000000000..b21e90dfd8 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUVersionComparisonProtocol.h @@ -0,0 +1,42 @@ +// +// SUVersionComparisonProtocol.h +// Sparkle +// +// Created by Andy Matuschak on 12/21/07. +// Copyright 2007 Andy Matuschak. All rights reserved. +// + +#ifndef SUVERSIONCOMPARISONPROTOCOL_H +#define SUVERSIONCOMPARISONPROTOCOL_H + +#import <Foundation/Foundation.h> + +#ifdef BUILDING_SPARKLE_TOOL +// Ignore incorrect warning +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header" +#import "SUExport.h" +#pragma clang diagnostic pop +#else +#import <Sparkle/SUExport.h> +#endif + +NS_ASSUME_NONNULL_BEGIN + +/** + Provides version comparison facilities for Sparkle. +*/ +@protocol SUVersionComparison + +/** + An abstract method to compare two version strings. + + Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a, + and NSOrderedSame if they are equivalent. +*/ +- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD! + +@end + +NS_ASSUME_NONNULL_END +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUVersionDisplayProtocol.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUVersionDisplayProtocol.h new file mode 100644 index 0000000000..736a28a86b --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/SUVersionDisplayProtocol.h @@ -0,0 +1,25 @@ +// +// SUVersionDisplayProtocol.h +// EyeTV +// +// Created by Uli Kusterer on 08.12.09. +// Copyright 2009 Elgato Systems GmbH. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import <Sparkle/SUExport.h> + +/** + Applies special display formatting to version numbers. +*/ +SU_EXPORT @protocol SUVersionDisplay + +/** + Formats two version strings. + + Both versions are provided so that important distinguishing information + can be displayed while also leaving out unnecessary/confusing parts. +*/ +- (void)formatVersion:(NSString *_Nonnull*_Nonnull)inOutVersionA andVersion:(NSString *_Nonnull*_Nonnull)inOutVersionB; + +@end diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Headers/Sparkle.h b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/Sparkle.h new file mode 100644 index 0000000000..a048d2670a --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Headers/Sparkle.h @@ -0,0 +1,39 @@ +// +// Sparkle.h +// Sparkle +// +// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07) +// Copyright 2006 Andy Matuschak. All rights reserved. +// + +#ifndef SPARKLE_H +#define SPARKLE_H + +// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless +// there are name-space collisions) so we can list all of them to start with: + +#import <Sparkle/SUExport.h> +#import <Sparkle/SUAppcast.h> +#import <Sparkle/SUAppcastItem.h> +#import <Sparkle/SUStandardVersionComparator.h> +#import <Sparkle/SPUUpdater.h> +#import <Sparkle/SPUUpdaterDelegate.h> +#import <Sparkle/SPUUpdaterSettings.h> +#import <Sparkle/SUVersionComparisonProtocol.h> +#import <Sparkle/SUVersionDisplayProtocol.h> +#import <Sparkle/SUErrors.h> +#import <Sparkle/SPUUpdatePermissionRequest.h> +#import <Sparkle/SUUpdatePermissionResponse.h> +#import <Sparkle/SPUUserDriver.h> +#import <Sparkle/SPUDownloadData.h> + +// UI bits +#import <Sparkle/SPUStandardUpdaterController.h> +#import <Sparkle/SPUStandardUserDriver.h> +#import <Sparkle/SPUStandardUserDriverDelegate.h> + +// Deprecated bits +#import <Sparkle/SUUpdater.h> +#import <Sparkle/SUUpdaterDelegate.h> + +#endif diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Modules/module.modulemap b/src/MacVim/Sparkle_2.framework/Versions/B/Modules/module.modulemap new file mode 100644 index 0000000000..af3fe6d050 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Sparkle { + umbrella header "Sparkle.h" + + export * + module * { export * } +} diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUAppcastItemStateResolver.h b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUAppcastItemStateResolver.h new file mode 100644 index 0000000000..825a5e2e4d --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUAppcastItemStateResolver.h @@ -0,0 +1,30 @@ +// +// SPUAppcastItemStateResolver.h +// Sparkle +// +// Created by Mayur Pawashe on 5/31/21. +// Copyright © 2021 Sparkle Project. All rights reserved. +// + +#import <Foundation/Foundation.h> + +#import <Sparkle/SUExport.h> + +NS_ASSUME_NONNULL_BEGIN + +@class SUStandardVersionComparator, SPUAppcastItemState; +@protocol SUVersionComparison; + +/** + Private exposed class used to resolve Appcast Item properties that rely on external factors such as a host. + This resolver is used for constructing appcast items. + */ +SU_EXPORT @interface SPUAppcastItemStateResolver : NSObject + +- (instancetype)init NS_UNAVAILABLE; + +- (instancetype)initWithHostVersion:(NSString *)hostVersion applicationVersionComparator:(id<SUVersionComparison>)applicationVersionComparator standardVersionComparator:(SUStandardVersionComparator *)standardVersionComparator; + +@end + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUGentleUserDriverReminders.h b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUGentleUserDriverReminders.h new file mode 100644 index 0000000000..a509e0e07c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUGentleUserDriverReminders.h @@ -0,0 +1,22 @@ +// +// SPUGentleUserDriverReminders.h +// Sparkle +// +// Copyright © 2022 Sparkle Project. All rights reserved. +// + +#ifndef SPUGentleUserDriverReminders_h +#define SPUGentleUserDriverReminders_h + +/** + A private protocol for user drivers implementing gentle scheduled reminders + */ +@protocol SPUGentleUserDriverReminders + +- (void)logGentleScheduledUpdateReminderWarningIfNeeded; + +- (void)resetTimeSinceOpportuneUpdateNotice; + +@end + +#endif /* SPUGentleUserDriverReminders_h */ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUInstallationType.h b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUInstallationType.h new file mode 100644 index 0000000000..2c6e556195 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUInstallationType.h @@ -0,0 +1,19 @@ +// +// SPUInstallationType.h +// Sparkle +// +// Created by Mayur Pawashe on 7/24/16. +// Copyright © 2016 Sparkle Project. All rights reserved. +// + +#ifndef SPUInstallationType_h +#define SPUInstallationType_h + +#define SPUInstallationTypeApplication @"application" // the default installation type for ordinary application updates +#define SPUInstallationTypeGuidedPackage @"package" // the preferred installation type for package installations +#define SPUInstallationTypeInteractivePackage @"interactive-package" // the deprecated installation type; use guided package instead + +#define SPUInstallationTypesArray (@[SPUInstallationTypeApplication, SPUInstallationTypeGuidedPackage, SPUInstallationTypeInteractivePackage]) +#define SPUValidInstallationType(x) ((x != nil) && [SPUInstallationTypesArray containsObject:(NSString * _Nonnull)x]) + +#endif /* SPUInstallationType_h */ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUStandardUserDriver+Private.h b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUStandardUserDriver+Private.h new file mode 100644 index 0000000000..877cadf2b3 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUStandardUserDriver+Private.h @@ -0,0 +1,31 @@ +// +// SPUStandardUserDriver+Private.h +// Sparkle +// +// Copyright © 2022 Sparkle Project. All rights reserved. +// + +#ifndef SPUStandardUserDriver_Private_h +#define SPUStandardUserDriver_Private_h + +#import <Sparkle/SPUStandardUserDriver.h> +#import <Sparkle/SUExport.h> + +@class NSWindowController; + +NS_ASSUME_NONNULL_BEGIN + +SU_EXPORT @interface SPUStandardUserDriver (Private) + +/** + Private API for accessing the active update alert's window controller. + This is the window controller that shows the update's release notes and install choices. + This can be accessed in -[SPUStandardUserDriverDelegate standardUserDriverWillHandleShowingUpdate:forUpdate:state:] + */ +@property (nonatomic, readonly, nullable) NSWindowController *activeUpdateAlert; + +@end + +NS_ASSUME_NONNULL_END + +#endif /* SPUStandardUserDriver_Private_h */ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUUserAgent+Private.h b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUUserAgent+Private.h new file mode 100644 index 0000000000..0b3c3c71fc --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SPUUserAgent+Private.h @@ -0,0 +1,20 @@ +// +// SPUUserAgent+Private.h +// Sparkle +// +// Created by Mayur Pawashe on 11/12/21. +// Copyright © 2021 Sparkle Project. All rights reserved. +// + +#import <Foundation/Foundation.h> +#import <Sparkle/SUExport.h> + +NS_ASSUME_NONNULL_BEGIN + +@class SUHost; + +SU_EXPORT NSString *SPUMakeUserAgentWithHost(SUHost *responsibleHost, NSString * _Nullable displayNameSuffix); + +SU_EXPORT NSString *SPUMakeUserAgentWithBundle(NSBundle *responsibleBundle, NSString * _Nullable displayNameSuffix); + +NS_ASSUME_NONNULL_END diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SUAppcastItem+Private.h b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SUAppcastItem+Private.h new file mode 100644 index 0000000000..7527a8f095 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SUAppcastItem+Private.h @@ -0,0 +1,39 @@ +// +// SUAppcastItem+Private.h +// Sparkle +// +// Created by Mayur Pawashe on 4/30/21. +// Copyright © 2021 Sparkle Project. All rights reserved. +// + +#ifndef SUAppcastItem_Private_h +#define SUAppcastItem_Private_h + +#import <Foundation/Foundation.h> + +NS_ASSUME_NONNULL_BEGIN + +// Available in SPUAppcastItemStateResolver.h (a private exposed header) +@class SPUAppcastItemStateResolver; +@class SUSignatures; + +@interface SUAppcastItem (Private) <NSSecureCoding> + +/** + Initializes with data from a dictionary provided by the RSS class and state resolver + + This initializer method is intended to be marked "private" and discouraged from public usage. + This method is available however. Talk to us to describe your use case and if you need to construct appcast items yourself. + */ +- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error; + +/** + The DSA and EdDSA signatures along with their statuses. + */ +@property (readonly, nullable) SUSignatures *signatures; + +@end + +NS_ASSUME_NONNULL_END + +#endif /* SUAppcastItem_Private_h */ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SUInstallerLauncher+Private.h b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SUInstallerLauncher+Private.h new file mode 100644 index 0000000000..f8e0410c5d --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/PrivateHeaders/SUInstallerLauncher+Private.h @@ -0,0 +1,29 @@ +// +// SUInstallerLauncher+Private.h +// SUInstallerLauncher+Private +// +// Created by Mayur Pawashe on 8/21/21. +// Copyright © 2021 Sparkle Project. All rights reserved. +// + +#ifndef SUInstallerLauncher_Private_h +#define SUInstallerLauncher_Private_h + +#import <Sparkle/SUExport.h> + +// Chances are clients will need this too +#import <Sparkle/SPUInstallationType.h> + +@class NSString; + +/** + Private API for determining if the system needs authorization access to update a bundle path + + This API is not supported when used directly from a Sandboxed applications and will always return @c YES in that case. + + @param bundlePath The bundle path to test if authorization is needed when performing an update that replaces this bundle. + @return @c YES if Sparkle thinks authorization is needed to update the @c bundlePath, otherwise @c NO. + */ +SU_EXPORT BOOL SPUSystemNeedsAuthorizationAccessForBundlePath(NSString *bundlePath); + +#endif /* SUInstallerLauncher_Private_h */ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdateAlert.nib b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdateAlert.nib new file mode 100644 index 0000000000..b06f35e9e2 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdateAlert.nib differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib new file mode 100644 index 0000000000..8774156e48 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib new file mode 100644 index 0000000000..a95f6a74b2 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/Sparkle.strings new file mode 100644 index 0000000000..3901514fd9 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Base.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Info.plist b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Info.plist new file mode 100644 index 0000000000..5c521c2000 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/Info.plist @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildMachineOSBuild</key> + <string>21G115</string> + <key>CFBundleDevelopmentRegion</key> + <string>en</string> + <key>CFBundleExecutable</key> + <string>Sparkle</string> + <key>CFBundleIdentifier</key> + <string>org.sparkle-project.Sparkle</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>Sparkle</string> + <key>CFBundlePackageType</key> + <string>FMWK</string> + <key>CFBundleShortVersionString</key> + <string>2.3.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleSupportedPlatforms</key> + <array> + <string>MacOSX</string> + </array> + <key>CFBundleVersion</key> + <string>2021</string> + <key>DTCompiler</key> + <string>com.apple.compilers.llvm.clang.1_0</string> + <key>DTPlatformBuild</key> + <string>13F100</string> + <key>DTPlatformName</key> + <string>macosx</string> + <key>DTPlatformVersion</key> + <string>12.3</string> + <key>DTSDKBuild</key> + <string>21E226</string> + <key>DTSDKName</key> + <string>macosx12.3</string> + <key>DTXcode</key> + <string>1341</string> + <key>DTXcodeBuild</key> + <string>13F100</string> + <key>LSMinimumSystemVersion</key> + <string>10.13</string> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ReleaseNotesColorStyle.css b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ReleaseNotesColorStyle.css new file mode 100644 index 0000000000..bcd84a2056 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ReleaseNotesColorStyle.css @@ -0,0 +1,13 @@ +@media (prefers-color-scheme: dark) { + html { + color-scheme: dark; + color: white; + background: transparent; + } + :link { + color: #419CFF; + } + :link:active { + color: #FF1919; + } +} diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/SUStatus.nib b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/SUStatus.nib new file mode 100644 index 0000000000..6d471ce4bf Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/SUStatus.nib differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..55b02304b5 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "محدث البرنامج"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "معلومات عن الإصدار:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "تذكيري لاحقًا"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "تخطي هذا الإصدار"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "تثبيت التحديث"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "تنزيل التحديثات وتثبيتها تلقائيًا في المستقبل"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..a75b589a43 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "عدم التحقق"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "هل تريد أن يتم التحقق من وجود تحديثات تلقائيًا؟"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "تضمين تقرير عن النظام دون ذكر معلومات عن المستخدم"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "التحقق تلقائيًا"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/Sparkle.strings new file mode 100644 index 0000000000..7ba248ad3f Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ar.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ca.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ca.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..284cf6dc62 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ca.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Actualització del programari"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Notes d'aquesta versió:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Recorda-m'ho més tard"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Omet aquesta versió"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Instal·la l'actualització"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Descarrega i instal·la les actualitzacions automàticament en el futur"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ca.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ca.lproj/Sparkle.strings new file mode 100644 index 0000000000..d6bae329a9 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ca.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..ff7d56ff6c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Aktualizace aplikace"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Poznámky k vydání:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Připomenout později"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Přeskočit tuto verzi"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Instalovat aktualizaci"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "V budoucnu stahovat a instalovat aktualizace automaticky"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..72489c9eff --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Informace z anonymního systémového profilu pomáhají vývojářům lépe plánovat budoucí vývoj aplikace.\nBudete-li mít nějaký dotaz, obraťte se na nás.\n\nToto jsou informace, které budou odeslány:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Nevyhledávat"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Vyhledávat aktualizace automaticky?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Odeslat anonymní systémový profil"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Automaticky vyhledávat"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/Sparkle.strings new file mode 100644 index 0000000000..aae40c5271 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/cs.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..271ae308f4 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Software Update"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Om denne udgivelse:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Påmind mig senere"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Spring over"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Installer"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Hent og installer opdateringer automatisk i fremtiden"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..d31f377bfb --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Søg ikke"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Søg efter opdateringer automatisk?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Vedhæft anonym systemprofil"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Søg automatisk"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/Sparkle.strings new file mode 100644 index 0000000000..2c717b2ff8 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/da.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..93e067a3b1 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Softwareupdate"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Versionshinweise:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Später erinnern"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Diese Version überspringen"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Installieren"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Updates in Zukunft automatisch laden und installieren"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..b4e78e1204 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = ""; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = ""; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Das anonymisierte Systemprofil unterstützt uns bei der zukünftigen Entwicklung. Bitte kontaktiere uns, wenn du Fragen hierzu hast.\n\nDiese Informationen würden an uns gesendet werden:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Nicht suchen"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Automatisch nach Updates suchen?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Anonymisiertes Systemprofil übertragen"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Automatisch suchen"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/Sparkle.strings new file mode 100644 index 0000000000..04b27fd35c Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/de.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..fc8679d8e5 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Ενημέρωση προγράμματος"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Σημειώσεις Έκδοσης:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Υπενθύμιση Αργότερα"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Παράλειψη Έκδοσης"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Εγκατάσταση Ενημέρωσης"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Αυτόματη λήψη και εγκατάσταση ενημερώσεων στο μέλλον"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..3fa256d9e9 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Οι ανώνυμες πληροφορίες του προφίλ του συστήματός σας, μας βοηθούν στο σχεδιασμό της μελλοντικής ανάπτυξης του προγράμματος. Παρακαλώ επικοινωνήστε μαζί μας άν έχετε ερωτήσεις.\n\nΑυτές είναι οι πληροφορίες που θα σταλούν σε εμάς:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Κανένας έλεγχος"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Αυτόματος έλεγχος για ενημερώσεις;"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Συμπερίληψη του ανώνυμου προφίλ του συστήματός σας"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Αυτόματος Ελεγχος"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/Sparkle.strings new file mode 100644 index 0000000000..f1c015eb0b Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/el.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/en.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/en.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..45a4cfc063 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/en.lproj/SUUpdateAlert.strings @@ -0,0 +1,18 @@ + +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Software Update"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Release Notes:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Remind Me Later"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Skip This Version"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Install Update"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Automatically download and install updates in the future"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/en.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/en.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..e9c01f3ab3 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/en.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,24 @@ + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "176"; */ +"OhZ-1K-DmA.title" = "Check Automatically"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "177"; */ +"cCJ-V0-aTi.title" = "Don’t Check"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "178"; */ +"gmh-T4-BO0.title" = "Check for updates automatically?"; + +/* Class = "NSTextFieldCell"; title = "DO NOT LOCALIZE"; ObjectID = "179"; */ +"179.title" = "DO NOT LOCALIZE"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "180"; */ +"gz7-LM-gNf.title" = "Include anonymous system profile"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..ab59ec28f2 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Actualización de software"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Notas de la versión:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Recordármelo"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "No instalar esta versión"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Instalar actualización"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Descargar e instalar actualizaciones automáticamente"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..a0ae2e0bcd --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "La información de perfil de sistema anónimo se usa para ayudarnos a planear el trabajo de desarrollo futuro. Por favor, póngase en contacto con nosotros si tiene preguntas sobre esto.\n\nEsta es la información que nos enviaría:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "No comprobar"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "¿Comprobar si hay actualizaciones automáticamente?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Incluir perfil de sistema anónimo"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Comprobar automáticamente"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/Sparkle.strings new file mode 100644 index 0000000000..679caf37bb Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/es.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fa.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fa.lproj/Sparkle.strings new file mode 100644 index 0000000000..0323587c45 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fa.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..dca6e2e39c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Ohjelmiston pävitys"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Tietoa päivityksestä:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Muistuta myöhemmin"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Ohita tämä versio"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Asenna päivitys"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Hae ja asenna päivitykset jatkossa automaattisesti"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..04212742a2 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Älä tarkista"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Tarkista päivityksiä käynnistyksen yhteydessä?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Sisällytä nimetön järjestelmäprofiili"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Tarkista automaattisesti"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/Sparkle.strings new file mode 100644 index 0000000000..a8ba03dbcf Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fi.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..fd8042edc7 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Mise à jour logiciel"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Notes de version :"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Pas maintenant"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Ignorer cette version"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Installer"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Télécharger et installer automatiquement les mises à jour"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..463337ce09 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Les informations anonymes de profil système nous aident à planifier les futurs développements. Contactez-nous pour toute question à ce sujet.\n\nCi-dessous figurent les informations qui seront transmises :"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Ne pas vérifier"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Rechercher automatiquement les mises à jour ?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Avec transmission anonyme de mon profil système"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Vérifier automatiquement"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/Sparkle.strings new file mode 100644 index 0000000000..042724d369 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/fr.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/he.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/he.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..dc8fa211ec --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/he.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "עדכון תכנה"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "פרטי גרסה:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "הזכר לי מאוחר יותר"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "דלג על גרסה זו"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "התקן עדכון"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "הורד והתקן עדכונים אוטומטית גם בעתיד"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/he.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/he.lproj/Sparkle.strings new file mode 100644 index 0000000000..bef3475277 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/he.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..60525afb3a --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Aktualiziranje softvera"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Napomene uz izdanje:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Podsjeti me kasnije"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Zanemari ovu verziju"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Instaliraj nadogradnju"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Ubuduće preuzmi i instaliraj nadogradnje automatski"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..8bff38ebc4 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonimizirani podaci profila susatava pomažu nam planirati budući razvoj. Kontaktiraj nas, ako imaš pitanja o tome.\n\nŠalju se sljedeći podaci:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Nemoj provjeravati"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Automatski provjeriti nadogradnje?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Uključi anonimizirane podatke o profilu sustava"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Provjeri automatski"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/Sparkle.strings new file mode 100644 index 0000000000..b9d3a646e0 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hr.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..841a5423c8 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Szoftverfrissítés"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Változások az előző verzióhoz képest:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Emlékeztessen később"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Verzió kihagyása"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Telepítés"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "A jövőben automatikusan töltse le és telepítse a frissítéseket"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..d1a121f362 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Manuális keresés"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Keresse automatikusan a frissítéseket?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Anonim rendszerinformáció küldése"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Automatikus keresés"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/Sparkle.strings new file mode 100644 index 0000000000..6b397d42ec Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/hu.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..314a8caa0e --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Hugbúnaðaruppfærsla"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Útgáfupunktar:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Áminntu mig síðar"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Sleppa þessari útgáfu"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Innsetja"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Sækja og innsetja uppfærslur sjálfkrafa framvegis"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..f21466e53b --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Upplýsingar úr nafnlausum kerfisskýrslum eru notaðar til að hjálpa okkur við framtíðarþróun hugbúnaðarins. Ekki hika við að hafa samband ef spurningar vakna um þetta.\n\nÞetta eru upplýsingarnar sem yrðu sendar:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Ekki kanna"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Athuga sjálfkrafa með uppfærslur?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Innifela nafnlausa kerfisskýrslu"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Kanna sjálfkrafa"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/Sparkle.strings new file mode 100644 index 0000000000..070979c616 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/is.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..cc0d7c3498 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Aggiornamento Software"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Note di rilascio:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Ricordamelo più tardi"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Ignora questa versione"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Installa"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "In futuro scarica e installa automaticamente gli aggiornamenti"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..4ddfda7e3c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Le informazioni del profilo di sistema anomino sono utilizzate per aiutarci in futuri lavori di sviluppo. Contattaci se hai dei quesiti sull’argomento.\n\nQueste sono le informazioni che verrebbero inviate:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Non controllare"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Controllo automaticamente gli aggiornamenti?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Include profilo di sistema anonimo"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Controlla Automaticamente"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/Sparkle.strings new file mode 100644 index 0000000000..cc0e4ef95f Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/it.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..6ac6410d6c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "ソフトウェア・アップデート"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "リリースノート:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "後で通知"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "このバージョンはスキップ"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "アップデートをインストール"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "今後はアップデートのダウンロードとインストールを自動で行う"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..cff48a228b --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "匿名のシステムプロファイル情報は、今後の開発の参考にさせていただきます。この件に関してご質問があればご連絡下さい。\n\n以下の情報が送信されます:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "確認しない"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "アップデートを自動で確認しますか?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "匿名のシステム情報を含める"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "自動で確認"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/Sparkle.strings new file mode 100644 index 0000000000..3a06f46569 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ja.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..ee92bf295f --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Software Update"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "배포 정보:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "나중에"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "이 버전 건너뛰기"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "업데이트 설치"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "나중에 업데이트 자동으로 다운로드 및 설치"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..472ef43720 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "익명으로 보내지는 시스템 정보로 차후 프로그램 개발에 도움이 될 수 있습니다. 질문이 있으시면 연락 주십시오.\n\n아래 정보가 전송될 것입니다."; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "취소"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "자동으로 업데이트 확인할까요?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "익명 시스템 정보 포함"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "자동으로 확인"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/Sparkle.strings new file mode 100644 index 0000000000..7cd74623f6 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ko.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..bd58fbb6b3 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/SUUpdateAlert.strings @@ -0,0 +1,18 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Programoppdatering"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Om oppdateringen:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Utsett"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Hopp over"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Installer"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Last ned og installer automatisk i fremtiden"; + diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..1b2d8bdb70 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,21 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Den anonyme systemprofilen hjelper oss med å planlegge fremtidig utviklingsarbeid. Ta gjerne kontakt med oss hvis du har spørsmål om dette.
\nFølgende innhold vil bli sendt:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Ikke søk"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Søk etter oppdateringer automatisk?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Inkluder anonym systemprofil"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Søk automatisk"; + diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/Sparkle.strings new file mode 100644 index 0000000000..c36e8d9310 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nb.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..3edac367ff --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Software-update"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Versiegegevens:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Herinner mij later"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Sla deze versie over"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Installeer update"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Download en installeer updates voortaan automatisch"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..af9d1b27f9 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,14 @@ +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Aan de hand van anonieme informatie over het systeemprofiel kunnen wij toekomstige ontwikkelingswerkzaamheden beter plannen. Neem contact met ons op als je hierover vragen hebt.\n\nDit is de informatie die wordt verzonden:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Zoek niet"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Automatisch zoeken naar updates?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Voeg anoniem systeemprofiel bij"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Zoek automatisch"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/Sparkle.strings new file mode 100644 index 0000000000..5ab394bef0 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/nl.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..4092fd0ac7 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Uaktualnienie oprogramowania"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Szczegóły wydania:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Przypomnij później"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Pomiń tę wersję"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Zainstaluj teraz"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Automatycznie pobierz i zainstaluj przyszłe uaktualnienia"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..029b447eee --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Nie sprawdzaj"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Sprawdzać automatycznie uaktualnienia?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Załącz anonimowe informacje o systemie"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Sprawdzaj automatycznie"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/Sparkle.strings new file mode 100644 index 0000000000..38d03dee8e Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pl.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..65aab08753 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Atualização de Software"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Notas do Lançamento:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Mais Tarde"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Ignorar Esta Versão"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Instalar Atualização"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Baixar e instalar atualizações futuras automaticamente"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..028f40ed18 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,23 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "As informações anônimas do sistema são usadas para nos ajudar a planejar o desenvolvimento futuro do aplicativo. Contate-nos caso tenha dúvidas sobre este procedimento.\n\nAs seguintes informações seriam enviadas:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Não Buscar"; + +/* Class = "NSTextFieldCell"; title = "DO NOT LOCALIZE"; ObjectID = "cfa-j0-Ya4"; */ +"cfa-j0-Ya4.title" = ""; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Buscar atualizações automaticamente?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Incluir perfil anônimo do sistema"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Buscar Automaticamente"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/Sparkle.strings new file mode 100644 index 0000000000..fae04566de Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-BR.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..ae805c423d --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Actualização de Software"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Notas de lançamento:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Lembrar mais tarde"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Saltar esta versão"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Instalar actualização"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "No futuro, transferir e instalar actualizações automaticamente"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..ef9ae46d0f --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "A informação anónima do perfil de sistema é usada para no futuro nos ajudar a planear o trabalho de desenvolvimento. Por favor contacte-nos se tiver alguma questão acerca deste assunto.\n\nEsta é a informação que seria enviada:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Não procurar"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Procurar actualizações automaticamente?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Incluir perfil de sistema anónimo"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Procurar automaticamente"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/Sparkle.strings new file mode 100644 index 0000000000..e7ed98d061 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/pt-PT.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..37e9bc76e4 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Actualizarea aplicației"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Note de ediție:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Amintește-mi mai târziu"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Sari peste…"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Instalează actualizarea"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "În viitor descarcă și instalează în automat actualizările"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..8746a83ce5 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Nu verifica"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Verifică pentru actualizări în mod automat?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Include profil anomin de sistem"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Verifică în mod automat"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/Sparkle.strings new file mode 100644 index 0000000000..1ee78cb3b7 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ro.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..137fd579f4 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Обновление программного обеспечения"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Заметки о выпуске:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Напоминать позже"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Пропустить эту версию"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Установить обновление"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Автоматически загружать и устанавливать обновления в будущем"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..79ab608ce1 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Использование анонимного профиля системы помогает нам в планировании будущей работы по разработке. Если у вас есть какие-либо вопросы по этой теме, обращайтесь к нам.\n\nЭто информация, предназначенная для отправления:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Не проверять"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Выполнять автоматическую проверку наличия обновлений?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Включить анонимный профиль системы"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Проверять автоматически"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/Sparkle.strings new file mode 100644 index 0000000000..777f637a0d Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/ru.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..266f0fb406 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Aktualizácia softvéru"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Poznámky k vydaniu:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Pripomenúť neskôr"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Vynechať túto verziu"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Nainštalovať"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "V budúcnosti aktualizácie preberať a inštalovať automaticky"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..25c836d80b --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonymný profil systému nám umožní zlepšiť plánovanie budúceho vývoja aplikácie. Ak máte ohľadom tohto akékoľvek otázky, neváhajte a kontaktujte nás.\n\nOdosielané budú nasledujúce informácie:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Nekontrolovať"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Kontrolovať aktualizácie automaticky?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Zahrnúť anonymný profil systému"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Kontrolovať automaticky"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/Sparkle.strings new file mode 100644 index 0000000000..157f6b96a5 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sk.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..d106021343 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Posodabljanje programske opreme"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Opombe ob izdaji:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Spomni me kasneje"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Preskoči to verzijo"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Namesti posodobitev"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "V prihodnje samodejno nameščaj posodobitve"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..514d885267 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonimni profil sistema se uporablja za načrtovanje nadaljnega razvoja programa. V primeru vprašanj nas lahko kontaktirate.\n\nPošljejo se sledeče informacije:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Ne preverjaj"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Naj občasno preverjam, če so na voljo posodobitve?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Vključi anonimni profil sistema"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Samodejno preverjaj"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/Sparkle.strings new file mode 100644 index 0000000000..ee72d78783 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sl.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..382b634a2f --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Programuppdatering"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Versionsinformation:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Påminn mig senare"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Hoppa över denna version"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Installera uppdatering"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Hämta och installera nya uppdateringar automatiskt i framtiden."; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..b7ff87c7f0 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Textcell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Textcell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Anonym systemprofilinformation används för att hjälpa oss att planera framtida utvecklingsarbete. Vänligen kontakta oss ifall du har några frågot om detta.\n\nDetta är informationen som skulle sändas:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Kontrollera inte"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Leta efter uppdateringar automatiskt?\n"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Inkludera anonym systemprofil"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Kontrollera automatiskt"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/Sparkle.strings new file mode 100644 index 0000000000..c17d53815f Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/sv.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..c57e3d3c59 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "อัพเดทซอฟต์แวร์"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Release Notes:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "เตือนในภายหลัง"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "ข้ามเวอร์ชั่นนี้"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "ติดตั้งอัพเดท"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "ดาวน์โหลดและติดตั้งอัพเดทโดยอัตโนมัติในอนาคต"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..d87f2cfbeb --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "ข้อมูลระบบแบบนิรนามช่วยในการวางแผนพัฒนาแอปพลิเคชันของเราในอนาคต กรุณาติดต่อเราถ้าคุณมีข้อสงสัยในเรื่องนี้\n\nนี่คือข้อมูลที่จะถูกส่งไป:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "ไม่ต้องตรวจสอบ"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "ตรวจสอบอัพเดทอัตโนมัติ?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "ส่งข้อมูลระบบแบบนิรนาม"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "ตรวจสอบโดยอัตโนมัติ"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/Sparkle.strings new file mode 100644 index 0000000000..1491bf0120 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/th.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..7f67ed6415 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Software-Aktualisierung"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Sürüm Hakkında:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Sonra Hatırlat"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Bu Sürümü Geç"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Kur"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Bundan sonra güncellemeleri kendiliğinden indir ve kur"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..9378b6c75c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Gönderdiğiniz anonim sistem bilgileri bu yazılımın geliştirilmesi için kullanılacaktır. Konu ile ilgili ayrıntılı bilgi için lütfen bizimle bağlantıya geçiniz. Göndereceğiniz Bilgiler:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Arama"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Güncellemeler otomatik olarak aransın mı?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Sistem bilgilerini kimlik gizlenmiş olarak gönder"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Otomatik Olarak Ara"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/Sparkle.strings new file mode 100644 index 0000000000..324dba3b6c Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/tr.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..ece6670799 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "Оновлення програмного забезпечення"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "Примітки про нову версію:"; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "Нагадати пізніше"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "Пропустити цю версію"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "Встановити оновлення"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "Автоматично завантажувати та встановлювати оновлення у майбутньому"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..36d56b030c --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "Використання анонімного профілю системи допомагає нам у планування майбутньої розробки. Якщо у вас виникли питання щодо цього, звертайтесь до нас.\n\nІнформація, що буде надіслано:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "Не перервіряти"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "Виконувати автоматичну перевірку оновлень?"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "Автоматично надсилати профіль системи"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "Перевіряти автоматично"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/Sparkle.strings new file mode 100644 index 0000000000..42370e97ad Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/uk.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..5772fc63f3 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "软件更新"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "更新信息："; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "稍后提示我"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "跳过这个版本"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "安装更新"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "以后自动下载并安装更新"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..51cd7fe93b --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "无记名系统概况信息被用于帮助我们安排将来的开发工作。如果对此存在疑问请联系我们。\n\n这是将要被发送的信息：:"; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "不核查"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "自动核查更新？"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "包括无记名系统概况"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "自动核查"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/Sparkle.strings new file mode 100644 index 0000000000..9942f1c492 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_CN.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/SUUpdateAlert.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/SUUpdateAlert.strings new file mode 100644 index 0000000000..d53374dd24 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/SUUpdateAlert.strings @@ -0,0 +1,17 @@ +/* Class = "NSWindow"; title = "Software Update"; ObjectID = "5"; */ +"5.title" = "軟體更新"; + +/* Class = "NSTextFieldCell"; title = "Release Notes:"; ObjectID = "170"; */ +"170.title" = "更新事項："; + +/* Class = "NSButtonCell"; title = "Remind Me Later"; ObjectID = "171"; */ +"171.title" = "暫緩提醒"; + +/* Class = "NSButtonCell"; title = "Skip This Version"; ObjectID = "172"; */ +"172.title" = "跳過此版本"; + +/* Class = "NSButtonCell"; title = "Install Update"; ObjectID = "173"; */ +"173.title" = "安裝更新項目"; + +/* Class = "NSButtonCell"; title = "Automatically download and install updates in the future"; ObjectID = "175"; */ +"175.title" = "自動下載並安裝未來的更新項目"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings new file mode 100644 index 0000000000..6173332785 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings @@ -0,0 +1,20 @@ +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */ +"43.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */ +"45.title" = "Text Cell"; + +/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */ +"183.title" = "匿名系統描述資訊可用來協助我們計畫未來的開發工作。若您有任何相關問題，請與我們聯繫。\n\n以下是會傳送的資訊："; + +/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */ +"cCJ-V0-aTi.title" = "不要檢查"; + +/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */ +"gmh-T4-BO0.title" = "自動檢查更新項目？"; + +/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */ +"gz7-LM-gNf.title" = "包含匿名的系統描述資料"; + +/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */ +"OhZ-1K-DmA.title" = "自動檢查"; diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/Sparkle.strings new file mode 100644 index 0000000000..e53d6d10b2 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Resources/zh_TW.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Sparkle b/src/MacVim/Sparkle_2.framework/Versions/B/Sparkle new file mode 100755 index 0000000000..9547a65584 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Sparkle differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Info.plist b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Info.plist new file mode 100644 index 0000000000..334e0a641f --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Info.plist @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildMachineOSBuild</key> + <string>21G115</string> + <key>CFBundleDevelopmentRegion</key> + <string>en</string> + <key>CFBundleExecutable</key> + <string>Updater</string> + <key>CFBundleIdentifier</key> + <string>org.sparkle-project.Sparkle.Updater</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>Updater</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>2.3.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleSupportedPlatforms</key> + <array> + <string>MacOSX</string> + </array> + <key>CFBundleVersion</key> + <string>2021</string> + <key>DTCompiler</key> + <string>com.apple.compilers.llvm.clang.1_0</string> + <key>DTPlatformBuild</key> + <string>13F100</string> + <key>DTPlatformName</key> + <string>macosx</string> + <key>DTPlatformVersion</key> + <string>12.3</string> + <key>DTSDKBuild</key> + <string>21E226</string> + <key>DTSDKName</key> + <string>macosx12.3</string> + <key>DTXcode</key> + <string>1341</string> + <key>DTXcodeBuild</key> + <string>13F100</string> + <key>LSApplicationCategoryType</key> + <string>public.app-category.utilities</string> + <key>LSMinimumSystemVersion</key> + <string>10.13</string> + <key>LSUIElement</key> + <string>1</string> + <key>NSPrincipalClass</key> + <string>NSApplication</string> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/MacOS/Updater b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/MacOS/Updater new file mode 100755 index 0000000000..410847d0c6 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/MacOS/Updater differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/PkgInfo b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/PkgInfo new file mode 100644 index 0000000000..bd04210fb4 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/Base.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/Base.lproj/Sparkle.strings new file mode 100644 index 0000000000..3901514fd9 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/Base.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/SUStatus.nib b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/SUStatus.nib new file mode 100644 index 0000000000..6d471ce4bf Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/SUStatus.nib differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ar.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ar.lproj/Sparkle.strings new file mode 100644 index 0000000000..7ba248ad3f Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ar.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ca.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ca.lproj/Sparkle.strings new file mode 100644 index 0000000000..d6bae329a9 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ca.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/cs.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/cs.lproj/Sparkle.strings new file mode 100644 index 0000000000..aae40c5271 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/cs.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/da.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/da.lproj/Sparkle.strings new file mode 100644 index 0000000000..2c717b2ff8 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/da.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/de.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/de.lproj/Sparkle.strings new file mode 100644 index 0000000000..04b27fd35c Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/de.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/el.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/el.lproj/Sparkle.strings new file mode 100644 index 0000000000..f1c015eb0b Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/el.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/es.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/es.lproj/Sparkle.strings new file mode 100644 index 0000000000..679caf37bb Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/es.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fa.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fa.lproj/Sparkle.strings new file mode 100644 index 0000000000..0323587c45 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fa.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fi.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fi.lproj/Sparkle.strings new file mode 100644 index 0000000000..a8ba03dbcf Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fi.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fr.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fr.lproj/Sparkle.strings new file mode 100644 index 0000000000..042724d369 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/fr.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/he.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/he.lproj/Sparkle.strings new file mode 100644 index 0000000000..bef3475277 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/he.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/hr.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/hr.lproj/Sparkle.strings new file mode 100644 index 0000000000..b9d3a646e0 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/hr.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/hu.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/hu.lproj/Sparkle.strings new file mode 100644 index 0000000000..6b397d42ec Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/hu.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/is.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/is.lproj/Sparkle.strings new file mode 100644 index 0000000000..070979c616 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/is.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/it.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/it.lproj/Sparkle.strings new file mode 100644 index 0000000000..cc0e4ef95f Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/it.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ja.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ja.lproj/Sparkle.strings new file mode 100644 index 0000000000..3a06f46569 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ja.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ko.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ko.lproj/Sparkle.strings new file mode 100644 index 0000000000..7cd74623f6 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ko.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/nb.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/nb.lproj/Sparkle.strings new file mode 100644 index 0000000000..c36e8d9310 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/nb.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/nl.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/nl.lproj/Sparkle.strings new file mode 100644 index 0000000000..5ab394bef0 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/nl.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pl.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pl.lproj/Sparkle.strings new file mode 100644 index 0000000000..38d03dee8e Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pl.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pt-BR.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pt-BR.lproj/Sparkle.strings new file mode 100644 index 0000000000..fae04566de Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pt-BR.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pt-PT.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pt-PT.lproj/Sparkle.strings new file mode 100644 index 0000000000..e7ed98d061 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/pt-PT.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ro.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ro.lproj/Sparkle.strings new file mode 100644 index 0000000000..1ee78cb3b7 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ro.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ru.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ru.lproj/Sparkle.strings new file mode 100644 index 0000000000..777f637a0d Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/ru.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sk.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sk.lproj/Sparkle.strings new file mode 100644 index 0000000000..157f6b96a5 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sk.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sl.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sl.lproj/Sparkle.strings new file mode 100644 index 0000000000..ee72d78783 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sl.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sv.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sv.lproj/Sparkle.strings new file mode 100644 index 0000000000..c17d53815f Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/sv.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/th.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/th.lproj/Sparkle.strings new file mode 100644 index 0000000000..1491bf0120 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/th.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/tr.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/tr.lproj/Sparkle.strings new file mode 100644 index 0000000000..324dba3b6c Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/tr.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/uk.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/uk.lproj/Sparkle.strings new file mode 100644 index 0000000000..42370e97ad Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/uk.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/zh_CN.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/zh_CN.lproj/Sparkle.strings new file mode 100644 index 0000000000..9942f1c492 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/zh_CN.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/zh_TW.lproj/Sparkle.strings b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/zh_TW.lproj/Sparkle.strings new file mode 100644 index 0000000000..e53d6d10b2 Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/Resources/zh_TW.lproj/Sparkle.strings differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources new file mode 100644 index 0000000000..02e5857aca --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/Updater.app/Contents/_CodeSignature/CodeResources @@ -0,0 +1,715 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>files</key> + <dict> + <key>Resources/Base.lproj/Sparkle.strings</key> + <data> + XSU5ujIHVj0VrcaL7/1PMjP8QWE= + </data> + <key>Resources/SUStatus.nib</key> + <data> + MMoEZd95HH2wagHtE7tdRXWDz2Y= + </data> + <key>Resources/ar.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5Ukin0TnIF0ot6Daz8OSgIoDZJ0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ca.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + SM9Ssbq+EA6SD88oCZx9K6nLvic= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + hIXy3nCBtLeY6/3v3pWwYRJl+sA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + CkbYzkpwfT37juYfJP25giiTUo4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + /1A+Sg5wG2SW+Q5Q7rGwtU2aVk0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + Hh2GQMfVkK/dapsekwiVZz9cakg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + fucEKrOlh81Wj9EqCtUl6sQVg1k= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fa.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + vI1JRqMnuuewEX52rjBZ/TDrrXk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + +T4u6wvinBvx2z6vcAQKz32lvvE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + fPB1Vk+1a7xRIMKxQ3/F1bxGirA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/he.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + bG2Mhx67XieRw+jRYm1/n2PIGnI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + S2g3qlSPK1msOuuvB2dU9UoInq4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5CCN2xKgiom6y3+mcWd48RVdX48= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + RO7D/40UgCd+DPSZg5LlrOBdmfY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + W/h9EbnuDfXU4nxRzIF7Dv8ckks= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + RYRC4Vmp6utNAtLodS/PTyi4yIM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + lmXDaCFjaOlD2OSN7WeCYPUkiAc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + n42iYGYF5rusi8bu9cZKBXVwwXE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + t++79qkzwHo15l2gbAGPNIoYsJc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + Z2RTzAW/+3ZV5g9/DyNv+YFZNQE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + HLX0cX6CzMOMpZ7eff4JZYu+KQY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + cyq/clJHyLGamebBp/NK6YzPUNM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + kYCbmI7ssPYVnQQ3uDHF6PgOBjw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 3yWhlgxQS7Hhh481yH9qttWea0U= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5I5OyTLppz6aT5r3kKOmRcrDfXg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5fscQshoMtSnO4kj3Ts2Nw4xqkc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + AlR6NnM+kipd4A8PFhs0S0Rccbk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + UrzLYtjSwKdvxlSQJa/xe5IqqVo= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + fKCgCsGuwlJJnukTgKv+0tfNjSg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + kATRxVYhY1dX+dY1bQ+V+TvmXNk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + PFAuCvFxcO/y7l7c9FyaMKNhLfQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + G/kIaADnb5wlgQMaCX6Gfa48OY8= + </data> + <key>optional</key> + <true/> + </dict> + </dict> + <key>files2</key> + <dict> + <key>Resources/Base.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 7DQi4XIdmNDFEuet0a26l/2qsTHrLKlDT4/zp6XA97w= + </data> + </dict> + <key>Resources/SUStatus.nib</key> + <dict> + <key>hash2</key> + <data> + xaemKA5RnHBgTuwB81z6r5d+f2CaMcz74K9Tv+bY4BM= + </data> + </dict> + <key>Resources/ar.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + yx9tkKjj3aOHvgdYCWXM89uhlyVeNb4oqcAenJxibwI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ca.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + DQhUnYhSgufw5NRY162lt2GGM83U38tQvNF1qotGYzE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + yJXcgwDV0GC2yZWVdhf9UQirDu1yLWTaa+x0vVpYkfo= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + qgYKiHiodd+q/4U1lIEIUSS9PX9ENx0isGUKLSWmKe4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + uxoRq90TmDirUKRbCW1lKy/k1tZvFz4EbxQPhVf+Mhs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + GvP3asj8JbFMZdNtcFo0MWdmrCB+z6k66kmleaGlmow= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + RYqWb4D0ylosWigPpdVjMlaCWiXNrRIvzIwwVbXpaSs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fa.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + hiHofXML8/Ej+t2dTRuvVL3vkS/6jW6b/wvx/3quM10= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + a70/+B90B44V8vfbEZUJjfFl7uva424DcaTZOvwCEs8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 47e3tLN5HipnOK5BV6nhmhttV0iZRHEYtGRTh56Pp6M= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/he.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + RYs+L0NAew70ya8KrCKYYJPkdzTVckZY7TLwVay0ubQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + xyEyZ8ezqdbPQQ/b6RSpnULrjnL08GWQ3wd+AasW2KQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 0UBqgjXjtRG51lEacNaLTmNvj5aFUeJ7oo1J4WYkrCw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + n1w40GWVeQM6/1d+krnNoL0XutbF3HNv2qjFaMErsuY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + TgEXGRRCYffwGHAa78wO2btMh/B5TluqOiVpvsy7yYY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 6b23nyneGkjP1x+wd00PTqF9PPujhu9g0TS4+3cBywo= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + PIYd2jHiJYoXmHfGbXu4sWialdDeBEyHWgMzu8Yd2H8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + oVMa0iTjxWVrd4HFHRrUvKxqnk+YFHk2CxOu43+wO2Q= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 2tCuekmOs0JtuIM7hm/+jt5s4OJGocWANizpTH8a58k= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + /qcXx+RijYb31wahT1y3K+QX0NCxCnGFDX9dWzAc56o= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + cExBbBN/cbmRWOsrqKbEBHJOo7FtTr3ZavW9slfCsVc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + WGgYHgAMqsDwSkDIWMFg5XBJnvRCbvM59I1pqJgmhgM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + o6GEyuuMFsBOFOONmS2V2x+bv11kkMT3xHEoelaxJv8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + uqN6dwLmCFJJQmbURrhDJv9wDJSGWqRqyqgeKTNUHZ0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + iZvCvn22+4feRZso6kzggSUbr1p4Z5zyDU7qniyWqE8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + eq+yTsmwGRXUHYRVC4w06YmUPnsYuuc4OjUfo7feieE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + ZoKH8cwKHH2VaZEkGsmRKevFaLdLxlAICRnrceNdsuw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + HT9jsdOsSvc+Orcce27NpaRxKmDCzIwkq+/wUGI3JQM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 756/lMgBfXOE5IDG5Ei94/iIP40obn9ZEROHo01+SRY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 90+2Bfu2sI863NKWVBCjCtNi5gbrwPr82sRRfR6DOGM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 50IP7eJ9NgEFLDIKBJXnmRRzcGT7MmW08hHJr4alKLQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + Ugk6n5077n97AZzPovvogEt/4FCL8ByB9WvIx7QOsqI= + </data> + <key>optional</key> + <true/> + </dict> + </dict> + <key>rules</key> + <dict> + <key>^Resources/</key> + <true/> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^version.plist$</key> + <true/> + </dict> + <key>rules2</key> + <dict> + <key>.*\.dSYM($|/)</key> + <dict> + <key>weight</key> + <real>11</real> + </dict> + <key>^(.*/)?\.DS_Store$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>2000</real> + </dict> + <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^.*</key> + <true/> + <key>^Info\.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^PkgInfo$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^[^/]+$</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^embedded\.provisionprofile$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^version\.plist$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + </dict> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/Info.plist b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/Info.plist new file mode 100644 index 0000000000..dfd2226d62 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/Info.plist @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildMachineOSBuild</key> + <string>21G115</string> + <key>CFBundleDevelopmentRegion</key> + <string>en</string> + <key>CFBundleExecutable</key> + <string>Downloader</string> + <key>CFBundleIdentifier</key> + <string>org.sparkle-project.Downloader</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>Downloader</string> + <key>CFBundlePackageType</key> + <string>XPC!</string> + <key>CFBundleShortVersionString</key> + <string>2.3.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleSupportedPlatforms</key> + <array> + <string>MacOSX</string> + </array> + <key>CFBundleVersion</key> + <string>2021</string> + <key>DTCompiler</key> + <string>com.apple.compilers.llvm.clang.1_0</string> + <key>DTPlatformBuild</key> + <string>13F100</string> + <key>DTPlatformName</key> + <string>macosx</string> + <key>DTPlatformVersion</key> + <string>12.3</string> + <key>DTSDKBuild</key> + <string>21E226</string> + <key>DTSDKName</key> + <string>macosx12.3</string> + <key>DTXcode</key> + <string>1341</string> + <key>DTXcodeBuild</key> + <string>13F100</string> + <key>LSMinimumSystemVersion</key> + <string>10.13</string> + <key>NSAppTransportSecurity</key> + <dict> + <key>NSAllowsArbitraryLoads</key> + <false/> + </dict> + <key>NSHumanReadableCopyright</key> + <string>Copyright © 2016 Sparkle Project. All rights reserved.</string> + <key>XPCService</key> + <dict> + <key>RunLoopType</key> + <string>NSRunLoop</string> + <key>ServiceType</key> + <string>Application</string> + </dict> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/MacOS/Downloader b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/MacOS/Downloader new file mode 100755 index 0000000000..cf04396e2f Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/MacOS/Downloader differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/_CodeSignature/CodeResources b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/_CodeSignature/CodeResources new file mode 100644 index 0000000000..d5d0fd7441 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Downloader.xpc/Contents/_CodeSignature/CodeResources @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>files</key> + <dict/> + <key>files2</key> + <dict/> + <key>rules</key> + <dict> + <key>^Resources/</key> + <true/> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^version.plist$</key> + <true/> + </dict> + <key>rules2</key> + <dict> + <key>.*\.dSYM($|/)</key> + <dict> + <key>weight</key> + <real>11</real> + </dict> + <key>^(.*/)?\.DS_Store$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>2000</real> + </dict> + <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^.*</key> + <true/> + <key>^Info\.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^PkgInfo$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^[^/]+$</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^embedded\.provisionprofile$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^version\.plist$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + </dict> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/Info.plist b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/Info.plist new file mode 100644 index 0000000000..a8fc6614cc --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/Info.plist @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildMachineOSBuild</key> + <string>21G115</string> + <key>CFBundleDevelopmentRegion</key> + <string>en</string> + <key>CFBundleExecutable</key> + <string>Installer</string> + <key>CFBundleIdentifier</key> + <string>org.sparkle-project.InstallerLauncher</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>Installer</string> + <key>CFBundlePackageType</key> + <string>XPC!</string> + <key>CFBundleShortVersionString</key> + <string>2.3.0</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleSupportedPlatforms</key> + <array> + <string>MacOSX</string> + </array> + <key>CFBundleVersion</key> + <string>2021</string> + <key>DTCompiler</key> + <string>com.apple.compilers.llvm.clang.1_0</string> + <key>DTPlatformBuild</key> + <string>13F100</string> + <key>DTPlatformName</key> + <string>macosx</string> + <key>DTPlatformVersion</key> + <string>12.3</string> + <key>DTSDKBuild</key> + <string>21E226</string> + <key>DTSDKName</key> + <string>macosx12.3</string> + <key>DTXcode</key> + <string>1341</string> + <key>DTXcodeBuild</key> + <string>13F100</string> + <key>LSMinimumSystemVersion</key> + <string>10.13</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright © 2016 Sparkle Project. All rights reserved.</string> + <key>XPCService</key> + <dict> + <key>JoinExistingSession</key> + <true/> + <key>ServiceType</key> + <string>Application</string> + </dict> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/MacOS/Installer b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/MacOS/Installer new file mode 100755 index 0000000000..31b45a64ad Binary files /dev/null and b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/MacOS/Installer differ diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/_CodeSignature/CodeResources b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/_CodeSignature/CodeResources new file mode 100644 index 0000000000..d5d0fd7441 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/XPCServices/Installer.xpc/Contents/_CodeSignature/CodeResources @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>files</key> + <dict/> + <key>files2</key> + <dict/> + <key>rules</key> + <dict> + <key>^Resources/</key> + <true/> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^version.plist$</key> + <true/> + </dict> + <key>rules2</key> + <dict> + <key>.*\.dSYM($|/)</key> + <dict> + <key>weight</key> + <real>11</real> + </dict> + <key>^(.*/)?\.DS_Store$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>2000</real> + </dict> + <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^.*</key> + <true/> + <key>^Info\.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^PkgInfo$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^[^/]+$</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^embedded\.provisionprofile$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^version\.plist$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + </dict> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/B/_CodeSignature/CodeResources b/src/MacVim/Sparkle_2.framework/Versions/B/_CodeSignature/CodeResources new file mode 100644 index 0000000000..36781036b1 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/B/_CodeSignature/CodeResources @@ -0,0 +1,2132 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>files</key> + <dict> + <key>Resources/Base.lproj/SUUpdateAlert.nib</key> + <data> + lTs68EHEuBNChZ0HaUfc6a2qJus= + </data> + <key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib</key> + <data> + rP8JtvaANGmgYMHZZYqXixYGclg= + </data> + <key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib</key> + <data> + GspzsCPMWa1nV05fEmLIp6zro0I= + </data> + <key>Resources/Base.lproj/Sparkle.strings</key> + <data> + XSU5ujIHVj0VrcaL7/1PMjP8QWE= + </data> + <key>Resources/Info.plist</key> + <data> + 80XtoE5bjZ67gFtb+CfYJ9InCV4= + </data> + <key>Resources/ReleaseNotesColorStyle.css</key> + <data> + NjIvb1z7eJuLCKf9HS15O5heg50= + </data> + <key>Resources/SUStatus.nib</key> + <data> + MMoEZd95HH2wagHtE7tdRXWDz2Y= + </data> + <key>Resources/ar.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + qTOMJ1P/HhCcJQi4qSJV9l/b7q0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ar.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + chEDY/Vh2Vh+3oo4r0XF7krQ7c4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ar.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5Ukin0TnIF0ot6Daz8OSgIoDZJ0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ca.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + l9CaCmAXFcs+Z+8rRt7PX9onkf8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ca.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + SM9Ssbq+EA6SD88oCZx9K6nLvic= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + G9Wgf14zMhU2alRSZvqclMmlTCA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + Wh57u912k8KoumveRiDRmINy170= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + hIXy3nCBtLeY6/3v3pWwYRJl+sA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + NEt5JVKz+OoMSynKxJC18KXMGaA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + 0FkWF1ciwhmhK0CunKhpfDGMZnk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + CkbYzkpwfT37juYfJP25giiTUo4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + YLQxXHDo3e3Udzaj8LHDIjotWzE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + YfY6kTIXAj9sipxrJBGc7eKEOHY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + /1A+Sg5wG2SW+Q5Q7rGwtU2aVk0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + BS+NpAFPK7X/XzX+n99gJLhlNKU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + H7jL3j77eZ1egMEj+Nj6LXnSHHc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + Hh2GQMfVkK/dapsekwiVZz9cakg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/en.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + FSez7jCd0gDTFFGHiWL1QXY8OUU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/en.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + NzxxRDATRj41eOLu03OYPRaKa1k= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + Q36SuanjGk70efU6liei3uz+Uds= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + 3UK3h3oTqvHtCsr1LJvTMphItJU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + fucEKrOlh81Wj9EqCtUl6sQVg1k= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fa.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + vI1JRqMnuuewEX52rjBZ/TDrrXk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + My5YiAuNV+4oR1vPL1np+nMMMOI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + jtobMUE88GHRVFEG2A28n2ZyHeA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + +T4u6wvinBvx2z6vcAQKz32lvvE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + ffz6ccHMgxcBdH6by1YAYX1jpOQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + 1OWrzot/72Uej/eeBpnZknMeyYs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + fPB1Vk+1a7xRIMKxQ3/F1bxGirA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/he.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + nZXhvxaoacIflCBRrHxQ4NDkeKg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/he.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + bG2Mhx67XieRw+jRYm1/n2PIGnI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + b/ru54Y0QwvH9Kz9sfRPEoP5z5k= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + AAiVUXPoJYgeG5yLdH5XaFKLXcc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + S2g3qlSPK1msOuuvB2dU9UoInq4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + VD/QPXFfEHRW7ksDLYiiO1xl1LQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + PMarJZpNhDysjzZuBuyKv8KBTXQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5CCN2xKgiom6y3+mcWd48RVdX48= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + bQiB5tUCaD24QKubEYeBTXsAF1g= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + 8LPYds94rtFaRsGn0VDNXjxk6T0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + RO7D/40UgCd+DPSZg5LlrOBdmfY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + Yev0Ro2PsLfgCLoY7JNED63PnqM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + pVInM2cpSCq7zmpffx7ytVY6shU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + W/h9EbnuDfXU4nxRzIF7Dv8ckks= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + vl6gP7QCeuFYsNYdgVYYUcm0S/4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + vmA8scrUnfvMygrsa76QF557nDU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + RYRC4Vmp6utNAtLodS/PTyi4yIM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + xZjyKASZdwg70f4m29uGtJjFUgQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + d+ifBccX26E56rM7eOY72BKC5aY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + lmXDaCFjaOlD2OSN7WeCYPUkiAc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + fck+vL9Sgcx19X7HthrjizRGhu8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + xds/kfSxmdLFOMffSREoZC9yQFM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + n42iYGYF5rusi8bu9cZKBXVwwXE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + 5ZpTsHPgV4inhhYiISGjC03BMG4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + 1OahTTjmwc6xGVrnfJ4jQAlczNg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + t++79qkzwHo15l2gbAGPNIoYsJc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + HX2RXVrN+fpwO4I60/UDyNuGj5Y= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + UwRkyzAvs+mt3UXwTadtNXNrClE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + Z2RTzAW/+3ZV5g9/DyNv+YFZNQE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + YFXY6v+45ptf8TuBq2MsKKdhfQ8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + V0pfsICkDi0t8PHF4+dGW9p9c8s= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + HLX0cX6CzMOMpZ7eff4JZYu+KQY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + pWRHcAJRvjUt7BOLr/gd+IupcGA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + Bn6gYNr9F1tKpTd3trapLKKg1bw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + cyq/clJHyLGamebBp/NK6YzPUNM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + a/RNqEdkehva+SwGWz11MktFGWA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + Ssaz0Z2Bvovi+gexkx+C1o46MQM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + kYCbmI7ssPYVnQQ3uDHF6PgOBjw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + Lmn0e5MDPfan55gnani1dQbR10Q= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + p3zkSrOy/L6GcSH9jCj2Y/uDmLE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 3yWhlgxQS7Hhh481yH9qttWea0U= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + 8o3l6mjHafwy5sLMMO2rZIe7xiQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + s3Cllq+eYT+urMLfXvnwsMkboWQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5I5OyTLppz6aT5r3kKOmRcrDfXg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + Ny5EoZGpd5UK5c3eMIUKLR8x4/I= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + jUZer0aLckRt7dLPlNB5I7dAV+s= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + 5fscQshoMtSnO4kj3Ts2Nw4xqkc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + YWicg3ZZLCEoiJ9WOUUZ6WoTZJY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + K5RsmL5IV2dSBTaN6i/cLYRGJ3U= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + AlR6NnM+kipd4A8PFhs0S0Rccbk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + Cd6guArNrSoJO3e2ntd1Eys3bok= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + oy0B8M6u8AjjwSepIoL324YKsWk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + UrzLYtjSwKdvxlSQJa/xe5IqqVo= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + wl9JoCOsqKgCSgMpFzhwObUUdh8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + pt6ThapYF8lNn28yLG7xW11onFg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + fKCgCsGuwlJJnukTgKv+0tfNjSg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + 6/WdcAg1mJs1/HT5krHhOxqyMWk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + HnKx/WpiOkat6j6EgFC4CCjcaVA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + kATRxVYhY1dX+dY1bQ+V+TvmXNk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + DjCjxSor6wnKAz8bFLcPCnW1Kw0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + DMhyvu1ywGudTYBfSXV5xoAHYhA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + PFAuCvFxcO/y7l7c9FyaMKNhLfQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash</key> + <data> + 167IbTfOhYu699bxXBhaGehjrco= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash</key> + <data> + YI4W+mUo+t840O84rzq2Ffdzm5o= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/Sparkle.strings</key> + <dict> + <key>hash</key> + <data> + G/kIaADnb5wlgQMaCX6Gfa48OY8= + </data> + <key>optional</key> + <true/> + </dict> + </dict> + <key>files2</key> + <dict> + <key>Autoupdate</key> + <dict> + <key>cdhash</key> + <data> + wjKYHW+iIqcNcuW+TXroPSuZJ4w= + </data> + <key>requirement</key> + <string>cdhash H"c232981d6fa222a70d72e5be4d7ae83d2b99278c" or cdhash H"48e6a2c240dff7117024bd5aa0391af280423730"</string> + </dict> + <key>Headers/SPUDownloadData.h</key> + <dict> + <key>hash2</key> + <data> + gsNEzLxb/w73quG4B8FDTObuCtckYFt7DKEIamBp2zU= + </data> + </dict> + <key>Headers/SPUStandardUpdaterController.h</key> + <dict> + <key>hash2</key> + <data> + GGqsgqKsWmdDkOTzCogsg35Z/rf6xGzHGoBrr4FFEm8= + </data> + </dict> + <key>Headers/SPUStandardUserDriver.h</key> + <dict> + <key>hash2</key> + <data> + nJAdi7PFjYFLmL6Nel5VtcsOGW0/wqrRCZ5RHMkNLkc= + </data> + </dict> + <key>Headers/SPUStandardUserDriverDelegate.h</key> + <dict> + <key>hash2</key> + <data> + BfZlHA+8hNs/Rq6hq3E97PRzyUgOTDowTBEJMvODnks= + </data> + </dict> + <key>Headers/SPUUpdateCheck.h</key> + <dict> + <key>hash2</key> + <data> + H30F2i5GYmOu/j4JEw5WsuZbiGJXnge5gpyb9e2SHAM= + </data> + </dict> + <key>Headers/SPUUpdatePermissionRequest.h</key> + <dict> + <key>hash2</key> + <data> + gc+ohsCgvzpHoQdUTcdiCT6weg66V3X//QkCUHTgUss= + </data> + </dict> + <key>Headers/SPUUpdater.h</key> + <dict> + <key>hash2</key> + <data> + 3KTijnCBw7D9doymRvwS2fxFP3KVVbvTQQOQarE8YbI= + </data> + </dict> + <key>Headers/SPUUpdaterDelegate.h</key> + <dict> + <key>hash2</key> + <data> + YSM2f1EtcHlJEo+gIatOa+N4Q5kJltHMFBvUeQfF95Q= + </data> + </dict> + <key>Headers/SPUUpdaterSettings.h</key> + <dict> + <key>hash2</key> + <data> + mxcAPbTuvCvtyq/+gQWGQgJGD8V0ByC4gCekPPa/Gjs= + </data> + </dict> + <key>Headers/SPUUserDriver.h</key> + <dict> + <key>hash2</key> + <data> + CsyeYijfrBcC4CgzS/DkmkanCboVqwq5zRHSgNRoEes= + </data> + </dict> + <key>Headers/SPUUserUpdateState.h</key> + <dict> + <key>hash2</key> + <data> + UvjyIpnBxaZdOPRKweTXGASm9uvNDyy78TgxmUplxys= + </data> + </dict> + <key>Headers/SUAppcast.h</key> + <dict> + <key>hash2</key> + <data> + e4/9nLfLxgixHXPPusCnelTLkGePoeUhmHu0Fu8fUbg= + </data> + </dict> + <key>Headers/SUAppcastItem.h</key> + <dict> + <key>hash2</key> + <data> + 2fyiwr4izcLQX6wA0wQQWHK4ncY3HuEBnCWfkxq3gQk= + </data> + </dict> + <key>Headers/SUErrors.h</key> + <dict> + <key>hash2</key> + <data> + fSRNpTjFOOtljWaiRSnjDxN54JS1BkiGpQneIip6sA8= + </data> + </dict> + <key>Headers/SUExport.h</key> + <dict> + <key>hash2</key> + <data> + XO8CQmbFThLbYg949NEGhg3g+iouIw3/3+BCCLtEdFE= + </data> + </dict> + <key>Headers/SUStandardVersionComparator.h</key> + <dict> + <key>hash2</key> + <data> + walPrXy07HqVX3JWuGPS02olWF59BjueVW1UoLwCv/g= + </data> + </dict> + <key>Headers/SUUpdatePermissionResponse.h</key> + <dict> + <key>hash2</key> + <data> + rXiDhQpt6r+9NOERnvdPFEr4rcUx9cMlnPLUamM1HLM= + </data> + </dict> + <key>Headers/SUUpdater.h</key> + <dict> + <key>hash2</key> + <data> + QenIKuHPtOmx2KG6r78Qr/2ULbw+HX/5JohFy5pdE/k= + </data> + </dict> + <key>Headers/SUUpdaterDelegate.h</key> + <dict> + <key>hash2</key> + <data> + hQVZhCFOVREGIafIiuf8GM49Ib4hEGaOsczKMhtggXI= + </data> + </dict> + <key>Headers/SUVersionComparisonProtocol.h</key> + <dict> + <key>hash2</key> + <data> + +ZNs7VCVpeYztnmVTNwQOWNDu6q8tv9CCNwqfhHiocI= + </data> + </dict> + <key>Headers/SUVersionDisplayProtocol.h</key> + <dict> + <key>hash2</key> + <data> + GOSHZhsDKrrKy8L3PkySoT90dC1Y/bYfITIsE6XyCGE= + </data> + </dict> + <key>Headers/Sparkle.h</key> + <dict> + <key>hash2</key> + <data> + OkQqMusip3u1oI5hrGeNr/32xpfTMCC4Kmg7r0Aijgw= + </data> + </dict> + <key>Modules/module.modulemap</key> + <dict> + <key>hash2</key> + <data> + 1TF+JZkzFr6n8oH4WItto+C5Vf3K12f0H9KjqD0A5QU= + </data> + </dict> + <key>PrivateHeaders/SPUAppcastItemStateResolver.h</key> + <dict> + <key>hash2</key> + <data> + uadB6ogg0HfIDtHd/Uc+JBuKuRjvAWUj8zWMqWhfJkg= + </data> + </dict> + <key>PrivateHeaders/SPUGentleUserDriverReminders.h</key> + <dict> + <key>hash2</key> + <data> + 9W2dJ38WQX151mpIS0r8/EfCqZV6jEh621xwna2JVAI= + </data> + </dict> + <key>PrivateHeaders/SPUInstallationType.h</key> + <dict> + <key>hash2</key> + <data> + hj9Br7Gf1Y8X1dqNvSUHMP70K+Q+S9xZAyPYMqKthFQ= + </data> + </dict> + <key>PrivateHeaders/SPUStandardUserDriver+Private.h</key> + <dict> + <key>hash2</key> + <data> + Y3+lm+u0IcRfOZ83REg4sB6t6Gt9zNvfoc36rDGqErw= + </data> + </dict> + <key>PrivateHeaders/SPUUserAgent+Private.h</key> + <dict> + <key>hash2</key> + <data> + 7oKxx32I6Y1OQh8mFj4fpLqcfat6wuEyXt7D4oZ4Vec= + </data> + </dict> + <key>PrivateHeaders/SUAppcastItem+Private.h</key> + <dict> + <key>hash2</key> + <data> + lD64eho6Q/ue23yAnMMiVK3Ma3wgI6wH1AzsCNek6Eg= + </data> + </dict> + <key>PrivateHeaders/SUInstallerLauncher+Private.h</key> + <dict> + <key>hash2</key> + <data> + 9igX5fnwg2PfKMmhEabcLvBsNhtWTQD1NsfXfCmQJp8= + </data> + </dict> + <key>Resources/Base.lproj/SUUpdateAlert.nib</key> + <dict> + <key>hash2</key> + <data> + 6GuEAoNdrDn6x7caEH4yQUf1Nl9w+NDANF0Ze40/Whw= + </data> + </dict> + <key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-101300.nib</key> + <dict> + <key>hash2</key> + <data> + pL+GKmbdcxP9FeynHxxQn4LiULgbgbtLjeBYQQpBPys= + </data> + </dict> + <key>Resources/Base.lproj/SUUpdatePermissionPrompt.nib/keyedobjects-110000.nib</key> + <dict> + <key>hash2</key> + <data> + ngBPulWqKTt+DrJFiZicSyfUiNyQq34nvTHBaXDsqCA= + </data> + </dict> + <key>Resources/Base.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 7DQi4XIdmNDFEuet0a26l/2qsTHrLKlDT4/zp6XA97w= + </data> + </dict> + <key>Resources/Info.plist</key> + <dict> + <key>hash2</key> + <data> + 7zndEsjUTz7MY6n66ce3jzeRAKrWgV6ziaBczCMVWsM= + </data> + </dict> + <key>Resources/ReleaseNotesColorStyle.css</key> + <dict> + <key>hash2</key> + <data> + dr1pmXWP2OUdF+a0gttDT5tHaMArA3r2vS46AAzoy8E= + </data> + </dict> + <key>Resources/SUStatus.nib</key> + <dict> + <key>hash2</key> + <data> + xaemKA5RnHBgTuwB81z6r5d+f2CaMcz74K9Tv+bY4BM= + </data> + </dict> + <key>Resources/ar.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + 33nOBJb6OPaZt3PKT2iUJ3RfF/c59DAGmt9TCQVn74A= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ar.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + T7jmmlpE0sLNULv3afiWTodnuCFQgWJobzgcUjYOqLE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ar.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + yx9tkKjj3aOHvgdYCWXM89uhlyVeNb4oqcAenJxibwI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ca.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + 18qLsTRnJfi0wDf6A85XbiMXGORSmuo9Ul3IK4m5gq0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ca.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + DQhUnYhSgufw5NRY162lt2GGM83U38tQvNF1qotGYzE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + qSoDl0PIYv+OrSxtJfUYk9xeQihmzfaxAf+egKyw4y4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + CVcpEvgI5PQ1NFmIg3Z3rmqCpPDyVHRAtfmMWzW8xUE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/cs.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + yJXcgwDV0GC2yZWVdhf9UQirDu1yLWTaa+x0vVpYkfo= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + aKNcPadrNnf7wuYmBAxoRzES9XhxXRHMrW/+9MtZBQs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + S375hGDUzaAJ0lfz41FIA5w56+Ws5PemLC/1KBRvhFc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/da.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + qgYKiHiodd+q/4U1lIEIUSS9PX9ENx0isGUKLSWmKe4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + A6JiLH5c4UX2iobAPXPHv7TLiBInrdHvtvqnnsTBxLI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + peRkazz0dsfYJDb3gPQ69Yyz9ZQ392Wpl9aKbPx52r4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/de.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + uxoRq90TmDirUKRbCW1lKy/k1tZvFz4EbxQPhVf+Mhs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + utAXO7a8Od4ICYV3R0WQBa8ncUQ30SfruZACTuvyDxk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + Ht2j5NyBIuVeI8cvtadQCMnAmv2pEX2/D2xssc0ks6E= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/el.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + GvP3asj8JbFMZdNtcFo0MWdmrCB+z6k66kmleaGlmow= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/en.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + EBVS8ZfEIJxGSghO17emwoHQo0LVWWzBJMFs8RwvKWg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/en.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + dtCxuHMLMU87LdmyOxxclj/bOGkoLz6sOZtmOQ4pjXg= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + 8KSmmlZHYEiMGUwXQRV+ZDxs07XmaeH4XIYI+di1ono= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + VK5FfxN+4wUvATUvyh9tQPkfMIY/r7/4mGBCqtWXYKI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/es.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + RYqWb4D0ylosWigPpdVjMlaCWiXNrRIvzIwwVbXpaSs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fa.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + hiHofXML8/Ej+t2dTRuvVL3vkS/6jW6b/wvx/3quM10= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + O+ja0EMKj5RxMmW3TRALc9XTpMJ7Y7dwXm706E33rUA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + vMvJgiGd2enOq2N6xcVfAIRCww8rgqjzeBKKQNINs7E= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fi.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + a70/+B90B44V8vfbEZUJjfFl7uva424DcaTZOvwCEs8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + Avyaxx14FRXq/CTIDvvF7uww42SRhYgNSc960h7MCfc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + yeck7eQs0FVk/UGgsjBUN59wJqOtzQenx9aM6Z13kKI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/fr.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 47e3tLN5HipnOK5BV6nhmhttV0iZRHEYtGRTh56Pp6M= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/he.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + SmfKGCNVK9M61LCNGqWk4/FZInlcKG2U9uD5ajPVobw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/he.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + RYs+L0NAew70ya8KrCKYYJPkdzTVckZY7TLwVay0ubQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + L7shRNgdZIfbt5y5pioLEIo+A9I7VtgIUFpzoCFkB1I= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + 997BslAfLieaezvoE7sMbvK8UeHB6cPZLCC7Mr36E/E= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hr.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + xyEyZ8ezqdbPQQ/b6RSpnULrjnL08GWQ3wd+AasW2KQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + 8LbsWTkMSczHFa4Rh9XZDRo0uCOyrV9VXUYEiEvnG7I= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + twHi8JXysxao7MlTGr178ZpB8yz1mXkij2V5n8NJWSQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/hu.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 0UBqgjXjtRG51lEacNaLTmNvj5aFUeJ7oo1J4WYkrCw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + 04Q9PpqtuYz6kfVhf6eI9XBxJn0LQB9Ck/ceBq1ztGU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + VTXP5MNyLB5x8ivTThsM02bVaHJiDEI3qu3+S1ZQJCw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/is.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + n1w40GWVeQM6/1d+krnNoL0XutbF3HNv2qjFaMErsuY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + 1zxkJlohqYtSJb0pj93fJXlPkedYm2IllbilGRDFo90= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + i2gXWKIvcXKpPvnw29Nyp4/CwAhAiZdn3LGMeDHwm0o= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/it.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + TgEXGRRCYffwGHAa78wO2btMh/B5TluqOiVpvsy7yYY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + vFagmq7Xdp80v7/plWY/m3PBNbxFsCeu0x8wDzZQRT4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + zYuOp6owctTI6zIFWac7yKqGLEglaXnTlNOnh/n7mow= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ja.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 6b23nyneGkjP1x+wd00PTqF9PPujhu9g0TS4+3cBywo= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + shkQwYfF0rI+GzhWoVLqI7A1hKTnRr/o4wnUFb3Vhik= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + lqPQJYKtJlVGV2/UpetCpxTEpb4u5aUUU9CjmZO2OaI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ko.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + PIYd2jHiJYoXmHfGbXu4sWialdDeBEyHWgMzu8Yd2H8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + RQbKlvLGnVjjVMP5eHHNUCv5kLJl4EA6zNGdDKatbH0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + fUXd7difLY77ZuS/SSvoYhf8PkFK9QDsJSO8or9i0xs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nb.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + oVMa0iTjxWVrd4HFHRrUvKxqnk+YFHk2CxOu43+wO2Q= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + tp3fY8ogv+xcQOFkz5BkDNTZHIaRrhGgT9uKfCjDB70= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + AnDExckS661tfAK+Boog4+sXuC5AkiTU7aNG62I8Pmk= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/nl.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 2tCuekmOs0JtuIM7hm/+jt5s4OJGocWANizpTH8a58k= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + oB2rGM/SPnJLdvhUz2CJfm8TS6XhrhmHD2gFyrVSq8U= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + 6wJzRSZnXz5LE2nE67bE6tnreEDCcpWZAsZdNGUmkMY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pl.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + /qcXx+RijYb31wahT1y3K+QX0NCxCnGFDX9dWzAc56o= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + hDN04zbJliR6KRqEv4lEuAVNTjbkmyYUpKjCbWKaKdU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + ORwVRY5Z5fnlWEKiFLcVc7Z7hJueiew9nBlzgX0dve0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-BR.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + cExBbBN/cbmRWOsrqKbEBHJOo7FtTr3ZavW9slfCsVc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + gto4ribWYRWZl0Eez6/7XZg3EesExPlGb5Nz1YVTuzE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + YfyCM23JKSt8X663Xe3gds6gHqq5Q+AnLpDFUAHM2BE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/pt-PT.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + WGgYHgAMqsDwSkDIWMFg5XBJnvRCbvM59I1pqJgmhgM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + PZZnueQNOLmQuEtkELhzxhnG+MDu7RyeOaySHSoHmYU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + ou6KdrTUzEKBrcCjBNtxZIZP9HuuJ8zirlEPslAq10Y= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ro.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + o6GEyuuMFsBOFOONmS2V2x+bv11kkMT3xHEoelaxJv8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + wdiMmOcek4MJvdl1u2OoccWD56zCu2lKDGUd40bnMb8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + 8OxiHFrqm2Kj33QZV8qXIaVimaF1Zcvtmks+/riocE0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/ru.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + uqN6dwLmCFJJQmbURrhDJv9wDJSGWqRqyqgeKTNUHZ0= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + FDJ/dTwG5X34BF9lDDkFVGJUwpLeKi1MUbF072nYass= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + xa+UPXIC+og1IpGE6bA/+51E2uR9ZG+HGWKFA83tTNU= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sk.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + iZvCvn22+4feRZso6kzggSUbr1p4Z5zyDU7qniyWqE8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + OAq7ojI6K/xR4nFEK1OBTiJeNaHqgb8xCgzZ5Y3P7Uo= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + fsDgHLZ/sucjdSCWTX5d16OnZjoRzcwYcFxhiqRs9QE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sl.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + eq+yTsmwGRXUHYRVC4w06YmUPnsYuuc4OjUfo7feieE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + LYXEBB7MF82Ig5MgIM9pTtJJAYJL51nzYzbVW1kdSGI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + 7cRrvSRjQl6vS+7I590mYMrXl264dBgJRgZ1orZvRSs= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/sv.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + ZoKH8cwKHH2VaZEkGsmRKevFaLdLxlAICRnrceNdsuw= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + dvWO9t2NYZ+cQoe/9B3Tib+EPOdPp4wgatHaVVhu8gQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + B38kLdAzztjjmbp+peEpxUJU+gVWTGiloPXhiVbRGD8= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/th.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + HT9jsdOsSvc+Orcce27NpaRxKmDCzIwkq+/wUGI3JQM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + Eas+RUaJ03H05UVqHIhONcr5aa06Oj3g21RnNac5od4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + EQ3vP20926+t1dfuYY2lCK4J1gu58mK2DMIqlVx67eE= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/tr.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 756/lMgBfXOE5IDG5Ei94/iIP40obn9ZEROHo01+SRY= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + lR6DOvFkMHpmbtXQJNE1aXtRXgBbd0siVMoq01D4dhM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + IK5drPScu8Mq49o8cg5TcT/cC7CWJ105vdDLIaxDWJc= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/uk.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 90+2Bfu2sI863NKWVBCjCtNi5gbrwPr82sRRfR6DOGM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + NXEAoNAKcjI5GBtGxYcUXmtz+rP06ocJSSVlaR/lnMA= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + BM6BTCrnXIEZ+HEAtMk2P2Wali7DXxm3BUqaeSfwLRM= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_CN.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + 50IP7eJ9NgEFLDIKBJXnmRRzcGT7MmW08hHJr4alKLQ= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/SUUpdateAlert.strings</key> + <dict> + <key>hash2</key> + <data> + jdmB9inrJUf1OmYmVnORSMfdz5z1SWmBtdv39I776K4= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/SUUpdatePermissionPrompt.strings</key> + <dict> + <key>hash2</key> + <data> + oEil3Q+GFFDEltcMZkVmRiVhGov3bZwifIFtP3zVm0A= + </data> + <key>optional</key> + <true/> + </dict> + <key>Resources/zh_TW.lproj/Sparkle.strings</key> + <dict> + <key>hash2</key> + <data> + Ugk6n5077n97AZzPovvogEt/4FCL8ByB9WvIx7QOsqI= + </data> + <key>optional</key> + <true/> + </dict> + <key>Updater.app</key> + <dict> + <key>cdhash</key> + <data> + CYp/QdoH4tFTfZZh+jGOPaczLm4= + </data> + <key>requirement</key> + <string>cdhash H"098a7f41da07e2d1537d9661fa318e3da7332e6e" or cdhash H"f229e3e86b98cda3735011b07bc93069302163a6"</string> + </dict> + <key>XPCServices/Downloader.xpc</key> + <dict> + <key>cdhash</key> + <data> + jOdIknmp+LDXHx8bMWqlx9Syt7U= + </data> + <key>requirement</key> + <string>cdhash H"8ce7489279a9f8b0d71f1f1b316aa5c7d4b2b7b5" or cdhash H"61387845638f386cbbdc2e3880c8b5824178db93"</string> + </dict> + <key>XPCServices/Installer.xpc</key> + <dict> + <key>cdhash</key> + <data> + XGsMkUjxG/PynRRe3I/CkaNHg+A= + </data> + <key>requirement</key> + <string>cdhash H"5c6b0c9148f11bf3f29d145edc8fc291a34783e0" or cdhash H"762d06af3a103981b55a3cb8de16d76ab651e255"</string> + </dict> + </dict> + <key>rules</key> + <dict> + <key>^Resources/</key> + <true/> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^version.plist$</key> + <true/> + </dict> + <key>rules2</key> + <dict> + <key>.*\.dSYM($|/)</key> + <dict> + <key>weight</key> + <real>11</real> + </dict> + <key>^(.*/)?\.DS_Store$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>2000</real> + </dict> + <key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^.*</key> + <true/> + <key>^Info\.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^PkgInfo$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^Resources/.*\.lproj/</key> + <dict> + <key>optional</key> + <true/> + <key>weight</key> + <real>1000</real> + </dict> + <key>^Resources/.*\.lproj/locversion.plist$</key> + <dict> + <key>omit</key> + <true/> + <key>weight</key> + <real>1100</real> + </dict> + <key>^Resources/Base\.lproj/</key> + <dict> + <key>weight</key> + <real>1010</real> + </dict> + <key>^[^/]+$</key> + <dict> + <key>nested</key> + <true/> + <key>weight</key> + <real>10</real> + </dict> + <key>^embedded\.provisionprofile$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + <key>^version\.plist$</key> + <dict> + <key>weight</key> + <real>20</real> + </dict> + </dict> +</dict> +</plist> diff --git a/src/MacVim/Sparkle_2.framework/Versions/Current b/src/MacVim/Sparkle_2.framework/Versions/Current new file mode 120000 index 0000000000..7371f47a6f --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/Versions/Current @@ -0,0 +1 @@ +B \ No newline at end of file diff --git a/src/MacVim/Sparkle_2.framework/XPCServices b/src/MacVim/Sparkle_2.framework/XPCServices new file mode 120000 index 0000000000..99c46ea236 --- /dev/null +++ b/src/MacVim/Sparkle_2.framework/XPCServices @@ -0,0 +1 @@ +Versions/Current/XPCServices \ No newline at end of file diff --git a/src/auto/configure b/src/auto/configure index 34c7d8888e..606a91ddb3 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -1,9 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -14,14 +15,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -31,46 +34,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -79,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -94,8 +90,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -107,30 +107,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -152,20 +132,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -185,42 +167,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -228,14 +221,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -253,18 +253,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -291,6 +292,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -308,6 +310,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -322,7 +332,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -331,7 +341,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -370,12 +380,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -387,18 +398,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -410,9 +430,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -439,7 +459,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -483,7 +503,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -497,6 +517,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -510,6 +534,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -575,50 +606,46 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= +PACKAGE_NAME='' +PACKAGE_TARNAME='' +PACKAGE_VERSION='' +PACKAGE_STRING='' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="vim.h" # Factoring default headers for most tests. ac_includes_default="\ -#include <stdio.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> +#include <stddef.h> +#ifdef HAVE_STDIO_H +# include <stdio.h> #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include <stdlib.h> -# include <stddef.h> -#else -# ifdef HAVE_STDLIB_H -# include <stdlib.h> -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include <memory.h> -# endif # include <string.h> #endif -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif #ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif #ifdef HAVE_STDINT_H # include <stdint.h> #endif +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif" +ac_header_c_list= ac_subst_vars='LTLIBOBJS LIBOBJS LINK_AS_NEEDED @@ -764,6 +791,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -789,6 +817,7 @@ enable_option_checking enable_fail_if_missing enable_darwin enable_sparkle +enable_sparkle_1 with_developer_dir with_macsdk with_macarchs @@ -904,6 +933,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -933,8 +963,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -975,9 +1003,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1001,9 +1029,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1156,6 +1184,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1205,9 +1242,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1221,9 +1258,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1267,9 +1304,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1285,7 +1322,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1293,7 +1330,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1349,7 +1386,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1446,6 +1483,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1481,6 +1519,7 @@ Optional Features: specified on the command line are missing. --disable-darwin Disable Darwin (Mac OS X) support. --disable-sparkle Disable Sparkle updater (MacVim). + --enable-sparkle_1 Use legacy Sparkle 1 updater (MacVim). --disable-smack Do not check for Smack support. --disable-selinux Do not check for SELinux support. --disable-xsmp Disable XSMP session management @@ -1583,9 +1622,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1613,7 +1652,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1621,7 +1661,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1631,9 +1671,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1650,14 +1690,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1665,14 +1705,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1694,7 +1735,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1702,14 +1743,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1725,14 +1767,14 @@ fi ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1740,17 +1782,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1765,10 +1808,43 @@ fi } # ac_fn_c_try_link +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_run LINENO # ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. ac_fn_c_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -1778,25 +1854,26 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status @@ -1807,135 +1884,18 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case <limits.h> declares $2. @@ -1943,16 +1903,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif + which can conflict with char $2 (); below. */ +#include <limits.h> #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1970,24 +1923,25 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -1999,17 +1953,18 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -2017,12 +1972,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -2030,18 +1986,19 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -2053,11 +2010,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_find_uintX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -$as_echo_n "checking for uint$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 +printf %s "checking for uint$2_t... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2067,7 +2025,7 @@ else /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; test_array [0] = 0; @@ -2077,7 +2035,8 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : case $ac_type in #( uint$2_t) : eval "$3=yes" ;; #( @@ -2085,17 +2044,18 @@ if ac_fn_c_try_compile "$LINENO"; then : eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no" +then : -else +else $as_nop break fi done fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_uintX_t @@ -2114,7 +2074,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= 0)]; test_array [0] = 0; @@ -2124,14 +2084,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=0 ac_mid=0 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2141,9 +2102,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid; break -else +else $as_nop as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= @@ -2151,14 +2113,14 @@ else fi as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) < 0)]; test_array [0] = 0; @@ -2168,14 +2130,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=-1 ac_mid=-1 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; test_array [0] = 0; @@ -2185,9 +2148,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=$ac_mid; break -else +else $as_nop as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= @@ -2195,14 +2159,14 @@ else fi as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val @@ -2210,7 +2174,7 @@ while test "x$ac_lo" != "x$ac_hi"; do /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2220,12 +2184,13 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid -else +else $as_nop as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done case $ac_lo in #(( ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; @@ -2235,12 +2200,12 @@ esac cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -static long int longval () { return $2; } -static unsigned long int ulongval () { return $2; } +static long int longval (void) { return $2; } +static unsigned long int ulongval (void) { return $2; } #include <stdio.h> #include <stdlib.h> int -main () +main (void) { FILE *f = fopen ("conftest.val", "w"); @@ -2268,9 +2233,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : echo >>conftest.val; read $3 <conftest.val; ac_retval=0 -else +else $as_nop ac_retval=1 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -2282,14 +2248,34 @@ rm -f conftest.val as_fn_set_status $ac_retval } # ac_fn_c_compute_int +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >auto/config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>auto/config.log @@ -2322,8 +2308,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2358,7 +2348,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2393,11 +2383,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2408,8 +2400,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2433,7 +2425,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2441,14 +2433,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2456,15 +2448,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2472,8 +2464,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2487,63 +2479,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2553,99 +2530,421 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -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 - - -ac_config_headers="$ac_config_headers auto/config.h:config.h.in" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif +#include <stddef.h> +#include <stdarg.h> +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*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; +} + +/* 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 do not provoke an error unfortunately, instead are silently treated + as an "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 is necessary to write \x00 == 0 to get something + that is 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 **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include <stdbool.h> +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} -$as_echo "#define UNIX 1" >>confdefs.h +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" +as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H" +as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H" +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +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 + + +ac_config_headers="$ac_config_headers auto/config.h:config.h.in" + + +printf "%s\n" "#define UNIX 1" >>confdefs.h + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -2661,16 +2960,25 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2679,11 +2987,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2691,11 +3000,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2706,11 +3019,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2719,11 +3032,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2731,11 +3045,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2746,11 +3064,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2758,8 +3076,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2772,11 +3090,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2784,11 +3103,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2799,11 +3122,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2812,11 +3135,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2825,15 +3149,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2849,33 +3177,144 @@ if test $ac_prog_rejected = yes; then # 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+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + 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 + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "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 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + 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 + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2883,11 +3322,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2898,28 +3341,25 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - test -n "$CC" && break - done fi -if test -z "$CC"; then +if test -z "$ac_cv_prog_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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2927,11 +3367,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2942,50 +3386,48 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - - test -n "$ac_ct_CC" && break -done - if test "x$ac_ct_CC" = x; then CC="" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2995,7 +3437,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3003,7 +3445,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3015,9 +3457,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM 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. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3038,11 +3480,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +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, @@ -3059,7 +3502,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3075,44 +3518,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +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 @@ -3126,15 +3571,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3143,7 +3588,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3155,8 +3600,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3164,10 +3609,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3175,39 +3620,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3221,11 +3667,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3234,31 +3681,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3268,29 +3716,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3299,382 +3751,255 @@ else /* end confdefs.h. */ int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdio.h> -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) +main (void) { - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* 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]; ; 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" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -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 - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -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 - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdarg.h> -#include <stdbool.h> -#include <stdlib.h> -#include <wchar.h> -#include <stdio.h> - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +else $as_nop + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int -main () +main (void) { - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); +int +main (void) +{ ; return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; 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 +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c99=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC +fi +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program +_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" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +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 + 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp do ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif +#include <limits.h> Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -3686,10 +4011,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -3699,7 +4025,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : break fi @@ -3711,29 +4038,24 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - # <limits.h> exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include <limits.h> -#else -# include <assert.h> -#endif +#include <limits.h> Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -3745,10 +4067,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -3758,11 +4081,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -3774,11 +4098,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -3786,10 +4111,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -3798,13 +4128,13 @@ case `"$ac_path_GREP" --version 2>&1` in ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3832,16 +4162,17 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -3852,10 +4183,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -3864,13 +4200,13 @@ case `"$ac_path_EGREP" --version 2>&1` in ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3899,8 +4235,8 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" @@ -3909,15 +4245,17 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "" >/dev/null 2>&1; then : + $EGREP "" >/dev/null 2>&1 +then : fi -rm -f conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +rm -rf conftest* + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -3928,10 +4266,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -3940,13 +4283,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3975,15 +4318,16 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if ${ac_cv_search_strerror+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 +printf %s "checking for library containing strerror... " >&6; } +if test ${ac_cv_search_strerror+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3991,46 +4335,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 strerror (); int -main () +main (void) { return strerror (); ; return 0; } _ACEOF -for ac_lib in '' cposix; do +for ac_lib in '' cposix +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_strerror=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_strerror+:} false; then : + if test ${ac_cv_search_strerror+y} +then : break fi done -if ${ac_cv_search_strerror+:} false; then : +if test ${ac_cv_search_strerror+y} +then : -else +else $as_nop ac_cv_search_strerror=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 +printf "%s\n" "$ac_cv_search_strerror" >&6; } ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -4038,11 +4384,12 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -4050,11 +4397,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4065,11 +4416,11 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4078,11 +4429,12 @@ done # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -4090,11 +4442,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4106,134 +4462,129 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -#include <stdarg.h> -#include <string.h> -#include <float.h> +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <string.h> -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : -else - ac_cv_header_stdc=no -fi -rm -f conftest* -fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdlib.h> -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : -else - ac_cv_header_stdc=no -fi -rm -f conftest* +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h fi +# Autoupdate added the next two lines to ensure that your configure +# script's behavior did not change. They are probably safe to remove. -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <ctype.h> -#include <stdlib.h> -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + 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" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_cv_path_EGREP=$EGREP fi + fi fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -$as_echo "#define STDC_HEADERS 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test ${ac_cv_header_sys_wait_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -4246,7 +4597,7 @@ else #endif int -main () +main (void) { int s; wait (&s); @@ -4255,18 +4606,19 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_sys_wait_h=yes -else +else $as_nop ac_cv_header_sys_wait_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi @@ -4274,14 +4626,17 @@ fi if test x"$ac_cv_prog_cc_c99" != xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 -$as_echo_n "checking for unsigned long long int... " >&6; } -if ${ac_cv_type_unsigned_long_long_int+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +printf %s "checking for unsigned long long int... " >&6; } +if test ${ac_cv_type_unsigned_long_long_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_type_unsigned_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case $ac_prog_cc_stdc in + no | c89) ;; + *) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* For now, do not test the preprocessor; as of 2007 there are too many @@ -4299,7 +4654,7 @@ else ? 1 : -1)]; int i = 63; int -main () +main (void) { /* Test availability of runtime routines for shift and division. */ long long int llmax = 9223372036854775807ll; @@ -4313,98 +4668,104 @@ main () } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : -else +else $as_nop ac_cv_type_unsigned_long_long_int=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext;; + esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 -$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +printf "%s\n" "$ac_cv_type_unsigned_long_long_int" >&6; } if test $ac_cv_type_unsigned_long_long_int = yes; then -$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h +printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if ${ac_cv_type_long_long_int+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +printf %s "checking for long long int... " >&6; } +if test ${ac_cv_type_long_long_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_type_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int - if test $ac_cv_type_long_long_int = yes; then - if test "$cross_compiling" = yes; then : + case $ac_prog_cc_stdc in + no | c89) ;; + *) + ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int + if test $ac_cv_type_long_long_int = yes; then + if test "$cross_compiling" = yes +then : : -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int -main () +main (void) { long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : -else +else $as_nop ac_cv_type_long_long_int=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi - fi + fi;; + esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 -$as_echo "$ac_cv_type_long_long_int" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 +printf "%s\n" "$ac_cv_type_long_long_int" >&6; } if test $ac_cv_type_long_long_int = yes; then -$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h +printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h fi if test "$ac_cv_type_long_long_int" = no; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Compiler does not support long long int See \`config.log' for more details" "$LINENO" 5; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports trailing commas" >&5 -$as_echo_n "checking if the compiler supports trailing commas... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the compiler supports trailing commas" >&5 +printf %s "checking if the compiler supports trailing commas... " >&6; } trailing_commas=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { enum { @@ -4414,46 +4775,48 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; trailing_commas=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; trailing_commas=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test "$trailing_commas" = no; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Compiler does not support trailing comma in enum See \`config.log' for more details" "$LINENO" 5; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports C++ comments" >&5 -$as_echo_n "checking if the compiler supports C++ comments... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the compiler supports C++ comments" >&5 +printf %s "checking if the compiler supports C++ comments... " >&6; } slash_comments=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { // C++ comments? ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; slash_comments=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; slash_comments=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test "$slash_comments" = no; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Compiler does not support C++ comments See \`config.log' for more details" "$LINENO" 5; } fi @@ -4462,26 +4825,25 @@ fi if test -n "$SOURCE_DATE_EPOCH"; then DATE_FMT="%b %d %Y %H:%M:%S" BUILD_DATE=$(LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || LC_ALL=C date -u -r "$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || LC_ALL=C date -u "+$DATE_FMT") - cat >>confdefs.h <<_ACEOF -#define BUILD_DATE "$BUILD_DATE" -_ACEOF + printf "%s\n" "#define BUILD_DATE \"$BUILD_DATE\"" >>confdefs.h BUILD_DATE_MSG=-"echo -e '=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\nNOTE: build date/time is fixed: $BUILD_DATE\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-='" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-fail-if-missing argument" >&5 -$as_echo_n "checking --enable-fail-if-missing argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-fail-if-missing argument" >&5 +printf %s "checking --enable-fail-if-missing argument... " >&6; } # Check whether --enable-fail_if_missing was given. -if test "${enable_fail_if_missing+set}" = set; then : +if test ${enable_fail_if_missing+y} +then : enableval=$enable_fail_if_missing; fail_if_missing="yes" -else +else $as_nop fail_if_missing="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5 -$as_echo "$fail_if_missing" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5 +printf "%s\n" "$fail_if_missing" >&6; } with_x_arg="$with_x" @@ -4505,35 +4867,35 @@ if test "$GCC" = yes; then fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang version" >&5 -$as_echo_n "checking for clang version... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang version" >&5 +printf %s "checking for clang version... " >&6; } CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed -n -e 's/^.*clang[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'` if test x"$CLANG_VERSION_STRING" != x"" ; then CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*/\1/p'` CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/p'` CLANG_REVISION=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)/\1/p'` CLANG_VERSION=`expr $CLANG_MAJOR '*' 1000000 '+' $CLANG_MINOR '*' 1000 '+' $CLANG_REVISION` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG_VERSION" >&5 -$as_echo "$CLANG_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5 -$as_echo_n "checking if clang supports -fno-strength-reduce... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CLANG_VERSION" >&5 +printf "%s\n" "$CLANG_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5 +printf %s "checking if clang supports -fno-strength-reduce... " >&6; } if test "$CLANG_MAJOR" -ge 10 -o "$CLANG_VERSION" -ge 500002075 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS=`echo "$CFLAGS" | sed -e 's/-fno-strength-reduce/ /'` else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: N/A" >&5 -$as_echo "N/A" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: N/A" >&5 +printf "%s\n" "N/A" >&6; } fi CROSS_COMPILING= if test "$cross_compiling" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&5 -$as_echo "cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&5 +printf "%s\n" "cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&6; } CROSS_COMPILING=1 fi @@ -4541,140 +4903,165 @@ fi test "$GCC" = yes && CPP_MM=M; if test -f ./toolcheck; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for buggy tools" >&5 -$as_echo_n "checking for buggy tools... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for buggy tools" >&5 +printf %s "checking for buggy tools... " >&6; } sh ./toolcheck 1>&6 fi OS_EXTRA_SRC=""; OS_EXTRA_OBJ="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname" >&5 -$as_echo_n "checking uname... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uname" >&5 +printf %s "checking uname... " >&6; } if test "x$vim_cv_uname_output" = "x" ; then vim_cv_uname_output=`(uname) 2>/dev/null` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output" >&5 -$as_echo "$vim_cv_uname_output" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output" >&5 +printf "%s\n" "$vim_cv_uname_output" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output (cached)" >&5 -$as_echo "$vim_cv_uname_output (cached)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output (cached)" >&5 +printf "%s\n" "$vim_cv_uname_output (cached)" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5 -$as_echo_n "checking uname -r... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5 +printf %s "checking uname -r... " >&6; } if test "x$vim_cv_uname_r_output" = "x" ; then vim_cv_uname_r_output=`(uname -r) 2>/dev/null` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output" >&5 -$as_echo "$vim_cv_uname_r_output" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output" >&5 +printf "%s\n" "$vim_cv_uname_r_output" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output (cached)" >&5 -$as_echo "$vim_cv_uname_r_output (cached)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output (cached)" >&5 +printf "%s\n" "$vim_cv_uname_r_output (cached)" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5 -$as_echo_n "checking uname -m... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5 +printf %s "checking uname -m... " >&6; } if test "x$vim_cv_uname_m_output" = "x" ; then vim_cv_uname_m_output=`(uname -m) 2>/dev/null` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output" >&5 -$as_echo "$vim_cv_uname_m_output" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output" >&5 +printf "%s\n" "$vim_cv_uname_m_output" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output (cached)" >&5 -$as_echo "$vim_cv_uname_m_output (cached)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output (cached)" >&5 +printf "%s\n" "$vim_cv_uname_m_output (cached)" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5 -$as_echo_n "checking for Haiku... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5 +printf %s "checking for Haiku... " >&6; } case $vim_cv_uname_output in - Haiku) HAIKU=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };; - *) HAIKU=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; };; + Haiku) HAIKU=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };; + *) HAIKU=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; };; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5 -$as_echo_n "checking for QNX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5 +printf %s "checking for QNX... " >&6; } case $vim_cv_uname_output in QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o test -z "$with_x" && with_x=no - QNX=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };; - *) QNX=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; };; + QNX=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };; + *) QNX=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; };; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5 -$as_echo_n "checking for Darwin (Mac OS X)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5 +printf %s "checking for Darwin (Mac OS X)... " >&6; } if test "$vim_cv_uname_output" = Darwin; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } MACOS_X=yes CPPFLAGS="$CPPFLAGS -DMACOS_X" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-darwin argument" >&5 -$as_echo_n "checking --disable-darwin argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-darwin argument" >&5 +printf %s "checking --disable-darwin argument... " >&6; } # Check whether --enable-darwin was given. -if test "${enable_darwin+set}" = set; then : +if test ${enable_darwin+y} +then : enableval=$enable_darwin; -else +else $as_nop enable_darwin="yes" fi if test "$enable_darwin" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Darwin files are there" >&5 -$as_echo_n "checking if Darwin files are there... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Darwin files are there" >&5 +printf %s "checking if Darwin files are there... " >&6; } if test -f os_macosx.m; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, Darwin support disabled" >&5 -$as_echo "no, Darwin support disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, Darwin support disabled" >&5 +printf "%s\n" "no, Darwin support disabled" >&6; } enable_darwin=no fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, Darwin support excluded" >&5 -$as_echo "yes, Darwin support excluded" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, Darwin support excluded" >&5 +printf "%s\n" "yes, Darwin support excluded" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sparkle argument" >&5 -$as_echo_n "checking --disable-sparkle argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-sparkle argument" >&5 +printf %s "checking --disable-sparkle argument... " >&6; } # Check whether --enable-sparkle was given. -if test "${enable_sparkle+set}" = set; then : +if test ${enable_sparkle+y} +then : enableval=$enable_sparkle; -else +else $as_nop enable_sparkle="yes" fi if test "$enable_sparkle" == "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XCODEFLAGS="$XCODEFLAGS GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DISABLE_SPARKLE=1'" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-developer-dir argument" >&5 -$as_echo_n "checking --with-developer-dir argument... " >&6; } + if test "$enable_sparkle" == "yes"; then + # Check if we want to build for legacy Sparkle version for old macOS + # versions + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-sparkle_1 argument" >&5 +printf %s "checking --enable-sparkle_1 argument... " >&6; } + # Check whether --enable-sparkle_1 was given. +if test ${enable_sparkle_1+y} +then : + enableval=$enable_sparkle_1; use_sparkle_1="yes" +fi + + if test "$use_sparkle_1" == "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + XCODEFLAGS="$XCODEFLAGS GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS USE_SPARKLE_1=1'" + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + fi + fi + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-developer-dir argument" >&5 +printf %s "checking --with-developer-dir argument... " >&6; } # Check whether --with-developer-dir was given. -if test "${with_developer_dir+set}" = set; then : - withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5 -$as_echo "not present" >&6; } +if test ${with_developer_dir+y} +then : + withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 +printf "%s\n" "$DEVELOPER_DIR" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not present" >&5 +printf "%s\n" "not present" >&6; } fi if test "x$DEVELOPER_DIR" = "x"; then # Extract the first word of "xcode-select", so it can be a program name with args. set dummy xcode-select; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XCODE_SELECT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XCODE_SELECT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XCODE_SELECT in [\\/]* | ?:[\\/]*) ac_cv_path_XCODE_SELECT="$XCODE_SELECT" # Let the user override the test with a path. @@ -4684,11 +5071,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XCODE_SELECT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4700,41 +5091,42 @@ esac fi XCODE_SELECT=$ac_cv_path_XCODE_SELECT if test -n "$XCODE_SELECT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODE_SELECT" >&5 -$as_echo "$XCODE_SELECT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XCODE_SELECT" >&5 +printf "%s\n" "$XCODE_SELECT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$XCODE_SELECT" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for developer dir using xcode-select" >&5 -$as_echo_n "checking for developer dir using xcode-select... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for developer dir using xcode-select" >&5 +printf %s "checking for developer dir using xcode-select... " >&6; } DEVELOPER_DIR=`$XCODE_SELECT -print-path` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 +printf "%s\n" "$DEVELOPER_DIR" >&6; } else DEVELOPER_DIR=/Developer fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-macsdk argument" >&5 -$as_echo_n "checking --with-macsdk argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-macsdk argument" >&5 +printf %s "checking --with-macsdk argument... " >&6; } # Check whether --with-macsdk was given. -if test "${with_macsdk+set}" = set; then : - withval=$with_macsdk; MACSDK="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACSDK" >&5 -$as_echo "$MACSDK" >&6; } -else - MACSDK=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default" >&5 -$as_echo "using default" >&6; } +if test ${with_macsdk+y} +then : + withval=$with_macsdk; MACSDK="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACSDK" >&5 +printf "%s\n" "$MACSDK" >&6; } +else $as_nop + MACSDK=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using default" >&5 +printf "%s\n" "using default" >&6; } fi if test -n "$MACSDK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SDK is supported" >&5 -$as_echo_n "checking if SDK is supported... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if SDK is supported" >&5 +printf %s "checking if SDK is supported... " >&6; } save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" sdkflags="$DEVELOPER_DIR/SDKs/MacOSX$MACSDK" @@ -4748,25 +5140,26 @@ $as_echo_n "checking if SDK is supported... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XCODEFLAGS="$XCODEFLAGS -sdk macosx$MACSDK MACOSX_DEPLOYMENT_TARGET=$MACSDK" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } MACSDK="" CFLAGS="$save_cflags" LDFLAGS="$save_ldflags" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else if test -z "$MACOSX_DEPLOYMENT_TARGET"; then @@ -4778,22 +5171,23 @@ rm -f core conftest.err conftest.$ac_objext \ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-macarchs argument" >&5 -$as_echo_n "checking --with-macarchs argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-macarchs argument" >&5 +printf %s "checking --with-macarchs argument... " >&6; } # Check whether --with-macarchs was given. -if test "${with_macarchs+set}" = set; then : - withval=$with_macarchs; ARCHS="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ARCHS" >&5 -$as_echo "$ARCHS" >&6; } -else - ARCHS=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to native arch" >&5 -$as_echo "defaulting to native arch" >&6; } +if test ${with_macarchs+y} +then : + withval=$with_macarchs; ARCHS="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ARCHS" >&5 +printf "%s\n" "$ARCHS" >&6; } +else $as_nop + ARCHS=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to native arch" >&5 +printf "%s\n" "defaulting to native arch" >&6; } fi if test -n "$ARCHS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if architectures are supported" >&5 -$as_echo_n "checking if architectures are supported... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if architectures are supported" >&5 +printf %s "checking if architectures are supported... " >&6; } save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" @@ -4811,25 +5205,26 @@ $as_echo_n "checking if architectures are supported... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XCODEFLAGS="$XCODEFLAGS ARCHS=\"$ARCHS\" ONLY_ACTIVE_ARCH=\"NO\"" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will build for native arch only" >&5 -$as_echo "no, will build for native arch only" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, will build for native arch only" >&5 +printf "%s\n" "no, will build for native arch only" >&6; } ARCHS="" CFLAGS="$save_cflags" LDFLAGS="$save_ldflags" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4838,7 +5233,7 @@ rm -f core conftest.err conftest.$ac_objext \ MACOS_X_DARWIN=yes OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" - $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN" @@ -4846,65 +5241,44 @@ rm -f core conftest.err conftest.$ac_objext \ SAVE_CFLAGS=$CFLAGS CPPFLAGS="$CPPFLAGS -ObjC" CFLAGS="$CFLAGS -ObjC" - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -ac_fn_c_check_header_mongrel "$LINENO" "Cocoa/Cocoa.h" "ac_cv_header_Cocoa_Cocoa_h" "$ac_includes_default" -if test "x$ac_cv_header_Cocoa_Cocoa_h" = xyes; then : + ac_fn_c_check_header_compile "$LINENO" "Cocoa/Cocoa.h" "ac_cv_header_Cocoa_Cocoa_h" "$ac_includes_default" +if test "x$ac_cv_header_Cocoa_Cocoa_h" = xyes +then : COCOA=yes fi - CPPFLAGS=$SAVE_CPPFLAGS CFLAGS=$SAVE_CFLAGS - if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then + if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then with_x=no fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -for ac_header in AvailabilityMacros.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default" -if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_AVAILABILITYMACROS_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default" +if test "x$ac_cv_header_AvailabilityMacros_h" = xyes +then : + printf "%s\n" "#define HAVE_AVAILABILITYMACROS_H 1" >>confdefs.h fi -done - if test "$cross_compiling" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-local-dir argument" >&5 -$as_echo_n "checking --with-local-dir argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-local-dir argument" >&5 +printf %s "checking --with-local-dir argument... " >&6; } have_local_include='' have_local_lib='' # Check whether --with-local-dir was given. -if test "${with_local_dir+set}" = set; then : +if test ${with_local_dir+y} +then : withval=$with_local_dir; local_dir="$withval" case "$withval" in @@ -4916,14 +5290,14 @@ if test "${with_local_dir+set}" = set; then : ;; *) as_fn_error $? "must pass path argument to --with-local-dir" "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $local_dir" >&5 -$as_echo "$local_dir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $local_dir" >&5 +printf "%s\n" "$local_dir" >&6; } -else +else $as_nop local_dir=/usr/local - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to $local_dir" >&5 -$as_echo "Defaulting to $local_dir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to $local_dir" >&5 +printf "%s\n" "Defaulting to $local_dir" >&6; } fi @@ -4947,94 +5321,93 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-vim-name argument" >&5 -$as_echo_n "checking --with-vim-name argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-vim-name argument" >&5 +printf %s "checking --with-vim-name argument... " >&6; } # Check whether --with-vim-name was given. -if test "${with_vim_name+set}" = set; then : - withval=$with_vim_name; VIMNAME="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VIMNAME" >&5 -$as_echo "$VIMNAME" >&6; } -else - VIMNAME="vim"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to $VIMNAME" >&5 -$as_echo "Defaulting to $VIMNAME" >&6; } +if test ${with_vim_name+y} +then : + withval=$with_vim_name; VIMNAME="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VIMNAME" >&5 +printf "%s\n" "$VIMNAME" >&6; } +else $as_nop + VIMNAME="vim"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to $VIMNAME" >&5 +printf "%s\n" "Defaulting to $VIMNAME" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ex-name argument" >&5 -$as_echo_n "checking --with-ex-name argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-ex-name argument" >&5 +printf %s "checking --with-ex-name argument... " >&6; } # Check whether --with-ex-name was given. -if test "${with_ex_name+set}" = set; then : - withval=$with_ex_name; EXNAME="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXNAME" >&5 -$as_echo "$EXNAME" >&6; } -else - EXNAME="ex"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to ex" >&5 -$as_echo "Defaulting to ex" >&6; } +if test ${with_ex_name+y} +then : + withval=$with_ex_name; EXNAME="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXNAME" >&5 +printf "%s\n" "$EXNAME" >&6; } +else $as_nop + EXNAME="ex"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to ex" >&5 +printf "%s\n" "Defaulting to ex" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-view-name argument" >&5 -$as_echo_n "checking --with-view-name argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-view-name argument" >&5 +printf %s "checking --with-view-name argument... " >&6; } # Check whether --with-view-name was given. -if test "${with_view_name+set}" = set; then : - withval=$with_view_name; VIEWNAME="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VIEWNAME" >&5 -$as_echo "$VIEWNAME" >&6; } -else - VIEWNAME="view"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to view" >&5 -$as_echo "Defaulting to view" >&6; } +if test ${with_view_name+y} +then : + withval=$with_view_name; VIEWNAME="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VIEWNAME" >&5 +printf "%s\n" "$VIEWNAME" >&6; } +else $as_nop + VIEWNAME="view"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to view" >&5 +printf "%s\n" "Defaulting to view" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-global-runtime argument" >&5 -$as_echo_n "checking --with-global-runtime argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-global-runtime argument" >&5 +printf %s "checking --with-global-runtime argument... " >&6; } # Check whether --with-global-runtime was given. -if test "${with_global_runtime+set}" = set; then : - withval=$with_global_runtime; RUNTIME_GLOBAL="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_global_runtime+y} +then : + withval=$with_global_runtime; RUNTIME_GLOBAL="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$RUNTIME_GLOBAL" != "X"; then RUNTIME_GLOBAL_AFTER=$(printf -- "$RUNTIME_GLOBAL\\n" | $AWK -F, 'BEGIN { comma=0 } { for (i = NF; i > 0; i--) { if (comma) { printf ",%s/after", $i } else { printf "%s/after", $i; comma=1 } } } END { printf "\n" }') - cat >>confdefs.h <<_ACEOF -#define RUNTIME_GLOBAL "$RUNTIME_GLOBAL" -_ACEOF + printf "%s\n" "#define RUNTIME_GLOBAL \"$RUNTIME_GLOBAL\"" >>confdefs.h - cat >>confdefs.h <<_ACEOF -#define RUNTIME_GLOBAL_AFTER "$RUNTIME_GLOBAL_AFTER" -_ACEOF + printf "%s\n" "#define RUNTIME_GLOBAL_AFTER \"$RUNTIME_GLOBAL_AFTER\"" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-modified-by argument" >&5 -$as_echo_n "checking --with-modified-by argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-modified-by argument" >&5 +printf %s "checking --with-modified-by argument... " >&6; } # Check whether --with-modified-by was given. -if test "${with_modified_by+set}" = set; then : - withval=$with_modified_by; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; }; cat >>confdefs.h <<_ACEOF -#define MODIFIED_BY "$withval" -_ACEOF +if test ${with_modified_by+y} +then : + withval=$with_modified_by; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; }; printf "%s\n" "#define MODIFIED_BY \"$withval\"" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if character set is EBCDIC" >&5 -$as_echo_n "checking if character set is EBCDIC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if character set is EBCDIC" >&5 +printf %s "checking if character set is EBCDIC... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { /* TryCompile function for CharSet. Treat any failure as ASCII for compatibility with existing art. @@ -5047,20 +5420,21 @@ make an error "Character set is not EBCDIC" return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # TryCompile action if true cf_cv_ebcdic=yes -else +else $as_nop # TryCompile action if false cf_cv_ebcdic=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # end of TryCompile ]) # end of CacheVal CvEbcdic -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_cv_ebcdic" >&5 -$as_echo "$cf_cv_ebcdic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cf_cv_ebcdic" >&5 +printf "%s\n" "$cf_cv_ebcdic" >&6; } case "$cf_cv_ebcdic" in #(vi - yes) $as_echo "#define EBCDIC 1" >>confdefs.h + yes) printf "%s\n" "#define EBCDIC 1" >>confdefs.h line_break='"\\n"' ;; @@ -5069,8 +5443,8 @@ esac if test "$cf_cv_ebcdic" = "yes"; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5 -$as_echo_n "checking for z/OS Unix... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5 +printf %s "checking for z/OS Unix... " >&6; } case $vim_cv_uname_output in OS/390) zOSUnix="yes"; if test "$CC" = "cc"; then @@ -5100,12 +5474,12 @@ case $vim_cv_uname_output in # Use haltonmsg to force error for missing H files. CFLAGS="$CFLAGS -D_ALL_SOURCE -Wc,float(ieee),haltonmsg(3296)"; LDFLAGS="$LDFLAGS -Wl,EDIT=NO" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; *) zOSUnix="no"; - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -5118,64 +5492,67 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-smack argument" >&5 -$as_echo_n "checking --disable-smack argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-smack argument" >&5 +printf %s "checking --disable-smack argument... " >&6; } # Check whether --enable-smack was given. -if test "${enable_smack+set}" = set; then : +if test ${enable_smack+y} +then : enableval=$enable_smack; -else +else $as_nop enable_smack="yes" fi if test "$enable_smack" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_fn_c_check_header_mongrel "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_xattr_h" = xyes; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ac_fn_c_check_header_compile "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_xattr_h" = xyes +then : true -else +else $as_nop enable_smack="no" fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test "$enable_smack" = "yes"; then - ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" -if test "x$ac_cv_header_attr_xattr_h" = xyes; then : + ac_fn_c_check_header_compile "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_attr_xattr_h" = xyes +then : true -else +else $as_nop enable_smack="no" fi - fi if test "$enable_smack" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XATTR_NAME_SMACKEXEC in linux/xattr.h" >&5 -$as_echo_n "checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XATTR_NAME_SMACKEXEC in linux/xattr.h" >&5 +printf %s "checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <linux/xattr.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "XATTR_NAME_SMACKEXEC" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; enable_smack="no" + $EGREP "XATTR_NAME_SMACKEXEC" >/dev/null 2>&1 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; enable_smack="no" fi -rm -f conftest* +rm -rf conftest* fi if test "$enable_smack" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setxattr in -lattr" >&5 -$as_echo_n "checking for setxattr in -lattr... " >&6; } -if ${ac_cv_lib_attr_setxattr+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setxattr in -lattr" >&5 +printf %s "checking for setxattr in -lattr... " >&6; } +if test ${ac_cv_lib_attr_setxattr+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lattr $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5184,56 +5561,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 setxattr (); int -main () +main (void) { return setxattr (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_attr_setxattr=yes -else +else $as_nop ac_cv_lib_attr_setxattr=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_setxattr" >&5 -$as_echo "$ac_cv_lib_attr_setxattr" >&6; } -if test "x$ac_cv_lib_attr_setxattr" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_setxattr" >&5 +printf "%s\n" "$ac_cv_lib_attr_setxattr" >&6; } +if test "x$ac_cv_lib_attr_setxattr" = xyes +then : LIBS="$LIBS -lattr" found_smack="yes" - $as_echo "#define HAVE_SMACK 1" >>confdefs.h + printf "%s\n" "#define HAVE_SMACK 1" >>confdefs.h fi fi if test "x$found_smack" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-selinux argument" >&5 -$as_echo_n "checking --disable-selinux argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-selinux argument" >&5 +printf %s "checking --disable-selinux argument... " >&6; } # Check whether --enable-selinux was given. -if test "${enable_selinux+set}" = set; then : +if test ${enable_selinux+y} +then : enableval=$enable_selinux; -else +else $as_nop enable_selinux="yes" fi if test "$enable_selinux" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5 -$as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; } -if ${ac_cv_lib_selinux_is_selinux_enabled+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5 +printf %s "checking for is_selinux_enabled in -lselinux... " >&6; } +if test ${ac_cv_lib_selinux_is_selinux_enabled+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lselinux $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5242,57 +5620,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 is_selinux_enabled (); int -main () +main (void) { return is_selinux_enabled (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_selinux_is_selinux_enabled=yes -else +else $as_nop ac_cv_lib_selinux_is_selinux_enabled=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 -$as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } -if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default" -if test "x$ac_cv_header_selinux_selinux_h" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 +printf "%s\n" "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } +if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes +then : + ac_fn_c_check_header_compile "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default" +if test "x$ac_cv_header_selinux_selinux_h" = xyes +then : LIBS="$LIBS -lselinux" - $as_echo "#define HAVE_SELINUX 1" >>confdefs.h + printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h fi - fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-features argument" >&5 -$as_echo_n "checking --with-features argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-features argument" >&5 +printf %s "checking --with-features argument... " >&6; } # Check whether --with-features was given. -if test "${with_features+set}" = set; then : - withval=$with_features; features="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $features" >&5 -$as_echo "$features" >&6; } -else - features="huge"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to huge" >&5 -$as_echo "Defaulting to huge" >&6; } +if test ${with_features+y} +then : + withval=$with_features; features="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $features" >&5 +printf "%s\n" "$features" >&6; } +else $as_nop + features="huge"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to huge" >&5 +printf "%s\n" "Defaulting to huge" >&6; } fi @@ -5304,16 +5682,16 @@ esac dovimdiff="" dogvimdiff="" case "$features" in - tiny) $as_echo "#define FEAT_TINY 1" >>confdefs.h + tiny) printf "%s\n" "#define FEAT_TINY 1" >>confdefs.h ;; - normal) $as_echo "#define FEAT_NORMAL 1" >>confdefs.h + normal) printf "%s\n" "#define FEAT_NORMAL 1" >>confdefs.h dovimdiff="installvimdiff"; dogvimdiff="installgvimdiff" ;; - huge) $as_echo "#define FEAT_HUGE 1" >>confdefs.h + huge) printf "%s\n" "#define FEAT_HUGE 1" >>confdefs.h dovimdiff="installvimdiff"; dogvimdiff="installgvimdiff" ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $features is not supported" >&5 -$as_echo "Sorry, $features is not supported" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $features is not supported" >&5 +printf "%s\n" "Sorry, $features is not supported" >&6; } ;; esac @@ -5325,81 +5703,85 @@ else has_eval=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-compiledby argument" >&5 -$as_echo_n "checking --with-compiledby argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-compiledby argument" >&5 +printf %s "checking --with-compiledby argument... " >&6; } # Check whether --with-compiledby was given. -if test "${with_compiledby+set}" = set; then : - withval=$with_compiledby; compiledby="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; } -else - compiledby=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_compiledby+y} +then : + withval=$with_compiledby; compiledby="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; } +else $as_nop + compiledby=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp argument" >&5 -$as_echo_n "checking --disable-xsmp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp argument" >&5 +printf %s "checking --disable-xsmp argument... " >&6; } # Check whether --enable-xsmp was given. -if test "${enable_xsmp+set}" = set; then : +if test ${enable_xsmp+y} +then : enableval=$enable_xsmp; -else +else $as_nop enable_xsmp="yes" fi if test "$enable_xsmp" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp-interact argument" >&5 -$as_echo_n "checking --disable-xsmp-interact argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp-interact argument" >&5 +printf %s "checking --disable-xsmp-interact argument... " >&6; } # Check whether --enable-xsmp-interact was given. -if test "${enable_xsmp_interact+set}" = set; then : +if test ${enable_xsmp_interact+y} +then : enableval=$enable_xsmp_interact; -else +else $as_nop enable_xsmp_interact="yes" fi if test "$enable_xsmp_interact" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - $as_echo "#define USE_XSMP_INTERACT 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + printf "%s\n" "#define USE_XSMP_INTERACT 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking diff feature" >&5 -$as_echo_n "checking diff feature... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking diff feature" >&5 +printf %s "checking diff feature... " >&6; } if test "x$features" = "xtiny"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled in $features version" >&5 -$as_echo "disabled in $features version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled in $features version" >&5 +printf "%s\n" "disabled in $features version" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5 -$as_echo "enabled" >&6; } - $as_echo "#define FEAT_DIFF 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: enabled" >&5 +printf "%s\n" "enabled" >&6; } + printf "%s\n" "#define FEAT_DIFF 1" >>confdefs.h XDIFF_OBJS_USED="\$(XDIFF_OBJS)" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-luainterp argument" >&5 -$as_echo_n "checking --enable-luainterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-luainterp argument" >&5 +printf %s "checking --enable-luainterp argument... " >&6; } # Check whether --enable-luainterp was given. -if test "${enable_luainterp+set}" = set; then : +if test ${enable_luainterp+y} +then : enableval=$enable_luainterp; -else +else $as_nop enable_luainterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_luainterp" >&5 -$as_echo "$enable_luainterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_luainterp" >&5 +printf "%s\n" "$enable_luainterp" >&6; } if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then if test "$has_eval" = "no"; then @@ -5408,58 +5790,61 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-lua-prefix argument" >&5 -$as_echo_n "checking --with-lua-prefix argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-lua-prefix argument" >&5 +printf %s "checking --with-lua-prefix argument... " >&6; } # Check whether --with-lua_prefix was given. -if test "${with_lua_prefix+set}" = set; then : - withval=$with_lua_prefix; with_lua_prefix="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lua_prefix" >&5 -$as_echo "$with_lua_prefix" >&6; } -else - with_lua_prefix="";{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_lua_prefix+y} +then : + withval=$with_lua_prefix; with_lua_prefix="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_lua_prefix" >&5 +printf "%s\n" "$with_lua_prefix" >&6; } +else $as_nop + with_lua_prefix="";{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$with_lua_prefix" != "X"; then vi_cv_path_lua_pfx="$with_lua_prefix" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LUA_PREFIX environment var" >&5 -$as_echo_n "checking LUA_PREFIX environment var... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LUA_PREFIX environment var" >&5 +printf %s "checking LUA_PREFIX environment var... " >&6; } if test "X$LUA_PREFIX" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$LUA_PREFIX\"" >&5 -$as_echo "\"$LUA_PREFIX\"" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$LUA_PREFIX\"" >&5 +printf "%s\n" "\"$LUA_PREFIX\"" >&6; } vi_cv_path_lua_pfx="$LUA_PREFIX" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set, default to /usr" >&5 -$as_echo "not set, default to /usr" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set, default to /usr" >&5 +printf "%s\n" "not set, default to /usr" >&6; } vi_cv_path_lua_pfx="/usr" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-luajit" >&5 -$as_echo_n "checking --with-luajit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-luajit" >&5 +printf %s "checking --with-luajit... " >&6; } # Check whether --with-luajit was given. -if test "${with_luajit+set}" = set; then : +if test ${with_luajit+y} +then : withval=$with_luajit; vi_cv_with_luajit="$withval" -else +else $as_nop vi_cv_with_luajit="no" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_with_luajit" >&5 -$as_echo "$vi_cv_with_luajit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_with_luajit" >&5 +printf "%s\n" "$vi_cv_with_luajit" >&6; } LUA_INC= if test "X$vi_cv_path_lua_pfx" != "X"; then if test "x$vi_cv_with_luajit" != "xno"; then # Extract the first word of "luajit", so it can be a program name with args. set dummy luajit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_luajit+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_luajit+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_luajit in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_luajit="$vi_cv_path_luajit" # Let the user override the test with a path. @@ -5469,11 +5854,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_luajit="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_luajit="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5485,44 +5874,47 @@ esac fi vi_cv_path_luajit=$ac_cv_path_vi_cv_path_luajit if test -n "$vi_cv_path_luajit"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_luajit" >&5 -$as_echo "$vi_cv_path_luajit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_luajit" >&5 +printf "%s\n" "$vi_cv_path_luajit" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_luajit" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5 -$as_echo_n "checking LuaJIT version... " >&6; } -if ${vi_cv_version_luajit+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5 +printf %s "checking LuaJIT version... " >&6; } +if test ${vi_cv_version_luajit+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]*\)* .*/\1/'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5 -$as_echo "$vi_cv_version_luajit" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version of LuaJIT" >&5 -$as_echo_n "checking Lua version of LuaJIT... " >&6; } -if ${vi_cv_version_lua_luajit+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5 +printf "%s\n" "$vi_cv_version_luajit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Lua version of LuaJIT" >&5 +printf %s "checking Lua version of LuaJIT... " >&6; } +if test ${vi_cv_version_lua_luajit+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5 -$as_echo "$vi_cv_version_lua_luajit" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5 +printf "%s\n" "$vi_cv_version_lua_luajit" >&6; } vi_cv_path_lua="$vi_cv_path_luajit" vi_cv_version_lua="$vi_cv_version_lua_luajit" fi else # Extract the first word of "lua", so it can be a program name with args. set dummy lua; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_plain_lua+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_plain_lua+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_plain_lua in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_plain_lua="$vi_cv_path_plain_lua" # Let the user override the test with a path. @@ -5532,11 +5924,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_plain_lua="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_plain_lua="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5548,55 +5944,56 @@ esac fi vi_cv_path_plain_lua=$ac_cv_path_vi_cv_path_plain_lua if test -n "$vi_cv_path_plain_lua"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_plain_lua" >&5 -$as_echo "$vi_cv_path_plain_lua" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_plain_lua" >&5 +printf "%s\n" "$vi_cv_path_plain_lua" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_plain_lua" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5 -$as_echo_n "checking Lua version... " >&6; } -if ${vi_cv_version_plain_lua+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5 +printf %s "checking Lua version... " >&6; } +if test ${vi_cv_version_plain_lua+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5 -$as_echo "$vi_cv_version_plain_lua" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5 +printf "%s\n" "$vi_cv_version_plain_lua" >&6; } fi vi_cv_path_lua="$vi_cv_path_plain_lua" vi_cv_version_lua="$vi_cv_version_plain_lua" fi if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5 -$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5 +printf %s "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; } if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } LUA_INC=/luajit-$vi_cv_version_luajit fi fi if test "X$LUA_INC" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 -$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 +printf %s "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; } if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5 -$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5 +printf %s "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } LUA_INC=/lua$vi_cv_version_lua else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } # Detect moonjit: # https://groups.google.com/forum/#!topic/vim_use/O0vek60WuTk @@ -5609,15 +6006,15 @@ $as_echo "no" >&6; } break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $inc_path$lua_suf" >&5 -$as_echo_n "checking if lua.h can be found in $inc_path$lua_suf... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $inc_path$lua_suf" >&5 +printf %s "checking if lua.h can be found in $inc_path$lua_suf... " >&6; } if test -f "$inc_path$lua_suf/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } LUA_INC=$lua_suf else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } vi_cv_path_lua_pfx= fi fi @@ -5648,29 +6045,30 @@ $as_echo "no" >&6; } if test "$enable_luainterp" = "dynamic"; then lua_ok="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if link with ${LUA_LIBS} is sane" >&5 -$as_echo_n "checking if link with ${LUA_LIBS} is sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if link with ${LUA_LIBS} is sane" >&5 +printf %s "checking if link with ${LUA_LIBS} is sane... " >&6; } libs_save=$LIBS LIBS="$LIBS $LUA_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; lua_ok="yes" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; lua_ok="no"; LUA_LIBS="" +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; lua_ok="yes" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; lua_ok="no"; LUA_LIBS="" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$libs_save fi @@ -5679,7 +6077,7 @@ rm -f core conftest.err conftest.$ac_objext \ LUA_SRC="if_lua.c" LUA_OBJ="objects/if_lua.o" LUA_PRO="if_lua.pro" - $as_echo "#define FEAT_LUA 1" >>confdefs.h + printf "%s\n" "#define FEAT_LUA 1" >>confdefs.h fi if test "$enable_luainterp" = "dynamic"; then @@ -5700,8 +6098,8 @@ rm -f core conftest.err conftest.$ac_objext \ lib_multiarch="lib/${multiarch}" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx" >&5 -$as_echo_n "checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx" >&5 +printf %s "checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx... " >&6; } for subdir in "${lib_multiarch}" lib64 lib; do if test -z "$subdir"; then continue @@ -5718,18 +6116,18 @@ $as_echo_n "checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua sover="" done if test "X$sover" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } lua_ok="no" vi_cv_dll_name_lua="liblua${luajit}.${ext}" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } lua_ok="yes" vi_cv_dll_name_lua="liblua${luajit}${sover}$sover2" fi fi - $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_LUA 1" >>confdefs.h LUA_LIBS="" LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS" @@ -5737,15 +6135,15 @@ $as_echo "yes" >&6; } # MacVim patch to hack in a different default dynamic lib path for # arm64. We don't test that it links here so this has to be binary # compatible with DYNAMIC_LUA_DLL - { $as_echo "$as_me:${as_lineno-$LINENO}: checking liblua${luajit}*.${ext}* (arm64)" >&5 -$as_echo_n "checking liblua${luajit}*.${ext}* (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking liblua${luajit}*.${ext}* (arm64)" >&5 +printf %s "checking liblua${luajit}*.${ext}* (arm64)... " >&6; } if test -n "${vi_cv_dll_name_lua_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_lua_arm64}" >&5 -$as_echo "${vi_cv_dll_name_lua_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_lua_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_lua_arm64}" >&6; } LUA_CFLAGS+=" -DDYNAMIC_LUA_DLL_ARM64=\\\"${vi_cv_dll_name_lua_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 -$as_echo "<none>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 +printf "%s\n" "<none>" >&6; } fi fi if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \ @@ -5766,31 +6164,33 @@ $as_echo "<none>" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-mzschemeinterp argument" >&5 -$as_echo_n "checking --enable-mzschemeinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-mzschemeinterp argument" >&5 +printf %s "checking --enable-mzschemeinterp argument... " >&6; } # Check whether --enable-mzschemeinterp was given. -if test "${enable_mzschemeinterp+set}" = set; then : +if test ${enable_mzschemeinterp+y} +then : enableval=$enable_mzschemeinterp; -else +else $as_nop enable_mzschemeinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mzschemeinterp" >&5 -$as_echo "$enable_mzschemeinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_mzschemeinterp" >&5 +printf "%s\n" "$enable_mzschemeinterp" >&6; } if test "$enable_mzschemeinterp" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-plthome argument" >&5 -$as_echo_n "checking --with-plthome argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-plthome argument" >&5 +printf %s "checking --with-plthome argument... " >&6; } # Check whether --with-plthome was given. -if test "${with_plthome+set}" = set; then : - withval=$with_plthome; with_plthome="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_plthome" >&5 -$as_echo "$with_plthome" >&6; } -else - with_plthome="";{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5 -$as_echo "\"no\"" >&6; } +if test ${with_plthome+y} +then : + withval=$with_plthome; with_plthome="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_plthome" >&5 +printf "%s\n" "$with_plthome" >&6; } +else $as_nop + with_plthome="";{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5 +printf "%s\n" "\"no\"" >&6; } fi @@ -5798,23 +6198,24 @@ fi vi_cv_path_mzscheme_pfx="$with_plthome" vi_cv_path_mzscheme="${vi_cv_path_mzscheme_pfx}/bin/mzscheme" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking PLTHOME environment var" >&5 -$as_echo_n "checking PLTHOME environment var... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PLTHOME environment var" >&5 +printf %s "checking PLTHOME environment var... " >&6; } if test "X$PLTHOME" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$PLTHOME\"" >&5 -$as_echo "\"$PLTHOME\"" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$PLTHOME\"" >&5 +printf "%s\n" "\"$PLTHOME\"" >&6; } vi_cv_path_mzscheme_pfx="$PLTHOME" vi_cv_path_mzscheme="${vi_cv_path_mzscheme_pfx}/bin/mzscheme" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +printf "%s\n" "not set" >&6; } # Extract the first word of "mzscheme", so it can be a program name with args. set dummy mzscheme; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_mzscheme+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_mzscheme+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_mzscheme in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_mzscheme="$vi_cv_path_mzscheme" # Let the user override the test with a path. @@ -5824,11 +6225,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_mzscheme="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_mzscheme="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5840,11 +6245,11 @@ esac fi vi_cv_path_mzscheme=$ac_cv_path_vi_cv_path_mzscheme if test -n "$vi_cv_path_mzscheme"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme" >&5 -$as_echo "$vi_cv_path_mzscheme" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme" >&5 +printf "%s\n" "$vi_cv_path_mzscheme" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5857,11 +6262,12 @@ fi fi if test "X$vi_cv_path_mzscheme" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MzScheme install prefix" >&5 -$as_echo_n "checking MzScheme install prefix... " >&6; } -if ${vi_cv_path_mzscheme_pfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MzScheme install prefix" >&5 +printf %s "checking MzScheme install prefix... " >&6; } +if test ${vi_cv_path_mzscheme_pfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop echo "(display (simplify-path \ (build-path (call-with-values \ (lambda () (split-path (find-system-path (quote exec-file)))) \ @@ -5869,68 +6275,68 @@ else vi_cv_path_mzscheme_pfx=`${vi_cv_path_mzscheme} -r mzdirs.scm | \ sed -e 's+/$++'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme_pfx" >&5 -$as_echo "$vi_cv_path_mzscheme_pfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme_pfx" >&5 +printf "%s\n" "$vi_cv_path_mzscheme_pfx" >&6; } rm -f mzdirs.scm fi fi fi if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket include directory" >&5 -$as_echo_n "checking for racket include directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket include directory" >&5 +printf %s "checking for racket include directory... " >&6; } SCHEME_INC=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-include-dir))) (when (path? p) (display p)))'` if test "X$SCHEME_INC" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_INC}" >&5 -$as_echo "${SCHEME_INC}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_INC}" >&5 +printf "%s\n" "${SCHEME_INC}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 -$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 +printf %s "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 -$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 +printf %s "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5 -$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5 +printf %s "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; } if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5 -$as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5 +printf %s "checking if scheme.h can be found in /usr/include/plt/... " >&6; } if test -f /usr/include/plt/scheme.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=/usr/include/plt else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5 -$as_echo_n "checking if scheme.h can be found in /usr/include/racket/... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5 +printf %s "checking if scheme.h can be found in /usr/include/racket/... " >&6; } if test -f /usr/include/racket/scheme.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=/usr/include/racket else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } vi_cv_path_mzscheme_pfx= fi fi @@ -5942,15 +6348,15 @@ $as_echo "no" >&6; } if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket lib directory" >&5 -$as_echo_n "checking for racket lib directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket lib directory" >&5 +printf %s "checking for racket lib directory... " >&6; } SCHEME_LIB=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-lib-dir))) (when (path? p) (display p)))'` if test "X$SCHEME_LIB" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_LIB}" >&5 -$as_echo "${SCHEME_LIB}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_LIB}" >&5 +printf "%s\n" "${SCHEME_LIB}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do @@ -5999,32 +6405,32 @@ $as_echo "not found" >&6; } fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if racket requires -pthread" >&5 -$as_echo_n "checking if racket requires -pthread... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if racket requires -pthread" >&5 +printf %s "checking if racket requires -pthread... " >&6; } if test "X$SCHEME_LIB" != "X" && $FGREP -e -pthread "$SCHEME_LIB/buildinfo" >/dev/null ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } MZSCHEME_LIBS="${MZSCHEME_LIBS} -pthread" MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -pthread" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket config directory" >&5 -$as_echo_n "checking for racket config directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket config directory" >&5 +printf %s "checking for racket config directory... " >&6; } SCHEME_CONFIGDIR=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-config-dir))) (when (path? p) (display p)))'` if test "X$SCHEME_CONFIGDIR" != "X"; then MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DMZSCHEME_CONFIGDIR='\"${SCHEME_CONFIGDIR}\"'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_CONFIGDIR}" >&5 -$as_echo "${SCHEME_CONFIGDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_CONFIGDIR}" >&5 +printf "%s\n" "${SCHEME_CONFIGDIR}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 -$as_echo_n "checking for racket collects directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 +printf %s "checking for racket collects directory... " >&6; } SCHEME_COLLECTS=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-collects-dir))) (when (path? p) (let-values (((base _1 _2) (split-path p))) (display base))))'` if test "X$SCHEME_COLLECTS" = "X"; then if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then @@ -6044,15 +6450,15 @@ $as_echo_n "checking for racket collects directory... " >&6; } fi fi if test "X$SCHEME_COLLECTS" != "X" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_COLLECTS}" >&5 -$as_echo "${SCHEME_COLLECTS}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_COLLECTS}" >&5 +printf "%s\n" "${SCHEME_COLLECTS}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mzscheme_base.c" >&5 -$as_echo_n "checking for mzscheme_base.c... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mzscheme_base.c" >&5 +printf %s "checking for mzscheme_base.c... " >&6; } if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then MZSCHEME_EXTRA="mzscheme_base.c" MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" @@ -6072,18 +6478,19 @@ $as_echo_n "checking for mzscheme_base.c... " >&6; } fi if test "X$MZSCHEME_EXTRA" != "X" ; then MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: needed" >&5 -$as_echo "needed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: needed" >&5 +printf "%s\n" "needed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not needed" >&5 -$as_echo "not needed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not needed" >&5 +printf "%s\n" "not needed" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_type_void in -lffi" >&5 -$as_echo_n "checking for ffi_type_void in -lffi... " >&6; } -if ${ac_cv_lib_ffi_ffi_type_void+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ffi_type_void in -lffi" >&5 +printf %s "checking for ffi_type_void in -lffi... " >&6; } +if test ${ac_cv_lib_ffi_ffi_type_void+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lffi $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6092,30 +6499,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 ffi_type_void (); int -main () +main (void) { return ffi_type_void (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ffi_ffi_type_void=yes -else +else $as_nop ac_cv_lib_ffi_ffi_type_void=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_type_void" >&5 -$as_echo "$ac_cv_lib_ffi_ffi_type_void" >&6; } -if test "x$ac_cv_lib_ffi_ffi_type_void" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_type_void" >&5 +printf "%s\n" "$ac_cv_lib_ffi_ffi_type_void" >&6; } +if test "x$ac_cv_lib_ffi_ffi_type_void" = xyes +then : MZSCHEME_LIBS="$MZSCHEME_LIBS -lffi" fi @@ -6123,8 +6529,8 @@ fi MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ -DMZSCHEME_COLLECTS='\"${SCHEME_COLLECTS}collects\"'" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for MzScheme are sane" >&5 -$as_echo_n "checking if compile and link flags for MzScheme are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for MzScheme are sane" >&5 +printf %s "checking if compile and link flags for MzScheme are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $MZSCHEME_CFLAGS" @@ -6133,21 +6539,22 @@ $as_echo_n "checking if compile and link flags for MzScheme are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; mzs_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: MZSCHEME DISABLED" >&5 -$as_echo "no: MZSCHEME DISABLED" >&6; }; mzs_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; mzs_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: MZSCHEME DISABLED" >&5 +printf "%s\n" "no: MZSCHEME DISABLED" >&6; }; mzs_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -6155,7 +6562,7 @@ rm -f core conftest.err conftest.$ac_objext \ MZSCHEME_SRC="if_mzsch.c" MZSCHEME_OBJ="objects/if_mzsch.o" MZSCHEME_PRO="if_mzsch.pro" - $as_echo "#define FEAT_MZSCHEME 1" >>confdefs.h + printf "%s\n" "#define FEAT_MZSCHEME 1" >>confdefs.h else MZSCHEME_CFLAGS= @@ -6174,17 +6581,18 @@ rm -f core conftest.err conftest.$ac_objext \ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-perlinterp argument" >&5 -$as_echo_n "checking --enable-perlinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-perlinterp argument" >&5 +printf %s "checking --enable-perlinterp argument... " >&6; } # Check whether --enable-perlinterp was given. -if test "${enable_perlinterp+set}" = set; then : +if test ${enable_perlinterp+y} +then : enableval=$enable_perlinterp; -else +else $as_nop enable_perlinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5 -$as_echo "$enable_perlinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5 +printf "%s\n" "$enable_perlinterp" >&6; } if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Perl with tiny features" "$LINENO" 5 @@ -6192,11 +6600,12 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_perl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_perl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_perl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_perl="$vi_cv_path_perl" # Let the user override the test with a path. @@ -6206,11 +6615,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_perl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_perl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6222,17 +6635,17 @@ esac fi vi_cv_path_perl=$ac_cv_path_vi_cv_path_perl if test -n "$vi_cv_path_perl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_perl" >&5 -$as_echo "$vi_cv_path_perl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_perl" >&5 +printf "%s\n" "$vi_cv_path_perl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_perl" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Perl version" >&5 -$as_echo_n "checking Perl version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Perl version" >&5 +printf %s "checking Perl version... " >&6; } if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then eval `$vi_cv_path_perl -V:usethreads` eval `$vi_cv_path_perl -V:libperl` @@ -6245,18 +6658,18 @@ $as_echo_n "checking Perl version... " >&6; } badthreads=no else badthreads=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5 -$as_echo ">>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5 +printf "%s\n" ">>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6; } fi else badthreads=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> Perl 5.5 with threads cannot be used <<<" >&5 -$as_echo ">>> Perl 5.5 with threads cannot be used <<<" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: >>> Perl 5.5 with threads cannot be used <<<" >&5 +printf "%s\n" ">>> Perl 5.5 with threads cannot be used <<<" >&6; } fi fi if test $badthreads = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +printf "%s\n" "OK" >&6; } eval `$vi_cv_path_perl -V:shrpenv` if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04 shrpenv="" @@ -6290,8 +6703,8 @@ $as_echo "OK" >&6; } perlcppflags=`echo "$perlcppflags" | sed -e 's/-arch[^-]*//g'` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Perl are sane" >&5 -$as_echo_n "checking if compile and link flags for Perl are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Perl are sane" >&5 +printf %s "checking if compile and link flags for Perl are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS ldflags_save=$LDFLAGS @@ -6303,21 +6716,22 @@ $as_echo_n "checking if compile and link flags for Perl are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; perl_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: PERL DISABLED" >&5 -$as_echo "no: PERL DISABLED" >&6; }; perl_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; perl_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: PERL DISABLED" >&5 +printf "%s\n" "no: PERL DISABLED" >&6; }; perl_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -6335,13 +6749,13 @@ rm -f core conftest.err conftest.$ac_objext \ PERL_SRC="auto/if_perl.c if_perlsfio.c" PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o" PERL_PRO="if_perl.pro if_perlsfio.pro" - $as_echo "#define FEAT_PERL 1" >>confdefs.h + printf "%s\n" "#define FEAT_PERL 1" >>confdefs.h fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5 -$as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5 +printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi fi @@ -6368,11 +6782,12 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "$enable_perlinterp" = "dynamic"; then if test "$perl_ok" = "yes" -a "X$libperl" != "X"; then - $as_echo "#define DYNAMIC_PERL 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PERL 1" >>confdefs.h - if ${vi_cv_dll_name_perl+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_dll_name_perl+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_dll_name_perl="$libperl" fi @@ -6392,33 +6807,35 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-pythoninterp argument" >&5 -$as_echo_n "checking --enable-pythoninterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-pythoninterp argument" >&5 +printf %s "checking --enable-pythoninterp argument... " >&6; } # Check whether --enable-pythoninterp was given. -if test "${enable_pythoninterp+set}" = set; then : +if test ${enable_pythoninterp+y} +then : enableval=$enable_pythoninterp; -else +else $as_nop enable_pythoninterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 -$as_echo "$enable_pythoninterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 +printf "%s\n" "$enable_pythoninterp" >&6; } if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Python with tiny features" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python-command argument" >&5 -$as_echo_n "checking --with-python-command argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-python-command argument" >&5 +printf %s "checking --with-python-command argument... " >&6; } # Check whether --with-python-command was given. -if test "${with_python_command+set}" = set; then : - withval=$with_python_command; vi_cv_path_python="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 -$as_echo "$vi_cv_path_python" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_python_command+y} +then : + withval=$with_python_command; vi_cv_path_python="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 +printf "%s\n" "$vi_cv_path_python" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6427,11 +6844,12 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_python+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_python+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_python in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_python="$vi_cv_path_python" # Let the user override the test with a path. @@ -6441,11 +6859,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_python="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_python="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6457,11 +6879,11 @@ esac fi vi_cv_path_python=$ac_cv_path_vi_cv_path_python if test -n "$vi_cv_path_python"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 -$as_echo "$vi_cv_path_python" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 +printf "%s\n" "$vi_cv_path_python" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6471,54 +6893,58 @@ done fi if test "X$vi_cv_path_python" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 -$as_echo_n "checking Python version... " >&6; } -if ${vi_cv_var_python_version+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 +printf %s "checking Python version... " >&6; } +if test ${vi_cv_var_python_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_var_python_version=` ${vi_cv_path_python} -c 'import sys; print sys.version[:3]'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python_version" >&5 -$as_echo "$vi_cv_var_python_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python_version" >&5 +printf "%s\n" "$vi_cv_var_python_version" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python is 2.3 or better" >&5 -$as_echo_n "checking Python is 2.3 or better... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python is 2.3 or better" >&5 +printf %s "checking Python is 2.3 or better... " >&6; } if ${vi_cv_path_python} -c \ "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)" then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yep" >&5 -$as_echo "yep" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 -$as_echo_n "checking Python's install prefix... " >&6; } -if ${vi_cv_path_python_pfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yep" >&5 +printf "%s\n" "yep" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 +printf %s "checking Python's install prefix... " >&6; } +if test ${vi_cv_path_python_pfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python_pfx=` ${vi_cv_path_python} -c \ "import sys; print sys.prefix"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_pfx" >&5 -$as_echo "$vi_cv_path_python_pfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_pfx" >&5 +printf "%s\n" "$vi_cv_path_python_pfx" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 -$as_echo_n "checking Python's execution prefix... " >&6; } -if ${vi_cv_path_python_epfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 +printf %s "checking Python's execution prefix... " >&6; } +if test ${vi_cv_path_python_epfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python_epfx=` ${vi_cv_path_python} -c \ "import sys; print sys.exec_prefix"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_epfx" >&5 -$as_echo "$vi_cv_path_python_epfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_epfx" >&5 +printf "%s\n" "$vi_cv_path_python_epfx" >&6; } - if ${vi_cv_path_pythonpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_pythonpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_pythonpath=` unset PYTHONPATH; ${vi_cv_path_python} -c \ @@ -6529,16 +6955,18 @@ fi # Check whether --with-python-config-dir was given. -if test "${with_python_config_dir+set}" = set; then : +if test ${with_python_config_dir+y} +then : withval=$with_python_config_dir; vi_cv_path_python_conf="${withval}"; have_python_config_dir=1 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 -$as_echo_n "checking Python's configuration directory... " >&6; } -if ${vi_cv_path_python_conf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 +printf %s "checking Python's configuration directory... " >&6; } +if test ${vi_cv_path_python_conf+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python_conf= d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"` @@ -6556,19 +6984,20 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5 -$as_echo "$vi_cv_path_python_conf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5 +printf "%s\n" "$vi_cv_path_python_conf" >&6; } PYTHON_CONFDIR="${vi_cv_path_python_conf}" if test "X$PYTHON_CONFDIR" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 -$as_echo "can't find it!" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 +printf "%s\n" "can't find it!" >&6; } else - if ${vi_cv_path_python_plibs+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_python_plibs+y} +then : + printf %s "(cached) " >&6 +else $as_nop pwd=`pwd` tmp_mkf="$pwd/config-PyMake$$" @@ -6611,11 +7040,12 @@ eof fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's dll name" >&5 -$as_echo_n "checking Python's dll name... " >&6; } -if ${vi_cv_dll_name_python+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's dll name" >&5 +printf %s "checking Python's dll name... " >&6; } +if test ${vi_cv_dll_name_python+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "X$python_DLLLIBRARY" != "X"; then vi_cv_dll_name_python="$python_DLLLIBRARY" @@ -6624,8 +7054,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python" >&5 -$as_echo "$vi_cv_dll_name_python" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python" >&5 +printf "%s\n" "$vi_cv_dll_name_python" >&6; } PYTHON_LIBS="${vi_cv_path_python_plibs}" if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then @@ -6640,8 +7070,8 @@ $as_echo "$vi_cv_dll_name_python" >&6; } PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 -$as_echo_n "checking if -pthread should be used... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 +printf %s "checking if -pthread should be used... " >&6; } threadsafe_flag= thread_lib= if test "$vim_cv_uname_output" != Darwin; then @@ -6663,27 +7093,28 @@ $as_echo_n "checking if -pthread should be used... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; LIBS=$libs_save_old +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$libs_save_old fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -n "$MACSDK"; then @@ -6693,8 +7124,8 @@ $as_echo "no" >&6; } PYTHON_GETPATH_CFLAGS= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 -$as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 +printf %s "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON_CFLAGS" @@ -6703,26 +7134,27 @@ $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; python_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: PYTHON DISABLED" >&5 -$as_echo "no: PYTHON DISABLED" >&6; }; python_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; python_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: PYTHON DISABLED" >&5 +printf "%s\n" "no: PYTHON DISABLED" >&6; }; python_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save if test $python_ok = yes; then - $as_echo "#define FEAT_PYTHON 1" >>confdefs.h + printf "%s\n" "#define FEAT_PYTHON 1" >>confdefs.h else LIBS=$libs_save_old @@ -6733,8 +7165,8 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old" >&5 -$as_echo "too old" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old" >&5 +printf "%s\n" "too old" >&6; } fi fi @@ -6750,33 +7182,35 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-python3interp argument" >&5 -$as_echo_n "checking --enable-python3interp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-python3interp argument" >&5 +printf %s "checking --enable-python3interp argument... " >&6; } # Check whether --enable-python3interp was given. -if test "${enable_python3interp+set}" = set; then : +if test ${enable_python3interp+y} +then : enableval=$enable_python3interp; -else +else $as_nop enable_python3interp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 -$as_echo "$enable_python3interp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 +printf "%s\n" "$enable_python3interp" >&6; } if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Python with tiny features" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python3-command argument" >&5 -$as_echo_n "checking --with-python3-command argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-python3-command argument" >&5 +printf %s "checking --with-python3-command argument... " >&6; } # Check whether --with-python3-command was given. -if test "${with_python3_command+set}" = set; then : - withval=$with_python3_command; vi_cv_path_python3="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 -$as_echo "$vi_cv_path_python3" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_python3_command+y} +then : + withval=$with_python3_command; vi_cv_path_python3="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 +printf "%s\n" "$vi_cv_path_python3" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6785,11 +7219,12 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_python3+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_python3+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_python3 in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_python3="$vi_cv_path_python3" # Let the user override the test with a path. @@ -6799,11 +7234,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_python3="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_python3="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6815,11 +7254,11 @@ esac fi vi_cv_path_python3=$ac_cv_path_vi_cv_path_python3 if test -n "$vi_cv_path_python3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 -$as_echo "$vi_cv_path_python3" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 +printf "%s\n" "$vi_cv_path_python3" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6829,31 +7268,33 @@ done fi if test "X$vi_cv_path_python3" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 -$as_echo_n "checking Python version... " >&6; } -if ${vi_cv_var_python3_version+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 +printf %s "checking Python version... " >&6; } +if test ${vi_cv_var_python3_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_var_python3_version=` ${vi_cv_path_python3} -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_version" >&5 -$as_echo "$vi_cv_var_python3_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_version" >&5 +printf "%s\n" "$vi_cv_var_python3_version" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python is 3.0 or better" >&5 -$as_echo_n "checking Python is 3.0 or better... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python is 3.0 or better" >&5 +printf %s "checking Python is 3.0 or better... " >&6; } if ${vi_cv_path_python3} -c \ "import sys; sys.exit(${vi_cv_var_python3_version} < 3.0)" then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yep" >&5 -$as_echo "yep" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yep" >&5 +printf "%s\n" "yep" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5 -$as_echo_n "checking Python's abiflags... " >&6; } -if ${vi_cv_var_python3_abiflags+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5 +printf %s "checking Python's abiflags... " >&6; } +if test ${vi_cv_var_python3_abiflags+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_var_python3_abiflags= if ${vi_cv_path_python3} -c \ @@ -6863,37 +7304,40 @@ else "import sys; print(sys.abiflags)"` fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_abiflags" >&5 -$as_echo "$vi_cv_var_python3_abiflags" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_abiflags" >&5 +printf "%s\n" "$vi_cv_var_python3_abiflags" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 -$as_echo_n "checking Python's install prefix... " >&6; } -if ${vi_cv_path_python3_pfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 +printf %s "checking Python's install prefix... " >&6; } +if test ${vi_cv_path_python3_pfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3_pfx=` ${vi_cv_path_python3} -c \ "import sys; print(sys.prefix)"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_pfx" >&5 -$as_echo "$vi_cv_path_python3_pfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_pfx" >&5 +printf "%s\n" "$vi_cv_path_python3_pfx" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 -$as_echo_n "checking Python's execution prefix... " >&6; } -if ${vi_cv_path_python3_epfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 +printf %s "checking Python's execution prefix... " >&6; } +if test ${vi_cv_path_python3_epfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3_epfx=` ${vi_cv_path_python3} -c \ "import sys; print(sys.exec_prefix)"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_epfx" >&5 -$as_echo "$vi_cv_path_python3_epfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_epfx" >&5 +printf "%s\n" "$vi_cv_path_python3_epfx" >&6; } - if ${vi_cv_path_python3path+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_python3path+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3path=` unset PYTHONPATH; ${vi_cv_path_python3} -c \ @@ -6904,16 +7348,18 @@ fi # Check whether --with-python3-config-dir was given. -if test "${with_python3_config_dir+set}" = set; then : +if test ${with_python3_config_dir+y} +then : withval=$with_python3_config_dir; vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 -$as_echo_n "checking Python's configuration directory... " >&6; } -if ${vi_cv_path_python3_conf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 +printf %s "checking Python's configuration directory... " >&6; } +if test ${vi_cv_path_python3_conf+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3_conf= config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" @@ -6935,19 +7381,20 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5 -$as_echo "$vi_cv_path_python3_conf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5 +printf "%s\n" "$vi_cv_path_python3_conf" >&6; } PYTHON3_CONFDIR="${vi_cv_path_python3_conf}" if test "X$PYTHON3_CONFDIR" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 -$as_echo "can't find it!" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 +printf "%s\n" "can't find it!" >&6; } else - if ${vi_cv_path_python3_plibs+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_python3_plibs+y} +then : + printf %s "(cached) " >&6 +else $as_nop pwd=`pwd` tmp_mkf="$pwd/config-PyMake$$" @@ -6968,11 +7415,12 @@ eof fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name" >&5 -$as_echo_n "checking Python3's dll name... " >&6; } -if ${vi_cv_dll_name_python3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python3's dll name" >&5 +printf %s "checking Python3's dll name... " >&6; } +if test ${vi_cv_dll_name_python3+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "X$python3_DLLLIBRARY" != "X"; then vi_cv_dll_name_python3="$python3_DLLLIBRARY" @@ -6981,8 +7429,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python3" >&5 -$as_echo "$vi_cv_dll_name_python3" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python3" >&5 +printf "%s\n" "$vi_cv_dll_name_python3" >&6; } PYTHON3_LIBS="${vi_cv_path_python3_plibs}" if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then @@ -6996,8 +7444,8 @@ $as_echo "$vi_cv_dll_name_python3" >&6; } PYTHON3_SRC="if_python3.c" PYTHON3_OBJ="objects/if_python3.o" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 -$as_echo_n "checking if -pthread should be used... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 +printf %s "checking if -pthread should be used... " >&6; } threadsafe_flag= thread_lib= if test "$vim_cv_uname_output" != Darwin; then @@ -7019,31 +7467,32 @@ $as_echo_n "checking if -pthread should be used... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; PYTHON3_CFLAGS="$PYTHON3_CFLAGS $threadsafe_flag" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; LIBS=$libs_save_old +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; PYTHON3_CFLAGS="$PYTHON3_CFLAGS $threadsafe_flag" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$libs_save_old fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python 3 are sane" >&5 -$as_echo_n "checking if compile and link flags for Python 3 are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python 3 are sane" >&5 +printf %s "checking if compile and link flags for Python 3 are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" @@ -7052,26 +7501,27 @@ $as_echo_n "checking if compile and link flags for Python 3 are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; python3_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: PYTHON3 DISABLED" >&5 -$as_echo "no: PYTHON3 DISABLED" >&6; }; python3_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; python3_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: PYTHON3 DISABLED" >&5 +printf "%s\n" "no: PYTHON3 DISABLED" >&6; }; python3_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save if test "$python3_ok" = yes; then - $as_echo "#define FEAT_PYTHON3 1" >>confdefs.h + printf "%s\n" "#define FEAT_PYTHON3 1" >>confdefs.h else LIBS=$libs_save_old @@ -7082,8 +7532,8 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old" >&5 -$as_echo "too old" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old" >&5 +printf "%s\n" "too old" >&6; } fi fi if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then @@ -7097,32 +7547,35 @@ fi + # Check whether --with-properly-linked-python2-python3 was given. -if test "${with_properly_linked_python2_python3+set}" = set; then : +if test ${with_properly_linked_python2_python3+y} +then : withval=$with_properly_linked_python2_python3; vi_cv_with_properly_linked_python2_python3="yes" -else +else $as_nop vi_cv_with_properly_linked_python2_python3="no" fi if test "$python_ok" = yes && test "$python3_ok" = yes; then - $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON 1" >>confdefs.h - $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON3 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python" >&5 -$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python" >&5 +printf %s "checking whether we can do without RTLD_GLOBAL for Python... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON_CFLAGS" libs_save=$LIBS LIBS="-ldl $LIBS" if test "x$MACOS_X" != "xyes"; then - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7160,13 +7613,14 @@ else return !not_needed; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };$as_echo "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };printf "%s\n" "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -7176,18 +7630,19 @@ fi CFLAGS=$cflags_save LIBS=$libs_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5 -$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5 +printf %s "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" libs_save=$LIBS LIBS="-ldl $LIBS" - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7226,13 +7681,14 @@ else return !not_needed; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };$as_echo "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };printf "%s\n" "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -7241,9 +7697,9 @@ fi fi if test "$vi_cv_with_properly_linked_python2_python3" = "yes"; then - $as_echo "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h + printf "%s\n" "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h - $as_echo "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h + printf "%s\n" "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h fi @@ -7262,26 +7718,26 @@ fi # MacVim patch to hack in a different default dynamic lib path for arm64. # We don't test that it links here so this has to be binary compatible with # DYNAMIC_PYTHON3_DLL - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 -$as_echo_n "checking Python3's dll name (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 +printf %s "checking Python3's dll name (arm64)... " >&6; } if test -n "${vi_cv_dll_name_python3_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 -$as_echo "${vi_cv_dll_name_python3_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_python3_arm64}" >&6; } PYTHON3_CFLAGS+=" -DDYNAMIC_PYTHON3_DLL_ARM64=\\\"${vi_cv_dll_name_python3_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 -$as_echo "<none>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 +printf "%s\n" "<none>" >&6; } fi elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then - $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON 1" >>confdefs.h PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\"" PYTHON_LIBS= elif test "$python_ok" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5 -$as_echo_n "checking if -fPIE can be added for Python... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5 +printf %s "checking if -fPIE can be added for Python... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON_CFLAGS -fPIE" @@ -7290,21 +7746,22 @@ $as_echo_n "checking if -fPIE can be added for Python... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; fpie_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; fpie_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; fpie_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; fpie_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -7312,7 +7769,7 @@ rm -f core conftest.err conftest.$ac_objext \ PYTHON_CFLAGS="$PYTHON_CFLAGS -fPIE" fi elif test "$python3_ok" = yes && test "$enable_python3interp" = "dynamic"; then - $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON3 1" >>confdefs.h PYTHON3_SRC="if_python3.c" PYTHON3_OBJ="objects/if_python3.o" @@ -7322,19 +7779,19 @@ elif test "$python3_ok" = yes && test "$enable_python3interp" = "dynamic"; then # MacVim patch to hack in a different default dynamic lib path for arm64. # We don't test that it links here so this has to be binary compatible with # DYNAMIC_PYTHON3_DLL - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 -$as_echo_n "checking Python3's dll name (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 +printf %s "checking Python3's dll name (arm64)... " >&6; } if test -n "${vi_cv_dll_name_python3_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 -$as_echo "${vi_cv_dll_name_python3_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_python3_arm64}" >&6; } PYTHON3_CFLAGS+=" -DDYNAMIC_PYTHON3_DLL_ARM64=\\\"${vi_cv_dll_name_python3_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 -$as_echo "<none>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 +printf "%s\n" "<none>" >&6; } fi elif test "$python3_ok" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5 -$as_echo_n "checking if -fPIE can be added for Python3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5 +printf %s "checking if -fPIE can be added for Python3... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON3_CFLAGS -fPIE" @@ -7343,21 +7800,22 @@ $as_echo_n "checking if -fPIE can be added for Python3... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; fpie_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; fpie_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; fpie_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; fpie_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -7366,39 +7824,42 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-tclinterp argument" >&5 -$as_echo_n "checking --enable-tclinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-tclinterp argument" >&5 +printf %s "checking --enable-tclinterp argument... " >&6; } # Check whether --enable-tclinterp was given. -if test "${enable_tclinterp+set}" = set; then : +if test ${enable_tclinterp+y} +then : enableval=$enable_tclinterp; -else +else $as_nop enable_tclinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tclinterp" >&5 -$as_echo "$enable_tclinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_tclinterp" >&5 +printf "%s\n" "$enable_tclinterp" >&6; } if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-tclsh argument" >&5 -$as_echo_n "checking --with-tclsh argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-tclsh argument" >&5 +printf %s "checking --with-tclsh argument... " >&6; } # Check whether --with-tclsh was given. -if test "${with_tclsh+set}" = set; then : - withval=$with_tclsh; tclsh_name="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclsh_name" >&5 -$as_echo "$tclsh_name" >&6; } -else - tclsh_name="tclsh8.5"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_tclsh+y} +then : + withval=$with_tclsh; tclsh_name="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tclsh_name" >&5 +printf "%s\n" "$tclsh_name" >&6; } +else $as_nop + tclsh_name="tclsh8.5"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7408,11 +7869,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7424,11 +7889,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7438,11 +7903,12 @@ fi tclsh_name="tclsh8.4" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7452,11 +7918,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7468,11 +7938,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7481,11 +7951,12 @@ fi tclsh_name="tclsh8.2" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7495,11 +7966,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7511,11 +7986,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7524,11 +7999,12 @@ fi tclsh_name="tclsh8.0" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7538,11 +8014,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7554,11 +8034,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7567,11 +8047,12 @@ fi tclsh_name="tclsh" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7581,11 +8062,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7597,27 +8082,27 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi if test "X$vi_cv_path_tcl" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5 -$as_echo_n "checking Tcl version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5 +printf %s "checking Tcl version... " >&6; } if echo 'exit [expr [info tclversion] < 8.0]' | "$vi_cv_path_tcl" - ; then tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5 -$as_echo "$tclver - OK" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5 +printf "%s\n" "$tclver - OK" >&6; }; tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -` tcldll=`echo 'puts libtcl[info tclversion][info sharedlibextension]' | $vi_cv_path_tcl -` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 -$as_echo_n "checking for location of Tcl include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 +printf %s "checking for location of Tcl include... " >&6; } if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" else @@ -7626,20 +8111,20 @@ $as_echo_n "checking for location of Tcl include... " >&6; } TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tcl.h" >&5 -$as_echo "$try/tcl.h" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tcl.h" >&5 +printf "%s\n" "$try/tcl.h" >&6; } TCL_INC=$try break fi done if test -z "$TCL_INC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 -$as_echo "<not found>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 +printf "%s\n" "<not found>" >&6; } SKIP_TCL=YES fi if test -z "$SKIP_TCL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 -$as_echo_n "checking for location of tclConfig.sh script... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 +printf %s "checking for location of tclConfig.sh script... " >&6; } if test "x$MACOS_X" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" @@ -7649,8 +8134,8 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; } fi for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -$as_echo "$try/tclConfig.sh" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +printf "%s\n" "$try/tclConfig.sh" >&6; } . "$try/tclConfig.sh" if test "$enable_tclinterp" = "dynamic"; then TCL_LIBS=`eval echo "$TCL_STUB_LIB_SPEC $TCL_LIBS"` @@ -7662,10 +8147,10 @@ $as_echo "$try/tclConfig.sh" >&6; } fi done if test -z "$TCL_LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 -$as_echo "<not found>" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl library by myself" >&5 -$as_echo_n "checking for Tcl library by myself... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 +printf "%s\n" "<not found>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Tcl library by myself" >&5 +printf %s "checking for Tcl library by myself... " >&6; } tcllib=`echo $tclinc | sed s/include/lib/g` tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`" for ext in .so .a ; do @@ -7673,8 +8158,8 @@ $as_echo_n "checking for Tcl library by myself... " >&6; } for try in $tcllib ; do trylib=tcl$ver$ext if test -f "$try/lib$trylib" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 -$as_echo "$try/lib$trylib" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 +printf "%s\n" "$try/lib$trylib" >&6; } TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm" if test "$vim_cv_uname_output" = SunOS && echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then @@ -7686,13 +8171,13 @@ $as_echo "$try/lib$trylib" >&6; } done done if test -z "$TCL_LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 -$as_echo "<not found>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 +printf "%s\n" "<not found>" >&6; } SKIP_TCL=YES fi fi if test -z "$SKIP_TCL"; then - $as_echo "#define FEAT_TCL 1" >>confdefs.h + printf "%s\n" "#define FEAT_TCL 1" >>confdefs.h TCL_SRC=if_tcl.c TCL_OBJ=objects/if_tcl.o @@ -7701,13 +8186,13 @@ $as_echo "<not found>" >&6; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old; need Tcl version 8.0 or later" >&5 -$as_echo "too old; need Tcl version 8.0 or later" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old; need Tcl version 8.0 or later" >&5 +printf "%s\n" "too old; need Tcl version 8.0 or later" >&6; } fi fi if test "$enable_tclinterp" = "dynamic"; then if test "X$TCL_SRC" != "X" -a "X$tcldll" != "X"; then - $as_echo "#define DYNAMIC_TCL 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_TCL 1" >>confdefs.h TCL_CFLAGS="-DDYNAMIC_TCL_DLL=\\\"$tcldll\\\" -DDYNAMIC_TCL_VER=\\\"$tclver\\\" $TCL_CFLAGS" fi @@ -7723,42 +8208,45 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-rubyinterp argument" >&5 -$as_echo_n "checking --enable-rubyinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-rubyinterp argument" >&5 +printf %s "checking --enable-rubyinterp argument... " >&6; } # Check whether --enable-rubyinterp was given. -if test "${enable_rubyinterp+set}" = set; then : +if test ${enable_rubyinterp+y} +then : enableval=$enable_rubyinterp; -else +else $as_nop enable_rubyinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5 -$as_echo "$enable_rubyinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5 +printf "%s\n" "$enable_rubyinterp" >&6; } if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Ruby with tiny features" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 -$as_echo_n "checking --with-ruby-command argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 +printf %s "checking --with-ruby-command argument... " >&6; } # Check whether --with-ruby-command was given. -if test "${with_ruby_command+set}" = set; then : - withval=$with_ruby_command; RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5 -$as_echo "$RUBY_CMD" >&6; } -else - RUBY_CMD="ruby"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5 -$as_echo "defaulting to $RUBY_CMD" >&6; } +if test ${with_ruby_command+y} +then : + withval=$with_ruby_command; RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5 +printf "%s\n" "$RUBY_CMD" >&6; } +else $as_nop + RUBY_CMD="ruby"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5 +printf "%s\n" "defaulting to $RUBY_CMD" >&6; } fi # Extract the first word of "$RUBY_CMD", so it can be a program name with args. set dummy $RUBY_CMD; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_ruby+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_ruby+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_ruby in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_ruby="$vi_cv_path_ruby" # Let the user override the test with a path. @@ -7768,11 +8256,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_ruby="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_ruby="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7784,34 +8276,34 @@ esac fi vi_cv_path_ruby=$ac_cv_path_vi_cv_path_ruby if test -n "$vi_cv_path_ruby"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_ruby" >&5 -$as_echo "$vi_cv_path_ruby" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_ruby" >&5 +printf "%s\n" "$vi_cv_path_ruby" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_ruby" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby version" >&5 -$as_echo_n "checking Ruby version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Ruby version" >&5 +printf %s "checking Ruby version... " >&6; } if $vi_cv_path_ruby -e 'RUBY_VERSION >= "1.9.1" or exit 1' >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5 -$as_echo_n "checking Ruby rbconfig... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +printf "%s\n" "OK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5 +printf %s "checking Ruby rbconfig... " >&6; } ruby_rbconfig="RbConfig" if ! $vi_cv_path_ruby -r rbconfig -e 'RbConfig' >/dev/null 2>/dev/null; then ruby_rbconfig="Config" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ruby_rbconfig" >&5 -$as_echo "$ruby_rbconfig" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby header files" >&5 -$as_echo_n "checking Ruby header files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ruby_rbconfig" >&5 +printf "%s\n" "$ruby_rbconfig" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Ruby header files" >&5 +printf %s "checking Ruby header files... " >&6; } rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e "print $ruby_rbconfig::CONFIG['rubyhdrdir'] || $ruby_rbconfig::CONFIG['archdir'] || \\$hdrdir" 2>/dev/null` if test "X$rubyhdrdir" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5 -$as_echo "$rubyhdrdir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5 +printf "%s\n" "$rubyhdrdir" >&6; } RUBY_CFLAGS="-I$rubyhdrdir" rubyarchdir=`$vi_cv_path_ruby -r rbconfig -e "print ($ruby_rbconfig::CONFIG.has_key? 'rubyarchhdrdir') ? $ruby_rbconfig::CONFIG['rubyarchhdrdir'] : '$rubyhdrdir/'+$ruby_rbconfig::CONFIG['arch']"` if test -d "$rubyarchdir"; then @@ -7861,14 +8353,14 @@ $as_echo "$rubyhdrdir" >&6; } RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro" - $as_echo "#define FEAT_RUBY 1" >>confdefs.h + printf "%s\n" "#define FEAT_RUBY 1" >>confdefs.h if test "$enable_rubyinterp" = "dynamic"; then libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_ALIASES'].split[0]"` if test -z "$libruby_soname"; then libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_SO']"` fi - $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_RUBY 1" >>confdefs.h RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS" RUBY_LIBS= @@ -7879,27 +8371,27 @@ $as_echo "$rubyhdrdir" >&6; } # Note: Apple does ship with a default Ruby lib, but it's usually older # than Homebrew, and since on x86_64 we use the Homebrew version, we # should use that as well for Apple Silicon. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking ${libruby_soname} (arm64)" >&5 -$as_echo_n "checking ${libruby_soname} (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ${libruby_soname} (arm64)" >&5 +printf %s "checking ${libruby_soname} (arm64)... " >&6; } if test -n "${vi_cv_dll_name_ruby_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_ruby_arm64}" >&5 -$as_echo "${vi_cv_dll_name_ruby_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_ruby_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_ruby_arm64}" >&6; } RUBY_CFLAGS+=" -DDYNAMIC_RUBY_DLL_ARM64=\\\"${vi_cv_dll_name_ruby_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 -$as_echo "<none>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <none>" >&5 +printf "%s\n" "<none>" >&6; } fi fi if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5 -$as_echo "not found; disabling Ruby" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5 +printf "%s\n" "not found; disabling Ruby" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old; need Ruby version 1.9.1 or later" >&5 -$as_echo "too old; need Ruby version 1.9.1 or later" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old; need Ruby version 1.9.1 or later" >&5 +printf "%s\n" "too old; need Ruby version 1.9.1 or later" >&6; } fi fi @@ -7914,81 +8406,85 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-cscope argument" >&5 -$as_echo_n "checking --enable-cscope argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-cscope argument" >&5 +printf %s "checking --enable-cscope argument... " >&6; } # Check whether --enable-cscope was given. -if test "${enable_cscope+set}" = set; then : +if test ${enable_cscope+y} +then : enableval=$enable_cscope; -else +else $as_nop enable_cscope="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5 -$as_echo "$enable_cscope" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5 +printf "%s\n" "$enable_cscope" >&6; } if test "$enable_cscope" = "yes"; then - $as_echo "#define FEAT_CSCOPE 1" >>confdefs.h + printf "%s\n" "#define FEAT_CSCOPE 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-netbeans argument" >&5 -$as_echo_n "checking --disable-netbeans argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-netbeans argument" >&5 +printf %s "checking --disable-netbeans argument... " >&6; } # Check whether --enable-netbeans was given. -if test "${enable_netbeans+set}" = set; then : +if test ${enable_netbeans+y} +then : enableval=$enable_netbeans; -else +else $as_nop enable_netbeans="yes" fi if test "$enable_netbeans" = "yes"; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny features" >&5 -$as_echo "cannot use NetBeans with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny features" >&5 +printf "%s\n" "cannot use NetBeans with tiny features" >&6; } enable_netbeans="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-channel argument" >&5 -$as_echo_n "checking --disable-channel argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-channel argument" >&5 +printf %s "checking --disable-channel argument... " >&6; } # Check whether --enable-channel was given. -if test "${enable_channel+set}" = set; then : +if test ${enable_channel+y} +then : enableval=$enable_channel; -else +else $as_nop enable_channel="yes" fi if test "$enable_channel" = "yes"; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny features" >&5 -$as_echo "cannot use channels with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny features" >&5 +printf "%s\n" "cannot use channels with tiny features" >&6; } enable_channel="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi else if test "$enable_netbeans" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, netbeans also disabled" >&5 -$as_echo "yes, netbeans also disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, netbeans also disabled" >&5 +printf "%s\n" "yes, netbeans also disabled" >&6; } enable_netbeans="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi if test "$enable_channel" = "yes"; then if test "x$HAIKU" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 -$as_echo_n "checking for socket in -lnetwork... " >&6; } -if ${ac_cv_lib_network_socket+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 +printf %s "checking for socket in -lnetwork... " >&6; } +if test ${ac_cv_lib_network_socket+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lnetwork $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7997,44 +8493,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 socket (); int -main () +main (void) { return socket (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_network_socket=yes -else +else $as_nop ac_cv_lib_network_socket=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 -$as_echo "$ac_cv_lib_network_socket" >&6; } -if test "x$ac_cv_lib_network_socket" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNETWORK 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 +printf "%s\n" "$ac_cv_lib_network_socket" >&6; } +if test "x$ac_cv_lib_network_socket" = xyes +then : + printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h LIBS="-lnetwork $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 -$as_echo_n "checking for socket in -lsocket... " >&6; } -if ${ac_cv_lib_socket_socket+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +printf %s "checking for socket in -lsocket... " >&6; } +if test ${ac_cv_lib_socket_socket+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8043,33 +8537,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 socket (); int -main () +main (void) { return socket (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_socket_socket=yes -else +else $as_nop ac_cv_lib_socket_socket=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 -$as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +printf "%s\n" "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = xyes +then : + printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h LIBS="-lsocket $LIBS" @@ -8077,11 +8568,12 @@ fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv6 networking is possible" >&5 -$as_echo_n "checking whether compiling with IPv6 networking is possible... " >&6; } -if ${vim_cv_ipv6_networking+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv6 networking is possible" >&5 +printf %s "checking whether compiling with IPv6 networking is possible... " >&6; } +if test ${vim_cv_ipv6_networking+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8101,7 +8593,7 @@ else }; int -main () +main (void) { /* Check creating a socket. */ @@ -8118,37 +8610,35 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vim_cv_ipv6_networking="yes" -else +else $as_nop vim_cv_ipv6_networking="no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv6_networking" >&5 -$as_echo "$vim_cv_ipv6_networking" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv6_networking" >&5 +printf "%s\n" "$vim_cv_ipv6_networking" >&6; } if test "x$vim_cv_ipv6_networking" = "xyes"; then - $as_echo "#define FEAT_IPV6 1" >>confdefs.h + printf "%s\n" "#define FEAT_IPV6 1" >>confdefs.h - for ac_func in inet_ntop -do : - ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" -if test "x$ac_cv_func_inet_ntop" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_INET_NTOP 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +if test "x$ac_cv_func_inet_ntop" = xyes +then : + printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h fi -done else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +printf %s "checking for gethostbyname in -lnsl... " >&6; } +if test ${ac_cv_lib_nsl_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8157,43 +8647,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_nsl_gethostbyname=yes -else +else $as_nop ac_cv_lib_nsl_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes +then : + printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h LIBS="-lnsl $LIBS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv4 networking is possible" >&5 -$as_echo_n "checking whether compiling with IPv4 networking is possible... " >&6; } -if ${vim_cv_ipv4_networking+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv4 networking is possible" >&5 +printf %s "checking whether compiling with IPv4 networking is possible... " >&6; } +if test ${vim_cv_ipv4_networking+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8213,7 +8701,7 @@ else }; int -main () +main (void) { /* Check creating a socket. */ @@ -8228,20 +8716,21 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vim_cv_ipv4_networking="yes" -else +else $as_nop vim_cv_ipv4_networking="no"; enable_netbeans="no"; enable_channel="no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv4_networking" >&5 -$as_echo "$vim_cv_ipv4_networking" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv4_networking" >&5 +printf "%s\n" "$vim_cv_ipv4_networking" >&6; } fi fi if test "$enable_netbeans" = "yes"; then - $as_echo "#define FEAT_NETBEANS_INTG 1" >>confdefs.h + printf "%s\n" "#define FEAT_NETBEANS_INTG 1" >>confdefs.h NETBEANS_SRC="netbeans.c" @@ -8249,7 +8738,7 @@ if test "$enable_netbeans" = "yes"; then fi if test "$enable_channel" = "yes"; then - $as_echo "#define FEAT_JOB_CHANNEL 1" >>confdefs.h + printf "%s\n" "#define FEAT_JOB_CHANNEL 1" >>confdefs.h CHANNEL_SRC="job.c channel.c" @@ -8257,42 +8746,43 @@ if test "$enable_channel" = "yes"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-terminal argument" >&5 -$as_echo_n "checking --enable-terminal argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-terminal argument" >&5 +printf %s "checking --enable-terminal argument... " >&6; } # Check whether --enable-terminal was given. -if test "${enable_terminal+set}" = set; then : +if test ${enable_terminal+y} +then : enableval=$enable_terminal; -else +else $as_nop enable_terminal="auto" fi if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny features" >&5 -$as_echo "cannot use terminal emulator with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny features" >&5 +printf "%s\n" "cannot use terminal emulator with tiny features" >&6; } enable_terminal="no" else if test "$enable_terminal" = "auto"; then enable_terminal="yes" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to yes" >&5 -$as_echo "defaulting to yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to yes" >&5 +printf "%s\n" "defaulting to yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi else if test "$enable_terminal" = "auto"; then enable_terminal="no" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to no" >&5 -$as_echo "defaulting to no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to no" >&5 +printf "%s\n" "defaulting to no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then - $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h + printf "%s\n" "#define FEAT_TERMINAL 1" >>confdefs.h TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/creen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" @@ -8302,120 +8792,128 @@ if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-autoservername argument" >&5 -$as_echo_n "checking --enable-autoservername argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-autoservername argument" >&5 +printf %s "checking --enable-autoservername argument... " >&6; } # Check whether --enable-autoservername was given. -if test "${enable_autoservername+set}" = set; then : +if test ${enable_autoservername+y} +then : enableval=$enable_autoservername; -else +else $as_nop enable_autoservername="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_autoservername" >&5 -$as_echo "$enable_autoservername" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_autoservername" >&5 +printf "%s\n" "$enable_autoservername" >&6; } if test "$enable_autoservername" = "yes"; then - $as_echo "#define FEAT_AUTOSERVERNAME 1" >>confdefs.h + printf "%s\n" "#define FEAT_AUTOSERVERNAME 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-multibyte argument" >&5 -$as_echo_n "checking --enable-multibyte argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-multibyte argument" >&5 +printf %s "checking --enable-multibyte argument... " >&6; } # Check whether --enable-multibyte was given. -if test "${enable_multibyte+set}" = set; then : +if test ${enable_multibyte+y} +then : enableval=$enable_multibyte; -else +else $as_nop enable_multibyte="yes" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_multibyte" >&5 -$as_echo "$enable_multibyte" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_multibyte" >&5 +printf "%s\n" "$enable_multibyte" >&6; } if test "$enable_multibyte" != "yes"; then as_fn_error $? "The multi-byte feature can no longer be disabled. If you have a problem with this, discuss on the Vim mailing list." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-rightleft argument" >&5 -$as_echo_n "checking --disable-rightleft argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-rightleft argument" >&5 +printf %s "checking --disable-rightleft argument... " >&6; } # Check whether --enable-rightleft was given. -if test "${enable_rightleft+set}" = set; then : +if test ${enable_rightleft+y} +then : enableval=$enable_rightleft; -else +else $as_nop enable_rightleft="yes" fi if test "$enable_rightleft" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define DISABLE_RIGHTLEFT 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define DISABLE_RIGHTLEFT 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-arabic argument" >&5 -$as_echo_n "checking --disable-arabic argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-arabic argument" >&5 +printf %s "checking --disable-arabic argument... " >&6; } # Check whether --enable-arabic was given. -if test "${enable_arabic+set}" = set; then : +if test ${enable_arabic+y} +then : enableval=$enable_arabic; -else +else $as_nop enable_arabic="yes" fi if test "$enable_arabic" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define DISABLE_ARABIC 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define DISABLE_ARABIC 1" >>confdefs.h fi # Check whether --enable-farsi was given. -if test "${enable_farsi+set}" = set; then : +if test ${enable_farsi+y} +then : enableval=$enable_farsi; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-xim argument" >&5 -$as_echo_n "checking --enable-xim argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-xim argument" >&5 +printf %s "checking --enable-xim argument... " >&6; } # Check whether --enable-xim was given. -if test "${enable_xim+set}" = set; then : - enableval=$enable_xim; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xim" >&5 -$as_echo "$enable_xim" >&6; } -else - enable_xim="auto"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to auto" >&5 -$as_echo "defaulting to auto" >&6; } +if test ${enable_xim+y} +then : + enableval=$enable_xim; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_xim" >&5 +printf "%s\n" "$enable_xim" >&6; } +else $as_nop + enable_xim="auto"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to auto" >&5 +printf "%s\n" "defaulting to auto" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-fontset argument" >&5 -$as_echo_n "checking --enable-fontset argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-fontset argument" >&5 +printf %s "checking --enable-fontset argument... " >&6; } # Check whether --enable-fontset was given. -if test "${enable_fontset+set}" = set; then : +if test ${enable_fontset+y} +then : enableval=$enable_fontset; -else +else $as_nop enable_fontset="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_fontset" >&5 -$as_echo "$enable_fontset" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_fontset" >&5 +printf "%s\n" "$enable_fontset" >&6; } test -z "$with_x" && with_x=yes test "${enable_gui-yes}" != no -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && with_x=yes if test "$with_x" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to: don't HAVE_X11" >&5 -$as_echo "defaulting to: don't HAVE_X11" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to: don't HAVE_X11" >&5 +printf "%s\n" "defaulting to: don't HAVE_X11" >&6; } else # Extract the first word of "xmkmf", so it can be a program name with args. set dummy xmkmf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_xmkmfpath+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_xmkmfpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $xmkmfpath in [\\/]* | ?:[\\/]*) ac_cv_path_xmkmfpath="$xmkmfpath" # Let the user override the test with a path. @@ -8425,11 +8923,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_xmkmfpath="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_xmkmfpath="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8441,21 +8943,22 @@ esac fi xmkmfpath=$ac_cv_path_xmkmfpath if test -n "$xmkmfpath"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmkmfpath" >&5 -$as_echo "$xmkmfpath" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xmkmfpath" >&5 +printf "%s\n" "$xmkmfpath" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +printf %s "checking for X... " >&6; } # Check whether --with-x was given. -if test "${with_x+set}" = set; then : +if test ${with_x+y} +then : withval=$with_x; fi @@ -8466,12 +8969,41 @@ if test "x$with_x" = xno; then else case $x_includes,$x_libraries in #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : - $as_echo_n "(cached) " >&6 -else + *,NONE | NONE,*) if test ${ac_cv_have_x+y} +then : + printf %s "(cached) " >&6 +else $as_nop # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir +ac_x_includes=no +ac_x_libraries=no +# Do we need to do anything special at all? +ac_save_LIBS=$LIBS +LIBS="-lX11 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <X11/Xlib.h> +int +main (void) +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + # We can compile and link X programs with no special options. + ac_x_includes= + ac_x_libraries= +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +# If that didn't work, only try xmkmf and file system searches +# for native compilation. +if test x"$ac_x_includes" = xno && test "$cross_compiling" = no +then : + rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -8510,7 +9042,7 @@ _ACEOF rm -f -r conftest.dir fi -# Standard set of common directories for X headers. + # Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -8537,6 +9069,8 @@ ac_x_header_dirs=' /usr/local/include/X11R5 /usr/local/include/X11R4 +/opt/X11/include + /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -8558,10 +9092,11 @@ if test "$ac_x_includes" = no; then /* end confdefs.h. */ #include <X11/Xlib.h> _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # We can compile using X headers with no special include directory. ac_x_includes= -else +else $as_nop for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir @@ -8582,20 +9117,21 @@ if test "$ac_x_libraries" = no; then /* end confdefs.h. */ #include <X11/Xlib.h> int -main () +main (void) { XrmInitialize () ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -else +else $as_nop LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib la dll; do @@ -8606,19 +9142,21 @@ do done done fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no +fi +# Record the results. case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) + no,* | *,no | *\'*) : # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) + ac_cv_have_x="have_x=no" ;; #( + *) : # Record where we found X for the cache. ac_cv_have_x="have_x=yes\ ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" + ac_x_libraries='$ac_x_libraries'" ;; esac fi ;; #( @@ -8628,8 +9166,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -$as_echo "$have_x" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +printf "%s\n" "$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -8639,14 +9177,14 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h +printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -8659,8 +9197,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +printf %s "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -8668,42 +9206,44 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" -else +else $as_nop LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -$as_echo "neither works" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +printf "%s\n" "neither works" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS @@ -8726,26 +9266,25 @@ rm -f core conftest.err conftest.$ac_objext \ /* 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 XOpenDisplay (); int -main () +main (void) { return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +printf %s "checking for dnet_ntoa in -ldnet... " >&6; } +if test ${ac_cv_lib_dnet_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8754,39 +9293,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 dnet_ntoa (); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_dnet_ntoa=yes -else +else $as_nop ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8795,36 +9334,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 dnet_ntoa (); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_stub_dnet_ntoa=yes -else +else $as_nop ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -8837,57 +9375,59 @@ rm -f core conftest.err conftest.$ac_objext \ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes; then : +if test "x$ac_cv_func_gethostbyname" = xyes +then : fi if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +printf %s "checking for gethostbyname in -lnsl... " >&6; } +if test ${ac_cv_lib_nsl_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* 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 + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ char gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_nsl_gethostbyname=yes -else +else $as_nop ac_cv_lib_nsl_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +printf %s "checking for gethostbyname in -lbsd... " >&6; } +if test ${ac_cv_lib_bsd_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8896,30 +9436,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_bsd_gethostbyname=yes -else +else $as_nop ac_cv_lib_bsd_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -8934,16 +9473,18 @@ fi # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = xyes; then : +if test "x$ac_cv_func_connect" = xyes +then : fi if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if ${ac_cv_lib_socket_connect+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +printf %s "checking for connect in -lsocket... " >&6; } +if test ${ac_cv_lib_socket_connect+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8952,30 +9493,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 connect (); int -main () +main (void) { return connect (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_socket_connect=yes -else +else $as_nop ac_cv_lib_socket_connect=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes +then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -8983,16 +9523,18 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = xyes; then : +if test "x$ac_cv_func_remove" = xyes +then : fi if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if ${ac_cv_lib_posix_remove+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +printf %s "checking for remove in -lposix... " >&6; } +if test ${ac_cv_lib_posix_remove+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9001,30 +9543,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 remove (); int -main () +main (void) { return remove (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_posix_remove=yes -else +else $as_nop ac_cv_lib_posix_remove=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -9032,16 +9573,18 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes; then : +if test "x$ac_cv_func_shmat" = xyes +then : fi if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if ${ac_cv_lib_ipc_shmat+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +printf %s "checking for shmat in -lipc... " >&6; } +if test ${ac_cv_lib_ipc_shmat+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9050,30 +9593,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 shmat (); int -main () +main (void) { return shmat (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ipc_shmat=yes -else +else $as_nop ac_cv_lib_ipc_shmat=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -9089,11 +9631,12 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +printf %s "checking for IceConnectionNumber in -lICE... " >&6; } +if test ${ac_cv_lib_ICE_IceConnectionNumber+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9102,30 +9645,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 IceConnectionNumber (); int -main () +main (void) { return IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ICE_IceConnectionNumber=yes -else +else $as_nop ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes +then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -9143,8 +9685,8 @@ fi if test -d "$x_includes" && test ! -d "$x_libraries"; then x_libraries=`echo "$x_includes" | sed s/include/lib/` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5 -$as_echo "Corrected X libraries to $x_libraries" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5 +printf "%s\n" "Corrected X libraries to $x_libraries" >&6; } X_LIBS="$X_LIBS -L$x_libraries" if test "$vim_cv_uname_output" = SunOS && echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then @@ -9154,8 +9696,8 @@ $as_echo "Corrected X libraries to $x_libraries" >&6; } if test -d "$x_libraries" && test ! -d "$x_includes"; then x_includes=`echo "$x_libraries" | sed s/lib/include/` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X includes to $x_includes" >&5 -$as_echo "Corrected X includes to $x_includes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Corrected X includes to $x_includes" >&5 +printf "%s\n" "Corrected X includes to $x_includes" >&6; } X_CFLAGS="$X_CFLAGS -I$x_includes" fi @@ -9164,8 +9706,8 @@ $as_echo "Corrected X includes to $x_includes" >&6; } X_LIBS="`echo $X_LIBS\ | sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if X11 header files can be found" >&5 -$as_echo_n "checking if X11 header files can be found... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if X11 header files can be found" >&5 +printf %s "checking if X11 header files can be found... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9173,27 +9715,28 @@ $as_echo_n "checking if X11 header files can be found... " >&6; } #include <X11/Xlib.h> #include <X11/Intrinsic.h> int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; no_x=yes +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; no_x=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=$cflags_save if test "${no_x-no}" = yes; then with_x=no else - $as_echo "#define HAVE_X11 1" >>confdefs.h + printf "%s\n" "#define HAVE_X11 1" >>confdefs.h X_LIB="-lXt -lX11"; @@ -9201,11 +9744,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="-L$x_libraries $LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 -$as_echo_n "checking for _XdmcpAuthDoIt in -lXdmcp... " >&6; } -if ${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 +printf %s "checking for _XdmcpAuthDoIt in -lXdmcp... " >&6; } +if test ${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXdmcp -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lXdmcp $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9214,39 +9758,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 _XdmcpAuthDoIt (); int -main () +main (void) { return _XdmcpAuthDoIt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xdmcp__XdmcpAuthDoIt=yes -else +else $as_nop ac_cv_lib_Xdmcp__XdmcpAuthDoIt=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 -$as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } -if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 +printf "%s\n" "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } +if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceOpenConnection in -lICE" >&5 -$as_echo_n "checking for IceOpenConnection in -lICE... " >&6; } -if ${ac_cv_lib_ICE_IceOpenConnection+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceOpenConnection in -lICE" >&5 +printf %s "checking for IceOpenConnection in -lICE... " >&6; } +if test ${ac_cv_lib_ICE_IceOpenConnection+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9255,40 +9799,40 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 IceOpenConnection (); int -main () +main (void) { return IceOpenConnection (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ICE_IceOpenConnection=yes -else +else $as_nop ac_cv_lib_ICE_IceOpenConnection=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 -$as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; } -if test "x$ac_cv_lib_ICE_IceOpenConnection" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 +printf "%s\n" "$ac_cv_lib_ICE_IceOpenConnection" >&6; } +if test "x$ac_cv_lib_ICE_IceOpenConnection" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE" fi LDFLAGS="$X_LIBS $ac_save_LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmCreatePixmapFromData in -lXpm" >&5 -$as_echo_n "checking for XpmCreatePixmapFromData in -lXpm... " >&6; } -if ${ac_cv_lib_Xpm_XpmCreatePixmapFromData+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XpmCreatePixmapFromData in -lXpm" >&5 +printf %s "checking for XpmCreatePixmapFromData in -lXpm... " >&6; } +if test ${ac_cv_lib_Xpm_XpmCreatePixmapFromData+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm -lXt $X_PRE_LIBS -lXpm -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9297,36 +9841,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 XpmCreatePixmapFromData (); int -main () +main (void) { return XpmCreatePixmapFromData (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes -else +else $as_nop ac_cv_lib_Xpm_XpmCreatePixmapFromData=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 -$as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } -if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +printf "%s\n" "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } +if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = xyes +then : X_PRE_LIBS="$X_PRE_LIBS -lXpm" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if X11 header files implicitly declare return values" >&5 -$as_echo_n "checking if X11 header files implicitly declare return values... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if X11 header files implicitly declare return values" >&5 +printf %s "checking if X11 header files implicitly declare return values... " >&6; } cflags_save=$CFLAGS if test "$GCC" = yes; then CFLAGS="$CFLAGS $X_CFLAGS -Werror" @@ -9337,53 +9880,57 @@ $as_echo_n "checking if X11 header files implicitly declare return values... " > /* end confdefs.h. */ #include <X11/Xlib.h> int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -else +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else $as_nop CFLAGS="$CFLAGS -Wno-implicit-int" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <X11/Xlib.h> int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; cflags_save="$cflags_save -Wno-implicit-int" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: test failed" >&5 -$as_echo "test failed" >&6; } +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; cflags_save="$cflags_save -Wno-implicit-int" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: test failed" >&5 +printf "%s\n" "test failed" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=$cflags_save LDFLAGS="$ac_save_LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t is 2 bytes" >&5 -$as_echo_n "checking size of wchar_t is 2 bytes... " >&6; } - if ${ac_cv_small_wchar_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of wchar_t is 2 bytes" >&5 +printf %s "checking size of wchar_t is 2 bytes... " >&6; } + if test ${ac_cv_small_wchar_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : as_fn_error $? "failed to compile test program" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9399,9 +9946,10 @@ else exit(0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_small_wchar_t="no" -else +else $as_nop ac_cv_small_wchar_t="yes" fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -9410,10 +9958,10 @@ fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_small_wchar_t" >&5 -$as_echo "$ac_cv_small_wchar_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_small_wchar_t" >&5 +printf "%s\n" "$ac_cv_small_wchar_t" >&6; } if test "x$ac_cv_small_wchar_t" = "xyes" ; then - $as_echo "#define SMALL_WCHAR_T 1" >>confdefs.h + printf "%s\n" "#define SMALL_WCHAR_T 1" >>confdefs.h fi @@ -9426,12 +9974,13 @@ fi test "x$with_x" = xno -a "x$HAIKU" != "xyes" -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5 -$as_echo_n "checking --enable-gui argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5 +printf %s "checking --enable-gui argument... " >&6; } # Check whether --enable-gui was given. -if test "${enable_gui+set}" = set; then : +if test ${enable_gui+y} +then : enableval=$enable_gui; -else +else $as_nop enable_gui="auto" fi @@ -9451,95 +10000,96 @@ GUITYPE=NONE if test "x$HAIKU" = "xyes"; then SKIP_HAIKU= case "$enable_gui_canon" in - no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } + no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } SKIP_HAIKU=YES ;; - yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5 -$as_echo "yes - automatic GUI support" >&6; } ;; - auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - automatic GUI support" >&5 -$as_echo "auto - automatic GUI support" >&6; } ;; - haiku) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Haiku GUI support" >&5 -$as_echo "Haiku GUI support" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } + yes|"") { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5 +printf "%s\n" "yes - automatic GUI support" >&6; } ;; + auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: auto - automatic GUI support" >&5 +printf "%s\n" "auto - automatic GUI support" >&6; } ;; + haiku) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Haiku GUI support" >&5 +printf "%s\n" "Haiku GUI support" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } SKIP_HAIKU=YES ;; esac elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then SKIP_PHOTON= case "$enable_gui_canon" in - no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } + no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } SKIP_PHOTON=YES ;; - yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 -$as_echo "automatic GUI support" >&6; } + yes|""|auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 +printf "%s\n" "automatic GUI support" >&6; } gui_auto=yes ;; - photon) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Photon GUI support" >&5 -$as_echo "Photon GUI support" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } + photon) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Photon GUI support" >&5 +printf "%s\n" "Photon GUI support" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } SKIP_PHOTON=YES ;; esac elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then SKIP_MACVIM= case "$enable_gui_canon" in - no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } + no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } SKIP_MACVIM=YES ;; - yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 -$as_echo "automatic GUI support" >&6; } + yes|""|auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 +printf "%s\n" "automatic GUI support" >&6; } gui_auto=yes ;; - macvim) { $as_echo "$as_me:${as_lineno-$LINENO}: result: MacVim GUI support" >&5 -$as_echo "MacVim GUI support" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } + macvim) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MacVim GUI support" >&5 +printf "%s\n" "MacVim GUI support" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } SKIP_MACVIM=YES ;; esac else case "$enable_gui_canon" in - no|none) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } ;; - yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5 -$as_echo "yes/auto - automatic GUI support" >&6; } + no|none) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } ;; + yes|""|auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5 +printf "%s\n" "yes/auto - automatic GUI support" >&6; } gui_auto=yes SKIP_GTK2= SKIP_GTK3= SKIP_GNOME= SKIP_MACVIM= SKIP_MOTIF=;; - gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5 -$as_echo "GTK+ 2.x GUI support" >&6; } + gtk2) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5 +printf "%s\n" "GTK+ 2.x GUI support" >&6; } SKIP_GTK2=;; - gnome2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GNOME 2.x GUI support" >&5 -$as_echo "GNOME 2.x GUI support" >&6; } + gnome2) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GNOME 2.x GUI support" >&5 +printf "%s\n" "GNOME 2.x GUI support" >&6; } SKIP_GNOME= SKIP_GTK2=;; - gtk3) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 3.x GUI support" >&5 -$as_echo "GTK+ 3.x GUI support" >&6; } + gtk3) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GTK+ 3.x GUI support" >&5 +printf "%s\n" "GTK+ 3.x GUI support" >&6; } SKIP_GTK3=;; - motif) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5 -$as_echo "Motif GUI support" >&6; } + motif) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5 +printf "%s\n" "Motif GUI support" >&6; } SKIP_MOTIF=;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } ;; esac fi if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \ -a "$enable_gui_canon" != "gnome2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 2" >&5 -$as_echo_n "checking whether or not to look for GTK+ 2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 2" >&5 +printf %s "checking whether or not to look for GTK+ 2... " >&6; } # Check whether --enable-gtk2-check was given. -if test "${enable_gtk2_check+set}" = set; then : +if test ${enable_gtk2_check+y} +then : enableval=$enable_gtk2_check; -else +else $as_nop enable_gtk2_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk2_check" >&5 -$as_echo "$enable_gtk2_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gtk2_check" >&5 +printf "%s\n" "$enable_gtk2_check" >&6; } if test "x$enable_gtk2_check" = "xno"; then SKIP_GTK2=YES SKIP_GNOME=YES @@ -9547,68 +10097,72 @@ $as_echo "$enable_gtk2_check" >&6; } fi if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GNOME" >&5 -$as_echo_n "checking whether or not to look for GNOME... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GNOME" >&5 +printf %s "checking whether or not to look for GNOME... " >&6; } # Check whether --enable-gnome-check was given. -if test "${enable_gnome_check+set}" = set; then : +if test ${enable_gnome_check+y} +then : enableval=$enable_gnome_check; -else +else $as_nop enable_gnome_check="no" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gnome_check" >&5 -$as_echo "$enable_gnome_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gnome_check" >&5 +printf "%s\n" "$enable_gnome_check" >&6; } if test "x$enable_gnome_check" = "xno"; then SKIP_GNOME=YES fi fi if test "x$SKIP_GTK3" != "xYES" -a "$enable_gui_canon" != "gtk3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 3" >&5 -$as_echo_n "checking whether or not to look for GTK+ 3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 3" >&5 +printf %s "checking whether or not to look for GTK+ 3... " >&6; } # Check whether --enable-gtk3-check was given. -if test "${enable_gtk3_check+set}" = set; then : +if test ${enable_gtk3_check+y} +then : enableval=$enable_gtk3_check; -else +else $as_nop enable_gtk3_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk3_check" >&5 -$as_echo "$enable_gtk3_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gtk3_check" >&5 +printf "%s\n" "$enable_gtk3_check" >&6; } if test "x$enable_gtk3_check" = "xno"; then SKIP_GTK3=YES fi fi if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Motif" >&5 -$as_echo_n "checking whether or not to look for Motif... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Motif" >&5 +printf %s "checking whether or not to look for Motif... " >&6; } # Check whether --enable-motif-check was given. -if test "${enable_motif_check+set}" = set; then : +if test ${enable_motif_check+y} +then : enableval=$enable_motif_check; -else +else $as_nop enable_motif_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_motif_check" >&5 -$as_echo "$enable_motif_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_motif_check" >&5 +printf "%s\n" "$enable_motif_check" >&6; } if test "x$enable_motif_check" = "xno"; then SKIP_MOTIF=YES fi fi if test "x$SKIP_MACVIM" != "xYES" -a "$enable_gui_canon" != "macvim"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for MacVim" >&5 -$as_echo_n "checking whether or not to look for MacVim... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for MacVim" >&5 +printf %s "checking whether or not to look for MacVim... " >&6; } # Check whether --enable-macvim-check was given. -if test "${enable_macvim_check+set}" = set; then : +if test ${enable_macvim_check+y} +then : enableval=$enable_macvim_check; -else +else $as_nop enable_macvim_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_macvim_check" >&5 -$as_echo "$enable_macvim_check" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_macvim_check" >&5 +printf "%s\n" "$enable_macvim_check" >&6; }; if test "x$enable_macvim_check" = "xno"; then SKIP_MACVIM=YES fi @@ -9620,17 +10174,17 @@ if test "x$MACOS_X" = "xyes"; then fi if test -z "$SKIP_MACVIM" -a "x$COCOA" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacVim GUI" >&5 -$as_echo_n "checking for MacVim GUI... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacVim GUI" >&5 +printf %s "checking for MacVim GUI... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; GUITYPE=MACVIMGUI datadir='${prefix}/MacVim.app/Contents/Resources' elif test -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5 -$as_echo_n "checking for Carbon GUI... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5 +printf %s "checking for Carbon GUI... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; GUITYPE=CARBONGUI datadir='${prefix}/Vim.app/Contents/Resources' @@ -9659,11 +10213,12 @@ if test "X$PKG_CONFIG" = "X"; 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. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -9673,11 +10228,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9689,11 +10248,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9702,11 +10261,12 @@ 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. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -9716,11 +10276,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9732,11 +10296,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -9744,8 +10308,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -9759,21 +10323,22 @@ fi if test -z "$SKIP_GTK2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 -$as_echo_n "checking --disable-gtktest argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 +printf %s "checking --disable-gtktest argument... " >&6; } # Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then : +if test ${enable_gtktest+y} +then : enableval=$enable_gtktest; -else +else $as_nop enable_gtktest=yes fi if test "x$enable_gtktest" = "xyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 -$as_echo "gtk test enabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 +printf "%s\n" "gtk test enabled" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 -$as_echo "gtk test disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 +printf "%s\n" "gtk test disabled" >&6; } fi if test "x$PKG_CONFIG" != "xno"; then @@ -9787,8 +10352,8 @@ $as_echo "gtk test disabled" >&6; } && $PKG_CONFIG --exists gtk+-2.0; then { min_gtk_version=2.2.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0` GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` @@ -9803,8 +10368,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } && $PKG_CONFIG --exists gtk+-3.0; then { min_gtk_version=2.2.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-3.0` @@ -9817,8 +10382,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 -$as_echo_n "checking for GTK -dev package... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 +printf %s "checking for GTK -dev package... " >&6; } no_gtk=yes fi @@ -9830,9 +10395,10 @@ $as_echo_n "checking for GTK -dev package... " >&6; } LIBS="$LIBS $GTK_LIBS" rm -f conf.gtktest - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : echo $ac_n "cross compiling; assumed OK... $ac_c" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9869,9 +10435,10 @@ return 1; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : -else +else $as_nop no_gtk=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -9884,19 +10451,19 @@ fi fi if test "x$no_gtk" = x ; then if test "x$enable_gtktest" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } fi GUI_LIB_LOC="$GTK_LIBDIR" GTK_LIBNAME="$GTK_LIBS" GUI_INC_LOC="$GTK_CFLAGS" else { - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } GTK_CFLAGS="" GTK_LIBS="" : @@ -9934,7 +10501,8 @@ $as_echo "no" >&6; } # Check whether --with-gnome-includes was given. -if test "${with_gnome_includes+set}" = set; then : +if test ${with_gnome_includes+y} +then : withval=$with_gnome_includes; CFLAGS="$CFLAGS -I$withval" fi @@ -9942,7 +10510,8 @@ fi # Check whether --with-gnome-libs was given. -if test "${with_gnome_libs+set}" = set; then : +if test ${with_gnome_libs+y} +then : withval=$with_gnome_libs; LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval fi @@ -9950,7 +10519,8 @@ fi # Check whether --with-gnome was given. -if test "${with_gnome+set}" = set; then : +if test ${with_gnome+y} +then : withval=$with_gnome; if test x$withval = xyes; then want_gnome=yes have_gnome=yes @@ -9964,37 +10534,37 @@ if test "${with_gnome+set}" = set; then : gnome_prefix=$withval/lib fi fi -else +else $as_nop want_gnome=yes fi if test "x$want_gnome" = xyes; then { - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnomeui-2.0" >&5 -$as_echo_n "checking for libgnomeui-2.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgnomeui-2.0" >&5 +printf %s "checking for libgnomeui-2.0... " >&6; } if $PKG_CONFIG --exists libgnomeui-2.0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5 -$as_echo_n "checking for FreeBSD... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5 +printf %s "checking for FreeBSD... " >&6; } if test "$vim_cv_uname_output" = FreeBSD; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE" GNOME_LIBS="$GNOME_LIBS -pthread" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi have_gnome=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } if test "x" = xfail; then as_fn_error $? "Could not find libgnomeui-2.0 via pkg-config" "$LINENO" 5 fi @@ -10003,7 +10573,7 @@ $as_echo "not found" >&6; } fi if test "x$have_gnome" = xyes ; then - $as_echo "#define FEAT_GUI_GNOME 1" >>confdefs.h + printf "%s\n" "#define FEAT_GUI_GNOME 1" >>confdefs.h GUI_INC_LOC="$GUI_INC_LOC $GNOME_INCLUDEDIR" GTK_LIBNAME="$GTK_LIBNAME $GNOME_LIBDIR $GNOME_LIBS" @@ -10016,21 +10586,22 @@ fi if test -z "$SKIP_GTK3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 -$as_echo_n "checking --disable-gtktest argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 +printf %s "checking --disable-gtktest argument... " >&6; } # Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then : +if test ${enable_gtktest+y} +then : enableval=$enable_gtktest; -else +else $as_nop enable_gtktest=yes fi if test "x$enable_gtktest" = "xyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 -$as_echo "gtk test enabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 +printf "%s\n" "gtk test enabled" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 -$as_echo "gtk test disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 +printf "%s\n" "gtk test disabled" >&6; } fi if test "x$PKG_CONFIG" != "xno"; then @@ -10044,8 +10615,8 @@ $as_echo "gtk test disabled" >&6; } && $PKG_CONFIG --exists gtk+-2.0; then { min_gtk_version=3.0.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0` GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` @@ -10060,8 +10631,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } && $PKG_CONFIG --exists gtk+-3.0; then { min_gtk_version=3.0.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-3.0` @@ -10074,8 +10645,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 -$as_echo_n "checking for GTK -dev package... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 +printf %s "checking for GTK -dev package... " >&6; } no_gtk=yes fi @@ -10087,9 +10658,10 @@ $as_echo_n "checking for GTK -dev package... " >&6; } LIBS="$LIBS $GTK_LIBS" rm -f conf.gtktest - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : echo $ac_n "cross compiling; assumed OK... $ac_c" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10126,9 +10698,10 @@ return 1; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : -else +else $as_nop no_gtk=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -10141,19 +10714,19 @@ fi fi if test "x$no_gtk" = x ; then if test "x$enable_gtktest" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } fi GUI_LIB_LOC="$GTK_LIBDIR" GTK_LIBNAME="$GTK_LIBS" GUI_INC_LOC="$GTK_CFLAGS" else { - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } GTK_CFLAGS="" GTK_LIBS="" : @@ -10178,7 +10751,7 @@ $as_echo "no" >&6; } SKIP_MOTIF=YES GUITYPE=GTK - $as_echo "#define USE_GTK3 1" >>confdefs.h + printf "%s\n" "#define USE_GTK3 1" >>confdefs.h else SKIP_GTK2=$save_skip_gtk2 @@ -10187,23 +10760,24 @@ $as_echo "no" >&6; } fi if test "x$GUITYPE" = "xGTK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of Gdk-Pixbuf" >&5 -$as_echo_n "checking version of Gdk-Pixbuf... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking version of Gdk-Pixbuf" >&5 +printf %s "checking version of Gdk-Pixbuf... " >&6; } gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0` if test "x$gdk_pixbuf_version" != x ; then gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'` if test "x$gdk_pixbuf_version_minor" != x -a \ $gdk_pixbuf_version_minor -ge 31 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5 -$as_echo "OK." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK." >&5 +printf "%s\n" "OK." >&6; } # Extract the first word of "glib-compile-resources", so it can be a program name with args. set dummy glib-compile-resources; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GLIB_COMPILE_RESOURCES+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GLIB_COMPILE_RESOURCES in [\\/]* | ?:[\\/]*) ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path. @@ -10213,11 +10787,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10230,56 +10808,58 @@ esac fi GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES if test -n "$GLIB_COMPILE_RESOURCES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 -$as_echo "$GLIB_COMPILE_RESOURCES" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 +printf "%s\n" "$GLIB_COMPILE_RESOURCES" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5 -$as_echo_n "checking glib-compile-resources... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5 +printf %s "checking glib-compile-resources... " >&6; } if test "x$GLIB_COMPILE_RESOURCES" = xno ; then GLIB_COMPILE_RESOURCES="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5 -$as_echo "cannot be found in PATH." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5 +printf "%s\n" "cannot be found in PATH." >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5 -$as_echo "usable." >&6; } - $as_echo "#define USE_GRESOURCE 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: usable." >&5 +printf "%s\n" "usable." >&6; } + printf "%s\n" "#define USE_GRESOURCE 1" >>confdefs.h GRESOURCE_SRC="auto/gui_gtk_gresources.c" GRESOURCE_OBJ="objects/gui_gtk_gresources.o" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5 -$as_echo "not usable." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable." >&5 +printf "%s\n" "not usable." >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot obtain from pkg_config." >&5 -$as_echo "cannot obtain from pkg_config." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot obtain from pkg_config." >&5 +printf "%s\n" "cannot obtain from pkg_config." >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-icon-cache-update argument" >&5 -$as_echo_n "checking --disable-icon-cache-update argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-icon-cache-update argument" >&5 +printf %s "checking --disable-icon-cache-update argument... " >&6; } # Check whether --enable-icon_cache_update was given. -if test "${enable_icon_cache_update+set}" = set; then : +if test ${enable_icon_cache_update+y} +then : enableval=$enable_icon_cache_update; -else +else $as_nop enable_icon_cache_update="yes" fi if test "$enable_icon_cache_update" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +printf "%s\n" "not set" >&6; } # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. set dummy gtk-update-icon-cache; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTK_UPDATE_ICON_CACHE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTK_UPDATE_ICON_CACHE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GTK_UPDATE_ICON_CACHE in [\\/]* | ?:[\\/]*) ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. @@ -10289,11 +10869,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10306,42 +10890,44 @@ esac fi GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE if test -n "$GTK_UPDATE_ICON_CACHE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5 -$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5 +printf "%s\n" "$GTK_UPDATE_ICON_CACHE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$GTK_UPDATE_ICON_CACHE" = "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 -$as_echo "not found in PATH." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 +printf "%s\n" "not found in PATH." >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 -$as_echo "update disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 +printf "%s\n" "update disabled" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-desktop-database-update argument" >&5 -$as_echo_n "checking --disable-desktop-database-update argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-desktop-database-update argument" >&5 +printf %s "checking --disable-desktop-database-update argument... " >&6; } # Check whether --enable-desktop_database_update was given. -if test "${enable_desktop_database_update+set}" = set; then : +if test ${enable_desktop_database_update+y} +then : enableval=$enable_desktop_database_update; -else +else $as_nop enable_desktop_database_update="yes" fi if test "$enable_desktop_database_update" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +printf "%s\n" "not set" >&6; } # Extract the first word of "update-desktop-database", so it can be a program name with args. set dummy update-desktop-database; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_UPDATE_DESKTOP_DATABASE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_UPDATE_DESKTOP_DATABASE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $UPDATE_DESKTOP_DATABASE in [\\/]* | ?:[\\/]*) ac_cv_path_UPDATE_DESKTOP_DATABASE="$UPDATE_DESKTOP_DATABASE" # Let the user override the test with a path. @@ -10351,11 +10937,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10368,21 +10958,21 @@ esac fi UPDATE_DESKTOP_DATABASE=$ac_cv_path_UPDATE_DESKTOP_DATABASE if test -n "$UPDATE_DESKTOP_DATABASE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UPDATE_DESKTOP_DATABASE" >&5 -$as_echo "$UPDATE_DESKTOP_DATABASE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UPDATE_DESKTOP_DATABASE" >&5 +printf "%s\n" "$UPDATE_DESKTOP_DATABASE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$UPDATE_DESKTOP_DATABASE" = "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 -$as_echo "not found in PATH." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 +printf "%s\n" "not found in PATH." >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 -$as_echo "update disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 +printf "%s\n" "update disabled" >&6; } fi fi @@ -10396,8 +10986,8 @@ if test -z "$SKIP_MOTIF"; then gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5 -$as_echo_n "checking for location of Motif GUI includes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5 +printf %s "checking for location of Motif GUI includes... " >&6; } gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC" GUI_INC_LOC= for try in $gui_includes; do @@ -10408,42 +10998,43 @@ $as_echo_n "checking for location of Motif GUI includes... " >&6; } if test -n "$GUI_INC_LOC"; then if test "$GUI_INC_LOC" = /usr/include; then GUI_INC_LOC= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 -$as_echo "in default path" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 +printf "%s\n" "in default path" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_INC_LOC" >&5 -$as_echo "$GUI_INC_LOC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GUI_INC_LOC" >&5 +printf "%s\n" "$GUI_INC_LOC" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 -$as_echo "<not found>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 +printf "%s\n" "<not found>" >&6; } SKIP_MOTIF=YES fi fi if test -z "$SKIP_MOTIF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-motif-lib argument" >&5 -$as_echo_n "checking --with-motif-lib argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-motif-lib argument" >&5 +printf %s "checking --with-motif-lib argument... " >&6; } # Check whether --with-motif-lib was given. -if test "${with_motif_lib+set}" = set; then : +if test ${with_motif_lib+y} +then : withval=$with_motif_lib; MOTIF_LIBNAME="${withval}" fi if test -n "$MOTIF_LIBNAME"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOTIF_LIBNAME" >&5 -$as_echo "$MOTIF_LIBNAME" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MOTIF_LIBNAME" >&5 +printf "%s\n" "$MOTIF_LIBNAME" >&6; } GUI_LIB_LOC= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" >&5 -$as_echo_n "checking for location of Motif GUI libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" >&5 +printf %s "checking for location of Motif GUI libs... " >&6; } gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do @@ -10458,12 +11049,12 @@ $as_echo_n "checking for location of Motif GUI libs... " >&6; } -o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \ -o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then GUI_LIB_LOC= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 -$as_echo "in default path" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 +printf "%s\n" "in default path" >&6; } else if test -n "$GUI_LIB_LOC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5 -$as_echo "$GUI_LIB_LOC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5 +printf "%s\n" "$GUI_LIB_LOC" >&6; } if test "$vim_cv_uname_output" = SunOS && echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC" @@ -10472,8 +11063,8 @@ $as_echo "$GUI_LIB_LOC" >&6; } fi MOTIF_LIBNAME=-lXm else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 -$as_echo "<not found>" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: <not found>" >&5 +printf "%s\n" "<not found>" >&6; } SKIP_MOTIF=YES fi fi @@ -10494,11 +11085,12 @@ if test -z "$SKIP_MOTIF"; then ldflags_save=$LDFLAGS LDFLAGS="$X_LIBS $LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 -$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; } -if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 +printf %s "checking for XShapeQueryExtension in -lXext... " >&6; } +if test ${ac_cv_lib_Xext_XShapeQueryExtension+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10507,38 +11099,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 XShapeQueryExtension (); int -main () +main (void) { return XShapeQueryExtension (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xext_XShapeQueryExtension=yes -else +else $as_nop ac_cv_lib_Xext_XShapeQueryExtension=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 -$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } -if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 +printf "%s\n" "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } +if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes +then : GUI_X_LIBS="-lXext" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wslen in -lw" >&5 -$as_echo_n "checking for wslen in -lw... " >&6; } -if ${ac_cv_lib_w_wslen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wslen in -lw" >&5 +printf %s "checking for wslen in -lw... " >&6; } +if test ${ac_cv_lib_w_wslen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10547,38 +11139,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 wslen (); int -main () +main (void) { return wslen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_w_wslen=yes -else +else $as_nop ac_cv_lib_w_wslen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wslen" >&5 -$as_echo "$ac_cv_lib_w_wslen" >&6; } -if test "x$ac_cv_lib_w_wslen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wslen" >&5 +printf "%s\n" "$ac_cv_lib_w_wslen" >&6; } +if test "x$ac_cv_lib_w_wslen" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lw" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5 -$as_echo_n "checking for dlsym in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlsym+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5 +printf %s "checking for dlsym in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlsym+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10587,38 +11179,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 dlsym (); int -main () +main (void) { return dlsym (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlsym=yes -else +else $as_nop ac_cv_lib_dl_dlsym=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5 -$as_echo "$ac_cv_lib_dl_dlsym" >&6; } -if test "x$ac_cv_lib_dl_dlsym" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlsym" >&6; } +if test "x$ac_cv_lib_dl_dlsym" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuCreateStippledPixmap in -lXmu" >&5 -$as_echo_n "checking for XmuCreateStippledPixmap in -lXmu... " >&6; } -if ${ac_cv_lib_Xmu_XmuCreateStippledPixmap+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XmuCreateStippledPixmap in -lXmu" >&5 +printf %s "checking for XmuCreateStippledPixmap in -lXmu... " >&6; } +if test ${ac_cv_lib_Xmu_XmuCreateStippledPixmap+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10627,39 +11219,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 XmuCreateStippledPixmap (); int -main () +main (void) { return XmuCreateStippledPixmap (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xmu_XmuCreateStippledPixmap=yes -else +else $as_nop ac_cv_lib_Xmu_XmuCreateStippledPixmap=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 -$as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } -if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 +printf "%s\n" "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } +if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = xyes +then : GUI_X_LIBS="-lXmu $GUI_X_LIBS" fi if test -z "$SKIP_MOTIF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpEndJob in -lXp" >&5 -$as_echo_n "checking for XpEndJob in -lXp... " >&6; } -if ${ac_cv_lib_Xp_XpEndJob+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XpEndJob in -lXp" >&5 +printf %s "checking for XpEndJob in -lXp... " >&6; } +if test ${ac_cv_lib_Xp_XpEndJob+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXp $GUI_X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10668,38 +11260,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 XpEndJob (); int -main () +main (void) { return XpEndJob (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xp_XpEndJob=yes -else +else $as_nop ac_cv_lib_Xp_XpEndJob=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpEndJob" >&5 -$as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; } -if test "x$ac_cv_lib_Xp_XpEndJob" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpEndJob" >&5 +printf "%s\n" "$ac_cv_lib_Xp_XpEndJob" >&6; } +if test "x$ac_cv_lib_Xp_XpEndJob" = xyes +then : GUI_X_LIBS="-lXp $GUI_X_LIBS" fi fi LDFLAGS=$ldflags_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra X11 defines" >&5 -$as_echo_n "checking for extra X11 defines... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extra X11 defines" >&5 +printf %s "checking for extra X11 defines... " >&6; } NARROW_PROTO= rm -fr conftestdir if mkdir conftestdir; then @@ -10715,11 +11306,11 @@ EOF rm -fr conftestdir fi if test -z "$NARROW_PROTO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NARROW_PROTO" >&5 -$as_echo "$NARROW_PROTO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NARROW_PROTO" >&5 +printf "%s\n" "$NARROW_PROTO" >&6; } fi fi @@ -10727,18 +11318,13 @@ fi if test "$enable_xsmp" = "yes"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" - for ac_header in X11/SM/SMlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_X11_SM_SMLIB_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes +then : + printf "%s\n" "#define HAVE_X11_SM_SMLIB_H 1" >>confdefs.h fi -done - CPPFLAGS=$cppflags_save fi @@ -10746,43 +11332,44 @@ fi if test -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" - for ac_header in X11/xpm.h X11/Sunkeysym.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_xpm_h" = xyes +then : + printf "%s\n" "#define HAVE_X11_XPM_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "X11/Sunkeysym.h" "ac_cv_header_X11_Sunkeysym_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_Sunkeysym_h" = xyes +then : + printf "%s\n" "#define HAVE_X11_SUNKEYSYM_H 1" >>confdefs.h -done +fi if test ! "$enable_xim" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIMText in X11/Xlib.h" >&5 -$as_echo_n "checking for XIMText in X11/Xlib.h... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XIMText in X11/Xlib.h" >&5 +printf %s "checking for XIMText in X11/Xlib.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <X11/Xlib.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "XIMText" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5 -$as_echo "no; xim has been disabled" >&6; }; enable_xim="no" + $EGREP "XIMText" >/dev/null 2>&1 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5 +printf "%s\n" "no; xim has been disabled" >&6; }; enable_xim="no" fi -rm -f conftest* +rm -rf conftest* fi CPPFLAGS=$cppflags_save if test "$enable_xim" = "auto" -a "x$GUITYPE" != "xNONE" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: X GUI selected; xim has been enabled" >&5 -$as_echo "X GUI selected; xim has been enabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: X GUI selected; xim has been enabled" >&5 +printf "%s\n" "X GUI selected; xim has been enabled" >&6; } enable_xim="yes" fi fi @@ -10790,31 +11377,32 @@ fi if test -z "$SKIP_MOTIF"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/Xmu/Editres.h" >&5 -$as_echo_n "checking for X11/Xmu/Editres.h... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11/Xmu/Editres.h" >&5 +printf %s "checking for X11/Xmu/Editres.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <X11/Intrinsic.h> #include <X11/Xmu/Editres.h> int -main () +main (void) { int i; i = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_X11_XMU_EDITRES_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_X11_XMU_EDITRES_H 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS=$cppflags_save fi @@ -10822,79 +11410,105 @@ if test -z "$SKIP_MOTIF"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" if test "$zOSUnix" = "yes"; then - for ac_header in Xm/Xm.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default" -if test "x$ac_cv_header_Xm_Xm_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_XM_XM_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Xm_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_XM_H 1" >>confdefs.h fi -done - else - for ac_header in Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h Xm/UnhighlightT.h Xm/Notebook.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Xm_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_XM_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "Xm/XpmP.h" "ac_cv_header_Xm_XpmP_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_XpmP_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_XPMP_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/JoinSideT.h" "ac_cv_header_Xm_JoinSideT_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_JoinSideT_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_JOINSIDET_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/TraitP.h" "ac_cv_header_Xm_TraitP_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_TraitP_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_TRAITP_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/Manager.h" "ac_cv_header_Xm_Manager_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Manager_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_MANAGER_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/UnhighlightT.h" "ac_cv_header_Xm_UnhighlightT_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_UnhighlightT_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_UNHIGHLIGHTT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/Notebook.h" "ac_cv_header_Xm_Notebook_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Notebook_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_NOTEBOOK_H 1" >>confdefs.h + +fi fi if test "x$ac_cv_header_Xm_XpmP_h" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmAttributes_21 in Xm/XpmP.h" >&5 -$as_echo_n "checking for XpmAttributes_21 in Xm/XpmP.h... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XpmAttributes_21 in Xm/XpmP.h" >&5 +printf %s "checking for XpmAttributes_21 in Xm/XpmP.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <Xm/XpmP.h> int -main () +main (void) { XpmAttributes_21 attr; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define XPMATTRIBUTES_TYPE XpmAttributes_21" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define XPMATTRIBUTES_TYPE XpmAttributes_21" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; $as_echo "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; printf "%s\n" "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext else - $as_echo "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h + printf "%s\n" "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h fi CPPFLAGS=$cppflags_save fi if test "x$GUITYPE" = "xNONE" -a "$enable_xim" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI selected; xim has been disabled" >&5 -$as_echo "no GUI selected; xim has been disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI selected; xim has been disabled" >&5 +printf "%s\n" "no GUI selected; xim has been disabled" >&6; } enable_xim="no" fi if test "x$GUITYPE" = "xNONE" -a "$enable_fontset" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI selected; fontset has been disabled" >&5 -$as_echo "no GUI selected; fontset has been disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI selected; fontset has been disabled" >&5 +printf "%s\n" "no GUI selected; fontset has been disabled" >&6; } enable_fontset="no" fi if test "x$GUITYPE:$enable_fontset" = "xGTK:yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2 GUI selected; fontset has been disabled" >&5 -$as_echo "GTK+ 2 GUI selected; fontset has been disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GTK+ 2 GUI selected; fontset has been disabled" >&5 +printf "%s\n" "GTK+ 2 GUI selected; fontset has been disabled" >&6; } enable_fontset="no" fi @@ -10916,72 +11530,74 @@ if test "$enable_workshop" = "yes" -a -n "$SKIP_MOTIF"; then fi if test "$enable_xim" = "yes"; then - $as_echo "#define FEAT_XIM 1" >>confdefs.h + printf "%s\n" "#define FEAT_XIM 1" >>confdefs.h fi if test "$enable_fontset" = "yes"; then - $as_echo "#define FEAT_XFONTSET 1" >>confdefs.h + printf "%s\n" "#define FEAT_XFONTSET 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc link to executable" >&5 -$as_echo_n "checking for /proc link to executable... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /proc link to executable" >&5 +printf %s "checking for /proc link to executable... " >&6; } if test -L "/proc/self/exe"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /proc/self/exe" >&5 -$as_echo "/proc/self/exe" >&6; } - $as_echo "#define PROC_EXE_LINK \"/proc/self/exe\"" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /proc/self/exe" >&5 +printf "%s\n" "/proc/self/exe" >&6; } + printf "%s\n" "#define PROC_EXE_LINK \"/proc/self/exe\"" >>confdefs.h elif test -L "/proc/self/path/a.out"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /proc/self/path/a.out" >&5 -$as_echo "/proc/self/path/a.out" >&6; } - $as_echo "#define PROC_EXE_LINK \"/proc/self/path/a.out\"" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /proc/self/path/a.out" >&5 +printf "%s\n" "/proc/self/path/a.out" >&6; } + printf "%s\n" "#define PROC_EXE_LINK \"/proc/self/path/a.out\"" >>confdefs.h elif test -L "/proc/curproc/file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /proc/curproc/file" >&5 -$as_echo "/proc/curproc/file" >&6; } - $as_echo "#define PROC_EXE_LINK \"/proc/curproc/file\"" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /proc/curproc/file" >&5 +printf "%s\n" "/proc/curproc/file" >&6; } + printf "%s\n" "#define PROC_EXE_LINK \"/proc/curproc/file\"" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5 -$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5 +printf %s "checking for CYGWIN or MSYS environment... " >&6; } case $vim_cv_uname_output in - CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5 -$as_echo_n "checking for CYGWIN clipboard support... " >&6; } + CYGWIN*|MSYS*) CYGWIN=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5 +printf %s "checking for CYGWIN clipboard support... " >&6; } if test "x$with_x" = "xno" ; then OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define FEAT_CYGWIN_WIN32_CLIPBOARD 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define FEAT_CYGWIN_WIN32_CLIPBOARD 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - using X11" >&5 -$as_echo "no - using X11" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no - using X11" >&5 +printf "%s\n" "no - using X11" >&6; } fi ;; - *) CYGWIN=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; };; + *) CYGWIN=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; };; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5 -$as_echo_n "checking whether toupper is broken... " >&6; } -if ${vim_cv_toupper_broken+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5 +printf %s "checking whether toupper is broken... " >&6; } +if test ${vim_cv_toupper_broken+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_toupper_broken'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10994,11 +11610,12 @@ else int main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_toupper_broken=yes -else +else $as_nop vim_cv_toupper_broken=no @@ -11008,72 +11625,75 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_toupper_broken" >&5 -$as_echo "$vim_cv_toupper_broken" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_toupper_broken" >&5 +printf "%s\n" "$vim_cv_toupper_broken" >&6; } if test "x$vim_cv_toupper_broken" = "xyes" ; then - $as_echo "#define BROKEN_TOUPPER 1" >>confdefs.h + printf "%s\n" "#define BROKEN_TOUPPER 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __DATE__ and __TIME__ work" >&5 -$as_echo_n "checking whether __DATE__ and __TIME__ work... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __DATE__ and __TIME__ work" >&5 +printf %s "checking whether __DATE__ and __TIME__ work... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main () +main (void) { printf("(" __DATE__ " " __TIME__ ")"); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DATE_TIME 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_DATE_TIME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((unused)) is allowed" >&5 -$as_echo_n "checking whether __attribute__((unused)) is allowed... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((unused)) is allowed" >&5 +printf %s "checking whether __attribute__((unused)) is allowed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main () +main (void) { int x __attribute__((unused)); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ATTRIBUTE_UNUSED 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ATTRIBUTE_UNUSED 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" -if test "x$ac_cv_header_elf_h" = xyes; then : +ac_fn_c_check_header_compile "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" +if test "x$ac_cv_header_elf_h" = xyes +then : HAS_ELF=1 fi - if test "$HAS_ELF" = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5 -$as_echo_n "checking for main in -lelf... " >&6; } -if ${ac_cv_lib_elf_main+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5 +printf %s "checking for main in -lelf... " >&6; } +if test ${ac_cv_lib_elf_main+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lelf $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11081,28 +11701,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main () +main (void) { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_elf_main=yes -else +else $as_nop ac_cv_lib_elf_main=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5 -$as_echo "$ac_cv_lib_elf_main" >&6; } -if test "x$ac_cv_lib_elf_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBELF 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5 +printf "%s\n" "$ac_cv_lib_elf_main" >&6; } +if test "x$ac_cv_lib_elf_main" = xyes +then : + printf "%s\n" "#define HAVE_LIBELF 1" >>confdefs.h LIBS="-lelf $LIBS" @@ -11112,19 +11732,20 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval \${$as_ac_Header+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +printf %s "checking for $ac_hdr that defines DIR... " >&6; } +if eval test \${$as_ac_Header+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <$ac_hdr> int -main () +main (void) { if ((DIR *) 0) return 0; @@ -11132,19 +11753,21 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$as_ac_Header=yes" -else +else $as_nop eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$as_ac_Header - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF ac_header_dirent=$ac_hdr; break @@ -11153,11 +11776,12 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11165,56 +11789,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' dir; do +for ac_lib in '' dir +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11222,46 +11849,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' x; do +for ac_lib in '' x +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -11270,134 +11899,352 @@ fi if test $ac_cv_header_sys_wait_h = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that defines union wait" >&5 -$as_echo_n "checking for sys/wait.h that defines union wait... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that defines union wait" >&5 +printf %s "checking for sys/wait.h that defines union wait... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/wait.h> int -main () +main (void) { union wait xx, yy; xx = yy ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h + + printf "%s\n" "#define HAVE_UNION_WAIT 1" >>confdefs.h + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = xyes +then : + printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_select_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_utsname_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "termcap.h" "ac_cv_header_termcap_h" "$ac_includes_default" +if test "x$ac_cv_header_termcap_h" = xyes +then : + printf "%s\n" "#define HAVE_TERMCAP_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sgtty.h" "ac_cv_header_sgtty_h" "$ac_includes_default" +if test "x$ac_cv_header_sgtty_h" = xyes +then : + printf "%s\n" "#define HAVE_SGTTY_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ioctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_time_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_types_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default" +if test "x$ac_cv_header_termio_h" = xyes +then : + printf "%s\n" "#define HAVE_TERMIO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" +if test "x$ac_cv_header_iconv_h" = xyes +then : + printf "%s\n" "#define HAVE_ICONV_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_inttypes_h" = xyes +then : + printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_langinfo_h" = xyes +then : + printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default" +if test "x$ac_cv_header_math_h" = xyes +then : + printf "%s\n" "#define HAVE_MATH_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default" +if test "x$ac_cv_header_stropts_h" = xyes +then : + printf "%s\n" "#define HAVE_STROPTS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" +if test "x$ac_cv_header_errno_h" = xyes +then : + printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_resource_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/systeminfo.h" "ac_cv_header_sys_systeminfo_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_systeminfo_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = xyes +then : + printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/stream.h" "ac_cv_header_sys_stream_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_stream_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STREAM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" +if test "x$ac_cv_header_termios_h" = xyes +then : + printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "libc.h" "ac_cv_header_libc_h" "$ac_includes_default" +if test "x$ac_cv_header_libc_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBC_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_statfs_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default" +if test "x$ac_cv_header_poll_h" = xyes +then : + printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_poll_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default" +if test "x$ac_cv_header_pwd_h" = xyes +then : + printf "%s\n" "#define HAVE_PWD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default" +if test "x$ac_cv_header_utime_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_param_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/ptms.h" "ac_cv_header_sys_ptms_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ptms_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PTMS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default" +if test "x$ac_cv_header_libgen_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBGEN_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "util/debug.h" "ac_cv_header_util_debug_h" "$ac_includes_default" +if test "x$ac_cv_header_util_debug_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIL_DEBUG_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "util/msg18n.h" "ac_cv_header_util_msg18n_h" "$ac_includes_default" +if test "x$ac_cv_header_util_msg18n_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIL_MSG18N_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "frame.h" "ac_cv_header_frame_h" "$ac_includes_default" +if test "x$ac_cv_header_frame_h" = xyes +then : + printf "%s\n" "#define HAVE_FRAME_H 1" >>confdefs.h - $as_echo "#define HAVE_UNION_WAIT 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_acl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_ACL_H 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -for ac_header in stdint.h stdlib.h string.h \ - sys/select.h sys/utsname.h termcap.h fcntl.h \ - sgtty.h sys/ioctl.h sys/time.h sys/types.h \ - termio.h iconv.h inttypes.h langinfo.h math.h \ - unistd.h stropts.h errno.h sys/resource.h \ - sys/systeminfo.h locale.h sys/stream.h termios.h \ - libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ - utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ - util/debug.h util/msg18n.h frame.h sys/acl.h \ - sys/access.h sys/sysinfo.h wchar.h wctype.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +fi +ac_fn_c_check_header_compile "$LINENO" "sys/access.h" "ac_cv_header_sys_access_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_access_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_ACCESS_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysinfo_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" +if test "x$ac_cv_header_wchar_h" = xyes +then : + printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "wctype.h" "ac_cv_header_wctype_h" "$ac_includes_default" +if test "x$ac_cv_header_wctype_h" = xyes +then : + printf "%s\n" "#define HAVE_WCTYPE_H 1" >>confdefs.h + +fi -for ac_header in sys/ptem.h -do : - ac_fn_c_check_header_compile "$LINENO" "sys/ptem.h" "ac_cv_header_sys_ptem_h" "#if defined HAVE_SYS_STREAM_H +ac_fn_c_check_header_compile "$LINENO" "sys/ptem.h" "ac_cv_header_sys_ptem_h" "#if defined HAVE_SYS_STREAM_H # include <sys/stream.h> #endif " -if test "x$ac_cv_header_sys_ptem_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_PTEM_H 1 -_ACEOF +if test "x$ac_cv_header_sys_ptem_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PTEM_H 1" >>confdefs.h fi -done - -for ac_header in sys/sysctl.h -do : - ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if defined HAVE_SYS_PARAM_H +ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if defined HAVE_SYS_PARAM_H # include <sys/param.h> #endif " -if test "x$ac_cv_header_sys_sysctl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_SYSCTL_H 1 -_ACEOF +if test "x$ac_cv_header_sys_sysctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSCTL_H 1" >>confdefs.h fi -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_np.h" >&5 -$as_echo_n "checking for pthread_np.h... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_np.h" >&5 +printf %s "checking for pthread_np.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> #include <pthread_np.h> int -main () +main (void) { int i; i = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PTHREAD_NP_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_PTHREAD_NP_H 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -for ac_header in strings.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" -if test "x$ac_cv_header_strings_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRINGS_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" +if test "x$ac_cv_header_strings_h" = xyes +then : + printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h fi -done - if test "x$MACOS_X" = "xyes"; then - $as_echo "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h + printf "%s\n" "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h else -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if strings.h can be included after string.h" >&5 -$as_echo_n "checking if strings.h can be included after string.h... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strings.h can be included after string.h" >&5 +printf %s "checking if strings.h can be included after string.h... " >&6; } cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11418,32 +12265,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { int i; i = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - $as_echo "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + printf "%s\n" "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS=$cppflags_save fi if test $ac_cv_c_compiler_gnu = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -$as_echo_n "checking whether $CC needs -traditional... " >&6; } -if ${ac_cv_prog_gcc_traditional+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 +printf %s "checking whether $CC needs -traditional... " >&6; } +if test ${ac_cv_prog_gcc_traditional+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_pattern="Autoconf.*'x'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11451,12 +12300,13 @@ else Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes -else +else $as_nop ac_cv_prog_gcc_traditional=no fi -rm -f conftest* +rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -11466,30 +12316,32 @@ rm -f conftest* Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes fi -rm -f conftest* +rm -rf conftest* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -$as_echo "$ac_cv_prog_gcc_traditional" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 +printf "%s\n" "$ac_cv_prog_gcc_traditional" >&6; } if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +printf %s "checking for an ANSI C-conforming const... " >&6; } +if test ${ac_cv_c_const+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __cplusplus @@ -11502,7 +12354,7 @@ main () /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. + /* IBM XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -11530,7 +12382,7 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ struct s { int j; const int *ap[3]; } bx; struct s *b = &bx; b->j = 5; @@ -11546,31 +12398,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_const=yes -else +else $as_nop ac_cv_c_const=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +printf "%s\n" "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -$as_echo "#define const /**/" >>confdefs.h +printf "%s\n" "#define const /**/" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 -$as_echo_n "checking for working volatile... " >&6; } -if ${ac_cv_c_volatile+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 +printf %s "checking for working volatile... " >&6; } +if test ${ac_cv_c_volatile+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { volatile int x; @@ -11580,92 +12434,118 @@ return !x && !y; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_volatile=yes -else +else $as_nop ac_cv_c_volatile=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 -$as_echo "$ac_cv_c_volatile" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 +printf "%s\n" "$ac_cv_c_volatile" >&6; } if test $ac_cv_c_volatile = no; then -$as_echo "#define volatile /**/" >>confdefs.h +printf "%s\n" "#define volatile /**/" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = xyes; then : +if test "x$ac_cv_type_mode_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF +printf "%s\n" "#define mode_t int" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = xyes; then : +if test "x$ac_cv_type_off_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF +printf "%s\n" "#define off_t long int" >>confdefs.h fi -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : -else + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" +if test "x$ac_cv_type_pid_t" = xyes +then : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + +int +main (void) +{ + + ; + return 0; +} -cat >>confdefs.h <<_ACEOF -#define pid_t int _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_pid_type='int' +else $as_nop + ac_pid_type='__int64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h + fi + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : +if test "x$ac_cv_type_size_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +printf "%s\n" "#define size_t unsigned int" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if ${ac_cv_type_uid_t+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +printf %s "checking for uid_t in sys/types.h... " >&6; } +if test ${ac_cv_type_uid_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then : + $EGREP "uid_t" >/dev/null 2>&1 +then : ac_cv_type_uid_t=yes -else +else $as_nop ac_cv_type_uid_t=no fi -rm -f conftest* +rm -rf conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -$as_echo "$ac_cv_type_uid_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +printf "%s\n" "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then -$as_echo "#define uid_t int" >>confdefs.h +printf "%s\n" "#define uid_t int" >>confdefs.h -$as_echo "#define gid_t int" >>confdefs.h +printf "%s\n" "#define gid_t int" >>confdefs.h fi @@ -11674,78 +12554,50 @@ case $ac_cv_c_uint32_t in #( no|yes) ;; #( *) -$as_echo "#define _UINT32_T 1" >>confdefs.h +printf "%s\n" "#define _UINT32_T 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define uint32_t $ac_cv_c_uint32_t -_ACEOF +printf "%s\n" "#define uint32_t $ac_cv_c_uint32_t" >>confdefs.h ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -#include <sys/time.h> -#include <time.h> -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h +# Obsolete code to be removed. +if test $ac_cv_header_sys_time_h = yes; then + +printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi +# End of obsolete code. ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default" -if test "x$ac_cv_type_ino_t" = xyes; then : +if test "x$ac_cv_type_ino_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define ino_t long -_ACEOF +printf "%s\n" "#define ino_t long" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "dev_t" "ac_cv_type_dev_t" "$ac_includes_default" -if test "x$ac_cv_type_dev_t" = xyes; then : +if test "x$ac_cv_type_dev_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define dev_t unsigned -_ACEOF +printf "%s\n" "#define dev_t unsigned" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +printf %s "checking whether byte ordering is bigendian... " >&6; } +if test ${ac_cv_c_bigendian+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11756,7 +12608,8 @@ else typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -11780,7 +12633,7 @@ if ac_fn_c_try_compile "$LINENO"; then : fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11789,7 +12642,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include <sys/param.h> int -main () +main (void) { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -11801,7 +12654,8 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11809,7 +12663,7 @@ if ac_fn_c_try_compile "$LINENO"; then : #include <sys/param.h> int -main () +main (void) { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -11819,14 +12673,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -11835,7 +12690,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include <limits.h> int -main () +main (void) { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -11845,14 +12700,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <limits.h> int -main () +main (void) { #ifndef _BIG_ENDIAN not big endian @@ -11862,31 +12718,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -short int ascii_mm[] = +unsigned short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = + unsigned short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - short int ebcdic_ii[] = + unsigned short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = + unsigned short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -11894,14 +12752,15 @@ short int ascii_mm[] = extern int foo; int -main () +main (void) { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -11914,13 +12773,13 @@ if ac_fn_c_try_compile "$LINENO"; then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { /* Are we little or big endian? From Harbison&Steele. */ @@ -11936,9 +12795,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_c_bigendian=no -else +else $as_nop ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -11947,17 +12807,17 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +printf "%s\n" "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h + printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -11965,32 +12825,34 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +printf %s "checking for inline... " >&6; } +if test ${ac_cv_c_inline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } +static $ac_kw foo_t static_foo (void) {return 0; } +$ac_kw foo_t foo (void) {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +printf "%s\n" "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -12008,11 +12870,11 @@ _ACEOF esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5 -$as_echo_n "checking for rlim_t... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5 +printf %s "checking for rlim_t... " >&6; } if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_rlim_t" >&5 -$as_echo "(cached) $ac_cv_type_rlim_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_rlim_t" >&5 +printf "%s\n" "(cached) $ac_cv_type_rlim_t" >&6; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12028,15 +12890,16 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : + $EGREP "(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]" >/dev/null 2>&1 +then : ac_cv_type_rlim_t=yes -else +else $as_nop ac_cv_type_rlim_t=no fi -rm -f conftest* +rm -rf conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_rlim_t" >&5 -$as_echo "$ac_cv_type_rlim_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_rlim_t" >&5 +printf "%s\n" "$ac_cv_type_rlim_t" >&6; } fi if test $ac_cv_type_rlim_t = no; then cat >> confdefs.h <<\EOF @@ -12044,11 +12907,11 @@ if test $ac_cv_type_rlim_t = no; then EOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stack_t" >&5 -$as_echo_n "checking for stack_t... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stack_t" >&5 +printf %s "checking for stack_t... " >&6; } if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_stack_t" >&5 -$as_echo "(cached) $ac_cv_type_stack_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_stack_t" >&5 +printf "%s\n" "(cached) $ac_cv_type_stack_t" >&6; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12062,15 +12925,16 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "stack_t" >/dev/null 2>&1; then : + $EGREP "stack_t" >/dev/null 2>&1 +then : ac_cv_type_stack_t=yes -else +else $as_nop ac_cv_type_stack_t=no fi -rm -f conftest* +rm -rf conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_stack_t" >&5 -$as_echo "$ac_cv_type_stack_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_stack_t" >&5 +printf "%s\n" "$ac_cv_type_stack_t" >&6; } fi if test $ac_cv_type_stack_t = no; then cat >> confdefs.h <<\EOF @@ -12078,8 +12942,8 @@ if test $ac_cv_type_stack_t = no; then EOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stack_t has an ss_base field" >&5 -$as_echo_n "checking whether stack_t has an ss_base field... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stack_t has an ss_base field" >&5 +printf %s "checking whether stack_t has an ss_base field... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12092,72 +12956,76 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include "confdefs.h" int -main () +main (void) { stack_t sigstk; sigstk.ss_base = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SS_BASE 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SS_BASE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext olibs="$LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-tlib argument" >&5 -$as_echo_n "checking --with-tlib argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-tlib argument" >&5 +printf %s "checking --with-tlib argument... " >&6; } # Check whether --with-tlib was given. -if test "${with_tlib+set}" = set; then : +if test ${with_tlib+y} +then : withval=$with_tlib; fi if test -n "$with_tlib"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tlib" >&5 -$as_echo "$with_tlib" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tlib" >&5 +printf "%s\n" "$with_tlib" >&6; } LIBS="$LIBS -l$with_tlib" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking with $with_tlib library" >&5 -$as_echo_n "checking for linking with $with_tlib library... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for linking with $with_tlib library" >&5 +printf %s "checking for linking with $with_tlib library... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } -else +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +printf "%s\n" "OK" >&6; } +else $as_nop as_fn_error $? "FAILED" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext olibs="$LIBS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5 -$as_echo "empty: automatic terminal library selection" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5 +printf "%s\n" "empty: automatic terminal library selection" >&6; } case "$vim_cv_uname_output" in OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";; *) tlibs="tinfo ncurses termlib termcap curses";; esac for libname in $tlibs; do - as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${libname}" >&5 -$as_echo_n "checking for tgetent in -l${libname}... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_Lib=`printf "%s\n" "ac_cv_lib_${libname}""_tgetent" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${libname}" >&5 +printf %s "checking for tgetent in -l${libname}... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-l${libname} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12166,33 +13034,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 tgetent (); int -main () +main (void) { return tgetent (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$as_ac_Lib=yes" -else +else $as_nop eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_LIB${libname}" | $as_tr_cpp` 1 _ACEOF LIBS="-l${libname} $LIBS" @@ -12200,9 +13067,10 @@ _ACEOF fi if test "x$olibs" != "x$LIBS"; then - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : res="FAIL" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12215,9 +13083,10 @@ else #endif int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : res="OK" -else +else $as_nop res="FAIL" fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -12227,55 +13096,58 @@ fi if test "$res" = "OK"; then break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libname library is not usable" >&5 -$as_echo "$libname library is not usable" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libname library is not usable" >&5 +printf "%s\n" "$libname library is not usable" >&6; } LIBS="$olibs" fi done if test "x$olibs" = "x$LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no terminal library found" >&5 -$as_echo "no terminal library found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no terminal library found" >&5 +printf "%s\n" "no terminal library found" >&6; } fi fi if test "x$olibs" = "x$LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent()" >&5 -$as_echo_n "checking for tgetent()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent()" >&5 +printf %s "checking for tgetent()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int tgetent(char *, const char *); int -main () +main (void) { char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop as_fn_error $? "NOT FOUND! You need to install a terminal library; for example ncurses. On Linux that would be the libncurses-dev package. Or specify the name of the library with --with-tlib." "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we talk terminfo" >&5 -$as_echo_n "checking whether we talk terminfo... " >&6; } -if ${vim_cv_terminfo+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we talk terminfo" >&5 +printf %s "checking whether we talk terminfo... " >&6; } +if test ${vim_cv_terminfo+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_terminfo'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12294,11 +13166,12 @@ int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_terminfo=no -else +else $as_nop vim_cv_terminfo=yes @@ -12309,25 +13182,27 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_terminfo" >&5 -$as_echo "$vim_cv_terminfo" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_terminfo" >&5 +printf "%s\n" "$vim_cv_terminfo" >&6; } if test "x$vim_cv_terminfo" = "xyes" ; then - $as_echo "#define TERMINFO 1" >>confdefs.h + printf "%s\n" "#define TERMINFO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5 -$as_echo_n "checking what tgetent() returns for an unknown terminal... " >&6; } -if ${vim_cv_tgetent+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5 +printf %s "checking what tgetent() returns for an unknown terminal... " >&6; } +if test ${vim_cv_tgetent+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "failed to compile test program." "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12343,11 +13218,12 @@ int main() {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_tgetent=zero -else +else $as_nop vim_cv_tgetent=non-zero @@ -12358,16 +13234,16 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgetent" >&5 -$as_echo "$vim_cv_tgetent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgetent" >&5 +printf "%s\n" "$vim_cv_tgetent" >&6; } if test "x$vim_cv_tgetent" = "xzero" ; then - $as_echo "#define TGETENT_ZERO_ERR 0" >>confdefs.h + printf "%s\n" "#define TGETENT_ZERO_ERR 0" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains ospeed" >&5 -$as_echo_n "checking whether termcap.h contains ospeed... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains ospeed" >&5 +printf %s "checking whether termcap.h contains ospeed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12376,22 +13252,23 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { ospeed = 20000 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_OSPEED 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_OSPEED 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ospeed can be extern" >&5 -$as_echo_n "checking whether ospeed can be extern... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ospeed can be extern" >&5 +printf %s "checking whether ospeed can be extern... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12401,30 +13278,31 @@ $as_echo_n "checking whether ospeed can be extern... " >&6; } extern short ospeed; int -main () +main (void) { ospeed = 20000 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define OSPEED_EXTERN 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define OSPEED_EXTERN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains UP, BC and PC" >&5 -$as_echo_n "checking whether termcap.h contains UP, BC and PC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains UP, BC and PC" >&5 +printf %s "checking whether termcap.h contains UP, BC and PC... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12433,22 +13311,23 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { if (UP == 0 && BC == 0) PC = 1 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_UP_BC_PC 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_UP_BC_PC 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UP, BC and PC can be extern" >&5 -$as_echo_n "checking whether UP, BC and PC can be extern... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UP, BC and PC can be extern" >&5 +printf %s "checking whether UP, BC and PC can be extern... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12458,30 +13337,31 @@ $as_echo_n "checking whether UP, BC and PC can be extern... " >&6; } extern char *UP, *BC, PC; int -main () +main (void) { if (UP == 0 && BC == 0) PC = 1 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define UP_BC_PC_EXTERN 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define UP_BC_PC_EXTERN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tputs() uses outfuntype" >&5 -$as_echo_n "checking whether tputs() uses outfuntype... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether tputs() uses outfuntype" >&5 +printf %s "checking whether tputs() uses outfuntype... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12490,25 +13370,26 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { extern int xx(); tputs("test", 1, (outfuntype)xx) ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_OUTFUNTYPE 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_OUTFUNTYPE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether del_curterm() can be used" >&5 -$as_echo_n "checking whether del_curterm() can be used... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether del_curterm() can be used" >&5 +printf %s "checking whether del_curterm() can be used... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12518,26 +13399,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include <term.h> int -main () +main (void) { if (cur_term) del_curterm(cur_term); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DEL_CURTERM 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_DEL_CURTERM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether sys/select.h and sys/time.h may both be included... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5 +printf %s "checking whether sys/select.h and sys/time.h may both be included... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12545,39 +13427,40 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include <sys/time.h> #include <sys/select.h> int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 -$as_echo_n "checking for /dev/ptc... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +printf %s "checking for /dev/ptc... " >&6; } if test -r /dev/ptc; then - $as_echo "#define HAVE_DEV_PTC 1" >>confdefs.h + printf "%s\n" "#define HAVE_DEV_PTC 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys" >&5 -$as_echo_n "checking for SVR4 ptys... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys" >&5 +printf %s "checking for SVR4 ptys... " >&6; } if test -c /dev/ptmx ; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12588,7 +13471,7 @@ int unlockpt(int); int grantpt(int); int -main () +main (void) { ptsname(0); @@ -12598,23 +13481,24 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SVR4_PTYS 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SVR4_PTYS 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ptyranges" >&5 -$as_echo_n "checking for ptyranges... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ptyranges" >&5 +printf %s "checking for ptyranges... " >&6; } if test -d /dev/ptym ; then pdir='/dev/ptym' else @@ -12628,34 +13512,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes" >/dev/null 2>&1 +then : ptys=`echo /dev/ptyp??` -else +else $as_nop ptys=`echo $pdir/pty??` fi -rm -f conftest* +rm -rf conftest* if test "$ptys" != "$pdir/pty??" ; then p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` - cat >>confdefs.h <<_ACEOF -#define PTYRANGE0 "$p0" -_ACEOF + printf "%s\n" "#define PTYRANGE0 \"$p0\"" >>confdefs.h - cat >>confdefs.h <<_ACEOF -#define PTYRANGE1 "$p1" -_ACEOF + printf "%s\n" "#define PTYRANGE1 \"$p1\"" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $p0 / $p1" >&5 -$as_echo "$p0 / $p1" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $p0 / $p1" >&5 +printf "%s\n" "$p0 / $p1" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: don't know" >&5 -$as_echo "don't know" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: don't know" >&5 +printf "%s\n" "don't know" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigcontext" >&5 -$as_echo_n "checking for struct sigcontext... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sigcontext" >&5 +printf %s "checking for struct sigcontext... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12667,35 +13548,38 @@ test_sig() return 1; } int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_SIGCONTEXT 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_SIGCONTEXT 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking getcwd implementation is broken" >&5 -$as_echo_n "checking getcwd implementation is broken... " >&6; } -if ${vim_cv_getcwd_broken+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking getcwd implementation is broken" >&5 +printf %s "checking getcwd implementation is broken... " >&6; } +if test ${vim_cv_getcwd_broken+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_getcwd_broken'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12713,11 +13597,12 @@ int main() } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_getcwd_broken=no -else +else $as_nop vim_cv_getcwd_broken=yes @@ -12728,62 +13613,357 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_getcwd_broken" >&5 -$as_echo "$vim_cv_getcwd_broken" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_getcwd_broken" >&5 +printf "%s\n" "$vim_cv_getcwd_broken" >&6; } if test "x$vim_cv_getcwd_broken" = "xyes" ; then - $as_echo "#define BAD_GETCWD 1" >>confdefs.h + printf "%s\n" "#define BAD_GETCWD 1" >>confdefs.h - for ac_func in getwd -do : ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd" -if test "x$ac_cv_func_getwd" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETWD 1 -_ACEOF +if test "x$ac_cv_func_getwd" = xyes +then : + printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h fi -done fi -for ac_func in fchdir fchown fchmod fsync getcwd getpseudotty \ - getpwent getpwnam getpwuid getrlimit gettimeofday localtime_r lstat \ - memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \ - getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \ - sigprocmask sigvec strcasecmp strcoll strerror strftime stricmp strncasecmp \ - strnicmp strpbrk strptime strtol tgetent towlower towupper iswupper \ - tzset usleep utime utimes mblen ftruncate unsetenv posix_openpt -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "fchdir" "ac_cv_func_fchdir" +if test "x$ac_cv_func_fchdir" = xyes +then : + printf "%s\n" "#define HAVE_FCHDIR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fchown" "ac_cv_func_fchown" +if test "x$ac_cv_func_fchown" = xyes +then : + printf "%s\n" "#define HAVE_FCHOWN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fchmod" "ac_cv_func_fchmod" +if test "x$ac_cv_func_fchmod" = xyes +then : + printf "%s\n" "#define HAVE_FCHMOD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fsync" "ac_cv_func_fsync" +if test "x$ac_cv_func_fsync" = xyes +then : + printf "%s\n" "#define HAVE_FSYNC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" +if test "x$ac_cv_func_getcwd" = xyes +then : + printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpseudotty" "ac_cv_func_getpseudotty" +if test "x$ac_cv_func_getpseudotty" = xyes +then : + printf "%s\n" "#define HAVE_GETPSEUDOTTY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpwent" "ac_cv_func_getpwent" +if test "x$ac_cv_func_getpwent" = xyes +then : + printf "%s\n" "#define HAVE_GETPWENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpwnam" "ac_cv_func_getpwnam" +if test "x$ac_cv_func_getpwnam" = xyes +then : + printf "%s\n" "#define HAVE_GETPWNAM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpwuid" "ac_cv_func_getpwuid" +if test "x$ac_cv_func_getpwuid" = xyes +then : + printf "%s\n" "#define HAVE_GETPWUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit" +if test "x$ac_cv_func_getrlimit" = xyes +then : + printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = xyes +then : + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" +if test "x$ac_cv_func_localtime_r" = xyes +then : + printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "lstat" "ac_cv_func_lstat" +if test "x$ac_cv_func_lstat" = xyes +then : + printf "%s\n" "#define HAVE_LSTAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset" +if test "x$ac_cv_func_memset" = xyes +then : + printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp" +if test "x$ac_cv_func_mkdtemp" = xyes +then : + printf "%s\n" "#define HAVE_MKDTEMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" +if test "x$ac_cv_func_nanosleep" = xyes +then : + printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "opendir" "ac_cv_func_opendir" +if test "x$ac_cv_func_opendir" = xyes +then : + printf "%s\n" "#define HAVE_OPENDIR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes +then : + printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "qsort" "ac_cv_func_qsort" +if test "x$ac_cv_func_qsort" = xyes +then : + printf "%s\n" "#define HAVE_QSORT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "readlink" "ac_cv_func_readlink" +if test "x$ac_cv_func_readlink" = xyes +then : + printf "%s\n" "#define HAVE_READLINK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" +if test "x$ac_cv_func_select" = xyes +then : + printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" +if test "x$ac_cv_func_setenv" = xyes +then : + printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid" +if test "x$ac_cv_func_getpgid" = xyes +then : + printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setpgid" "ac_cv_func_setpgid" +if test "x$ac_cv_func_setpgid" = xyes +then : + printf "%s\n" "#define HAVE_SETPGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid" +if test "x$ac_cv_func_setsid" = xyes +then : + printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack" +if test "x$ac_cv_func_sigaltstack" = xyes +then : + printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigstack" "ac_cv_func_sigstack" +if test "x$ac_cv_func_sigstack" = xyes +then : + printf "%s\n" "#define HAVE_SIGSTACK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigset" "ac_cv_func_sigset" +if test "x$ac_cv_func_sigset" = xyes +then : + printf "%s\n" "#define HAVE_SIGSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp" +if test "x$ac_cv_func_sigsetjmp" = xyes +then : + printf "%s\n" "#define HAVE_SIGSETJMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +if test "x$ac_cv_func_sigaction" = xyes +then : + printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" +if test "x$ac_cv_func_sigprocmask" = xyes +then : + printf "%s\n" "#define HAVE_SIGPROCMASK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec" +if test "x$ac_cv_func_sigvec" = xyes +then : + printf "%s\n" "#define HAVE_SIGVEC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strcoll" "ac_cv_func_strcoll" +if test "x$ac_cv_func_strcoll" = xyes +then : + printf "%s\n" "#define HAVE_STRCOLL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +if test "x$ac_cv_func_strerror" = xyes +then : + printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +if test "x$ac_cv_func_strftime" = xyes +then : + printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "stricmp" "ac_cv_func_stricmp" +if test "x$ac_cv_func_stricmp" = xyes +then : + printf "%s\n" "#define HAVE_STRICMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" +if test "x$ac_cv_func_strncasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strnicmp" "ac_cv_func_strnicmp" +if test "x$ac_cv_func_strnicmp" = xyes +then : + printf "%s\n" "#define HAVE_STRNICMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk" +if test "x$ac_cv_func_strpbrk" = xyes +then : + printf "%s\n" "#define HAVE_STRPBRK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" +if test "x$ac_cv_func_strptime" = xyes +then : + printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" +if test "x$ac_cv_func_strtol" = xyes +then : + printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "tgetent" "ac_cv_func_tgetent" +if test "x$ac_cv_func_tgetent" = xyes +then : + printf "%s\n" "#define HAVE_TGETENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" +if test "x$ac_cv_func_towlower" = xyes +then : + printf "%s\n" "#define HAVE_TOWLOWER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "towupper" "ac_cv_func_towupper" +if test "x$ac_cv_func_towupper" = xyes +then : + printf "%s\n" "#define HAVE_TOWUPPER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "iswupper" "ac_cv_func_iswupper" +if test "x$ac_cv_func_iswupper" = xyes +then : + printf "%s\n" "#define HAVE_ISWUPPER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset" +if test "x$ac_cv_func_tzset" = xyes +then : + printf "%s\n" "#define HAVE_TZSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" +if test "x$ac_cv_func_usleep" = xyes +then : + printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime" +if test "x$ac_cv_func_utime" = xyes +then : + printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes" +if test "x$ac_cv_func_utimes" = xyes +then : + printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mblen" "ac_cv_func_mblen" +if test "x$ac_cv_func_mblen" = xyes +then : + printf "%s\n" "#define HAVE_MBLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" +if test "x$ac_cv_func_ftruncate" = xyes +then : + printf "%s\n" "#define HAVE_FTRUNCATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" +if test "x$ac_cv_func_unsetenv" = xyes +then : + printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "posix_openpt" "ac_cv_func_posix_openpt" +if test "x$ac_cv_func_posix_openpt" = xyes +then : + printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h fi -done -for ac_header in sys/select.h sys/socket.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 -$as_echo_n "checking types of arguments for select... " >&6; } -if ${ac_cv_func_select_args+:} false; then : - $as_echo_n "(cached) " >&6 -else - for ac_arg234 in 'fd_set *' 'int *' 'void *'; do +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 +printf %s "checking types of arguments for select... " >&6; } +if test ${ac_cv_func_select_args+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_func_select_args='int,int *,struct timeval *' +for ac_arg234 in 'fd_set *' 'int *' 'void *'; do for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12797,7 +13977,7 @@ $ac_includes_default #endif int -main () +main (void) { extern int select ($ac_arg1, $ac_arg234, $ac_arg234, $ac_arg234, @@ -12806,52 +13986,46 @@ extern int select ($ac_arg1, return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done done done -# Provide a safe default value. -: "${ac_cv_func_select_args=int,int *,struct timeval *}" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 -$as_echo "$ac_cv_func_select_args" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 +printf "%s\n" "$ac_cv_func_select_args" >&6; } ac_save_IFS=$IFS; IFS=',' set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` IFS=$ac_save_IFS shift -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG1 $1 -_ACEOF +printf "%s\n" "#define SELECT_TYPE_ARG1 $1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG234 ($2) -_ACEOF +printf "%s\n" "#define SELECT_TYPE_ARG234 ($2)" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG5 ($3) -_ACEOF +printf "%s\n" "#define SELECT_TYPE_ARG5 ($3)" >>confdefs.h -rm -f conftest* +rm -rf conftest* -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if ${ac_cv_sys_largefile_source+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_source+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> /* for off_t */ #include <stdio.h> int -main () +main (void) { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -12859,10 +14033,11 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_sys_largefile_source=no; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12870,7 +14045,7 @@ rm -f core conftest.err conftest.$ac_objext \ #include <sys/types.h> /* for off_t */ #include <stdio.h> int -main () +main (void) { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -12878,23 +14053,22 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_sys_largefile_source=1; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_cv_sys_largefile_source=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } case $ac_cv_sys_largefile_source in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF +printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h ;; esac rm -rf conftest* @@ -12904,23 +14078,25 @@ rm -rf conftest* # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. if test $ac_cv_sys_largefile_source != unknown; then -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h +printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h fi # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : +if test ${enable_largefile+y} +then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -12934,44 +14110,47 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12980,22 +14159,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -13004,43 +14184,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13049,22 +14229,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -13073,71 +14254,69 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h ;; esac rm -rf conftest* fi - - fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-canberra argument" >&5 -$as_echo_n "checking --enable-canberra argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-canberra argument" >&5 +printf %s "checking --enable-canberra argument... " >&6; } # Check whether --enable-canberra was given. -if test "${enable_canberra+set}" = set; then : +if test ${enable_canberra+y} +then : enableval=$enable_canberra; -else +else $as_nop enable_canberra="maybe" fi if test "$enable_canberra" = "maybe"; then if test "$features" = "huge"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 -$as_echo "Defaulting to yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 +printf "%s\n" "Defaulting to yes" >&6; } enable_canberra="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 -$as_echo "Defaulting to no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 +printf "%s\n" "Defaulting to no" >&6; } enable_canberra="no" fi else if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny features" >&5 -$as_echo "cannot use sound with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny features" >&5 +printf "%s\n" "cannot use sound with tiny features" >&6; } enable_canberra="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5 -$as_echo "$enable_canberra" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5 +printf "%s\n" "$enable_canberra" >&6; } fi fi if test "$enable_canberra" = "yes"; then @@ -13149,8 +14328,8 @@ if test "$enable_canberra" = "yes"; then canberra_lib=-lcanberra canberra_cflags=-D_REENTRANT fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcanberra" >&5 -$as_echo_n "checking for libcanberra... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcanberra" >&5 +printf %s "checking for libcanberra... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then @@ -13163,7 +14342,7 @@ $as_echo_n "checking for libcanberra... " >&6; } # include <canberra.h> int -main () +main (void) { ca_context *hello; @@ -13172,41 +14351,43 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_CANBERRA 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_CANBERRA 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; try installing libcanberra-dev" >&5 -$as_echo "no; try installing libcanberra-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no; try installing libcanberra-dev" >&5 +printf "%s\n" "no; try installing libcanberra-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-libsodium argument" >&5 -$as_echo_n "checking --enable-libsodium argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-libsodium argument" >&5 +printf %s "checking --enable-libsodium argument... " >&6; } # Check whether --enable-libsodium was given. -if test "${enable_libsodium+set}" = set; then : +if test ${enable_libsodium+y} +then : enableval=$enable_libsodium; -else +else $as_nop enable_libsodium="maybe" fi if test "$enable_libsodium" = "maybe"; then if test "$features" = "huge"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 -$as_echo "Defaulting to yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 +printf "%s\n" "Defaulting to yes" >&6; } enable_libsodium="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 -$as_echo "Defaulting to no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 +printf "%s\n" "Defaulting to no" >&6; } enable_libsodium="no" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libsodium" >&5 -$as_echo "$enable_libsodium" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_libsodium" >&5 +printf "%s\n" "$enable_libsodium" >&6; } fi if test "$enable_libsodium" = "yes"; then if test "x$PKG_CONFIG" != "xno"; then @@ -13217,8 +14398,8 @@ if test "$enable_libsodium" = "yes"; then libsodium_lib=-lsodium libsodium_cflags= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium" >&5 -$as_echo_n "checking for libsodium... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium" >&5 +printf %s "checking for libsodium... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $libsodium_cflags" @@ -13229,7 +14410,7 @@ $as_echo_n "checking for libsodium... " >&6; } # include <sodium.h> int -main () +main (void) { printf("%d", sodium_init()); @@ -13237,15 +14418,16 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SODIUM 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SODIUM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; try installing libsodium-dev" >&5 -$as_echo "no; try installing libsodium-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no; try installing libsodium-dev" >&5 +printf "%s\n" "no; try installing libsodium-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext # MacVim: Hack to statically link against libsodium instead of dynamic link, as we can't distribute app bundles with @@ -13265,14 +14447,14 @@ printf "%s\n" "libsodium.a not found - keeping using -lsodium" >&6; }; fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blksize" >&5 -$as_echo_n "checking for st_blksize... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for st_blksize" >&5 +printf %s "checking for st_blksize... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/stat.h> int -main () +main (void) { struct stat st; int n; @@ -13283,27 +14465,30 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ST_BLKSIZE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create without -lrt" >&5 -$as_echo_n "checking for timer_create without -lrt... " >&6; } -if ${vim_cv_timer_create+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create without -lrt" >&5 +printf %s "checking for timer_create without -lrt... " >&6; } +if test ${vim_cv_timer_create+y} +then : + printf %s "(cached) " >&6 +else $as_nop -if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&5 -$as_echo "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&2;} +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&5 +printf "%s\n" "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&2;} -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13316,7 +14501,7 @@ else static void set_flag(union sigval sv) {} int -main () +main (void) { struct timespec ts; @@ -13332,9 +14517,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_timer_create=yes -else +else $as_nop vim_cv_timer_create=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13342,23 +14528,25 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create" >&5 -$as_echo "$vim_cv_timer_create" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create" >&5 +printf "%s\n" "$vim_cv_timer_create" >&6; } if test "x$vim_cv_timer_create" = "xno" ; then save_LIBS="$LIBS" LIBS="$LIBS -lrt" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create with -lrt" >&5 -$as_echo_n "checking for timer_create with -lrt... " >&6; } -if ${vim_cv_timer_create_with_lrt+:} false; then : - $as_echo_n "(cached) " >&6 -else - - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&5 -$as_echo "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&2;} - -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create with -lrt" >&5 +printf %s "checking for timer_create with -lrt... " >&6; } +if test ${vim_cv_timer_create_with_lrt+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&5 +printf "%s\n" "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&2;} + +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13371,7 +14559,7 @@ else static void set_flag(union sigval sv) {} int -main () +main (void) { struct timespec ts; @@ -13387,9 +14575,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_timer_create_with_lrt=yes -else +else $as_nop vim_cv_timer_create_with_lrt=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13397,34 +14586,36 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create_with_lrt" >&5 -$as_echo "$vim_cv_timer_create_with_lrt" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create_with_lrt" >&5 +printf "%s\n" "$vim_cv_timer_create_with_lrt" >&6; } LIBS="$save_LIBS" else vim_cv_timer_create_with_lrt=no fi if test "x$vim_cv_timer_create" = "xyes" ; then - $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h fi if test "x$vim_cv_timer_create_with_lrt" = "xyes" ; then - $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h LIBS="$LIBS -lrt" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5 -$as_echo_n "checking whether stat() ignores a trailing slash... " >&6; } -if ${vim_cv_stat_ignores_slash+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5 +printf %s "checking whether stat() ignores a trailing slash... " >&6; } +if test ${vim_cv_stat_ignores_slash+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_stat_ignores_slash'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13438,11 +14629,12 @@ else int main() {struct stat st; exit(stat("configure/", &st) != 0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_stat_ignores_slash=yes -else +else $as_nop vim_cv_stat_ignores_slash=no @@ -13453,19 +14645,20 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_stat_ignores_slash" >&5 -$as_echo "$vim_cv_stat_ignores_slash" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_stat_ignores_slash" >&5 +printf "%s\n" "$vim_cv_stat_ignores_slash" >&6; } if test "x$vim_cv_stat_ignores_slash" = "xyes" ; then - $as_echo "#define STAT_IGNORES_SLASH 1" >>confdefs.h + printf "%s\n" "#define STAT_IGNORES_SLASH 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanoseconds field of struct stat" >&5 -$as_echo_n "checking for nanoseconds field of struct stat... " >&6; } -if ${ac_cv_struct_st_mtim_nsec+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanoseconds field of struct stat" >&5 +printf %s "checking for nanoseconds field of struct stat... " >&6; } +if test ${ac_cv_struct_st_mtim_nsec+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_CPPFLAGS="$CPPFLAGS" ac_cv_struct_st_mtim_nsec=no # st_mtim.tv_nsec -- the usual case @@ -13482,33 +14675,32 @@ else #include <sys/types.h> #include <sys/stat.h> int -main () +main (void) { struct stat s; s.ST_MTIM_NSEC; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_struct_st_mtim_nsec=$ac_val; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done CPPFLAGS="$ac_save_CPPFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_st_mtim_nsec" >&5 -$as_echo "$ac_cv_struct_st_mtim_nsec" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_st_mtim_nsec" >&5 +printf "%s\n" "$ac_cv_struct_st_mtim_nsec" >&6; } if test $ac_cv_struct_st_mtim_nsec != no; then -cat >>confdefs.h <<_ACEOF -#define ST_MTIM_NSEC $ac_cv_struct_st_mtim_nsec -_ACEOF +printf "%s\n" "#define ST_MTIM_NSEC $ac_cv_struct_st_mtim_nsec" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open()" >&5 -$as_echo_n "checking for iconv_open()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv_open()" >&5 +printf %s "checking for iconv_open()... " >&6; } save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13519,18 +14711,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { iconv_open("fr", "to"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; with -liconv" >&5 -$as_echo "yes; with -liconv" >&6; }; $as_echo "#define HAVE_ICONV 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes; with -liconv" >&5 +printf "%s\n" "yes; with -liconv" >&6; }; printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h -else +else $as_nop LIBS="$save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13540,30 +14733,31 @@ else #endif int -main () +main (void) { iconv_open("fr", "to"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ICONV 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo(CODESET)" >&5 -$as_echo_n "checking for nl_langinfo(CODESET)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo(CODESET)" >&5 +printf %s "checking for nl_langinfo(CODESET)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13572,29 +14766,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { char *cs = nl_langinfo(CODESET); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_NL_LANGINFO_CODESET 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_NL_LANGINFO_CODESET 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtod in -lm" >&5 -$as_echo_n "checking for strtod in -lm... " >&6; } -if ${ac_cv_lib_m_strtod+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strtod in -lm" >&5 +printf %s "checking for strtod in -lm... " >&6; } +if test ${ac_cv_lib_m_strtod+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13603,41 +14799,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 strtod (); int -main () +main (void) { return strtod (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_m_strtod=yes -else +else $as_nop ac_cv_lib_m_strtod=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_strtod" >&5 -$as_echo "$ac_cv_lib_m_strtod" >&6; } -if test "x$ac_cv_lib_m_strtod" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_strtod" >&5 +printf "%s\n" "$ac_cv_lib_m_strtod" >&6; } +if test "x$ac_cv_lib_m_strtod" = xyes +then : + printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h LIBS="-lm $LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf()" >&5 -$as_echo_n "checking for isinf()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isinf()" >&5 +printf %s "checking for isinf()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13650,26 +14843,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { int r = isinf(1.11); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ISINF 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ISINF 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan()" >&5 -$as_echo_n "checking for isnan()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isnan()" >&5 +printf %s "checking for isnan()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13682,41 +14876,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { int r = isnan(1.11); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ISNAN 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ISNAN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-acl argument" >&5 -$as_echo_n "checking --disable-acl argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-acl argument" >&5 +printf %s "checking --disable-acl argument... " >&6; } # Check whether --enable-acl was given. -if test "${enable_acl+set}" = set; then : +if test ${enable_acl+y} +then : enableval=$enable_acl; -else +else $as_nop enable_acl="yes" fi if test "$enable_acl" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5 -$as_echo_n "checking for acl_get_file in -lposix1e... " >&6; } -if ${ac_cv_lib_posix1e_acl_get_file+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5 +printf %s "checking for acl_get_file in -lposix1e... " >&6; } +if test ${ac_cv_lib_posix1e_acl_get_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lposix1e $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13725,37 +14922,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 acl_get_file (); int -main () +main (void) { return acl_get_file (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_posix1e_acl_get_file=yes -else +else $as_nop ac_cv_lib_posix1e_acl_get_file=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix1e_acl_get_file" >&5 -$as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; } -if test "x$ac_cv_lib_posix1e_acl_get_file" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix1e_acl_get_file" >&5 +printf "%s\n" "$ac_cv_lib_posix1e_acl_get_file" >&6; } +if test "x$ac_cv_lib_posix1e_acl_get_file" = xyes +then : LIBS="$LIBS -lposix1e" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 -$as_echo_n "checking for acl_get_file in -lacl... " >&6; } -if ${ac_cv_lib_acl_acl_get_file+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 +printf %s "checking for acl_get_file in -lacl... " >&6; } +if test ${ac_cv_lib_acl_acl_get_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lacl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13764,36 +14961,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 acl_get_file (); int -main () +main (void) { return acl_get_file (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_acl_acl_get_file=yes -else +else $as_nop ac_cv_lib_acl_acl_get_file=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5 -$as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } -if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5 +printf "%s\n" "$ac_cv_lib_acl_acl_get_file" >&6; } +if test "x$ac_cv_lib_acl_acl_get_file" = xyes +then : LIBS="$LIBS -lacl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5 -$as_echo_n "checking for fgetxattr in -lattr... " >&6; } -if ${ac_cv_lib_attr_fgetxattr+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5 +printf %s "checking for fgetxattr in -lattr... " >&6; } +if test ${ac_cv_lib_attr_fgetxattr+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lattr $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13802,30 +14999,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 fgetxattr (); int -main () +main (void) { return fgetxattr (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_attr_fgetxattr=yes -else +else $as_nop ac_cv_lib_attr_fgetxattr=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5 -$as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } -if test "x$ac_cv_lib_attr_fgetxattr" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5 +printf "%s\n" "$ac_cv_lib_attr_fgetxattr" >&6; } +if test "x$ac_cv_lib_attr_fgetxattr" = xyes +then : LIBS="$LIBS -lattr" fi @@ -13834,8 +15030,8 @@ fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5 -$as_echo_n "checking for POSIX ACL support... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5 +printf %s "checking for POSIX ACL support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13845,7 +15041,7 @@ $as_echo_n "checking for POSIX ACL support... " >&6; } #endif acl_t acl; int -main () +main (void) { acl = acl_get_file("foo", ACL_TYPE_ACCESS); acl_set_file("foo", ACL_TYPE_ACCESS, acl); @@ -13854,22 +15050,24 @@ acl = acl_get_file("foo", ACL_TYPE_ACCESS); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_POSIX_ACL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_POSIX_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5 -$as_echo_n "checking for acl_get in -lsec... " >&6; } -if ${ac_cv_lib_sec_acl_get+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5 +printf %s "checking for acl_get in -lsec... " >&6; } +if test ${ac_cv_lib_sec_acl_get+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsec $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13878,35 +15076,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 acl_get (); int -main () +main (void) { return acl_get (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_sec_acl_get=yes -else +else $as_nop ac_cv_lib_sec_acl_get=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_acl_get" >&5 -$as_echo "$ac_cv_lib_sec_acl_get" >&6; } -if test "x$ac_cv_lib_sec_acl_get" = xyes; then : - LIBS="$LIBS -lsec"; $as_echo "#define HAVE_SOLARIS_ZFS_ACL 1" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_acl_get" >&5 +printf "%s\n" "$ac_cv_lib_sec_acl_get" >&6; } +if test "x$ac_cv_lib_sec_acl_get" = xyes +then : + LIBS="$LIBS -lsec"; printf "%s\n" "#define HAVE_SOLARIS_ZFS_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris ACL support" >&5 -$as_echo_n "checking for Solaris ACL support... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Solaris ACL support" >&5 +printf %s "checking for Solaris ACL support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13914,7 +15111,7 @@ $as_echo_n "checking for Solaris ACL support... " >&6; } # include <sys/acl.h> #endif int -main () +main (void) { acl("foo", GETACLCNT, 0, NULL); @@ -13922,21 +15119,22 @@ acl("foo", GETACLCNT, 0, NULL); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SOLARIS_ACL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SOLARIS_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5 -$as_echo_n "checking for AIX ACL support... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5 +printf %s "checking for AIX ACL support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13957,7 +15155,7 @@ $as_echo_n "checking for AIX ACL support... " >&6; } int aclsize; struct acl *aclent; int -main () +main (void) { aclsize = sizeof(struct acl); aclent = (void *)malloc(aclsize); @@ -13967,24 +15165,25 @@ aclsize = sizeof(struct acl); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_AIX_ACL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_AIX_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test "x$GTK_CFLAGS" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pango_shape_full" >&5 -$as_echo_n "checking for pango_shape_full... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pango_shape_full" >&5 +printf %s "checking for pango_shape_full... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" @@ -13993,110 +15192,116 @@ $as_echo_n "checking for pango_shape_full... " >&6; } /* end confdefs.h. */ #include <gtk/gtk.h> int -main () +main (void) { pango_shape_full(NULL, 0, NULL, 0, NULL, NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_PANGO_SHAPE_FULL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_PANGO_SHAPE_FULL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gpm argument" >&5 -$as_echo_n "checking --enable-gpm argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-gpm argument" >&5 +printf %s "checking --enable-gpm argument... " >&6; } # Check whether --enable-gpm was given. -if test "${enable_gpm+set}" = set; then : +if test ${enable_gpm+y} +then : enableval=$enable_gpm; -else +else $as_nop enable_gpm="yes" fi if test "$enable_gpm" = "yes" -o "$enable_gpm" = "dynamic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gpm" >&5 -$as_echo "$enable_gpm" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5 -$as_echo_n "checking for gpm... " >&6; } -if ${vi_cv_have_gpm+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gpm" >&5 +printf "%s\n" "$enable_gpm" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5 +printf %s "checking for gpm... " >&6; } +if test ${vi_cv_have_gpm+y} +then : + printf %s "(cached) " >&6 +else $as_nop olibs="$LIBS" ; LIBS="-lgpm" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gpm.h> #include <linux/keyboard.h> int -main () +main (void) { Gpm_GetLibVersion(NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vi_cv_have_gpm=yes -else +else $as_nop vi_cv_have_gpm=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$olibs" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5 -$as_echo "$vi_cv_have_gpm" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5 +printf "%s\n" "$vi_cv_have_gpm" >&6; } if test $vi_cv_have_gpm = yes; then if test "$enable_gpm" = "yes"; then LIBS="$LIBS -lgpm" else - $as_echo "#define DYNAMIC_GPM 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_GPM 1" >>confdefs.h fi - $as_echo "#define HAVE_GPM 1" >>confdefs.h + printf "%s\n" "#define HAVE_GPM 1" >>confdefs.h fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5 -$as_echo_n "checking --disable-sysmouse argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5 +printf %s "checking --disable-sysmouse argument... " >&6; } # Check whether --enable-sysmouse was given. -if test "${enable_sysmouse+set}" = set; then : +if test ${enable_sysmouse+y} +then : enableval=$enable_sysmouse; -else +else $as_nop enable_sysmouse="yes" fi if test "$enable_sysmouse" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysmouse" >&5 -$as_echo_n "checking for sysmouse... " >&6; } -if ${vi_cv_have_sysmouse+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysmouse" >&5 +printf %s "checking for sysmouse... " >&6; } +if test ${vi_cv_have_sysmouse+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/consio.h> #include <signal.h> #include <sys/fbio.h> int -main () +main (void) { struct mouse_info mouse; mouse.operation = MOUSE_MODE; @@ -14107,132 +15312,137 @@ struct mouse_info mouse; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vi_cv_have_sysmouse=yes -else +else $as_nop vi_cv_have_sysmouse=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_sysmouse" >&5 -$as_echo "$vi_cv_have_sysmouse" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_sysmouse" >&5 +printf "%s\n" "$vi_cv_have_sysmouse" >&6; } if test $vi_cv_have_sysmouse = yes; then - $as_echo "#define HAVE_SYSMOUSE 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYSMOUSE 1" >>confdefs.h fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FD_CLOEXEC" >&5 -$as_echo_n "checking for FD_CLOEXEC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FD_CLOEXEC" >&5 +printf %s "checking for FD_CLOEXEC... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if HAVE_FCNTL_H # include <fcntl.h> #endif int -main () +main (void) { int flag = FD_CLOEXEC; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_FD_CLOEXEC 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_FD_CLOEXEC 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rename" >&5 -$as_echo_n "checking for rename... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rename" >&5 +printf %s "checking for rename... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdio.h> int -main () +main (void) { rename("this", "that") ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_RENAME 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_RENAME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd" >&5 -$as_echo_n "checking for dirfd... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dirfd" >&5 +printf %s "checking for dirfd... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <dirent.h> int -main () +main (void) { DIR * dir=opendir("dirname"); dirfd(dir); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DIRFD 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_DIRFD 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock" >&5 -$as_echo_n "checking for flock... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock" >&5 +printf %s "checking for flock... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/file.h> int -main () +main (void) { flock(10, LOCK_SH); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_FLOCK 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysctl" >&5 -$as_echo_n "checking for sysctl... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysctl" >&5 +printf %s "checking for sysctl... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/sysctl.h> int -main () +main (void) { int mib[2], r; size_t len; @@ -14246,24 +15456,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCTL 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSCTL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo" >&5 -$as_echo_n "checking for sysinfo... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysinfo" >&5 +printf %s "checking for sysinfo... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/sysinfo.h> int -main () +main (void) { struct sysinfo sinfo; int t; @@ -14275,25 +15486,26 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSINFO 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo.mem_unit" >&5 -$as_echo_n "checking for sysinfo.mem_unit... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysinfo.mem_unit" >&5 +printf %s "checking for sysinfo.mem_unit... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/sysinfo.h> int -main () +main (void) { struct sysinfo sinfo; sinfo.mem_unit = 1; @@ -14302,24 +15514,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSINFO_MEM_UNIT 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSINFO_MEM_UNIT 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo.uptime" >&5 -$as_echo_n "checking for sysinfo.uptime... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysinfo.uptime" >&5 +printf %s "checking for sysinfo.uptime... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> #include <sys/sysinfo.h> int -main () +main (void) { struct sysinfo sinfo; long ut; @@ -14331,23 +15544,24 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSINFO_UPTIME 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSINFO_UPTIME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5 -$as_echo_n "checking for sysconf... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5 +printf %s "checking for sysconf... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> int -main () +main (void) { (void)sysconf(_SC_PAGESIZE); (void)sysconf(_SC_PHYS_PAGES); @@ -14356,23 +15570,24 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCONF 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _SC_SIGSTKSZ via sysconf()" >&5 -$as_echo_n "checking for _SC_SIGSTKSZ via sysconf()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _SC_SIGSTKSZ via sysconf()" >&5 +printf %s "checking for _SC_SIGSTKSZ via sysconf()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> int -main () +main (void) { (void)sysconf(_SC_SIGSTKSZ); @@ -14380,31 +15595,34 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCONF_SIGSTKSZ 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSCONF_SIGSTKSZ 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if ${ac_cv_sizeof_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +printf %s "checking size of int... " >&6; } +if test ${ac_cv_sizeof_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int) See \`config.log' for more details" "$LINENO" 5; } else @@ -14413,31 +15631,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +printf "%s\n" "$ac_cv_sizeof_int" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int -_ACEOF +printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if ${ac_cv_sizeof_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +printf %s "checking size of long... " >&6; } +if test ${ac_cv_sizeof_long+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) See \`config.log' for more details" "$LINENO" 5; } else @@ -14446,31 +15664,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF +printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 -$as_echo_n "checking size of time_t... " >&6; } -if ${ac_cv_sizeof_time_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +printf %s "checking size of time_t... " >&6; } +if test ${ac_cv_sizeof_time_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_time_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (time_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -14479,31 +15697,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 -$as_echo "$ac_cv_sizeof_time_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +printf "%s\n" "$ac_cv_sizeof_time_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_TIME_T $ac_cv_sizeof_time_t -_ACEOF +printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 -$as_echo_n "checking size of off_t... " >&6; } -if ${ac_cv_sizeof_off_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : - -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 +printf %s "checking size of off_t... " >&6; } +if test ${ac_cv_sizeof_off_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default" +then : + +else $as_nop if test "$ac_cv_type_off_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (off_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -14512,32 +15730,27 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -$as_echo "$ac_cv_sizeof_off_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 +printf "%s\n" "$ac_cv_sizeof_off_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -_ACEOF +printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VIM_SIZEOF_INT $ac_cv_sizeof_int -_ACEOF +printf "%s\n" "#define VIM_SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VIM_SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF +printf "%s\n" "#define VIM_SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 -$as_echo_n "checking uint32_t is 32 bits... " >&6; } -if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5 -$as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;} -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 +printf %s "checking uint32_t is 32 bits... " >&6; } +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5 +printf "%s\n" "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;} +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14554,10 +15767,11 @@ int main() { return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -else +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } +else $as_nop as_fn_error $? "WRONG! uint32_t not defined correctly." "$LINENO" 5 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -14588,26 +15802,29 @@ int main() { exit(0); /* libc version works properly. */ }' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memmove handles overlaps" >&5 -$as_echo_n "checking whether memmove handles overlaps... " >&6; } -if ${vim_cv_memmove_handles_overlap+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether memmove handles overlaps" >&5 +printf %s "checking whether memmove handles overlaps... " >&6; } +if test ${vim_cv_memmove_handles_overlap+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_memmove_handles_overlap'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_memmove_handles_overlap=yes -else +else $as_nop vim_cv_memmove_handles_overlap=no @@ -14618,33 +15835,36 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memmove_handles_overlap" >&5 -$as_echo "$vim_cv_memmove_handles_overlap" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memmove_handles_overlap" >&5 +printf "%s\n" "$vim_cv_memmove_handles_overlap" >&6; } if test "x$vim_cv_memmove_handles_overlap" = "xyes" ; then - $as_echo "#define USEMEMMOVE 1" >>confdefs.h + printf "%s\n" "#define USEMEMMOVE 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bcopy handles overlaps" >&5 -$as_echo_n "checking whether bcopy handles overlaps... " >&6; } -if ${vim_cv_bcopy_handles_overlap+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether bcopy handles overlaps" >&5 +printf %s "checking whether bcopy handles overlaps... " >&6; } +if test ${vim_cv_bcopy_handles_overlap+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_bcopy_handles_overlap'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define mch_bcopy(s,d,l) bcopy(d,s,l) $bcopy_test_prog _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_bcopy_handles_overlap=yes -else +else $as_nop vim_cv_bcopy_handles_overlap=no @@ -14655,33 +15875,36 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_bcopy_handles_overlap" >&5 -$as_echo "$vim_cv_bcopy_handles_overlap" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_bcopy_handles_overlap" >&5 +printf "%s\n" "$vim_cv_bcopy_handles_overlap" >&6; } if test "x$vim_cv_bcopy_handles_overlap" = "xyes" ; then - $as_echo "#define USEBCOPY 1" >>confdefs.h + printf "%s\n" "#define USEBCOPY 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memcpy handles overlaps" >&5 -$as_echo_n "checking whether memcpy handles overlaps... " >&6; } -if ${vim_cv_memcpy_handles_overlap+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether memcpy handles overlaps" >&5 +printf %s "checking whether memcpy handles overlaps... " >&6; } +if test ${vim_cv_memcpy_handles_overlap+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_memcpy_handles_overlap'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define mch_memcpy(s,d,l) memcpy(d,s,l) $bcopy_test_prog _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_memcpy_handles_overlap=yes -else +else $as_nop vim_cv_memcpy_handles_overlap=no @@ -14692,11 +15915,11 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memcpy_handles_overlap" >&5 -$as_echo "$vim_cv_memcpy_handles_overlap" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memcpy_handles_overlap" >&5 +printf "%s\n" "$vim_cv_memcpy_handles_overlap" >&6; } if test "x$vim_cv_memcpy_handles_overlap" = "xyes" ; then - $as_echo "#define USEMEMCPY 1" >>confdefs.h + printf "%s\n" "#define USEMEMCPY 1" >>confdefs.h fi fi @@ -14709,96 +15932,94 @@ if test "x$with_x" = "xyes"; then LIBS="$LIBS $X_LIBS $GUI_LIB_LOC $GUI_X_LIBS $X_PRE_LIBS $X_LIB $X_EXTRA_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether X_LOCALE needed" >&5 -$as_echo_n "checking whether X_LOCALE needed... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether X_LOCALE needed" >&5 +printf %s "checking whether X_LOCALE needed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <X11/Xlocale.h> int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* 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 _Xsetlocale (); int -main () +main (void) { return _Xsetlocale (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define X_LOCALE 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define X_LOCALE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xutf8SetWMProperties() can be used" >&5 -$as_echo_n "checking whether Xutf8SetWMProperties() can be used... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Xutf8SetWMProperties() can be used" >&5 +printf %s "checking whether Xutf8SetWMProperties() can be used... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* 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 Xutf8SetWMProperties (); int -main () +main (void) { return Xutf8SetWMProperties (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_XUTF8SETWMPROPERTIES 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_XUTF8SETWMPROPERTIES 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _xpg4_setrunelocale in -lxpg4" >&5 -$as_echo_n "checking for _xpg4_setrunelocale in -lxpg4... " >&6; } -if ${ac_cv_lib_xpg4__xpg4_setrunelocale+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _xpg4_setrunelocale in -lxpg4" >&5 +printf %s "checking for _xpg4_setrunelocale in -lxpg4... " >&6; } +if test ${ac_cv_lib_xpg4__xpg4_setrunelocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lxpg4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14807,36 +16028,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* 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 _xpg4_setrunelocale (); int -main () +main (void) { return _xpg4_setrunelocale (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_xpg4__xpg4_setrunelocale=yes -else +else $as_nop ac_cv_lib_xpg4__xpg4_setrunelocale=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 -$as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } -if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 +printf "%s\n" "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } +if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = xyes +then : LIBS="$LIBS -lxpg4" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 -$as_echo_n "checking how to create tags... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 +printf %s "checking how to create tags... " >&6; } test -f tags && mv tags tags.save if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then TAGPRG="ctags -I INIT+,INIT2+,INIT3+,INIT4+,INIT5+ --fields=+S" @@ -14855,33 +16075,34 @@ else (eval ctags -i+m /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags -i+m" fi test -f tags.save && mv tags.save tags -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAGPRG" >&5 -$as_echo "$TAGPRG" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TAGPRG" >&5 +printf "%s\n" "$TAGPRG" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run man with a section nr" >&5 -$as_echo_n "checking how to run man with a section nr... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run man with a section nr" >&5 +printf %s "checking how to run man with a section nr... " >&6; } MANDEF="man" (eval MANPAGER=cat PAGER=cat man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANDEF" >&5 -$as_echo "$MANDEF" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANDEF" >&5 +printf "%s\n" "$MANDEF" >&6; } if test "$MANDEF" = "man -s"; then - $as_echo "#define USEMAN_S 1" >>confdefs.h + printf "%s\n" "#define USEMAN_S 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-nls argument" >&5 -$as_echo_n "checking --disable-nls argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-nls argument" >&5 +printf %s "checking --disable-nls argument... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : +if test ${enable_nls+y} +then : enableval=$enable_nls; -else +else $as_nop enable_nls="yes" fi if test "$enable_nls" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } INSTALL_LANGS=install-languages @@ -14890,11 +16111,12 @@ $as_echo "no" >&6; } # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MSGFMT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MSGFMT"; then ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test. else @@ -14902,11 +16124,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MSGFMT="msgfmt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -14917,16 +16143,16 @@ fi fi MSGFMT=$ac_cv_prog_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NLS" >&5 -$as_echo_n "checking for NLS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NLS" >&5 +printf %s "checking for NLS... " >&6; } if test -f po/Makefile; then have_gettext="no" if test -n "$MSGFMT"; then @@ -14936,86 +16162,85 @@ $as_echo_n "checking for NLS... " >&6; } /* end confdefs.h. */ #include <libintl.h> int -main () +main (void) { gettext("Test"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5 -$as_echo "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs -else +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5 +printf "%s\n" "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs +else $as_nop LIBS="-lintl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> int -main () +main (void) { gettext("Test"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5 -$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes"; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5 +printf "%s\n" "gettext() works with -lintl" >&6; }; have_gettext="yes"; LIBS="$olibs -lintl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5 -$as_echo "gettext() doesn't work" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5 +printf "%s\n" "gettext() doesn't work" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: msgfmt not found - disabled" >&5 -$as_echo "msgfmt not found - disabled" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: msgfmt not found - disabled" >&5 +printf "%s\n" "msgfmt not found - disabled" >&6; }; fi if test $have_gettext = "yes" -a "x$features" != "xtiny"; then - $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h MAKEMO=yes - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes +then : + printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h fi -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _nl_msg_cat_cntr" >&5 -$as_echo_n "checking for _nl_msg_cat_cntr... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _nl_msg_cat_cntr" >&5 +printf %s "checking for _nl_msg_cat_cntr... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <libintl.h> extern int _nl_msg_cat_cntr; int -main () +main (void) { ++_nl_msg_cat_cntr; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_NL_MSG_CAT_CNTR 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_NL_MSG_CAT_CNTR 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext # MacVim: Hack to statically link against libintl instead of dynamic link, as we can't distribute app bundles with @@ -15023,68 +16248,68 @@ rm -f core conftest.err conftest.$ac_objext \ # linkage if a dylib exists in the same folder, and as such we have to manually specify the library path instead # of using -l<lib> syntax. This also means it won't work with AC_LINK_IFELSE as specifying full lib path only works # if you have separate compile/link stages but AC_LINK_IFELSE just compiles/link in one command. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libintl.a" >&5 -$as_echo_n "checking for libintl.a... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libintl.a" >&5 +printf %s "checking for libintl.a... " >&6; } if test -f ${local_dir}/lib/libintl.a; then LIBS="$olibs ${local_dir}/lib/libintl.a" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ${local_dir}/lib/libintl.a instead of -lintl" >&5 -$as_echo "Using ${local_dir}/lib/libintl.a instead of -lintl" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ${local_dir}/lib/libintl.a instead of -lintl" >&5 +printf "%s\n" "Using ${local_dir}/lib/libintl.a instead of -lintl" >&6; }; else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libintl.a not found - keeping using -lintl" >&5 -$as_echo "libintl.a not found - keeping using -lintl" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libintl.a not found - keeping using -lintl" >&5 +printf "%s\n" "libintl.a not found - keeping using -lintl" >&6; }; fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --desktop" >&5 -$as_echo_n "checking if msgfmt supports --desktop... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --desktop" >&5 +printf %s "checking if msgfmt supports --desktop... " >&6; } MSGFMT_DESKTOP= if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then if "$MSGFMT" --version | grep '0.19.[3-7]$' >/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5 -$as_echo "broken" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken" >&5 +printf "%s\n" "broken" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } MSGFMT_DESKTOP="gvim.desktop vim.desktop" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5 -$as_echo "no \"po/Makefile\" - disabled" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5 +printf "%s\n" "no \"po/Makefile\" - disabled" >&6; }; fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" +if test "x$ac_cv_header_dlfcn_h" = xyes +then : DLL=dlfcn.h -else - ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" -if test "x$ac_cv_header_dl_h" = xyes; then : +else $as_nop + ac_fn_c_check_header_compile "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" +if test "x$ac_cv_header_dl_h" = xyes +then : DLL=dl.h fi - fi - if test x${DLL} = xdlfcn.h; then -$as_echo "#define HAVE_DLFCN_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen()" >&5 -$as_echo_n "checking for dlopen()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen()" >&5 +printf %s "checking for dlopen()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlopen(); @@ -15094,24 +16319,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen() in -ldl" >&5 -$as_echo_n "checking for dlopen() in -ldl... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen() in -ldl" >&5 +printf %s "checking for dlopen() in -ldl... " >&6; } olibs=$LIBS LIBS="$LIBS -ldl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlopen(); @@ -15121,29 +16347,30 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym()" >&5 -$as_echo_n "checking for dlsym()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym()" >&5 +printf %s "checking for dlsym()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlsym(); @@ -15153,24 +16380,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLSYM 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym() in -ldl" >&5 -$as_echo_n "checking for dlsym() in -ldl... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym() in -ldl" >&5 +printf %s "checking for dlsym() in -ldl... " >&6; } olibs=$LIBS LIBS="$LIBS -ldl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlsym(); @@ -15180,33 +16408,34 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLSYM 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext elif test x${DLL} = xdl.h; then -$as_echo "#define HAVE_DL_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_DL_H 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load()" >&5 -$as_echo_n "checking for shl_load()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load()" >&5 +printf %s "checking for shl_load()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* shl_load(); @@ -15216,24 +16445,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHL_LOAD 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load() in -ldld" >&5 -$as_echo_n "checking for shl_load() in -ldld... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load() in -ldld" >&5 +printf %s "checking for shl_load() in -ldld... " >&6; } olibs=$LIBS LIBS="$LIBS -ldld" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* shl_load(); @@ -15243,35 +16473,31 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHL_LOAD 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -for ac_header in setjmp.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default" -if test "x$ac_cv_header_setjmp_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SETJMP_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default" +if test "x$ac_cv_header_setjmp_h" = xyes +then : + printf "%s\n" "#define HAVE_SETJMP_H 1" >>confdefs.h fi -done - if test "x$MACOS_X" = "xyes" -a -n "$PERL"; then if echo $LIBS | grep -e '-ldl' >/dev/null; then @@ -15281,38 +16507,39 @@ if test "x$MACOS_X" = "xyes" -a -n "$PERL"; then fi if test "$MACOS_X" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5 -$as_echo_n "checking whether we need macOS frameworks... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5 +printf %s "checking whether we need macOS frameworks... " >&6; } if test "$MACOS_X_DARWIN" = "yes"; then if test "$features" = "tiny"; then OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'` OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5 -$as_echo "yes, we need CoreServices" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5 +printf "%s\n" "yes, we need CoreServices" >&6; } LIBS="$LIBS -framework CoreServices" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need AppKit" >&5 -$as_echo "yes, we need AppKit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, we need AppKit" >&5 +printf "%s\n" "yes, we need AppKit" >&6; } LIBS="$LIBS -framework AppKit" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi if test "x$MACOS_X" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-xcodecfg argument" >&5 -$as_echo_n "checking --with-xcodecfg argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-xcodecfg argument" >&5 +printf %s "checking --with-xcodecfg argument... " >&6; } # Check whether --with-xcodecfg was given. -if test "${with_xcodecfg+set}" = set; then : +if test ${with_xcodecfg+y} +then : withval=$with_xcodecfg; XCODEFLAGS="$XCODEFLAGS -configuration $withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default" >&5 -$as_echo "using default" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using default" >&5 +printf "%s\n" "using default" >&6; } fi @@ -15336,47 +16563,47 @@ fi DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 -$as_echo_n "checking for GCC 3 or later... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 +printf %s "checking for GCC 3 or later... " >&6; } gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9][0-9]*\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5 -$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5 +printf %s "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } if test "$gccmajor" -gt "3"; then CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-U_FORTIFY_SOURCE//g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to force -D_FILE_OFFSET_BITS=64" >&5 -$as_echo_n "checking whether we need to force -D_FILE_OFFSET_BITS=64... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we need to force -D_FILE_OFFSET_BITS=64" >&5 +printf %s "checking whether we need to force -D_FILE_OFFSET_BITS=64... " >&6; } if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q D_FILE_OFFSET_BITS 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5 -$as_echo_n "checking linker --as-needed support... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5 +printf %s "checking linker --as-needed support... " >&6; } LINK_AS_NEEDED= # Check if linker supports --as-needed and --no-as-needed options if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then @@ -15386,11 +16613,11 @@ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then LINK_AS_NEEDED=yes fi if test "$LINK_AS_NEEDED" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15428,8 +16655,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -15459,15 +16686,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -15481,8 +16708,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -15499,7 +16726,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -15516,8 +16743,8 @@ LTLIBOBJS=$ac_ltlibobjs ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -15540,14 +16767,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -15557,46 +16786,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi +if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -15605,13 +16834,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -15620,8 +16842,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -15633,30 +16859,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -15669,13 +16875,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -15702,18 +16909,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -15725,12 +16934,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -15761,7 +16971,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -15783,6 +16993,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -15796,6 +17010,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -15837,7 +17057,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -15846,7 +17066,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -15909,7 +17129,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15967,14 +17187,16 @@ $config_headers Report bugs to the package provider." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16012,15 +17234,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -16028,7 +17250,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -16037,7 +17259,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -16065,7 +17287,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -16079,7 +17301,7 @@ exec 5>>auto/config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -16105,8 +17327,8 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers fi # Have a temporary directory for convenience. Make it in the build tree @@ -16442,7 +17664,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -16450,17 +17672,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -16477,7 +17699,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -16501,9 +17723,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -16556,8 +17778,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -16599,9 +17821,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -16617,20 +17839,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -16671,8 +17893,9 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/src/configure.ac b/src/configure.ac index d6290dccce..37db41f8f4 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -239,6 +239,21 @@ if test "$vim_cv_uname_output" = Darwin; then XCODEFLAGS="$XCODEFLAGS GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DISABLE_SPARKLE=1'" fi + if test "$enable_sparkle" == "yes"; then + # Check if we want to build for legacy Sparkle version for old macOS + # versions + AC_MSG_CHECKING(--enable-sparkle_1 argument) + AC_ARG_ENABLE(sparkle_1, + [ --enable-sparkle_1 Use legacy Sparkle 1 updater (MacVim).], + [use_sparkle_1="yes"]) + if test "$use_sparkle_1" == "yes"; then + AC_MSG_RESULT(yes) + XCODEFLAGS="$XCODEFLAGS GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS USE_SPARKLE_1=1'" + else + AC_MSG_RESULT(no) + fi + fi + AC_MSG_CHECKING(--with-developer-dir argument) AC_ARG_WITH(developer-dir, [ --with-developer-dir=PATH use PATH as location for Xcode developer tools], DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR),