Merged with latest SDL2 sources
authorDavidLudwig <dludwig@pobox.com>
Sat, 01 Sep 2012 07:19:49 -0400
changeset 831140f2e97c4051
parent 8310 5d9ba2a65baf
parent 6409 b85e863a507e
child 8312 75abd645be43
Merged with latest SDL2 sources
README.iOS
src/video/uikit/SDL_uikitview.m
src/video/uikit/SDL_uikitwindow.m
     1.1 --- a/README.android	Wed Jul 25 20:56:42 2012 -0400
     1.2 +++ b/README.android	Sat Sep 01 07:19:49 2012 -0400
     1.3 @@ -58,7 +58,7 @@
     1.4  	AndroidManifest.xml	- package manifest, do not modify
     1.5  	build.properties	- empty
     1.6  	build.xml		- build description file, used by ant
     1.7 -	default.properties	- holds the ABI for the application, currently android-4 which corresponds to the Android 1.6 system image
     1.8 +	default.properties	- holds the ABI for the application, currently android-5 which corresponds to the Android 2.0 system image
     1.9  	local.properties	- holds the SDK path, you should change this to the path to your SDK
    1.10  	jni/			- directory holding native code
    1.11  	jni/Android.mk		- Android makefile that includes all subdirectories
    1.12 @@ -126,7 +126,7 @@
    1.13   * Select the Android -> Android Project wizard and click Next
    1.14   * Enter the name you'd like your project to have
    1.15   * Select "Create project from existing source" and browse for your project directory
    1.16 - * Make sure the Build Target is set to Android 1.6
    1.17 + * Make sure the Build Target is set to Android 2.0
    1.18   * Click Finish
    1.19  
    1.20  
     2.1 --- a/README.iOS	Wed Jul 25 20:56:42 2012 -0400
     2.2 +++ b/README.iOS	Sat Sep 01 07:19:49 2012 -0400
     2.3 @@ -79,15 +79,15 @@
     2.4  Notes -- Keyboard
     2.5  ==============================================================================
     2.6  
     2.7 -SDL for iPhone contains several additional functions related to keyboard visibility.  These functions are not part of the SDL standard API, but are necessary for revealing and hiding the iPhone's virtual onscreen keyboard.
     2.8 +The SDL keyboard API has been extended to support on-screen keyboards:
     2.9  
    2.10 -int SDL_iPhoneKeyboardShow(SDL_Window * window) 
    2.11 +int SDL_ShowScreenKeyboard(SDL_Window * window) 
    2.12  	-- reveals the onscreen keyboard.  Returns 0 on success and -1 on error.
    2.13 -int SDL_iPhoneKeyboardHide(SDL_Window * window) 
    2.14 +int SDL_HideScreenKeyboard(SDL_Window * window) 
    2.15  	-- hides the onscreen keyboard.  Returns 0 on success and -1 on error.
    2.16 -SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window) 
    2.17 +SDL_bool SDL_IsScreenKeyboardShown(SDL_Window * window) 
    2.18  	-- returns whether or not the onscreen keyboard is currently visible.
    2.19 -int SDL_iPhoneKeyboardToggle(SDL_Window * window) 	
    2.20 +int SDL_ToggleScreenKeyboard(SDL_Window * window) 	
    2.21  	-- toggles the visibility of the onscreen keyboard.  Returns 0 on success and -1 on error.
    2.22  
    2.23  ==============================================================================
     3.1 --- a/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj	Wed Jul 25 20:56:42 2012 -0400
     3.2 +++ b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj	Sat Sep 01 07:19:49 2012 -0400
     3.3 @@ -15,12 +15,12 @@
     3.4  		FD15FD6B0E086911003BDF25 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; };
     3.5  		FD15FD6C0E086911003BDF25 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDB96ED30DEFC9C700FAF19F /* OpenGLES.framework */; };
     3.6  		FD15FD6D0E086911003BDF25 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDB96EDF0DEFC9DC00FAF19F /* QuartzCore.framework */; };
     3.7 -		FD1B48DD0E313255007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; };
     3.8 -		FD1B49980E313261007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; };
     3.9 -		FD1B499C0E313269007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; };
    3.10 -		FD1B499E0E31326C007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; };
    3.11 -		FD1B49A00E313270007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; };
    3.12 -		FD1B49A20E313273007AB34E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; };
    3.13 +		FD1B48DD0E313255007AB34E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL2.a */; };
    3.14 +		FD1B49980E313261007AB34E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL2.a */; };
    3.15 +		FD1B499C0E313269007AB34E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL2.a */; };
    3.16 +		FD1B499E0E31326C007AB34E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL2.a */; };
    3.17 +		FD1B49A00E313270007AB34E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL2.a */; };
    3.18 +		FD1B49A20E313273007AB34E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL2.a */; };
    3.19  		FD5F9CE80E0E0741008E885B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
    3.20  		FD5F9CE90E0E0741008E885B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
    3.21  		FD5F9CEA0E0E0741008E885B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; };
    3.22 @@ -56,7 +56,7 @@
    3.23  		FDB651FA0E43D1F300F688B5 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = FD925B180E0F276600E92347 /* Icon.png */; };
    3.24  		FDB651FB0E43D1F300F688B5 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FD787AA00E22A5CC003E8E36 /* Default.png */; };
    3.25  		FDB651FD0E43D1F300F688B5 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FD77A0060E26BC0500F39101 /* common.c */; };
    3.26 -		FDB652000E43D1F300F688B5 /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL.a */; };
    3.27 +		FDB652000E43D1F300F688B5 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B489E0E313154007AB34E /* libSDL2.a */; };
    3.28  		FDB652020E43D1F300F688B5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
    3.29  		FDB652030E43D1F300F688B5 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; };
    3.30  		FDB652040E43D1F300F688B5 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D3623EB0D0F72F000981E51 /* CoreGraphics.framework */; };
    3.31 @@ -215,7 +215,7 @@
    3.32  			isa = PBXFrameworksBuildPhase;
    3.33  			buildActionMask = 2147483647;
    3.34  			files = (
    3.35 -				FD1B48DD0E313255007AB34E /* libSDL.a in Frameworks */,
    3.36 +				FD1B48DD0E313255007AB34E /* libSDL2.a in Frameworks */,
    3.37  				FDF0D7AB0E12D53800247964 /* CoreAudio.framework in Frameworks */,
    3.38  				FDF0D7AC0E12D53800247964 /* AudioToolbox.framework in Frameworks */,
    3.39  				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
    3.40 @@ -230,7 +230,7 @@
    3.41  			isa = PBXFrameworksBuildPhase;
    3.42  			buildActionMask = 2147483647;
    3.43  			files = (
    3.44 -				FD1B49980E313261007AB34E /* libSDL.a in Frameworks */,
    3.45 +				FD1B49980E313261007AB34E /* libSDL2.a in Frameworks */,
    3.46  				FDF0D7A90E12D53500247964 /* CoreAudio.framework in Frameworks */,
    3.47  				FDF0D7AA0E12D53500247964 /* AudioToolbox.framework in Frameworks */,
    3.48  				FD15FD690E086911003BDF25 /* Foundation.framework in Frameworks */,
    3.49 @@ -245,7 +245,7 @@
    3.50  			isa = PBXFrameworksBuildPhase;
    3.51  			buildActionMask = 2147483647;
    3.52  			files = (
    3.53 -				FD1B499C0E313269007AB34E /* libSDL.a in Frameworks */,
    3.54 +				FD1B499C0E313269007AB34E /* libSDL2.a in Frameworks */,
    3.55  				FDF0D7A70E12D53200247964 /* CoreAudio.framework in Frameworks */,
    3.56  				FDF0D7A80E12D53200247964 /* AudioToolbox.framework in Frameworks */,
    3.57  				FD5F9CEB0E0E0741008E885B /* OpenGLES.framework in Frameworks */,
    3.58 @@ -260,7 +260,7 @@
    3.59  			isa = PBXFrameworksBuildPhase;
    3.60  			buildActionMask = 2147483647;
    3.61  			files = (
    3.62 -				FDB652000E43D1F300F688B5 /* libSDL.a in Frameworks */,
    3.63 +				FDB652000E43D1F300F688B5 /* libSDL2.a in Frameworks */,
    3.64  				FDB652020E43D1F300F688B5 /* Foundation.framework in Frameworks */,
    3.65  				FDB652030E43D1F300F688B5 /* UIKit.framework in Frameworks */,
    3.66  				FDB652040E43D1F300F688B5 /* CoreGraphics.framework in Frameworks */,
    3.67 @@ -275,7 +275,7 @@
    3.68  			isa = PBXFrameworksBuildPhase;
    3.69  			buildActionMask = 2147483647;
    3.70  			files = (
    3.71 -				FD1B499E0E31326C007AB34E /* libSDL.a in Frameworks */,
    3.72 +				FD1B499E0E31326C007AB34E /* libSDL2.a in Frameworks */,
    3.73  				FDF0D7950E12D52900247964 /* CoreAudio.framework in Frameworks */,
    3.74  				FDF0D7960E12D52900247964 /* AudioToolbox.framework in Frameworks */,
    3.75  				FDC202E60E107B1200ABAC90 /* Foundation.framework in Frameworks */,
    3.76 @@ -290,7 +290,7 @@
    3.77  			isa = PBXFrameworksBuildPhase;
    3.78  			buildActionMask = 2147483647;
    3.79  			files = (
    3.80 -				FD1B49A20E313273007AB34E /* libSDL.a in Frameworks */,
    3.81 +				FD1B49A20E313273007AB34E /* libSDL2.a in Frameworks */,
    3.82  				FDC52ED40E2843D6008D768C /* Foundation.framework in Frameworks */,
    3.83  				FDC52ED50E2843D6008D768C /* UIKit.framework in Frameworks */,
    3.84  				FDC52ED60E2843D6008D768C /* CoreGraphics.framework in Frameworks */,
    3.85 @@ -305,7 +305,7 @@
    3.86  			isa = PBXFrameworksBuildPhase;
    3.87  			buildActionMask = 2147483647;
    3.88  			files = (
    3.89 -				FD1B49A00E313270007AB34E /* libSDL.a in Frameworks */,
    3.90 +				FD1B49A00E313270007AB34E /* libSDL2.a in Frameworks */,
    3.91  				FDF0D69C0E12D05400247964 /* Foundation.framework in Frameworks */,
    3.92  				FDF0D69D0E12D05400247964 /* UIKit.framework in Frameworks */,
    3.93  				FDF0D69E0E12D05400247964 /* CoreGraphics.framework in Frameworks */,
    3.94 @@ -607,7 +607,7 @@
    3.95  		FD1B489E0E313154007AB34E /* libSDL.a */ = {
    3.96  			isa = PBXReferenceProxy;
    3.97  			fileType = archive.ar;
    3.98 -			path = libSDL.a;
    3.99 +			path = libSDL2.a;
   3.100  			remoteRef = FD1B489D0E313154007AB34E /* PBXContainerItemProxy */;
   3.101  			sourceTree = BUILT_PRODUCTS_DIR;
   3.102  		};
     4.1 --- a/Xcode-iOS/Demos/src/keyboard.c	Wed Jul 25 20:56:42 2012 -0400
     4.2 +++ b/Xcode-iOS/Demos/src/keyboard.c	Sat Sep 01 07:19:49 2012 -0400
     4.3 @@ -12,13 +12,6 @@
     4.4  
     4.5  static SDL_Texture *texture; /* texture where we'll hold our font */
     4.6  
     4.7 -/* iPhone SDL addition keyboard related function definitions */
     4.8 -extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardShow(SDL_Window * window);
     4.9 -extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardHide(SDL_Window * window);
    4.10 -extern DECLSPEC SDL_bool SDLCALL SDL_iPhoneKeyboardIsShown(SDL_Window *
    4.11 -                                                           window);
    4.12 -extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardToggle(SDL_Window * window);
    4.13 -
    4.14  /* function declarations */
    4.15  void cleanup(void);
    4.16  void drawBlank(int x, int y);
    4.17 @@ -296,14 +289,10 @@
    4.18              /* draw our updates to the screen */
    4.19              SDL_RenderPresent(renderer);
    4.20              break;
    4.21 -#ifdef __IPHONEOS__
    4.22          case SDL_MOUSEBUTTONUP:
    4.23 -            /*      mouse up toggles onscreen keyboard visibility
    4.24 -               this function is available ONLY on iPhone OS
    4.25 -             */
    4.26 -            SDL_iPhoneKeyboardToggle(window);
    4.27 +            /*      mouse up toggles onscreen keyboard visibility */
    4.28 +            SDL_ToggleScreenKeyboard(window);
    4.29              break;
    4.30 -#endif
    4.31          }
    4.32      }
    4.33      cleanup();
     5.1 --- a/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj	Wed Jul 25 20:56:42 2012 -0400
     5.2 +++ b/Xcode-iOS/Test/TestiPhoneOS.xcodeproj/project.pbxproj	Sat Sep 01 07:19:49 2012 -0400
     5.3 @@ -8,7 +8,7 @@
     5.4  
     5.5  /* Begin PBXBuildFile section */
     5.6  		046CEF7713254F23007AD51D /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
     5.7 -		046CEF7B13254F23007AD51D /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
     5.8 +		046CEF7B13254F23007AD51D /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
     5.9  		046CEF7C13254F23007AD51D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
    5.10  		046CEF7D13254F23007AD51D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
    5.11  		046CEF7E13254F23007AD51D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */; };
    5.12 @@ -17,7 +17,7 @@
    5.13  		046CEF8113254F23007AD51D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89D0E2D111A00EA573E /* Foundation.framework */; };
    5.14  		046CEF8213254F23007AD51D /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
    5.15  		046CEF8A13254F63007AD51D /* testgesture.c in Sources */ = {isa = PBXBuildFile; fileRef = 046CEF8913254F63007AD51D /* testgesture.c */; };
    5.16 -		047A63E213285C3200CD7973 /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.17 +		047A63E213285C3200CD7973 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.18  		047A63E313285C3200CD7973 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
    5.19  		047A63E413285C3200CD7973 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
    5.20  		047A63E513285C3200CD7973 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */; };
    5.21 @@ -27,7 +27,7 @@
    5.22  		047A63E913285C3200CD7973 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89E0E2D111A00EA573E /* CoreAudio.framework */; };
    5.23  		047A63F113285CD100CD7973 /* checkkeys.c in Sources */ = {isa = PBXBuildFile; fileRef = 047A63F013285CD100CD7973 /* checkkeys.c */; };
    5.24  		56ED04FE118A8FE400A56AA6 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
    5.25 -		56ED0502118A8FE400A56AA6 /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.26 +		56ED0502118A8FE400A56AA6 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.27  		56ED0503118A8FE400A56AA6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
    5.28  		56ED0504118A8FE400A56AA6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
    5.29  		56ED0505118A8FE400A56AA6 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */; };
    5.30 @@ -38,7 +38,7 @@
    5.31  		56ED0511118A904200A56AA6 /* testpower.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED0510118A904200A56AA6 /* testpower.c */; };
    5.32  		AAE7DEDC14CBB1E100DF1A0E /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
    5.33  		AAE7DEDE14CBB1E100DF1A0E /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
    5.34 -		AAE7DEE114CBB1E100DF1A0E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.35 +		AAE7DEE114CBB1E100DF1A0E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.36  		AAE7DEE214CBB1E100DF1A0E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
    5.37  		AAE7DEE314CBB1E100DF1A0E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
    5.38  		AAE7DEE414CBB1E100DF1A0E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */; };
    5.39 @@ -51,7 +51,7 @@
    5.40  		AAE7DFA014CBB54E00DF1A0E /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
    5.41  		AAE7DFA114CBB54E00DF1A0E /* sample.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AADE0E2D33C100EA573E /* sample.bmp */; };
    5.42  		AAE7DFA314CBB54E00DF1A0E /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
    5.43 -		AAE7DFA614CBB54E00DF1A0E /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.44 +		AAE7DFA614CBB54E00DF1A0E /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.45  		AAE7DFA714CBB54E00DF1A0E /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
    5.46  		AAE7DFA814CBB54E00DF1A0E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
    5.47  		AAE7DFA914CBB54E00DF1A0E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */; };
    5.48 @@ -112,24 +112,24 @@
    5.49  		FDAAC62A0E2D5960001DB1D8 /* testgles.c in Sources */ = {isa = PBXBuildFile; fileRef = FDAAC6290E2D5960001DB1D8 /* testgles.c */; };
    5.50  		FDAAC6390E2D59BE001DB1D8 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = FDA8AAD90E2D33B000EA573E /* icon.bmp */; };
    5.51  		FDAAC7780E2D7024001DB1D8 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA8A7840E2D0F1F00EA573E /* common.c */; };
    5.52 -		FDBDE57C0E313445006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.53 -		FDBDE5810E313465006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.54 -		FDBDE5850E313495006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.55 -		FDBDE58C0E3134F3006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.56 -		FDBDE59B0E31356A006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.57 -		FDBDE59F0E31358D006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.58 -		FDBDE5A90E3135C0006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.59 -		FDBDE5AE0E3135E6006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.60 -		FDBDE5B60E3135FE006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.61 -		FDBDE5BC0E31364D006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.62 -		FDBDE5C20E313663006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.63 -		FDBDE5C60E3136F1006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.64 -		FDBDE5C80E313702006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.65 -		FDBDE5CA0E313712006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.66 -		FDBDE5CC0E31372B006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.67 -		FDBDE5CE0E31373E006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.68 -		FDBDE5D40E313789006BAC0B /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.69 -		FDC42FF40F0D866D009C87E1 /* libSDL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL.a */; };
    5.70 +		FDBDE57C0E313445006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.71 +		FDBDE5810E313465006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.72 +		FDBDE5850E313495006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.73 +		FDBDE58C0E3134F3006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.74 +		FDBDE59B0E31356A006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.75 +		FDBDE59F0E31358D006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.76 +		FDBDE5A90E3135C0006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.77 +		FDBDE5AE0E3135E6006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.78 +		FDBDE5B60E3135FE006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.79 +		FDBDE5BC0E31364D006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.80 +		FDBDE5C20E313663006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.81 +		FDBDE5C60E3136F1006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.82 +		FDBDE5C80E313702006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.83 +		FDBDE5CA0E313712006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.84 +		FDBDE5CC0E31372B006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.85 +		FDBDE5CE0E31373E006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.86 +		FDBDE5D40E313789006BAC0B /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.87 +		FDC42FF40F0D866D009C87E1 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD1B48B80E3131CA007AB34E /* libSDL2.a */; };
    5.88  		FDC42FF60F0D866D009C87E1 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8980E2D111A00EA573E /* AudioToolbox.framework */; };
    5.89  		FDC42FF70F0D866D009C87E1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A8990E2D111A00EA573E /* QuartzCore.framework */; };
    5.90  		FDC42FF80F0D866D009C87E1 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDA8A89A0E2D111A00EA573E /* OpenGLES.framework */; };
    5.91 @@ -322,7 +322,7 @@
    5.92  			isa = PBXFrameworksBuildPhase;
    5.93  			buildActionMask = 2147483647;
    5.94  			files = (
    5.95 -				046CEF7B13254F23007AD51D /* libSDL.a in Frameworks */,
    5.96 +				046CEF7B13254F23007AD51D /* libSDL2.a in Frameworks */,
    5.97  				046CEF7C13254F23007AD51D /* AudioToolbox.framework in Frameworks */,
    5.98  				046CEF7D13254F23007AD51D /* QuartzCore.framework in Frameworks */,
    5.99  				046CEF7E13254F23007AD51D /* OpenGLES.framework in Frameworks */,
   5.100 @@ -337,7 +337,7 @@
   5.101  			isa = PBXFrameworksBuildPhase;
   5.102  			buildActionMask = 2147483647;
   5.103  			files = (
   5.104 -				047A63E213285C3200CD7973 /* libSDL.a in Frameworks */,
   5.105 +				047A63E213285C3200CD7973 /* libSDL2.a in Frameworks */,
   5.106  				047A63E313285C3200CD7973 /* AudioToolbox.framework in Frameworks */,
   5.107  				047A63E413285C3200CD7973 /* QuartzCore.framework in Frameworks */,
   5.108  				047A63E513285C3200CD7973 /* OpenGLES.framework in Frameworks */,
   5.109 @@ -352,7 +352,7 @@
   5.110  			isa = PBXFrameworksBuildPhase;
   5.111  			buildActionMask = 2147483647;
   5.112  			files = (
   5.113 -				FDBDE5810E313465006BAC0B /* libSDL.a in Frameworks */,
   5.114 +				FDBDE5810E313465006BAC0B /* libSDL2.a in Frameworks */,
   5.115  				FDA8A89F0E2D111A00EA573E /* AudioToolbox.framework in Frameworks */,
   5.116  				FDA8A8A00E2D111A00EA573E /* QuartzCore.framework in Frameworks */,
   5.117  				FDA8A8A10E2D111A00EA573E /* OpenGLES.framework in Frameworks */,
   5.118 @@ -367,7 +367,7 @@
   5.119  			isa = PBXFrameworksBuildPhase;
   5.120  			buildActionMask = 2147483647;
   5.121  			files = (
   5.122 -				56ED0502118A8FE400A56AA6 /* libSDL.a in Frameworks */,
   5.123 +				56ED0502118A8FE400A56AA6 /* libSDL2.a in Frameworks */,
   5.124  				56ED0503118A8FE400A56AA6 /* AudioToolbox.framework in Frameworks */,
   5.125  				56ED0504118A8FE400A56AA6 /* QuartzCore.framework in Frameworks */,
   5.126  				56ED0505118A8FE400A56AA6 /* OpenGLES.framework in Frameworks */,
   5.127 @@ -382,7 +382,7 @@
   5.128  			isa = PBXFrameworksBuildPhase;
   5.129  			buildActionMask = 2147483647;
   5.130  			files = (
   5.131 -				AAE7DEE114CBB1E100DF1A0E /* libSDL.a in Frameworks */,
   5.132 +				AAE7DEE114CBB1E100DF1A0E /* libSDL2.a in Frameworks */,
   5.133  				AAE7DEE214CBB1E100DF1A0E /* AudioToolbox.framework in Frameworks */,
   5.134  				AAE7DEE314CBB1E100DF1A0E /* QuartzCore.framework in Frameworks */,
   5.135  				AAE7DEE414CBB1E100DF1A0E /* OpenGLES.framework in Frameworks */,
   5.136 @@ -397,7 +397,7 @@
   5.137  			isa = PBXFrameworksBuildPhase;
   5.138  			buildActionMask = 2147483647;
   5.139  			files = (
   5.140 -				AAE7DFA614CBB54E00DF1A0E /* libSDL.a in Frameworks */,
   5.141 +				AAE7DFA614CBB54E00DF1A0E /* libSDL2.a in Frameworks */,
   5.142  				AAE7DFA714CBB54E00DF1A0E /* AudioToolbox.framework in Frameworks */,
   5.143  				AAE7DFA814CBB54E00DF1A0E /* QuartzCore.framework in Frameworks */,
   5.144  				AAE7DFA914CBB54E00DF1A0E /* OpenGLES.framework in Frameworks */,
   5.145 @@ -412,7 +412,7 @@
   5.146  			isa = PBXFrameworksBuildPhase;
   5.147  			buildActionMask = 2147483647;
   5.148  			files = (
   5.149 -				FDBDE5850E313495006BAC0B /* libSDL.a in Frameworks */,
   5.150 +				FDBDE5850E313495006BAC0B /* libSDL2.a in Frameworks */,
   5.151  				FDA8AAB10E2D330F00EA573E /* AudioToolbox.framework in Frameworks */,
   5.152  				FDA8AAB20E2D330F00EA573E /* QuartzCore.framework in Frameworks */,
   5.153  				FDA8AAB30E2D330F00EA573E /* OpenGLES.framework in Frameworks */,
   5.154 @@ -427,7 +427,7 @@
   5.155  			isa = PBXFrameworksBuildPhase;
   5.156  			buildActionMask = 2147483647;
   5.157  			files = (
   5.158 -				FDBDE58C0E3134F3006BAC0B /* libSDL.a in Frameworks */,
   5.159 +				FDBDE58C0E3134F3006BAC0B /* libSDL2.a in Frameworks */,
   5.160  				FDAAC3C30E2D47E6001DB1D8 /* AudioToolbox.framework in Frameworks */,
   5.161  				FDAAC3C40E2D47E6001DB1D8 /* QuartzCore.framework in Frameworks */,
   5.162  				FDAAC3C50E2D47E6001DB1D8 /* OpenGLES.framework in Frameworks */,
   5.163 @@ -442,7 +442,7 @@
   5.164  			isa = PBXFrameworksBuildPhase;
   5.165  			buildActionMask = 2147483647;
   5.166  			files = (
   5.167 -				FDBDE59B0E31356A006BAC0B /* libSDL.a in Frameworks */,
   5.168 +				FDBDE59B0E31356A006BAC0B /* libSDL2.a in Frameworks */,
   5.169  				FDAAC5910E2D5429001DB1D8 /* AudioToolbox.framework in Frameworks */,
   5.170  				FDAAC5920E2D5429001DB1D8 /* QuartzCore.framework in Frameworks */,
   5.171  				FDAAC5930E2D5429001DB1D8 /* OpenGLES.framework in Frameworks */,
   5.172 @@ -457,7 +457,7 @@
   5.173  			isa = PBXFrameworksBuildPhase;
   5.174  			buildActionMask = 2147483647;
   5.175  			files = (
   5.176 -				FDBDE59F0E31358D006BAC0B /* libSDL.a in Frameworks */,
   5.177 +				FDBDE59F0E31358D006BAC0B /* libSDL2.a in Frameworks */,
   5.178  				FDAAC5BF0E2D55B5001DB1D8 /* AudioToolbox.framework in Frameworks */,
   5.179  				FDAAC5C00E2D55B5001DB1D8 /* QuartzCore.framework in Frameworks */,
   5.180  				FDAAC5C10E2D55B5001DB1D8 /* OpenGLES.framework in Frameworks */,
   5.181 @@ -472,7 +472,7 @@
   5.182  			isa = PBXFrameworksBuildPhase;
   5.183  			buildActionMask = 2147483647;
   5.184  			files = (
   5.185 -				FDBDE57C0E313445006BAC0B /* libSDL.a in Frameworks */,
   5.186 +				FDBDE57C0E313445006BAC0B /* libSDL2.a in Frameworks */,
   5.187  				FDAAC61C0E2D5914001DB1D8 /* AudioToolbox.framework in Frameworks */,
   5.188  				FDAAC61D0E2D5914001DB1D8 /* QuartzCore.framework in Frameworks */,
   5.189  				FDAAC61E0E2D5914001DB1D8 /* OpenGLES.framework in Frameworks */,
   5.190 @@ -487,7 +487,7 @@
   5.191  			isa = PBXFrameworksBuildPhase;
   5.192  			buildActionMask = 2147483647;
   5.193  			files = (
   5.194 -				FDC42FF40F0D866D009C87E1 /* libSDL.a in Frameworks */,
   5.195 +				FDC42FF40F0D866D009C87E1 /* libSDL2.a in Frameworks */,
   5.196  				FDC42FF60F0D866D009C87E1 /* AudioToolbox.framework in Frameworks */,
   5.197  				FDC42FF70F0D866D009C87E1 /* QuartzCore.framework in Frameworks */,
   5.198  				FDC42FF80F0D866D009C87E1 /* OpenGLES.framework in Frameworks */,
   5.199 @@ -502,7 +502,7 @@
   5.200  			isa = PBXFrameworksBuildPhase;
   5.201  			buildActionMask = 2147483647;
   5.202  			files = (
   5.203 -				FDBDE5A90E3135C0006BAC0B /* libSDL.a in Frameworks */,
   5.204 +				FDBDE5A90E3135C0006BAC0B /* libSDL2.a in Frameworks */,
   5.205  				FDD2C1000E2E4F4B00B7A85F /* AudioToolbox.framework in Frameworks */,
   5.206  				FDD2C1010E2E4F4B00B7A85F /* QuartzCore.framework in Frameworks */,
   5.207  				FDD2C1020E2E4F4B00B7A85F /* OpenGLES.framework in Frameworks */,
   5.208 @@ -517,7 +517,7 @@
   5.209  			isa = PBXFrameworksBuildPhase;
   5.210  			buildActionMask = 2147483647;
   5.211  			files = (
   5.212 -				FDBDE5AE0E3135E6006BAC0B /* libSDL.a in Frameworks */,
   5.213 +				FDBDE5AE0E3135E6006BAC0B /* libSDL2.a in Frameworks */,
   5.214  				FDD2C1770E2E52C000B7A85F /* AudioToolbox.framework in Frameworks */,
   5.215  				FDD2C1780E2E52C000B7A85F /* QuartzCore.framework in Frameworks */,
   5.216  				FDD2C1790E2E52C000B7A85F /* OpenGLES.framework in Frameworks */,
   5.217 @@ -532,7 +532,7 @@
   5.218  			isa = PBXFrameworksBuildPhase;
   5.219  			buildActionMask = 2147483647;
   5.220  			files = (
   5.221 -				FDBDE5B60E3135FE006BAC0B /* libSDL.a in Frameworks */,
   5.222 +				FDBDE5B60E3135FE006BAC0B /* libSDL2.a in Frameworks */,
   5.223  				FDD2C19B0E2E534F00B7A85F /* AudioToolbox.framework in Frameworks */,
   5.224  				FDD2C19C0E2E534F00B7A85F /* QuartzCore.framework in Frameworks */,
   5.225  				FDD2C19D0E2E534F00B7A85F /* OpenGLES.framework in Frameworks */,
   5.226 @@ -547,7 +547,7 @@
   5.227  			isa = PBXFrameworksBuildPhase;
   5.228  			buildActionMask = 2147483647;
   5.229  			files = (
   5.230 -				FDBDE5BC0E31364D006BAC0B /* libSDL.a in Frameworks */,
   5.231 +				FDBDE5BC0E31364D006BAC0B /* libSDL2.a in Frameworks */,
   5.232  				FDD2C4540E2E773800B7A85F /* AudioToolbox.framework in Frameworks */,
   5.233  				FDD2C4550E2E773800B7A85F /* QuartzCore.framework in Frameworks */,
   5.234  				FDD2C4560E2E773800B7A85F /* OpenGLES.framework in Frameworks */,
   5.235 @@ -562,7 +562,7 @@
   5.236  			isa = PBXFrameworksBuildPhase;
   5.237  			buildActionMask = 2147483647;
   5.238  			files = (
   5.239 -				FDBDE5C20E313663006BAC0B /* libSDL.a in Frameworks */,
   5.240 +				FDBDE5C20E313663006BAC0B /* libSDL2.a in Frameworks */,
   5.241  				FDD2C4720E2E77D700B7A85F /* AudioToolbox.framework in Frameworks */,
   5.242  				FDD2C4730E2E77D700B7A85F /* QuartzCore.framework in Frameworks */,
   5.243  				FDD2C4740E2E77D700B7A85F /* OpenGLES.framework in Frameworks */,
   5.244 @@ -577,7 +577,7 @@
   5.245  			isa = PBXFrameworksBuildPhase;
   5.246  			buildActionMask = 2147483647;
   5.247  			files = (
   5.248 -				FDBDE5C60E3136F1006BAC0B /* libSDL.a in Frameworks */,
   5.249 +				FDBDE5C60E3136F1006BAC0B /* libSDL2.a in Frameworks */,
   5.250  				FDD2C5010E2E7F4800B7A85F /* AudioToolbox.framework in Frameworks */,
   5.251  				FDD2C5020E2E7F4800B7A85F /* QuartzCore.framework in Frameworks */,
   5.252  				FDD2C5030E2E7F4800B7A85F /* OpenGLES.framework in Frameworks */,
   5.253 @@ -592,7 +592,7 @@
   5.254  			isa = PBXFrameworksBuildPhase;
   5.255  			buildActionMask = 2147483647;
   5.256  			files = (
   5.257 -				FDBDE5C80E313702006BAC0B /* libSDL.a in Frameworks */,
   5.258 +				FDBDE5C80E313702006BAC0B /* libSDL2.a in Frameworks */,
   5.259  				FDD2C51F0E2E807600B7A85F /* AudioToolbox.framework in Frameworks */,
   5.260  				FDD2C5200E2E807600B7A85F /* QuartzCore.framework in Frameworks */,
   5.261  				FDD2C5210E2E807600B7A85F /* OpenGLES.framework in Frameworks */,
   5.262 @@ -607,7 +607,7 @@
   5.263  			isa = PBXFrameworksBuildPhase;
   5.264  			buildActionMask = 2147483647;
   5.265  			files = (
   5.266 -				FDBDE5CA0E313712006BAC0B /* libSDL.a in Frameworks */,
   5.267 +				FDBDE5CA0E313712006BAC0B /* libSDL2.a in Frameworks */,
   5.268  				FDD2C5440E2E80E400B7A85F /* AudioToolbox.framework in Frameworks */,
   5.269  				FDD2C5450E2E80E400B7A85F /* QuartzCore.framework in Frameworks */,
   5.270  				FDD2C5460E2E80E400B7A85F /* OpenGLES.framework in Frameworks */,
   5.271 @@ -622,7 +622,7 @@
   5.272  			isa = PBXFrameworksBuildPhase;
   5.273  			buildActionMask = 2147483647;
   5.274  			files = (
   5.275 -				FDBDE5CC0E31372B006BAC0B /* libSDL.a in Frameworks */,
   5.276 +				FDBDE5CC0E31372B006BAC0B /* libSDL2.a in Frameworks */,
   5.277  				FDD2C57D0E2E8C7400B7A85F /* AudioToolbox.framework in Frameworks */,
   5.278  				FDD2C57E0E2E8C7400B7A85F /* QuartzCore.framework in Frameworks */,
   5.279  				FDD2C57F0E2E8C7400B7A85F /* OpenGLES.framework in Frameworks */,
   5.280 @@ -637,7 +637,7 @@
   5.281  			isa = PBXFrameworksBuildPhase;
   5.282  			buildActionMask = 2147483647;
   5.283  			files = (
   5.284 -				FDBDE5CE0E31373E006BAC0B /* libSDL.a in Frameworks */,
   5.285 +				FDBDE5CE0E31373E006BAC0B /* libSDL2.a in Frameworks */,
   5.286  				FDD2C5BB0E2E8CFC00B7A85F /* AudioToolbox.framework in Frameworks */,
   5.287  				FDD2C5BC0E2E8CFC00B7A85F /* QuartzCore.framework in Frameworks */,
   5.288  				FDD2C5BD0E2E8CFC00B7A85F /* OpenGLES.framework in Frameworks */,
   5.289 @@ -652,7 +652,7 @@
   5.290  			isa = PBXFrameworksBuildPhase;
   5.291  			buildActionMask = 2147483647;
   5.292  			files = (
   5.293 -				FDBDE5D40E313789006BAC0B /* libSDL.a in Frameworks */,
   5.294 +				FDBDE5D40E313789006BAC0B /* libSDL2.a in Frameworks */,
   5.295  				FDD2C6EA0E2E959E00B7A85F /* AudioToolbox.framework in Frameworks */,
   5.296  				FDD2C6EB0E2E959E00B7A85F /* QuartzCore.framework in Frameworks */,
   5.297  				FDD2C6EC0E2E959E00B7A85F /* OpenGLES.framework in Frameworks */,
   5.298 @@ -711,7 +711,7 @@
   5.299  		FD1B48AD0E3131CA007AB34E /* Products */ = {
   5.300  			isa = PBXGroup;
   5.301  			children = (
   5.302 -				FD1B48B80E3131CA007AB34E /* libSDL.a */,
   5.303 +				FD1B48B80E3131CA007AB34E /* libSDL2.a */,
   5.304  				0466EE7011E565E4000198A4 /* testsdl.app */,
   5.305  			);
   5.306  			name = Products;
   5.307 @@ -1234,10 +1234,10 @@
   5.308  			remoteRef = 0466EE6F11E565E4000198A4 /* PBXContainerItemProxy */;
   5.309  			sourceTree = BUILT_PRODUCTS_DIR;
   5.310  		};
   5.311 -		FD1B48B80E3131CA007AB34E /* libSDL.a */ = {
   5.312 +		FD1B48B80E3131CA007AB34E /* libSDL2.a */ = {
   5.313  			isa = PBXReferenceProxy;
   5.314  			fileType = archive.ar;
   5.315 -			path = libSDL.a;
   5.316 +			path = libSDL2.a;
   5.317  			remoteRef = FD1B48B70E3131CA007AB34E /* PBXContainerItemProxy */;
   5.318  			sourceTree = BUILT_PRODUCTS_DIR;
   5.319  		};
     6.1 --- a/android-project/AndroidManifest.xml	Wed Jul 25 20:56:42 2012 -0400
     6.2 +++ b/android-project/AndroidManifest.xml	Sat Sep 01 07:19:49 2012 -0400
     6.3 @@ -3,6 +3,9 @@
     6.4        package="org.libsdl.app"
     6.5        android:versionCode="1"
     6.6        android:versionName="1.0">
     6.7 +
     6.8 +    <uses-sdk android:minSdkVersion="5" />
     6.9 +
    6.10      <application android:label="@string/app_name" android:icon="@drawable/icon">
    6.11          <activity android:name="SDLActivity"
    6.12                    android:label="@string/app_name">
     7.1 --- a/android-project/src/org/libsdl/app/SDLActivity.java	Wed Jul 25 20:56:42 2012 -0400
     7.2 +++ b/android-project/src/org/libsdl/app/SDLActivity.java	Sat Sep 01 07:19:49 2012 -0400
     7.3 @@ -9,6 +9,7 @@
     7.4  import android.app.*;
     7.5  import android.content.*;
     7.6  import android.view.*;
     7.7 +import android.view.inputmethod.InputMethodManager;
     7.8  import android.os.*;
     7.9  import android.util.Log;
    7.10  import android.graphics.*;
    7.11 @@ -106,13 +107,33 @@
    7.12      }
    7.13  
    7.14      // Messages from the SDLMain thread
    7.15 -    static int COMMAND_CHANGE_TITLE = 1;
    7.16 +    static final int COMMAND_CHANGE_TITLE = 1;
    7.17 +    static final int COMMAND_KEYBOARD_SHOW = 2;
    7.18  
    7.19      // Handler for the messages
    7.20      Handler commandHandler = new Handler() {
    7.21 +        @Override
    7.22          public void handleMessage(Message msg) {
    7.23 -            if (msg.arg1 == COMMAND_CHANGE_TITLE) {
    7.24 +            switch (msg.arg1) {
    7.25 +            case COMMAND_CHANGE_TITLE:
    7.26                  setTitle((String)msg.obj);
    7.27 +                break;
    7.28 +            case COMMAND_KEYBOARD_SHOW:
    7.29 +                InputMethodManager manager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
    7.30 +                if (manager != null) {
    7.31 +                    switch (((Integer)msg.obj).intValue()) {
    7.32 +                    case 0:
    7.33 +                        manager.hideSoftInputFromWindow(mSurface.getWindowToken(), 0);
    7.34 +                        break;
    7.35 +                    case 1:
    7.36 +                        manager.showSoftInput(mSurface, 0);
    7.37 +                        break;
    7.38 +                    case 2:
    7.39 +                        manager.toggleSoftInputFromWindow(mSurface.getWindowToken(), 0, 0);
    7.40 +                        break;
    7.41 +                    }
    7.42 +                }
    7.43 +               break;
    7.44              }
    7.45          }
    7.46      };
    7.47 @@ -155,6 +176,10 @@
    7.48          mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
    7.49      }
    7.50  
    7.51 +    public static void sendMessage(int command, int param) {
    7.52 +        mSingleton.sendCommand(command, Integer.valueOf(param));
    7.53 +    }
    7.54 +
    7.55      public static Context getContext() {
    7.56          return mSingleton;
    7.57      }
    7.58 @@ -424,6 +449,9 @@
    7.59      // Sensors
    7.60      private static SensorManager mSensorManager;
    7.61  
    7.62 +    // Keep track of the surface size to normalize touch events
    7.63 +    private static float mWidth, mHeight;
    7.64 +
    7.65      // Startup    
    7.66      public SDLSurface(Context context) {
    7.67          super(context);
    7.68 @@ -435,7 +463,11 @@
    7.69          setOnKeyListener(this); 
    7.70          setOnTouchListener(this);   
    7.71  
    7.72 -        mSensorManager = (SensorManager)context.getSystemService("sensor");  
    7.73 +        mSensorManager = (SensorManager)context.getSystemService("sensor");
    7.74 +
    7.75 +        // Some arbitrary defaults to avoid a potential division by zero
    7.76 +        mWidth = 1.0f;
    7.77 +        mHeight = 1.0f;
    7.78      }
    7.79  
    7.80      // Called when we have a valid drawing surface
    7.81 @@ -504,6 +536,9 @@
    7.82              Log.v("SDL", "pixel format unknown " + format);
    7.83              break;
    7.84          }
    7.85 +
    7.86 +        mWidth = (float) width;
    7.87 +        mHeight = (float) height;
    7.88          SDLActivity.onNativeResize(width, height, sdlFormat);
    7.89          Log.v("SDL", "Window size:" + width + "x"+height);
    7.90  
    7.91 @@ -539,12 +574,12 @@
    7.92               final int touchDevId = event.getDeviceId();
    7.93               final int pointerCount = event.getPointerCount();
    7.94               // touchId, pointerId, action, x, y, pressure
    7.95 -             int actionPointerIndex = event.getActionIndex();
    7.96 +             int actionPointerIndex = (event.getAction() & MotionEvent.ACTION_POINTER_ID_MASK) >> MotionEvent. ACTION_POINTER_ID_SHIFT; /* API 8: event.getActionIndex(); */
    7.97               int pointerFingerId = event.getPointerId(actionPointerIndex);
    7.98 -             int action = event.getActionMasked();
    7.99 +             int action = (event.getAction() & MotionEvent.ACTION_MASK); /* API 8: event.getActionMasked(); */
   7.100  
   7.101 -             float x = event.getX(actionPointerIndex);
   7.102 -             float y = event.getY(actionPointerIndex);
   7.103 +             float x = event.getX(actionPointerIndex) / mWidth;
   7.104 +             float y = event.getY(actionPointerIndex) / mHeight;
   7.105               float p = event.getPressure(actionPointerIndex);
   7.106  
   7.107               if (action == MotionEvent.ACTION_MOVE && pointerCount > 1) {
   7.108 @@ -552,8 +587,8 @@
   7.109                  // changed since prev event.
   7.110                  for (int i = 0; i < pointerCount; i++) {
   7.111                      pointerFingerId = event.getPointerId(i);
   7.112 -                    x = event.getX(i);
   7.113 -                    y = event.getY(i);
   7.114 +                    x = event.getX(i) / mWidth;
   7.115 +                    y = event.getY(i) / mHeight;
   7.116                      p = event.getPressure(i);
   7.117                      SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
   7.118                  }
   7.119 @@ -590,4 +625,3 @@
   7.120      }
   7.121  
   7.122  }
   7.123 -
     8.1 --- a/configure.in	Wed Jul 25 20:56:42 2012 -0400
     8.2 +++ b/configure.in	Sat Sep 01 07:19:49 2012 -0400
     8.3 @@ -1,7 +1,6 @@
     8.4  dnl Process this file with autoconf to produce a configure script.
     8.5  AC_INIT(README)
     8.6  AC_CONFIG_HEADER(include/SDL_config.h)
     8.7 -AC_GNU_SOURCE
     8.8  AC_CONFIG_AUX_DIR(build-scripts)
     8.9  AC_CONFIG_MACRO_DIR([acinclude])
    8.10  
    8.11 @@ -1045,8 +1044,13 @@
    8.12                  *-*-openbsd*)
    8.13                      x11_lib='libX11.so'
    8.14                      x11ext_lib='libXext.so'
    8.15 +                    xcursor_lib='libXcursor.so'
    8.16 +                    xinerama_lib='libXinerama.so'
    8.17 +                    xinput_lib='libXi.so'
    8.18 +                    xrandr_lib='libXrandr.so'
    8.19                      xrender_lib='libXrender.so'
    8.20 -                    xrandr_lib='libXrandr.so'
    8.21 +                    xss_lib='libXss.so'
    8.22 +                    xvidmode_lib='libXxf86vm.so'
    8.23                      ;;
    8.24                  *)
    8.25                      x11_lib=[`find_lib "libX11.so.*" "$X_LIBS -L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`]
     9.1 --- a/include/SDL_config_macosx.h	Wed Jul 25 20:56:42 2012 -0400
     9.2 +++ b/include/SDL_config_macosx.h	Sat Sep 01 07:19:49 2012 -0400
     9.3 @@ -139,17 +139,23 @@
     9.4  #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
     9.5  #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
     9.6  #define SDL_VIDEO_DRIVER_X11_XINERAMA 1
     9.7 -/* 
     9.8 -not included with Mac OS X at the moment...
     9.9 -#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
    9.10 -#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
    9.11 -*/
    9.12  #define SDL_VIDEO_DRIVER_X11_XRANDR 1
    9.13  #define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
    9.14  #define SDL_VIDEO_DRIVER_X11_XSHAPE 1
    9.15  #define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
    9.16  #define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
    9.17  
    9.18 +#ifdef MAC_OS_X_VERSION_10_8
    9.19 +/*
    9.20 + * No matter the versions targeted, this is the 10.8 or later SDK, so you have
    9.21 + *  to use the external Xquartz, which is a more modern Xlib. Previous SDKs
    9.22 + *  used an older Xlib.
    9.23 + */
    9.24 +#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
    9.25 +#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
    9.26 +#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
    9.27 +#endif
    9.28 +
    9.29  #ifndef SDL_VIDEO_RENDER_OGL
    9.30  #define SDL_VIDEO_RENDER_OGL	1
    9.31  #endif
    10.1 --- a/include/SDL_keyboard.h	Wed Jul 25 20:56:42 2012 -0400
    10.2 +++ b/include/SDL_keyboard.h	Sat Sep 01 07:19:49 2012 -0400
    10.3 @@ -171,6 +171,78 @@
    10.4   */
    10.5  extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect);
    10.6  
    10.7 +/**
    10.8 + *  \brief Returns whether the platform has some screen keyboard support.
    10.9 + *  
   10.10 + *  \param window The window for which screen keyboard should be checked.
   10.11 + *  
   10.12 + *  \return SDL_TRUE if some keyboard support is available else SDL_FALSE.
   10.13 + *  
   10.14 + *  \note Not all screen keyboard functions are supported on all platforms.
   10.15 + *  
   10.16 + *  \sa SDL_ShowScreenKeyboard()
   10.17 + *  \sa SDL_HideScreenKeyboard()
   10.18 + *  \sa SDL_IsScreenKeyboardShown()
   10.19 + *  \sa SDL_ToggleScreenKeyboard()
   10.20 + */
   10.21 +extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(SDL_Window *window);
   10.22 +
   10.23 +/**
   10.24 + *  \brief Requests to show a screen keyboard for given window.
   10.25 + *  
   10.26 + *  \param window The window for which screen keyboard should be shown.
   10.27 + *  
   10.28 + *  \return 0 if request will be processed or -1 on error (e.g. no support).
   10.29 + *  
   10.30 + *  \note Showing screen keyboards is asynchronous on some platforms.
   10.31 + *  
   10.32 + *  \sa SDL_HasScreenKeyboardSupport()
   10.33 + *  \sa SDL_HideScreenKeyboard()
   10.34 + */
   10.35 +extern DECLSPEC int SDLCALL SDL_ShowScreenKeyboard(SDL_Window *window);
   10.36 +
   10.37 +/**
   10.38 + *  \brief Requests to hide a screen keyboard for given window.
   10.39 + *  
   10.40 + *  \param window The window for which screen keyboard should be shown.
   10.41 + *  
   10.42 + *  \return 0 if request will be processed or -1 on error (e.g. no support).
   10.43 + *  
   10.44 + *  \note Hiding screen keyboards is asynchronous on some platforms.
   10.45 + *  
   10.46 + *  \sa SDL_HasScreenKeyboardSupport()
   10.47 + *  \sa SDL_ShowScreenKeyboard()
   10.48 + */
   10.49 +extern DECLSPEC int SDLCALL SDL_HideScreenKeyboard(SDL_Window *window);
   10.50 +
   10.51 +/**
   10.52 + *  \brief Requests to toggle a screen keyboard for given window.
   10.53 + *  
   10.54 + *  \param window The window for which screen keyboard should be toggled.
   10.55 + *  
   10.56 + *  \return 0 if request will be processed or -1 on error (e.g. no support).
   10.57 + *  
   10.58 + *  \note Showing and hiding screen keyboards is asynchronous on some platforms.
   10.59 + *  
   10.60 + *  \sa SDL_HasScreenKeyboardSupport()
   10.61 + *  \sa SDL_IsScreenKeyboardShown()
   10.62 + */
   10.63 +extern DECLSPEC int SDLCALL SDL_ToggleScreenKeyboard(SDL_Window * window);
   10.64 +
   10.65 +/**
   10.66 + *  \brief Returns whether the screen keyboard is shown for given window.
   10.67 + *  
   10.68 + *  \param window The window for which screen keyboard should be queried.
   10.69 + *  
   10.70 + *  \return SDL_TRUE if screen keyboard is shown else SDL_FALSE.
   10.71 + *  
   10.72 + *  \note May always return SDL_FALSE on some platforms (not implemented there).
   10.73 + *  
   10.74 + *  \sa SDL_HasScreenKeyboardSupport()
   10.75 + *  \sa SDL_ShowScreenKeyboard()
   10.76 + *  \sa SDL_HideScreenKeyboard()
   10.77 + */
   10.78 +extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
   10.79  
   10.80  /* Ends C function definitions when using C++ */
   10.81  #ifdef __cplusplus
    11.1 --- a/include/SDL_system.h	Wed Jul 25 20:56:42 2012 -0400
    11.2 +++ b/include/SDL_system.h	Sat Sep 01 07:19:49 2012 -0400
    11.3 @@ -30,6 +30,11 @@
    11.4  
    11.5  #include "SDL_stdinc.h"
    11.6  
    11.7 +#if __IPHONEOS__
    11.8 +#include "SDL_video.h"
    11.9 +#include "SDL_keyboard.h"
   11.10 +#endif
   11.11 +
   11.12  #include "begin_code.h"
   11.13  /* Set up for C function definitions, even when using C++ */
   11.14  #ifdef __cplusplus
   11.15 @@ -40,15 +45,13 @@
   11.16  
   11.17  #if __IPHONEOS__
   11.18  
   11.19 -#include "SDL_video.h"
   11.20 -
   11.21  extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
   11.22  extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
   11.23  
   11.24 -extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardShow(SDL_Window * window);
   11.25 -extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardHide(SDL_Window * window);
   11.26 -extern DECLSPEC SDL_bool SDLCALL SDL_iPhoneKeyboardIsShown(SDL_Window * window);
   11.27 -extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardToggle(SDL_Window * window);
   11.28 +#define SDL_iPhoneKeyboardShow  SDL_ShowScreenKeyboard
   11.29 +#define SDL_iPhoneKeyboardHide  SDL_HideScreenKeyboard
   11.30 +#define SDL_iPhoneKeyboardToggle    SDL_ToggleScreenKeyboard
   11.31 +#define SDL_iPhoneKeyboardIsShown   SDL_IsScreenKeyboardShown
   11.32  
   11.33  #endif
   11.34  
    12.1 --- a/include/SDL_video.h	Wed Jul 25 20:56:42 2012 -0400
    12.2 +++ b/include/SDL_video.h	Sat Sep 01 07:19:49 2012 -0400
    12.3 @@ -185,21 +185,23 @@
    12.4      SDL_GL_CONTEXT_MINOR_VERSION,
    12.5      SDL_GL_CONTEXT_EGL,
    12.6      SDL_GL_CONTEXT_FLAGS,
    12.7 -    SDL_GL_CONTEXT_PROFILE_MASK
    12.8 +    SDL_GL_CONTEXT_PROFILE_MASK,
    12.9 +    SDL_GL_SHARE_WITH_CURRENT_CONTEXT
   12.10  } SDL_GLattr;
   12.11  
   12.12  typedef enum
   12.13  {
   12.14      SDL_GL_CONTEXT_PROFILE_CORE           = 0x0001,
   12.15      SDL_GL_CONTEXT_PROFILE_COMPATIBILITY  = 0x0002,
   12.16 -    SDL_GL_CONTEXT_PROFILE_ES2            = 0x0004
   12.17 +    SDL_GL_CONTEXT_PROFILE_ES             = 0x0004
   12.18  } SDL_GLprofile;
   12.19  
   12.20  typedef enum
   12.21  {
   12.22      SDL_GL_CONTEXT_DEBUG_FLAG              = 0x0001,
   12.23      SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002,
   12.24 -    SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG      = 0x0004
   12.25 +    SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG      = 0x0004,
   12.26 +    SDL_GL_CONTEXT_RESET_ISOLATION_FLAG    = 0x0008
   12.27  } SDL_GLcontextFlag;
   12.28  
   12.29  
   12.30 @@ -789,7 +791,9 @@
   12.31   *  \brief Set the swap interval for the current OpenGL context.
   12.32   *  
   12.33   *  \param interval 0 for immediate updates, 1 for updates synchronized with the
   12.34 - *                  vertical retrace.
   12.35 + *                  vertical retrace. If the system supports it, you may
   12.36 + *                  specify -1 to allow late swaps to happen immediately
   12.37 + *                  instead of waiting for the next retrace.
   12.38   *  
   12.39   *  \return 0 on success, or -1 if setting the swap interval is not supported.
   12.40   *  
   12.41 @@ -801,8 +805,10 @@
   12.42   *  \brief Get the swap interval for the current OpenGL context.
   12.43   *  
   12.44   *  \return 0 if there is no vertical retrace synchronization, 1 if the buffer 
   12.45 - *          swap is synchronized with the vertical retrace, and -1 if getting 
   12.46 - *          the swap interval is not supported.
   12.47 + *          swap is synchronized with the vertical retrace, and -1 if late
   12.48 + *          swaps happen immediately instead of waiting for the next retrace.
   12.49 + *          If the system can't determine the swap interval, or there isn't a
   12.50 + *          valid current context, this will return 0 as a safe default.
   12.51   *  
   12.52   *  \sa SDL_GL_SetSwapInterval()
   12.53   */
    13.1 --- a/src/SDL_hints.c	Wed Jul 25 20:56:42 2012 -0400
    13.2 +++ b/src/SDL_hints.c	Sat Sep 01 07:19:49 2012 -0400
    13.3 @@ -57,7 +57,7 @@
    13.4                          SDL_HintPriority priority)
    13.5  {
    13.6      const char *env;
    13.7 -    SDL_Hint *prev, *hint;
    13.8 +    SDL_Hint *hint;
    13.9  
   13.10      if (!name || !value) {
   13.11          return SDL_FALSE;
   13.12 @@ -68,8 +68,7 @@
   13.13          return SDL_FALSE;
   13.14      }
   13.15  
   13.16 -    prev = NULL;
   13.17 -    for (hint = SDL_hints; hint; prev = hint, hint = hint->next) {
   13.18 +    for (hint = SDL_hints; hint; hint = hint->next) {
   13.19          if (SDL_strcmp(name, hint->name) == 0) {
   13.20              if (priority < hint->priority) {
   13.21                  return SDL_FALSE;
    14.1 --- a/src/audio/SDL_audio.c	Wed Jul 25 20:56:42 2012 -0400
    14.2 +++ b/src/audio/SDL_audio.c	Sat Sep 01 07:19:49 2012 -0400
    14.3 @@ -314,7 +314,6 @@
    14.4      int stream_len;
    14.5      void *udata;
    14.6      void (SDLCALL * fill) (void *userdata, Uint8 * stream, int len);
    14.7 -    int silence;
    14.8      Uint32 delay;
    14.9      /* For streaming when the buffer sizes don't match up */
   14.10      Uint8 *istream;
   14.11 @@ -335,12 +334,6 @@
   14.12      device->use_streamer = 0;
   14.13  
   14.14      if (device->convert.needed) {
   14.15 -        if (device->convert.src_format == AUDIO_U8) {
   14.16 -            silence = 0x80;
   14.17 -        } else {
   14.18 -            silence = 0;
   14.19 -        }
   14.20 -
   14.21  #if 0                           /* !!! FIXME: I took len_div out of the structure. Use rate_incr instead? */
   14.22          /* If the result of the conversion alters the length, i.e. resampling is being used, use the streamer */
   14.23          if (device->convert.len_mult != 1 || device->convert.len_div != 1) {
   14.24 @@ -367,7 +360,6 @@
   14.25          /* stream_len = device->convert.len; */
   14.26          stream_len = device->spec.size;
   14.27      } else {
   14.28 -        silence = device->spec.silence;
   14.29          stream_len = device->spec.size;
   14.30      }
   14.31  
    15.1 --- a/src/audio/SDL_wave.c	Wed Jul 25 20:56:42 2012 -0400
    15.2 +++ b/src/audio/SDL_wave.c	Sat Sep 01 07:19:49 2012 -0400
    15.3 @@ -49,7 +49,6 @@
    15.4  InitMS_ADPCM(WaveFMT * format)
    15.5  {
    15.6      Uint8 *rogue_feel;
    15.7 -    Uint16 extra_info;
    15.8      int i;
    15.9  
   15.10      /* Set the rogue pointer to the MS_ADPCM specific data */
   15.11 @@ -62,7 +61,7 @@
   15.12          SDL_SwapLE16(format->bitspersample);
   15.13      rogue_feel = (Uint8 *) format + sizeof(*format);
   15.14      if (sizeof(*format) == 16) {
   15.15 -        extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);
   15.16 +        /*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);*/
   15.17          rogue_feel += sizeof(Uint16);
   15.18      }
   15.19      MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
   15.20 @@ -233,7 +232,6 @@
   15.21  InitIMA_ADPCM(WaveFMT * format)
   15.22  {
   15.23      Uint8 *rogue_feel;
   15.24 -    Uint16 extra_info;
   15.25  
   15.26      /* Set the rogue pointer to the IMA_ADPCM specific data */
   15.27      IMA_ADPCM_state.wavefmt.encoding = SDL_SwapLE16(format->encoding);
   15.28 @@ -245,7 +243,7 @@
   15.29          SDL_SwapLE16(format->bitspersample);
   15.30      rogue_feel = (Uint8 *) format + sizeof(*format);
   15.31      if (sizeof(*format) == 16) {
   15.32 -        extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);
   15.33 +        /*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]);*/
   15.34          rogue_feel += sizeof(Uint16);
   15.35      }
   15.36      IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
   15.37 @@ -424,6 +422,8 @@
   15.38      /* FMT chunk */
   15.39      WaveFMT *format = NULL;
   15.40  
   15.41 +    SDL_zero(chunk);
   15.42 +
   15.43      /* Make sure we are passed a valid data source */
   15.44      was_error = 0;
   15.45      if (src == NULL) {
    16.1 --- a/src/core/android/SDL_android.cpp	Wed Jul 25 20:56:42 2012 -0400
    16.2 +++ b/src/core/android/SDL_android.cpp	Sat Sep 01 07:19:49 2012 -0400
    16.3 @@ -735,6 +735,21 @@
    16.4      return Android_JNI_FileClose(ctx, true);
    16.5  }
    16.6  
    16.7 +// sends message to be handled on the UI event dispatch thread
    16.8 +extern "C" int Android_JNI_SendMessage(int command, int param)
    16.9 +{
   16.10 +    JNIEnv *env = Android_JNI_GetEnv();
   16.11 +    if (!env) {
   16.12 +        return -1;
   16.13 +    }
   16.14 +    jmethodID mid = env->GetStaticMethodID(mActivityClass, "sendMessage", "(II)V");
   16.15 +    if (!mid) {
   16.16 +        return -1;
   16.17 +    }
   16.18 +    env->CallStaticVoidMethod(mActivityClass, mid, command, param);
   16.19 +    return 0;
   16.20 +}
   16.21 +
   16.22  #endif /* __ANDROID__ */
   16.23  
   16.24  /* vi: set ts=4 sw=4 expandtab: */
    17.1 --- a/src/core/android/SDL_android.h	Wed Jul 25 20:56:42 2012 -0400
    17.2 +++ b/src/core/android/SDL_android.h	Sat Sep 01 07:19:49 2012 -0400
    17.3 @@ -53,6 +53,9 @@
    17.4  JNIEnv *Android_JNI_GetEnv(void);
    17.5  int Android_JNI_SetupThread(void);
    17.6  
    17.7 +// Generic messages
    17.8 +int Android_JNI_SendMessage(int command, int param);
    17.9 +
   17.10  /* Ends C function definitions when using C++ */
   17.11  #ifdef __cplusplus
   17.12  /* *INDENT-OFF* */
    18.1 --- a/src/haptic/SDL_haptic.c	Wed Jul 25 20:56:42 2012 -0400
    18.2 +++ b/src/haptic/SDL_haptic.c	Sat Sep 01 07:19:49 2012 -0400
    18.3 @@ -766,7 +766,6 @@
    18.4  int
    18.5  SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length)
    18.6  {
    18.7 -    int ret;
    18.8      SDL_HapticPeriodic *efx;
    18.9  
   18.10      if (!ValidHaptic(haptic)) {
   18.11 @@ -790,7 +789,7 @@
   18.12      efx = &haptic->rumble_effect.periodic;
   18.13      efx->magnitude = (Sint16)(32767.0f*strength);
   18.14      efx->length = length;
   18.15 -    ret = SDL_HapticUpdateEffect(haptic, haptic->rumble_id, &haptic->rumble_effect);
   18.16 +    SDL_HapticUpdateEffect(haptic, haptic->rumble_id, &haptic->rumble_effect);
   18.17  
   18.18      return SDL_HapticRunEffect(haptic, haptic->rumble_id, 1);
   18.19  }
    19.1 --- a/src/haptic/windows/SDL_syshaptic.c	Wed Jul 25 20:56:42 2012 -0400
    19.2 +++ b/src/haptic/windows/SDL_syshaptic.c	Sat Sep 01 07:19:49 2012 -0400
    19.3 @@ -120,12 +120,7 @@
    19.4  static int
    19.5  DI_GUIDIsSame(const GUID * a, const GUID * b)
    19.6  {
    19.7 -    if (((a)->Data1 == (b)->Data1) &&
    19.8 -        ((a)->Data2 == (b)->Data2) &&
    19.9 -        ((a)->Data3 == (b)->Data3) &&
   19.10 -        (SDL_strcmp((a)->Data4, (b)->Data4) == 0))
   19.11 -        return 1;
   19.12 -    return 0;
   19.13 +    return (SDL_memcmp(a, b, sizeof (GUID)) == 0);
   19.14  }
   19.15  
   19.16  
    20.1 --- a/src/joystick/bsd/SDL_sysjoystick.c	Wed Jul 25 20:56:42 2012 -0400
    20.2 +++ b/src/joystick/bsd/SDL_sysjoystick.c	Sat Sep 01 07:19:49 2012 -0400
    20.3 @@ -76,7 +76,7 @@
    20.4  #include "../SDL_sysjoystick.h"
    20.5  #include "../SDL_joystick_c.h"
    20.6  
    20.7 -#define MAX_UHID_JOYS	4
    20.8 +#define MAX_UHID_JOYS	16
    20.9  #define MAX_JOY_JOYS	2
   20.10  #define MAX_JOYS	(MAX_UHID_JOYS + MAX_JOY_JOYS)
   20.11  
    21.1 --- a/src/joystick/linux/SDL_sysjoystick.c	Wed Jul 25 20:56:42 2012 -0400
    21.2 +++ b/src/joystick/linux/SDL_sysjoystick.c	Sat Sep 01 07:19:49 2012 -0400
    21.3 @@ -582,7 +582,7 @@
    21.4  {
    21.5      SDL_bool handled;
    21.6      unsigned char n;
    21.7 -    int old_axes, tmp_naxes, tmp_nhats, tmp_nballs;
    21.8 +    int tmp_naxes, tmp_nhats, tmp_nballs;
    21.9      const char *name;
   21.10      char *env, env_name[128];
   21.11      int i;
   21.12 @@ -602,7 +602,6 @@
   21.13      }
   21.14  
   21.15      name = SDL_SYS_JoystickName(joystick->index);
   21.16 -    old_axes = joystick->naxes;
   21.17  
   21.18      /* Generic analog joystick support */
   21.19      if (SDL_strstr(name, "Analog") == name && SDL_strstr(name, "-hat")) {
    22.1 --- a/src/joystick/windows/SDL_dxjoystick.c	Wed Jul 25 20:56:42 2012 -0400
    22.2 +++ b/src/joystick/windows/SDL_dxjoystick.c	Sat Sep 01 07:19:49 2012 -0400
    22.3 @@ -65,7 +65,6 @@
    22.4  static DIDEVICEINSTANCE SYS_Joystick[MAX_JOYSTICKS];    /* array to hold joystick ID values */
    22.5  static char *SYS_JoystickNames[MAX_JOYSTICKS];
    22.6  static int SYS_NumJoysticks;
    22.7 -static HINSTANCE DInputDLL = NULL;
    22.8  
    22.9  
   22.10  /* local prototypes */
    23.1 --- a/src/render/SDL_render.c	Wed Jul 25 20:56:42 2012 -0400
    23.2 +++ b/src/render/SDL_render.c	Sat Sep 01 07:19:49 2012 -0400
    23.3 @@ -546,11 +546,8 @@
    23.4  SDL_GetTextureColorMod(SDL_Texture * texture, Uint8 * r, Uint8 * g,
    23.5                         Uint8 * b)
    23.6  {
    23.7 -    SDL_Renderer *renderer;
    23.8 -
    23.9      CHECK_TEXTURE_MAGIC(texture, -1);
   23.10  
   23.11 -    renderer = texture->renderer;
   23.12      if (r) {
   23.13          *r = texture->r;
   23.14      }
   23.15 @@ -1173,7 +1170,6 @@
   23.16  SDL_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
   23.17                 const SDL_Rect * srcrect, const SDL_Rect * dstrect)
   23.18  {
   23.19 -    SDL_Window *window;
   23.20      SDL_Rect real_srcrect;
   23.21      SDL_Rect real_dstrect;
   23.22  
   23.23 @@ -1184,7 +1180,6 @@
   23.24          SDL_SetError("Texture was not created with this renderer");
   23.25          return -1;
   23.26      }
   23.27 -    window = renderer->window;
   23.28  
   23.29      real_srcrect.x = 0;
   23.30      real_srcrect.y = 0;
   23.31 @@ -1237,7 +1232,6 @@
   23.32                 const SDL_Rect * srcrect, const SDL_Rect * dstrect,
   23.33                 const double angle, const SDL_Point *center, const SDL_RendererFlip flip)
   23.34  {
   23.35 -    SDL_Window *window;
   23.36      SDL_Rect real_srcrect, real_dstrect;
   23.37      SDL_Point real_center;
   23.38  
   23.39 @@ -1253,8 +1247,6 @@
   23.40          return -1;
   23.41      }
   23.42      
   23.43 -    window = renderer->window;
   23.44 -
   23.45      real_srcrect.x = 0;
   23.46      real_srcrect.y = 0;
   23.47      real_srcrect.w = texture->w;
   23.48 @@ -1268,10 +1260,10 @@
   23.49      /* We don't intersect the dstrect with the viewport as RenderCopy does because of potential rotation clipping issues... TODO: should we? */
   23.50      if (dstrect) real_dstrect = *dstrect;
   23.51      else {
   23.52 -        real_srcrect.x = 0;
   23.53 -        real_srcrect.y = 0;
   23.54 -        real_srcrect.w = renderer->viewport.w;
   23.55 -        real_srcrect.h = renderer->viewport.h;
   23.56 +        real_dstrect.x = 0;
   23.57 +        real_dstrect.y = 0;
   23.58 +        real_dstrect.w = renderer->viewport.w;
   23.59 +        real_dstrect.h = renderer->viewport.h;
   23.60      }
   23.61  
   23.62      if (texture->native) {
   23.63 @@ -1291,7 +1283,6 @@
   23.64  SDL_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect,
   23.65                       Uint32 format, void * pixels, int pitch)
   23.66  {
   23.67 -    SDL_Window *window;
   23.68      SDL_Rect real_rect;
   23.69  
   23.70      CHECK_RENDERER_MAGIC(renderer, -1);
   23.71 @@ -1300,10 +1291,9 @@
   23.72          SDL_Unsupported();
   23.73          return -1;
   23.74      }
   23.75 -    window = renderer->window;
   23.76  
   23.77      if (!format) {
   23.78 -        format = SDL_GetWindowPixelFormat(window);
   23.79 +        format = SDL_GetWindowPixelFormat(renderer->window);
   23.80      }
   23.81  
   23.82      real_rect.x = renderer->viewport.x;
    24.1 --- a/src/render/direct3d/SDL_render_d3d.c	Wed Jul 25 20:56:42 2012 -0400
    24.2 +++ b/src/render/direct3d/SDL_render_d3d.c	Sat Sep 01 07:19:49 2012 -0400
    24.3 @@ -682,8 +682,6 @@
    24.4  D3D_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    24.5  {
    24.6      D3D_RenderData *renderdata = (D3D_RenderData *) renderer->driverdata;
    24.7 -    SDL_Window *window = renderer->window;
    24.8 -    D3DFORMAT display_format = renderdata->pparams.BackBufferFormat;
    24.9      D3D_TextureData *data;
   24.10      D3DPOOL pool;
   24.11      DWORD usage;
   24.12 @@ -731,7 +729,6 @@
   24.13                    const SDL_Rect * rect, const void *pixels, int pitch)
   24.14  {
   24.15      D3D_TextureData *data = (D3D_TextureData *) texture->driverdata;
   24.16 -    D3D_RenderData *renderdata = (D3D_RenderData *) renderer->driverdata;
   24.17      RECT d3drect;
   24.18      D3DLOCKED_RECT locked;
   24.19      const Uint8 *src;
    25.1 --- a/src/render/software/SDL_rotate.c	Wed Jul 25 20:56:42 2012 -0400
    25.2 +++ b/src/render/software/SDL_rotate.c	Sat Sep 01 07:19:49 2012 -0400
    25.3 @@ -272,7 +272,7 @@
    25.4  */
    25.5  void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int isin, int icos, int flipx, int flipy)
    25.6  {
    25.7 -    int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay, sw, sh;
    25.8 +    int x, y, dx, dy, xd, yd, sdx, sdy, ax, ay;
    25.9      tColorY *pc, *sp;
   25.10      int gap;
   25.11  
   25.12 @@ -283,8 +283,6 @@
   25.13      yd = ((src->h - dst->h) << 15);
   25.14      ax = (cx << 16) - (icos * cx);
   25.15      ay = (cy << 16) - (isin * cx);
   25.16 -    sw = src->w - 1;
   25.17 -    sh = src->h - 1;
   25.18      pc = (tColorY*) dst->pixels;
   25.19      gap = dst->pitch - dst->w;
   25.20      /*
    26.1 --- a/src/video/SDL_RLEaccel.c	Wed Jul 25 20:56:42 2012 -0400
    26.2 +++ b/src/video/SDL_RLEaccel.c	Sat Sep 01 07:19:49 2012 -0400
    26.3 @@ -1270,9 +1270,8 @@
    26.4      Uint8 *rlebuf, *dst;
    26.5      int maxn;
    26.6      int y;
    26.7 -    Uint8 *srcbuf, *curbuf, *lastline;
    26.8 +    Uint8 *srcbuf, *lastline;
    26.9      int maxsize = 0;
   26.10 -    int skip, run;
   26.11      int bpp = surface->format->BytesPerPixel;
   26.12      getpix_func getpix;
   26.13      Uint32 ckey, rgbmask;
   26.14 @@ -1306,9 +1305,7 @@
   26.15  
   26.16      /* Set up the conversion */
   26.17      srcbuf = (Uint8 *) surface->pixels;
   26.18 -    curbuf = srcbuf;
   26.19      maxn = bpp == 4 ? 65535 : 255;
   26.20 -    skip = run = 0;
   26.21      dst = rlebuf;
   26.22      rgbmask = ~surface->format->Amask;
   26.23      ckey = surface->map->info.colorkey & rgbmask;
    27.1 --- a/src/video/SDL_bmp.c	Wed Jul 25 20:56:42 2012 -0400
    27.2 +++ b/src/video/SDL_bmp.c	Sat Sep 01 07:19:49 2012 -0400
    27.3 @@ -67,23 +67,23 @@
    27.4  
    27.5      /* The Win32 BMP file header (14 bytes) */
    27.6      char magic[2];
    27.7 -    Uint32 bfSize;
    27.8 -    Uint16 bfReserved1;
    27.9 -    Uint16 bfReserved2;
   27.10 -    Uint32 bfOffBits;
   27.11 +    /*Uint32 bfSize = 0;*/
   27.12 +    /*Uint16 bfReserved1 = 0;*/
   27.13 +    /*Uint16 bfReserved2 = 0;*/
   27.14 +    Uint32 bfOffBits = 0;
   27.15  
   27.16      /* The Win32 BITMAPINFOHEADER struct (40 bytes) */
   27.17 -    Uint32 biSize;
   27.18 -    Sint32 biWidth;
   27.19 -    Sint32 biHeight;
   27.20 -    Uint16 biPlanes;
   27.21 -    Uint16 biBitCount;
   27.22 -    Uint32 biCompression;
   27.23 -    Uint32 biSizeImage;
   27.24 -    Sint32 biXPelsPerMeter;
   27.25 -    Sint32 biYPelsPerMeter;
   27.26 -    Uint32 biClrUsed;
   27.27 -    Uint32 biClrImportant;
   27.28 +    Uint32 biSize = 0;
   27.29 +    Sint32 biWidth = 0;
   27.30 +    Sint32 biHeight = 0;
   27.31 +    /*Uint16 biPlanes = 0;*/
   27.32 +    Uint16 biBitCount = 0;
   27.33 +    Uint32 biCompression = 0;
   27.34 +    /*Uint32 biSizeImage = 0;*/
   27.35 +    /*Sint32 biXPelsPerMeter = 0;*/
   27.36 +    /*Sint32 biYPelsPerMeter = 0;*/
   27.37 +    Uint32 biClrUsed = 0;
   27.38 +    /*Uint32 biClrImportant = 0;*/
   27.39  
   27.40      /* Make sure we are passed a valid data source */
   27.41      surface = NULL;
   27.42 @@ -106,9 +106,9 @@
   27.43          was_error = SDL_TRUE;
   27.44          goto done;
   27.45      }
   27.46 -    bfSize = SDL_ReadLE32(src);
   27.47 -    bfReserved1 = SDL_ReadLE16(src);
   27.48 -    bfReserved2 = SDL_ReadLE16(src);
   27.49 +    /*bfSize =*/ SDL_ReadLE32(src);
   27.50 +    /*bfReserved1 =*/ SDL_ReadLE16(src);
   27.51 +    /*bfReserved2 =*/ SDL_ReadLE16(src);
   27.52      bfOffBits = SDL_ReadLE32(src);
   27.53  
   27.54      /* Read the Win32 BITMAPINFOHEADER */
   27.55 @@ -116,25 +116,20 @@
   27.56      if (biSize == 12) {
   27.57          biWidth = (Uint32) SDL_ReadLE16(src);
   27.58          biHeight = (Uint32) SDL_ReadLE16(src);
   27.59 -        biPlanes = SDL_ReadLE16(src);
   27.60 +        /*biPlanes =*/ SDL_ReadLE16(src);
   27.61          biBitCount = SDL_ReadLE16(src);
   27.62          biCompression = BI_RGB;
   27.63 -        biSizeImage = 0;
   27.64 -        biXPelsPerMeter = 0;
   27.65 -        biYPelsPerMeter = 0;
   27.66 -        biClrUsed = 0;
   27.67 -        biClrImportant = 0;
   27.68      } else {
   27.69          biWidth = SDL_ReadLE32(src);
   27.70          biHeight = SDL_ReadLE32(src);
   27.71 -        biPlanes = SDL_ReadLE16(src);
   27.72 +        /*biPlanes =*/ SDL_ReadLE16(src);
   27.73          biBitCount = SDL_ReadLE16(src);
   27.74          biCompression = SDL_ReadLE32(src);
   27.75 -        biSizeImage = SDL_ReadLE32(src);
   27.76 -        biXPelsPerMeter = SDL_ReadLE32(src);
   27.77 -        biYPelsPerMeter = SDL_ReadLE32(src);
   27.78 +        /*biSizeImage =*/ SDL_ReadLE32(src);
   27.79 +        /*biXPelsPerMeter =*/ SDL_ReadLE32(src);
   27.80 +        /*biYPelsPerMeter =*/ SDL_ReadLE32(src);
   27.81          biClrUsed = SDL_ReadLE32(src);
   27.82 -        biClrImportant = SDL_ReadLE32(src);
   27.83 +        /*biClrImportant =*/ SDL_ReadLE32(src);
   27.84      }
   27.85      if (biHeight < 0) {
   27.86          topDown = SDL_TRUE;
    28.1 --- a/src/video/SDL_stretch.c	Wed Jul 25 20:56:42 2012 -0400
    28.2 +++ b/src/video/SDL_stretch.c	Sat Sep 01 07:19:49 2012 -0400
    28.3 @@ -209,7 +209,6 @@
    28.4      int src_locked;
    28.5      int dst_locked;
    28.6      int pos, inc;
    28.7 -    int dst_width;
    28.8      int dst_maxrow;
    28.9      int src_row, dst_row;
   28.10      Uint8 *srcp = NULL;
   28.11 @@ -286,7 +285,6 @@
   28.12      inc = (srcrect->h << 16) / dstrect->h;
   28.13      src_row = srcrect->y;
   28.14      dst_row = dstrect->y;
   28.15 -    dst_width = dstrect->w * bpp;
   28.16  
   28.17  #ifdef USE_ASM_STRETCH
   28.18      /* Write the opcodes for this stretch */
    29.1 --- a/src/video/SDL_surface.c	Wed Jul 25 20:56:42 2012 -0400
    29.2 +++ b/src/video/SDL_surface.c	Sat Sep 01 07:19:49 2012 -0400
    29.3 @@ -912,6 +912,7 @@
    29.4      SDL_PixelFormat src_fmt, dst_fmt;
    29.5      SDL_BlitMap src_blitmap, dst_blitmap;
    29.6      SDL_Rect rect;
    29.7 +    void *nonconst_src = (void *) src;
    29.8  
    29.9      /* Fast path for same format copy */
   29.10      if (src_format == dst_format) {
   29.11 @@ -942,7 +943,7 @@
   29.12          return 0;
   29.13      }
   29.14  
   29.15 -    if (!SDL_CreateSurfaceOnStack(width, height, src_format, (void*)src,
   29.16 +    if (!SDL_CreateSurfaceOnStack(width, height, src_format, nonconst_src,
   29.17                                    src_pitch,
   29.18                                    &src_surface, &src_fmt, &src_blitmap)) {
   29.19          return -1;
    30.1 --- a/src/video/SDL_sysvideo.h	Wed Jul 25 20:56:42 2012 -0400
    30.2 +++ b/src/video/SDL_sysvideo.h	Sat Sep 01 07:19:49 2012 -0400
    30.3 @@ -233,6 +233,13 @@
    30.4      void (*StopTextInput) (_THIS);
    30.5      void (*SetTextInputRect) (_THIS, SDL_Rect *rect);
    30.6  
    30.7 +    /* Screen keyboard */
    30.8 +    SDL_bool (*SDL_HasScreenKeyboardSupport) (_THIS, SDL_Window *window);
    30.9 +    int (*SDL_ShowScreenKeyboard) (_THIS, SDL_Window *window);
   30.10 +    int (*SDL_HideScreenKeyboard) (_THIS, SDL_Window *window);
   30.11 +    int (*SDL_ToggleScreenKeyboard) (_THIS, SDL_Window *window);
   30.12 +    SDL_bool (*SDL_IsScreenKeyboardShown) (_THIS, SDL_Window *window);
   30.13 +
   30.14      /* Clipboard */
   30.15      int (*SetClipboardText) (_THIS, const char *text);
   30.16      char * (*GetClipboardText) (_THIS);
   30.17 @@ -273,6 +280,7 @@
   30.18          int flags;
   30.19          int profile_mask;
   30.20          int use_egl;
   30.21 +        int share_with_current_context;
   30.22          int retained_backing;
   30.23          int driver_loaded;
   30.24          char driver_path[256];
    31.1 --- a/src/video/SDL_video.c	Wed Jul 25 20:56:42 2012 -0400
    31.2 +++ b/src/video/SDL_video.c	Sat Sep 01 07:19:49 2012 -0400
    31.3 @@ -505,6 +505,7 @@
    31.4  #endif
    31.5      _this->gl_config.flags = 0;
    31.6      _this->gl_config.profile_mask = 0;
    31.7 +    _this->gl_config.share_with_current_context = 0;
    31.8  
    31.9      /* Initialize the video subsystem */
   31.10      if (_this->VideoInit(_this) < 0) {
   31.11 @@ -2309,11 +2310,30 @@
   31.12          _this->gl_config.use_egl = value;
   31.13          break;
   31.14      case SDL_GL_CONTEXT_FLAGS:
   31.15 +        if( value & ~(SDL_GL_CONTEXT_DEBUG_FLAG |
   31.16 +		      SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG |
   31.17 +		      SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG |
   31.18 +		      SDL_GL_CONTEXT_RESET_ISOLATION_FLAG) ) {
   31.19 +	    SDL_SetError("Unknown OpenGL context flag %d", value);
   31.20 +	    retval = -1;
   31.21 +	    break;
   31.22 +	}
   31.23          _this->gl_config.flags = value;
   31.24          break;
   31.25      case SDL_GL_CONTEXT_PROFILE_MASK:
   31.26 +        if( value != 0 &&
   31.27 +	    value != SDL_GL_CONTEXT_PROFILE_CORE &&
   31.28 +	    value != SDL_GL_CONTEXT_PROFILE_COMPATIBILITY &&
   31.29 +	    value != SDL_GL_CONTEXT_PROFILE_ES ) {
   31.30 +	    SDL_SetError("Unknown OpenGL context profile %d", value);
   31.31 +	    retval = -1;
   31.32 +	    break;
   31.33 +	}
   31.34          _this->gl_config.profile_mask = value;
   31.35          break;
   31.36 +    case SDL_GL_SHARE_WITH_CURRENT_CONTEXT:
   31.37 +        _this->gl_config.share_with_current_context = value;
   31.38 +	break;
   31.39      default:
   31.40          SDL_SetError("Unknown OpenGL attribute");
   31.41          retval = -1;
   31.42 @@ -2475,6 +2495,11 @@
   31.43              *value = _this->gl_config.profile_mask;
   31.44              return 0;
   31.45          }
   31.46 +    case SDL_GL_SHARE_WITH_CURRENT_CONTEXT:
   31.47 +        {
   31.48 +            *value = _this->gl_config.share_with_current_context;
   31.49 +            return 0;
   31.50 +        }
   31.51      default:
   31.52          SDL_SetError("Unknown OpenGL attribute");
   31.53          return -1;
   31.54 @@ -2578,16 +2603,13 @@
   31.55  SDL_GL_GetSwapInterval(void)
   31.56  {
   31.57      if (!_this) {
   31.58 -        SDL_UninitializedVideo();
   31.59 -        return -1;
   31.60 +        return 0;
   31.61      } else if (_this->current_glctx == NULL) {
   31.62 -        SDL_SetError("No OpenGL context has been made current");
   31.63 -        return -1;
   31.64 +        return 0;
   31.65      } else if (_this->GL_GetSwapInterval) {
   31.66          return _this->GL_GetSwapInterval(_this);
   31.67      } else {
   31.68 -        SDL_SetError("Getting the swap interval is not supported");
   31.69 -        return -1;
   31.70 +        return 0;
   31.71      }
   31.72  }
   31.73  
   31.74 @@ -2756,4 +2778,49 @@
   31.75      }
   31.76  }
   31.77  
   31.78 +SDL_bool
   31.79 +SDL_HasScreenKeyboardSupport(SDL_Window *window)
   31.80 +{
   31.81 +    if (window && _this && _this->SDL_HasScreenKeyboardSupport) {
   31.82 +        return _this->SDL_HasScreenKeyboardSupport(_this, window);
   31.83 +    }
   31.84 +    return SDL_FALSE;
   31.85 +}
   31.86 +
   31.87 +int
   31.88 +SDL_ShowScreenKeyboard(SDL_Window *window)
   31.89 +{
   31.90 +    if (window && _this && _this->SDL_ShowScreenKeyboard) {
   31.91 +        return _this->SDL_ShowScreenKeyboard(_this, window);
   31.92 +    }
   31.93 +    return -1;
   31.94 +}
   31.95 +
   31.96 +int
   31.97 +SDL_HideScreenKeyboard(SDL_Window *window)
   31.98 +{
   31.99 +    if (window && _this && _this->SDL_HideScreenKeyboard) {
  31.100 +        return _this->SDL_HideScreenKeyboard(_this, window);
  31.101 +    }
  31.102 +    return -1;
  31.103 +}
  31.104 +
  31.105 +int
  31.106 +SDL_ToggleScreenKeyboard(SDL_Window *window)
  31.107 +{
  31.108 +    if (window && _this && _this->SDL_ToggleScreenKeyboard) {
  31.109 +        return _this->SDL_ToggleScreenKeyboard(_this, window);
  31.110 +    }
  31.111 +    return -1;
  31.112 +}
  31.113 +
  31.114 +SDL_bool
  31.115 +SDL_IsScreenKeyboardShown(SDL_Window *window)
  31.116 +{
  31.117 +    if (window && _this && _this->SDL_IsScreenKeyboardShown) {
  31.118 +        return _this->SDL_IsScreenKeyboardShown(_this, window);
  31.119 +    }
  31.120 +    return SDL_FALSE;
  31.121 +}
  31.122 +
  31.123  /* vi: set ts=4 sw=4 expandtab: */
    32.1 --- a/src/video/android/SDL_androidkeyboard.c	Wed Jul 25 20:56:42 2012 -0400
    32.2 +++ b/src/video/android/SDL_androidkeyboard.c	Sat Sep 01 07:19:49 2012 -0400
    32.3 @@ -178,6 +178,40 @@
    32.4      return SDL_SendKeyboardKey(SDL_RELEASED, TranslateKeycode(keycode));
    32.5  }
    32.6  
    32.7 +// has to fit Activity constant
    32.8 +#define COMMAND_KEYBOARD_SHOW 2
    32.9 +
   32.10 +SDL_bool
   32.11 +Android_HasScreenKeyboardSupport(_THIS, SDL_Window * window)
   32.12 +{
   32.13 +    return Android_Window ? SDL_TRUE : SDL_FALSE;
   32.14 +}
   32.15 +
   32.16 +int
   32.17 +Android_ShowScreenKeyboard(_THIS, SDL_Window * window)
   32.18 +{
   32.19 +    return Android_Window ? Android_JNI_SendMessage(COMMAND_KEYBOARD_SHOW, 1) : -1;
   32.20 +}
   32.21 +
   32.22 +int
   32.23 +Android_HideScreenKeyboard(_THIS, SDL_Window * window)
   32.24 +{
   32.25 +    
   32.26 +    return Android_Window ? Android_JNI_SendMessage(COMMAND_KEYBOARD_SHOW, 0) : -1;
   32.27 +}
   32.28 +
   32.29 +int
   32.30 +Android_ToggleScreenKeyboard(_THIS, SDL_Window * window)
   32.31 +{
   32.32 +    return Android_Window ? Android_JNI_SendMessage(COMMAND_KEYBOARD_SHOW, 2) : -1;
   32.33 +}
   32.34 +
   32.35 +SDL_bool
   32.36 +Android_IsScreenKeyboardShown(_THIS, SDL_Window * window)
   32.37 +{
   32.38 +    return SDL_FALSE;
   32.39 +}
   32.40 +
   32.41  #endif /* SDL_VIDEO_DRIVER_ANDROID */
   32.42  
   32.43  /* vi: set ts=4 sw=4 expandtab: */
    33.1 --- a/src/video/android/SDL_androidkeyboard.h	Wed Jul 25 20:56:42 2012 -0400
    33.2 +++ b/src/video/android/SDL_androidkeyboard.h	Sat Sep 01 07:19:49 2012 -0400
    33.3 @@ -26,4 +26,10 @@
    33.4  extern int Android_OnKeyDown(int keycode);
    33.5  extern int Android_OnKeyUp(int keycode);
    33.6  
    33.7 +extern SDL_bool Android_HasScreenKeyboardSupport(_THIS, SDL_Window * window);
    33.8 +extern int Android_ShowScreenKeyboard(_THIS, SDL_Window * window);
    33.9 +extern int Android_HideScreenKeyboard(_THIS, SDL_Window * window);
   33.10 +extern int Android_ToggleScreenKeyboard(_THIS, SDL_Window * window);
   33.11 +extern SDL_bool Android_IsScreenKeyboardShown(_THIS, SDL_Window * window);
   33.12 +
   33.13  /* vi: set ts=4 sw=4 expandtab: */
    34.1 --- a/src/video/android/SDL_androidtouch.c	Wed Jul 25 20:56:42 2012 -0400
    34.2 +++ b/src/video/android/SDL_androidtouch.c	Sat Sep 01 07:19:49 2012 -0400
    34.3 @@ -55,10 +55,10 @@
    34.4          memset( &touch, 0, sizeof(touch) );
    34.5          touch.id = touchDeviceId;
    34.6          touch.x_min = 0.0f;
    34.7 -        touch.x_max = (float)Android_ScreenWidth;
    34.8 +        touch.x_max = 1.0f;
    34.9          touch.native_xres = touch.x_max - touch.x_min;
   34.10          touch.y_min = 0.0f;
   34.11 -        touch.y_max = (float)Android_ScreenHeight;
   34.12 +        touch.y_max = 1.0f;
   34.13          touch.native_yres = touch.y_max - touch.y_min;
   34.14          touch.pressure_min = 0.0f;
   34.15          touch.pressure_max = 1.0f;
    35.1 --- a/src/video/android/SDL_androidvideo.c	Wed Jul 25 20:56:42 2012 -0400
    35.2 +++ b/src/video/android/SDL_androidvideo.c	Sat Sep 01 07:19:49 2012 -0400
    35.3 @@ -119,6 +119,13 @@
    35.4      device->GL_SwapWindow = Android_GL_SwapWindow;
    35.5      device->GL_DeleteContext = Android_GL_DeleteContext;
    35.6  
    35.7 +    /* Screen keyboard */
    35.8 +    device->SDL_HasScreenKeyboardSupport = Android_HasScreenKeyboardSupport;
    35.9 +    device->SDL_ShowScreenKeyboard = Android_ShowScreenKeyboard;
   35.10 +    device->SDL_HideScreenKeyboard = Android_HideScreenKeyboard;
   35.11 +    device->SDL_ToggleScreenKeyboard = Android_ToggleScreenKeyboard;
   35.12 +    device->SDL_IsScreenKeyboardShown = Android_IsScreenKeyboardShown;
   35.13 +
   35.14      return device;
   35.15  }
   35.16  
    36.1 --- a/src/video/cocoa/SDL_cocoamodes.m	Wed Jul 25 20:56:42 2012 -0400
    36.2 +++ b/src/video/cocoa/SDL_cocoamodes.m	Sat Sep 01 07:19:49 2012 -0400
    36.3 @@ -102,9 +102,6 @@
    36.4      case kCGErrorCannotComplete:
    36.5          error = "kCGErrorCannotComplete";
    36.6          break;
    36.7 -    case kCGErrorNameTooLong:
    36.8 -        error = "kCGErrorNameTooLong";
    36.9 -        break;
   36.10      case kCGErrorNotImplemented:
   36.11          error = "kCGErrorNotImplemented";
   36.12          break;
   36.13 @@ -114,9 +111,6 @@
   36.14      case kCGErrorTypeCheck:
   36.15          error = "kCGErrorTypeCheck";
   36.16          break;
   36.17 -    case kCGErrorNoCurrentPoint:
   36.18 -        error = "kCGErrorNoCurrentPoint";
   36.19 -        break;
   36.20      case kCGErrorInvalidOperation:
   36.21          error = "kCGErrorInvalidOperation";
   36.22          break;
    37.1 --- a/src/video/cocoa/SDL_cocoaopengl.m	Wed Jul 25 20:56:42 2012 -0400
    37.2 +++ b/src/video/cocoa/SDL_cocoaopengl.m	Sat Sep 01 07:19:49 2012 -0400
    37.3 @@ -250,7 +250,7 @@
    37.4      NSAutoreleasePool *pool;
    37.5      NSOpenGLContext *nscontext;
    37.6      GLint value;
    37.7 -    int status;
    37.8 +    int status = 0;
    37.9  
   37.10      pool = [[NSAutoreleasePool alloc] init];
   37.11  
   37.12 @@ -258,9 +258,6 @@
   37.13      if (nscontext != nil) {
   37.14          [nscontext getValues:&value forParameter:NSOpenGLCPSwapInterval];
   37.15          status = (int)value;
   37.16 -    } else {
   37.17 -        SDL_SetError("No current OpenGL context");
   37.18 -        status = -1;
   37.19      }
   37.20  
   37.21      [pool release];
    38.1 --- a/src/video/directfb/SDL_DirectFB_opengl.c	Wed Jul 25 20:56:42 2012 -0400
    38.2 +++ b/src/video/directfb/SDL_DirectFB_opengl.c	Sat Sep 01 07:19:49 2012 -0400
    38.3 @@ -250,8 +250,7 @@
    38.4  int
    38.5  DirectFB_GL_GetSwapInterval(_THIS)
    38.6  {
    38.7 -    SDL_Unsupported();
    38.8 -    return -1;
    38.9 +    return 0;
   38.10  }
   38.11  
   38.12  void
    39.1 --- a/src/video/pandora/SDL_pandora.c	Wed Jul 25 20:56:42 2012 -0400
    39.2 +++ b/src/video/pandora/SDL_pandora.c	Sat Sep 01 07:19:49 2012 -0400
    39.3 @@ -796,15 +796,7 @@
    39.4  int
    39.5  PND_gl_getswapinterval(_THIS)
    39.6  {
    39.7 -    SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata;
    39.8 -
    39.9 -    if (phdata->egl_initialized != SDL_TRUE) {
   39.10 -        SDL_SetError("PND: GLES initialization failed, no OpenGL ES support");
   39.11 -        return -1;
   39.12 -    }
   39.13 -
   39.14 -    /* Return default swap interval value */
   39.15 -    return phdata->swapinterval;
   39.16 +    return ((SDL_VideoData *) _this->driverdata)->swapinterval;
   39.17  }
   39.18  
   39.19  void
    40.1 --- a/src/video/uikit/SDL_uikitvideo.m	Wed Jul 25 20:56:42 2012 -0400
    40.2 +++ b/src/video/uikit/SDL_uikitvideo.m	Sat Sep 01 07:19:49 2012 -0400
    40.3 @@ -89,6 +89,11 @@
    40.4      device->DestroyWindow = UIKit_DestroyWindow;
    40.5      device->GetWindowWMInfo = UIKit_GetWindowWMInfo;
    40.6  
    40.7 +    device->SDL_HasScreenKeyboardSupport = UIKit_HasScreenKeyboardSupport;
    40.8 +    device->SDL_ShowScreenKeyboard = UIKit_ShowScreenKeyboard;
    40.9 +    device->SDL_HideScreenKeyboard = UIKit_HideScreenKeyboard;
   40.10 +    device->SDL_ToggleScreenKeyboard = UIKit_ToggleScreenKeyboard;
   40.11 +    device->SDL_IsScreenKeyboardShown = UIKit_IsScreenKeyboardShown;
   40.12  
   40.13      /* OpenGL (ES) functions */
   40.14      device->GL_MakeCurrent        = UIKit_GL_MakeCurrent;
    41.1 --- a/src/video/uikit/SDL_uikitview.h	Wed Jul 25 20:56:42 2012 -0400
    41.2 +++ b/src/video/uikit/SDL_uikitview.h	Sat Sep 01 07:19:49 2012 -0400
    41.3 @@ -60,6 +60,13 @@
    41.4  - (void)hideKeyboard;
    41.5  - (void)initializeKeyboard;
    41.6  @property (readonly) BOOL keyboardVisible;
    41.7 +
    41.8 +SDL_bool UIKit_HasScreenKeyboardSupport(_THIS, SDL_Window *window);
    41.9 +int UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window);
   41.10 +int UIKit_HideScreenKeyboard(_THIS, SDL_Window *window);
   41.11 +int UIKit_ToggleScreenKeyboard(_THIS, SDL_Window *window);
   41.12 +SDL_bool UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window);
   41.13 +
   41.14  #endif
   41.15  
   41.16  @end
    42.1 --- a/src/video/uikit/SDL_uikitview.m	Wed Jul 25 20:56:42 2012 -0400
    42.2 +++ b/src/video/uikit/SDL_uikitview.m	Sat Sep 01 07:19:49 2012 -0400
    42.3 @@ -355,7 +355,17 @@
    42.4      return view;
    42.5  }
    42.6  
    42.7 -int SDL_iPhoneKeyboardShow(SDL_Window * window)
    42.8 +SDL_bool UIKit_HasScreenKeyboardSupport(_THIS, SDL_Window *window)
    42.9 +{
   42.10 +    SDL_uikitview *view = getWindowView(window);
   42.11 +    if (view == nil) {
   42.12 +        return SDL_FALSE;
   42.13 +    }
   42.14 +
   42.15 +    return SDL_TRUE;
   42.16 +}
   42.17 +
   42.18 +int UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window)
   42.19  {
   42.20      SDL_uikitview *view = getWindowView(window);
   42.21      if (view == nil) {
   42.22 @@ -366,7 +376,7 @@
   42.23      return 0;
   42.24  }
   42.25  
   42.26 -int SDL_iPhoneKeyboardHide(SDL_Window * window)
   42.27 +int UIKit_HideScreenKeyboard(_THIS, SDL_Window *window)
   42.28  {
   42.29      SDL_uikitview *view = getWindowView(window);
   42.30      if (view == nil) {
   42.31 @@ -377,7 +387,7 @@
   42.32      return 0;
   42.33  }
   42.34  
   42.35 -SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window)
   42.36 +SDL_bool UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window)
   42.37  {
   42.38      SDL_uikitview *view = getWindowView(window);
   42.39      if (view == nil) {
   42.40 @@ -387,49 +397,22 @@
   42.41      return view.keyboardVisible;
   42.42  }
   42.43  
   42.44 -int SDL_iPhoneKeyboardToggle(SDL_Window * window)
   42.45 +int UIKit_ToggleScreenKeyboard(_THIS, SDL_Window *window)
   42.46  {
   42.47      SDL_uikitview *view = getWindowView(window);
   42.48      if (view == nil) {
   42.49          return -1;
   42.50      }
   42.51  
   42.52 -    if (SDL_iPhoneKeyboardIsShown(window)) {
   42.53 -        SDL_iPhoneKeyboardHide(window);
   42.54 +    if (UIKit_IsScreenKeyboardShown(_this, window)) {
   42.55 +        UIKit_HideScreenKeyboard(_this, window);
   42.56      }
   42.57      else {
   42.58 -        SDL_iPhoneKeyboardShow(window);
   42.59 +        UIKit_ShowScreenKeyboard(_this, window);
   42.60      }
   42.61      return 0;
   42.62  }
   42.63  
   42.64 -#else
   42.65 -
   42.66 -/* stubs, used if compiled without keyboard support */
   42.67 -
   42.68 -int SDL_iPhoneKeyboardShow(SDL_Window * window)
   42.69 -{
   42.70 -    SDL_SetError("Not compiled with keyboard support");
   42.71 -    return -1;
   42.72 -}
   42.73 -
   42.74 -int SDL_iPhoneKeyboardHide(SDL_Window * window)
   42.75 -{
   42.76 -    SDL_SetError("Not compiled with keyboard support");
   42.77 -    return -1;
   42.78 -}
   42.79 -
   42.80 -SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window)
   42.81 -{
   42.82 -    return 0;
   42.83 -}
   42.84 -
   42.85 -int SDL_iPhoneKeyboardToggle(SDL_Window * window)
   42.86 -{
   42.87 -    SDL_SetError("Not compiled with keyboard support");
   42.88 -    return -1;
   42.89 -}
   42.90 -
   42.91  #endif /* SDL_IPHONE_KEYBOARD */
   42.92  
   42.93  #endif /* SDL_VIDEO_DRIVER_UIKIT */
    43.1 --- a/src/video/uikit/SDL_uikitwindow.m	Wed Jul 25 20:56:42 2012 -0400
    43.2 +++ b/src/video/uikit/SDL_uikitwindow.m	Sat Sep 01 07:19:49 2012 -0400
    43.3 @@ -95,7 +95,6 @@
    43.4  
    43.5      /* only one window on iOS, always shown */
    43.6      window->flags &= ~SDL_WINDOW_HIDDEN;
    43.7 -    window->flags |= SDL_WINDOW_SHOWN;
    43.8  
    43.9      // SDL_WINDOW_BORDERLESS controls whether status bar is hidden.
   43.10      // This is only set if the window is on the main screen. Other screens
    44.1 --- a/src/video/windows/SDL_windowskeyboard.c	Wed Jul 25 20:56:42 2012 -0400
    44.2 +++ b/src/video/windows/SDL_windowskeyboard.c	Sat Sep 01 07:19:49 2012 -0400
    44.3 @@ -572,20 +572,20 @@
    44.4                          #define pVerFixedInfo   ((VS_FIXEDFILEINFO FAR*)lpVerData)
    44.5                          DWORD dwVer = pVerFixedInfo->dwFileVersionMS;
    44.6                          dwVer = (dwVer & 0x00ff0000) << 8 | (dwVer & 0x000000ff) << 16;
    44.7 -                        if (videodata->GetReadingString ||
    44.8 -                            dwLang == LANG_CHT && (
    44.9 +                        if ((videodata->GetReadingString) ||
   44.10 +                            ((dwLang == LANG_CHT) && (
   44.11                              dwVer == MAKEIMEVERSION(4, 2) ||
   44.12                              dwVer == MAKEIMEVERSION(4, 3) ||
   44.13                              dwVer == MAKEIMEVERSION(4, 4) ||
   44.14                              dwVer == MAKEIMEVERSION(5, 0) ||
   44.15                              dwVer == MAKEIMEVERSION(5, 1) ||
   44.16                              dwVer == MAKEIMEVERSION(5, 2) ||
   44.17 -                            dwVer == MAKEIMEVERSION(6, 0))
   44.18 +                            dwVer == MAKEIMEVERSION(6, 0)))
   44.19                              ||
   44.20 -                            dwLang == LANG_CHS && (
   44.21 +                            ((dwLang == LANG_CHS) && (
   44.22                              dwVer == MAKEIMEVERSION(4, 1) ||
   44.23                              dwVer == MAKEIMEVERSION(4, 2) ||
   44.24 -                            dwVer == MAKEIMEVERSION(5, 3))) {
   44.25 +                            dwVer == MAKEIMEVERSION(5, 3)))) {
   44.26                              dwRet[0] = dwVer | dwLang;
   44.27                              dwRet[1] = pVerFixedInfo->dwFileVersionLS;
   44.28                              SDL_free(lpVerBuffer);
   44.29 @@ -1050,7 +1050,6 @@
   44.30      if (SUCCEEDED(element->lpVtbl->QueryInterface(element, &IID_ITfReadingInformationUIElement, (LPVOID *)&preading))) {
   44.31          BSTR bstr;
   44.32          if (SUCCEEDED(preading->lpVtbl->GetString(preading, &bstr)) && bstr) {
   44.33 -            WCHAR *s = (WCHAR *)bstr;
   44.34              SysFreeString(bstr);
   44.35          }
   44.36          preading->lpVtbl->Release(preading);
   44.37 @@ -1133,7 +1132,7 @@
   44.38  
   44.39  STDMETHODIMP IPPASink_OnActivated(TSFSink *sink, DWORD dwProfileType, LANGID langid, REFCLSID clsid, REFGUID catid, REFGUID guidProfile, HKL hkl, DWORD dwFlags)
   44.40  {
   44.41 -    static GUID TF_PROFILE_DAYI = {0x037B2C25, 0x480C, 0x4D7F, 0xB0, 0x27, 0xD6, 0xCA, 0x6B, 0x69, 0x78, 0x8A};
   44.42 +    static const GUID TF_PROFILE_DAYI = { 0x037B2C25, 0x480C, 0x4D7F, { 0xB0, 0x27, 0xD6, 0xCA, 0x6B, 0x69, 0x78, 0x8A } };
   44.43      SDL_VideoData *videodata = (SDL_VideoData *)sink->data;
   44.44      videodata->ime_candlistindexbase = SDL_IsEqualGUID(&TF_PROFILE_DAYI, guidProfile) ? 0 : 1;
   44.45      if (SDL_IsEqualIID(catid, &GUID_TFCAT_TIP_KEYBOARD) && (dwFlags & TF_IPSINK_FLAG_ACTIVE))
    45.1 --- a/src/video/windows/SDL_windowsopengl.c	Wed Jul 25 20:56:42 2012 -0400
    45.2 +++ b/src/video/windows/SDL_windowsopengl.c	Sat Sep 01 07:19:49 2012 -0400
    45.3 @@ -61,6 +61,11 @@
    45.4  #define WGL_CONTEXT_ES2_PROFILE_BIT_EXT           0x00000004
    45.5  #endif
    45.6  
    45.7 +#ifndef WGL_EXT_create_context_es_profile
    45.8 +#define WGL_EXT_create_context_es_profile
    45.9 +#define WGL_CONTEXT_ES_PROFILE_BIT_EXT            0x00000004
   45.10 +#endif
   45.11 +
   45.12  typedef HGLRC(APIENTRYP PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC,
   45.13                                                              HGLRC
   45.14                                                              hShareContext,
   45.15 @@ -112,10 +117,8 @@
   45.16          GetProcAddress(handle, "wglDeleteContext");
   45.17      _this->gl_data->wglMakeCurrent = (BOOL(WINAPI *) (HDC, HGLRC))
   45.18          GetProcAddress(handle, "wglMakeCurrent");
   45.19 -    _this->gl_data->wglSwapIntervalEXT = (void (WINAPI *) (int))
   45.20 -        GetProcAddress(handle, "wglSwapIntervalEXT");
   45.21 -    _this->gl_data->wglGetSwapIntervalEXT = (int (WINAPI *) (void))
   45.22 -        GetProcAddress(handle, "wglGetSwapIntervalEXT");
   45.23 +    _this->gl_data->wglShareLists = (BOOL(WINAPI *) (HGLRC, HGLRC))
   45.24 +        GetProcAddress(handle, "wglShareLists");
   45.25  
   45.26      if (!_this->gl_data->wglGetProcAddress ||
   45.27          !_this->gl_data->wglCreateContext ||
   45.28 @@ -341,7 +344,7 @@
   45.29      }
   45.30  
   45.31      /* Check for WGL_ARB_pixel_format */
   45.32 -    _this->gl_data->WGL_ARB_pixel_format = 0;
   45.33 +    _this->gl_data->HAS_WGL_ARB_pixel_format = SDL_FALSE;
   45.34      if (HasExtension("WGL_ARB_pixel_format", extensions)) {
   45.35          _this->gl_data->wglChoosePixelFormatARB = (BOOL(WINAPI *)
   45.36                                                     (HDC, const int *,
   45.37 @@ -354,16 +357,20 @@
   45.38  
   45.39          if ((_this->gl_data->wglChoosePixelFormatARB != NULL) &&
   45.40              (_this->gl_data->wglGetPixelFormatAttribivARB != NULL)) {
   45.41 -            _this->gl_data->WGL_ARB_pixel_format = 1;
   45.42 +            _this->gl_data->HAS_WGL_ARB_pixel_format = SDL_TRUE;
   45.43          }
   45.44      }
   45.45  
   45.46      /* Check for WGL_EXT_swap_control */
   45.47 +    _this->gl_data->HAS_WGL_EXT_swap_control_tear = SDL_FALSE;
   45.48      if (HasExtension("WGL_EXT_swap_control", extensions)) {
   45.49          _this->gl_data->wglSwapIntervalEXT =
   45.50              WIN_GL_GetProcAddress(_this, "wglSwapIntervalEXT");
   45.51          _this->gl_data->wglGetSwapIntervalEXT =
   45.52              WIN_GL_GetProcAddress(_this, "wglGetSwapIntervalEXT");
   45.53 +        if (HasExtension("WGL_EXT_swap_control_tear", extensions)) {
   45.54 +            _this->gl_data->HAS_WGL_EXT_swap_control_tear = SDL_TRUE;
   45.55 +        }
   45.56      } else {
   45.57          _this->gl_data->wglSwapIntervalEXT = NULL;
   45.58          _this->gl_data->wglGetSwapIntervalEXT = NULL;
   45.59 @@ -397,7 +404,7 @@
   45.60  
   45.61          WIN_GL_InitExtensions(_this, hdc);
   45.62  
   45.63 -        if (_this->gl_data->WGL_ARB_pixel_format) {
   45.64 +        if (_this->gl_data->HAS_WGL_ARB_pixel_format) {
   45.65              _this->gl_data->wglChoosePixelFormatARB(hdc, iAttribs, fAttribs,
   45.66                                                      1, &pixel_format,
   45.67                                                      &matching);
   45.68 @@ -519,10 +526,22 @@
   45.69  WIN_GL_CreateContext(_THIS, SDL_Window * window)
   45.70  {
   45.71      HDC hdc = ((SDL_WindowData *) window->driverdata)->hdc;
   45.72 -    HGLRC context;
   45.73 +    HGLRC context, share_context;
   45.74  
   45.75 -    if (_this->gl_config.major_version < 3) {
   45.76 +    if (_this->gl_config.share_with_current_context) {
   45.77 +        share_context = (HGLRC)(_this->current_glctx);
   45.78 +    } else {
   45.79 +        share_context = 0;
   45.80 +    }
   45.81 +
   45.82 +    if (_this->gl_config.major_version < 3 &&
   45.83 +	_this->gl_config.profile_mask == 0 &&
   45.84 +	_this->gl_config.flags == 0) {
   45.85 +        /* Create legacy context */
   45.86          context = _this->gl_data->wglCreateContext(hdc);
   45.87 +	if( share_context != 0 ) {
   45.88 +            _this->gl_data->wglShareLists(share_context, context);
   45.89 +	}
   45.90      } else {
   45.91          PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB;
   45.92          HGLRC temp_context = _this->gl_data->wglCreateContext(hdc);
   45.93 @@ -567,7 +586,7 @@
   45.94  	    attribs[iattr++] = 0;
   45.95  
   45.96              /* Create the GL 3.x context */
   45.97 -            context = wglCreateContextAttribsARB(hdc, 0, attribs);
   45.98 +            context = wglCreateContextAttribsARB(hdc, share_context, attribs);
   45.99              /* Delete the GL 2.x context */
  45.100              _this->gl_data->wglDeleteContext(temp_context);
  45.101          }
  45.102 @@ -611,24 +630,29 @@
  45.103  int
  45.104  WIN_GL_SetSwapInterval(_THIS, int interval)
  45.105  {
  45.106 -    if (_this->gl_data->wglSwapIntervalEXT) {
  45.107 -        _this->gl_data->wglSwapIntervalEXT(interval);
  45.108 -        return 0;
  45.109 +    int retval = -1;
  45.110 +    if ((interval < 0) && (!_this->gl_data->HAS_WGL_EXT_swap_control_tear)) {
  45.111 +        SDL_SetError("Negative swap interval unsupported in this GL");
  45.112 +    } else if (_this->gl_data->wglSwapIntervalEXT) {
  45.113 +        if (_this->gl_data->wglSwapIntervalEXT(interval) == TRUE) {
  45.114 +            retval = 0;
  45.115 +        } else {
  45.116 +            WIN_SetError("wglSwapIntervalEXT()");
  45.117 +        }
  45.118      } else {
  45.119          SDL_Unsupported();
  45.120 -        return -1;
  45.121      }
  45.122 +    return retval;
  45.123  }
  45.124  
  45.125  int
  45.126  WIN_GL_GetSwapInterval(_THIS)
  45.127  {
  45.128 +    int retval = 0;
  45.129      if (_this->gl_data->wglGetSwapIntervalEXT) {
  45.130 -        return _this->gl_data->wglGetSwapIntervalEXT();
  45.131 -    } else {
  45.132 -        SDL_Unsupported();
  45.133 -        return -1;
  45.134 +        retval = _this->gl_data->wglGetSwapIntervalEXT();
  45.135      }
  45.136 +    return retval;
  45.137  }
  45.138  
  45.139  void
    46.1 --- a/src/video/windows/SDL_windowsopengl.h	Wed Jul 25 20:56:42 2012 -0400
    46.2 +++ b/src/video/windows/SDL_windowsopengl.h	Sat Sep 01 07:19:49 2012 -0400
    46.3 @@ -27,12 +27,14 @@
    46.4  
    46.5  struct SDL_GLDriverData
    46.6  {
    46.7 -    int WGL_ARB_pixel_format;
    46.8 +    SDL_bool HAS_WGL_ARB_pixel_format;
    46.9 +    SDL_bool HAS_WGL_EXT_swap_control_tear;
   46.10  
   46.11      void *(WINAPI * wglGetProcAddress) (const char *proc);
   46.12        HGLRC(WINAPI * wglCreateContext) (HDC hdc);
   46.13        BOOL(WINAPI * wglDeleteContext) (HGLRC hglrc);
   46.14        BOOL(WINAPI * wglMakeCurrent) (HDC hdc, HGLRC hglrc);
   46.15 +      BOOL(WINAPI * wglShareLists) (HGLRC hglrc1, HGLRC hglrc2);
   46.16        BOOL(WINAPI * wglChoosePixelFormatARB) (HDC hdc,
   46.17                                                const int *piAttribIList,
   46.18                                                const FLOAT * pfAttribFList,
   46.19 @@ -44,7 +46,7 @@
   46.20                                                     UINT nAttributes,
   46.21                                                     const int *piAttributes,
   46.22                                                     int *piValues);
   46.23 -    void (WINAPI * wglSwapIntervalEXT) (int interval);
   46.24 +    BOOL (WINAPI * wglSwapIntervalEXT) (int interval);
   46.25      int (WINAPI * wglGetSwapIntervalEXT) (void);
   46.26  };
   46.27  
    47.1 --- a/src/video/windows/SDL_windowsshape.c	Wed Jul 25 20:56:42 2012 -0400
    47.2 +++ b/src/video/windows/SDL_windowsshape.c	Sat Sep 01 07:19:49 2012 -0400
    47.3 @@ -65,11 +65,14 @@
    47.4      SDL_ShapeData *data;
    47.5      HRGN mask_region = NULL;
    47.6  
    47.7 -    if (shaper == NULL || shape == NULL)
    47.8 +    if( (shaper == NULL) ||
    47.9 +        (shape == NULL) ||
   47.10 +        ((shape->format->Amask == 0) && (shape_mode->mode != ShapeModeColorKey)) ||
   47.11 +        (shape->w != shaper->window->w) ||
   47.12 +        (shape->h != shaper->window->h) ) {
   47.13          return SDL_INVALID_SHAPE_ARGUMENT;
   47.14 -    if(shape->format->Amask == 0 && shape_mode->mode != ShapeModeColorKey || shape->w != shaper->window->w || shape->h != shaper->window->h)
   47.15 -        return SDL_INVALID_SHAPE_ARGUMENT;
   47.16 -    
   47.17 +    }
   47.18 +
   47.19      data = (SDL_ShapeData*)shaper->driverdata;
   47.20      if(data->mask_tree != NULL)
   47.21          SDL_FreeShapeTree(&data->mask_tree);
    48.1 --- a/src/video/windows/SDL_windowswindow.c	Wed Jul 25 20:56:42 2012 -0400
    48.2 +++ b/src/video/windows/SDL_windowswindow.c	Sat Sep 01 07:19:49 2012 -0400
    48.3 @@ -74,7 +74,6 @@
    48.4  SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
    48.5  {
    48.6      SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
    48.7 -    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
    48.8      SDL_WindowData *data;
    48.9  
   48.10      /* Allocate the window data */
   48.11 @@ -193,7 +192,6 @@
   48.12  int
   48.13  WIN_CreateWindow(_THIS, SDL_Window * window)
   48.14  {
   48.15 -    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
   48.16      HWND hwnd;
   48.17      RECT rect;
   48.18      DWORD style = STYLE_BASIC;
   48.19 @@ -344,7 +342,6 @@
   48.20  void
   48.21  WIN_SetWindowPosition(_THIS, SDL_Window * window)
   48.22  {
   48.23 -    SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
   48.24      HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
   48.25      RECT rect;
   48.26      DWORD style;
   48.27 @@ -481,11 +478,12 @@
   48.28  WIN_MaximizeWindow(_THIS, SDL_Window * window)
   48.29  {
   48.30      HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
   48.31 -    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
   48.32  
   48.33  #ifdef _WIN32_WCE
   48.34 -    if((window->flags & SDL_WINDOW_FULLSCREEN) && videodata->SHFullScreen)
   48.35 +    if((window->flags & SDL_WINDOW_FULLSCREEN) && videodata->SHFullScreen) {
   48.36 +        SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
   48.37          videodata->SHFullScreen(hwnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
   48.38 +    }
   48.39  #endif
   48.40  
   48.41      ShowWindow(hwnd, SW_MAXIMIZE);
   48.42 @@ -495,13 +493,14 @@
   48.43  WIN_MinimizeWindow(_THIS, SDL_Window * window)
   48.44  {
   48.45      HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
   48.46 -    SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
   48.47  
   48.48      ShowWindow(hwnd, SW_MINIMIZE);
   48.49  
   48.50  #ifdef _WIN32_WCE
   48.51 -    if((window->flags & SDL_WINDOW_FULLSCREEN) && videodata->SHFullScreen)
   48.52 +    if((window->flags & SDL_WINDOW_FULLSCREEN) && videodata->SHFullScreen) {
   48.53 +        SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
   48.54          videodata->SHFullScreen(hwnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON | SHFS_SHOWSIPBUTTON);
   48.55 +    }
   48.56  #endif
   48.57  }
   48.58  
    49.1 --- a/src/video/x11/SDL_x11opengl.c	Wed Jul 25 20:56:42 2012 -0400
    49.2 +++ b/src/video/x11/SDL_x11opengl.c	Sat Sep 01 07:19:49 2012 -0400
    49.3 @@ -105,6 +105,10 @@
    49.4  #define GLX_MAX_SWAP_INTERVAL_EXT          0x20F2
    49.5  #endif
    49.6  
    49.7 +#ifndef GLX_EXT_swap_control_tear
    49.8 +#define GLX_LATE_SWAPS_TEAR_EXT 0x20F3
    49.9 +#endif
   49.10 +
   49.11  #define OPENGL_REQUIRES_DLOPEN
   49.12  #if defined(OPENGL_REQUIRES_DLOPEN) && defined(SDL_LOADSO_DLOPEN)
   49.13  #include <dlfcn.h>
   49.14 @@ -318,11 +322,15 @@
   49.15          extensions = NULL;
   49.16      }
   49.17  
   49.18 -    /* Check for GLX_EXT_swap_control */
   49.19 +    /* Check for GLX_EXT_swap_control(_tear) */
   49.20 +    _this->gl_data->HAS_GLX_EXT_swap_control_tear = SDL_FALSE;
   49.21      if (HasExtension("GLX_EXT_swap_control", extensions)) {
   49.22          _this->gl_data->glXSwapIntervalEXT =
   49.23              (int (*)(Display*,GLXDrawable,int))
   49.24                  X11_GL_GetProcAddress(_this, "glXSwapIntervalEXT");
   49.25 +        if (HasExtension("GLX_EXT_swap_control_tear", extensions)) {
   49.26 +            _this->gl_data->HAS_GLX_EXT_swap_control_tear = SDL_TRUE;
   49.27 +        }
   49.28      }
   49.29  
   49.30      /* Check for GLX_MESA_swap_control */
   49.31 @@ -476,7 +484,13 @@
   49.32      XWindowAttributes xattr;
   49.33      XVisualInfo v, *vinfo;
   49.34      int n;
   49.35 -    GLXContext context = NULL;
   49.36 +    GLXContext context = NULL, share_context;
   49.37 +
   49.38 +    if (_this->gl_config.share_with_current_context) {
   49.39 +        share_context = (GLXContext)(_this->current_glctx);
   49.40 +    } else {
   49.41 +        share_context = NULL;
   49.42 +    }
   49.43  
   49.44      /* We do this to create a clean separation between X and GLX errors. */
   49.45      XSync(display, False);
   49.46 @@ -485,9 +499,12 @@
   49.47      v.visualid = XVisualIDFromVisual(xattr.visual);
   49.48      vinfo = XGetVisualInfo(display, VisualScreenMask | VisualIDMask, &v, &n);
   49.49      if (vinfo) {
   49.50 -        if (_this->gl_config.major_version < 3) {
   49.51 +        if (_this->gl_config.major_version < 3 &&
   49.52 +            _this->gl_config.profile_mask == 0 &&
   49.53 +            _this->gl_config.flags == 0) {
   49.54 +            /* Create legacy context */
   49.55              context =
   49.56 -                _this->gl_data->glXCreateContext(display, vinfo, NULL, True);
   49.57 +                _this->gl_data->glXCreateContext(display, vinfo, share_context, True);
   49.58          } else {
   49.59              /* If we want a GL 3.0 context or later we need to get a temporary
   49.60                 context to grab the new context creation function */
   49.61 @@ -497,7 +514,7 @@
   49.62                  SDL_SetError("Could not create GL context");
   49.63                  return NULL;
   49.64              } else {
   49.65 -	        /* max 8 attributes plus terminator */
   49.66 +                /* max 8 attributes plus terminator */
   49.67                  int attribs[9] = {
   49.68                      GLX_CONTEXT_MAJOR_VERSION_ARB,
   49.69                      _this->gl_config.major_version,
   49.70 @@ -505,21 +522,21 @@
   49.71                      _this->gl_config.minor_version,
   49.72                      0
   49.73                  };
   49.74 -		int iattr = 4;
   49.75 +                int iattr = 4;
   49.76  
   49.77 -		/* SDL profile bits match GLX profile bits */
   49.78 -		if( _this->gl_config.profile_mask != 0 ) {
   49.79 -		    attribs[iattr++] = GLX_CONTEXT_PROFILE_MASK_ARB;
   49.80 -		    attribs[iattr++] = _this->gl_config.profile_mask;
   49.81 -		}
   49.82 +                /* SDL profile bits match GLX profile bits */
   49.83 +                if( _this->gl_config.profile_mask != 0 ) {
   49.84 +                    attribs[iattr++] = GLX_CONTEXT_PROFILE_MASK_ARB;
   49.85 +                    attribs[iattr++] = _this->gl_config.profile_mask;
   49.86 +                }
   49.87  
   49.88 -		/* SDL flags match GLX flags */
   49.89 -		if( _this->gl_config.flags != 0 ) {
   49.90 -		    attribs[iattr++] = GLX_CONTEXT_FLAGS_ARB;
   49.91 -		    attribs[iattr++] = _this->gl_config.flags;
   49.92 -		}
   49.93 +                /* SDL flags match GLX flags */
   49.94 +                if( _this->gl_config.flags != 0 ) {
   49.95 +                    attribs[iattr++] = GLX_CONTEXT_FLAGS_ARB;
   49.96 +                    attribs[iattr++] = _this->gl_config.flags;
   49.97 +                }
   49.98  
   49.99 -		attribs[iattr++] = 0;
  49.100 +                attribs[iattr++] = 0;
  49.101  
  49.102                  /* Get a pointer to the context creation function for GL 3.0 */
  49.103                  PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribs =
  49.104 @@ -560,7 +577,7 @@
  49.105                          context =
  49.106                              glXCreateContextAttribs(display,
  49.107                                                      framebuffer_config[0],
  49.108 -                                                    NULL, True, attribs);
  49.109 +                                                    share_context, True, attribs);
  49.110                          _this->gl_data->glXDestroyContext(display,
  49.111                                                            temp_context);
  49.112                      }
  49.113 @@ -615,9 +632,11 @@
  49.114  int
  49.115  X11_GL_SetSwapInterval(_THIS, int interval)
  49.116  {
  49.117 -    int status;
  49.118 +    int status = -1;
  49.119  
  49.120 -    if (_this->gl_data->glXSwapIntervalEXT) {
  49.121 +    if ((interval < 0) && (!_this->gl_data->HAS_GLX_EXT_swap_control_tear)) {
  49.122 +        SDL_SetError("Negative swap interval unsupported in this GL");
  49.123 +    } else if (_this->gl_data->glXSwapIntervalEXT) {
  49.124          Display *display = ((SDL_VideoData *) _this->driverdata)->display;
  49.125          const SDL_WindowData *windowdata = (SDL_WindowData *)
  49.126              _this->current_glwin->driverdata;
  49.127 @@ -625,7 +644,6 @@
  49.128          status = _this->gl_data->glXSwapIntervalEXT(display,drawable,interval);
  49.129          if (status != 0) {
  49.130              SDL_SetError("glxSwapIntervalEXT failed");
  49.131 -            status = -1;
  49.132          } else {
  49.133              swapinterval = interval;
  49.134          }
  49.135 @@ -633,7 +651,6 @@
  49.136          status = _this->gl_data->glXSwapIntervalMESA(interval);
  49.137          if (status != 0) {
  49.138              SDL_SetError("glxSwapIntervalMESA failed");
  49.139 -            status = -1;
  49.140          } else {
  49.141              swapinterval = interval;
  49.142          }
  49.143 @@ -641,13 +658,11 @@
  49.144          status = _this->gl_data->glXSwapIntervalSGI(interval);
  49.145          if (status != 0) {
  49.146              SDL_SetError("glxSwapIntervalSGI failed");
  49.147 -            status = -1;
  49.148          } else {
  49.149              swapinterval = interval;
  49.150          }
  49.151      } else {
  49.152          SDL_Unsupported();
  49.153 -        status = -1;
  49.154      }
  49.155      return status;
  49.156  }
  49.157 @@ -660,10 +675,23 @@
  49.158          const SDL_WindowData *windowdata = (SDL_WindowData *)
  49.159              _this->current_glwin->driverdata;
  49.160          Window drawable = windowdata->xwindow;
  49.161 -        unsigned int value = 0;
  49.162 +        unsigned int allow_late_swap_tearing = 0;
  49.163 +        unsigned int interval = 0;
  49.164 +
  49.165 +        if (_this->gl_data->HAS_GLX_EXT_swap_control_tear) {
  49.166 +            _this->gl_data->glXQueryDrawable(display, drawable,
  49.167 +                                            GLX_LATE_SWAPS_TEAR_EXT,
  49.168 +                                            &allow_late_swap_tearing);
  49.169 +        }
  49.170 +
  49.171          _this->gl_data->glXQueryDrawable(display, drawable,
  49.172 -                                         GLX_SWAP_INTERVAL_EXT, &value);
  49.173 -        return (int) value;
  49.174 +                                         GLX_SWAP_INTERVAL_EXT, &interval);
  49.175 +
  49.176 +        if ((allow_late_swap_tearing) && (interval > 0)) {
  49.177 +            return -((int) interval);
  49.178 +        }
  49.179 +
  49.180 +        return (int) interval;
  49.181      } else if (_this->gl_data->glXGetSwapIntervalMESA) {
  49.182          return _this->gl_data->glXGetSwapIntervalMESA();
  49.183      } else {
    50.1 --- a/src/video/x11/SDL_x11opengl.h	Wed Jul 25 20:56:42 2012 -0400
    50.2 +++ b/src/video/x11/SDL_x11opengl.h	Sat Sep 01 07:19:49 2012 -0400
    50.3 @@ -30,6 +30,7 @@
    50.4  struct SDL_GLDriverData
    50.5  {
    50.6      SDL_bool HAS_GLX_EXT_visual_rating;
    50.7 +    SDL_bool HAS_GLX_EXT_swap_control_tear;
    50.8  
    50.9      void *(*glXGetProcAddress) (const GLubyte*);
   50.10      XVisualInfo *(*glXChooseVisual) (Display*,int,int*);
    51.1 --- a/test/Makefile.in	Wed Jul 25 20:56:42 2012 -0400
    51.2 +++ b/test/Makefile.in	Sat Sep 01 07:19:49 2012 -0400
    51.3 @@ -121,11 +121,25 @@
    51.4  testlock$(EXE): $(srcdir)/testlock.c
    51.5  	$(CC) -o $@ $? $(CFLAGS) $(LIBS)
    51.6  
    51.7 +ifeq (@ISMACOSX@,true)
    51.8  testnative$(EXE): $(srcdir)/testnative.c \
    51.9  			$(srcdir)/testnativecocoa.m \
   51.10  			$(srcdir)/testnativew32.c \
   51.11  			$(srcdir)/testnativex11.c
   51.12  	$(CC) -o $@ $? $(CFLAGS) $(LIBS) -L/usr/X11/lib -lX11 -framework Cocoa
   51.13 +endif
   51.14 +
   51.15 +ifeq (@ISWINDOWS@,true)
   51.16 +testnative$(EXE): $(srcdir)/testnative.c \
   51.17 +			$(srcdir)/testnativew32.c
   51.18 +	$(CC) -o $@ $? $(CFLAGS) $(LIBS)
   51.19 +endif
   51.20 +
   51.21 +ifeq (@ISUNIX@,true)
   51.22 +testnative$(EXE): $(srcdir)/testnative.c \
   51.23 +			$(srcdir)/testnativex11.c
   51.24 +	$(CC) -o $@ $? $(CFLAGS) $(LIBS) -L/usr/X11/lib -lX11
   51.25 +endif
   51.26  
   51.27  testoverlay2$(EXE): $(srcdir)/testoverlay2.c
   51.28  	$(CC) -o $@ $? $(CFLAGS) $(LIBS)
    52.1 --- a/test/checkkeys.c	Wed Jul 25 20:56:42 2012 -0400
    52.2 +++ b/test/checkkeys.c	Sat Sep 01 07:19:49 2012 -0400
    52.3 @@ -138,10 +138,6 @@
    52.4      SDL_Log("Text: %s", text);
    52.5  }
    52.6  
    52.7 -#if __IPHONEOS__
    52.8 -extern DECLSPEC int SDLCALL SDL_iPhoneKeyboardShow(SDL_Window * window);
    52.9 -#endif
   52.10 -
   52.11  int
   52.12  main(int argc, char *argv[])
   52.13  {
   52.14 @@ -168,9 +164,11 @@
   52.15  #if __IPHONEOS__
   52.16      /* Creating the context creates the view, which we need to show keyboard */
   52.17      SDL_GL_CreateContext(window);
   52.18 -    SDL_iPhoneKeyboardShow(window);
   52.19  #endif
   52.20 -    
   52.21 +
   52.22 +    if (SDL_HasScreenKeyboardSupport(window)) {
   52.23 +        SDL_ShowScreenKeyboard(window);
   52.24 +    }
   52.25  
   52.26      /* Watch keystrokes */
   52.27      done = 0;
    53.1 --- a/test/configure	Wed Jul 25 20:56:42 2012 -0400
    53.2 +++ b/test/configure	Sat Sep 01 07:19:49 2012 -0400
    53.3 @@ -1,60 +1,83 @@
    53.4  #! /bin/sh
    53.5  # Guess values for system-dependent variables and create Makefiles.
    53.6 -# Generated by GNU Autoconf 2.61.
    53.7 +# Generated by GNU Autoconf 2.68.
    53.8 +#
    53.9  #
   53.10  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
   53.11 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
   53.12 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
   53.13 +# Foundation, Inc.
   53.14 +#
   53.15 +#
   53.16  # This configure script is free software; the Free Software Foundation
   53.17  # gives unlimited permission to copy, distribute and modify it.
   53.18 -## --------------------- ##
   53.19 -## M4sh Initialization.  ##
   53.20 -## --------------------- ##
   53.21 +## -------------------- ##
   53.22 +## M4sh Initialization. ##
   53.23 +## -------------------- ##
   53.24  
   53.25  # Be more Bourne compatible
   53.26  DUALCASE=1; export DUALCASE # for MKS sh
   53.27 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   53.28 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   53.29    emulate sh
   53.30    NULLCMD=:
   53.31 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   53.32 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   53.33    # is contrary to our usage.  Disable this feature.
   53.34    alias -g '${1+"$@"}'='"$@"'
   53.35    setopt NO_GLOB_SUBST
   53.36  else
   53.37 -  case `(set -o) 2>/dev/null` in
   53.38 -  *posix*) set -o posix ;;
   53.39 +  case `(set -o) 2>/dev/null` in #(
   53.40 +  *posix*) :
   53.41 +    set -o posix ;; #(
   53.42 +  *) :
   53.43 +     ;;
   53.44  esac
   53.45 -
   53.46  fi
   53.47  
   53.48  
   53.49 -
   53.50 -
   53.51 -# PATH needs CR
   53.52 -# Avoid depending upon Character Ranges.
   53.53 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
   53.54 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
   53.55 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
   53.56 -as_cr_digits='0123456789'
   53.57 -as_cr_alnum=$as_cr_Letters$as_cr_digits
   53.58 +as_nl='
   53.59 +'
   53.60 +export as_nl
   53.61 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
   53.62 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
   53.63 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
   53.64 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
   53.65 +# Prefer a ksh shell builtin over an external printf program on Solaris,
   53.66 +# but without wasting forks for bash or zsh.
   53.67 +if test -z "$BASH_VERSION$ZSH_VERSION" \
   53.68 +    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
   53.69 +  as_echo='print -r --'
   53.70 +  as_echo_n='print -rn --'
   53.71 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   53.72 +  as_echo='printf %s\n'
   53.73 +  as_echo_n='printf %s'
   53.74 +else
   53.75 +  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
   53.76 +    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
   53.77 +    as_echo_n='/usr/ucb/echo -n'
   53.78 +  else
   53.79 +    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
   53.80 +    as_echo_n_body='eval
   53.81 +      arg=$1;
   53.82 +      case $arg in #(
   53.83 +      *"$as_nl"*)
   53.84 +	expr "X$arg" : "X\\(.*\\)$as_nl";
   53.85 +	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
   53.86 +      esac;
   53.87 +      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
   53.88 +    '
   53.89 +    export as_echo_n_body
   53.90 +    as_echo_n='sh -c $as_echo_n_body as_echo'
   53.91 +  fi
   53.92 +  export as_echo_body
   53.93 +  as_echo='sh -c $as_echo_body as_echo'
   53.94 +fi
   53.95  
   53.96  # The user is always right.
   53.97  if test "${PATH_SEPARATOR+set}" != set; then
   53.98 -  echo "#! /bin/sh" >conf$$.sh
   53.99 -  echo  "exit 0"   >>conf$$.sh
  53.100 -  chmod +x conf$$.sh
  53.101 -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
  53.102 -    PATH_SEPARATOR=';'
  53.103 -  else
  53.104 -    PATH_SEPARATOR=:
  53.105 -  fi
  53.106 -  rm -f conf$$.sh
  53.107 -fi
  53.108 -
  53.109 -# Support unset when possible.
  53.110 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
  53.111 -  as_unset=unset
  53.112 -else
  53.113 -  as_unset=false
  53.114 +  PATH_SEPARATOR=:
  53.115 +  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
  53.116 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
  53.117 +      PATH_SEPARATOR=';'
  53.118 +  }
  53.119  fi
  53.120  
  53.121  
  53.122 @@ -63,20 +86,19 @@
  53.123  # there to prevent editors from complaining about space-tab.
  53.124  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  53.125  # splitting by setting IFS to empty value.)
  53.126 -as_nl='
  53.127 -'
  53.128  IFS=" ""	$as_nl"
  53.129  
  53.130  # Find who we are.  Look in the path if we contain no directory separator.
  53.131 -case $0 in
  53.132 +as_myself=
  53.133 +case $0 in #((
  53.134    *[\\/]* ) as_myself=$0 ;;
  53.135    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  53.136  for as_dir in $PATH
  53.137  do
  53.138    IFS=$as_save_IFS
  53.139    test -z "$as_dir" && as_dir=.
  53.140 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  53.141 -done
  53.142 +    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
  53.143 +  done
  53.144  IFS=$as_save_IFS
  53.145  
  53.146       ;;
  53.147 @@ -87,32 +109,276 @@
  53.148    as_myself=$0
  53.149  fi
  53.150  if test ! -f "$as_myself"; then
  53.151 -  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
  53.152 -  { (exit 1); exit 1; }
  53.153 +  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
  53.154 +  exit 1
  53.155  fi
  53.156  
  53.157 -# Work around bugs in pre-3.0 UWIN ksh.
  53.158 -for as_var in ENV MAIL MAILPATH
  53.159 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
  53.160 +# Unset variables that we do not need and which cause bugs (e.g. in
  53.161 +# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
  53.162 +# suppresses any "Segmentation fault" message there.  '((' could
  53.163 +# trigger a bug in pdksh 5.2.14.
  53.164 +for as_var in BASH_ENV ENV MAIL MAILPATH
  53.165 +do eval test x\${$as_var+set} = xset \
  53.166 +  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
  53.167  done
  53.168  PS1='$ '
  53.169  PS2='> '
  53.170  PS4='+ '
  53.171  
  53.172  # NLS nuisances.
  53.173 -for as_var in \
  53.174 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
  53.175 -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
  53.176 -  LC_TELEPHONE LC_TIME
  53.177 +LC_ALL=C
  53.178 +export LC_ALL
  53.179 +LANGUAGE=C
  53.180 +export LANGUAGE
  53.181 +
  53.182 +# CDPATH.
  53.183 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  53.184 +
  53.185 +if test "x$CONFIG_SHELL" = x; then
  53.186 +  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
  53.187 +  emulate sh
  53.188 +  NULLCMD=:
  53.189 +  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
  53.190 +  # is contrary to our usage.  Disable this feature.
  53.191 +  alias -g '\${1+\"\$@\"}'='\"\$@\"'
  53.192 +  setopt NO_GLOB_SUBST
  53.193 +else
  53.194 +  case \`(set -o) 2>/dev/null\` in #(
  53.195 +  *posix*) :
  53.196 +    set -o posix ;; #(
  53.197 +  *) :
  53.198 +     ;;
  53.199 +esac
  53.200 +fi
  53.201 +"
  53.202 +  as_required="as_fn_return () { (exit \$1); }
  53.203 +as_fn_success () { as_fn_return 0; }
  53.204 +as_fn_failure () { as_fn_return 1; }
  53.205 +as_fn_ret_success () { return 0; }
  53.206 +as_fn_ret_failure () { return 1; }
  53.207 +
  53.208 +exitcode=0
  53.209 +as_fn_success || { exitcode=1; echo as_fn_success failed.; }
  53.210 +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
  53.211 +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
  53.212 +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
  53.213 +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
  53.214 +
  53.215 +else
  53.216 +  exitcode=1; echo positional parameters were not saved.
  53.217 +fi
  53.218 +test x\$exitcode = x0 || exit 1"
  53.219 +  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
  53.220 +  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
  53.221 +  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
  53.222 +  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
  53.223 +  if (eval "$as_required") 2>/dev/null; then :
  53.224 +  as_have_required=yes
  53.225 +else
  53.226 +  as_have_required=no
  53.227 +fi
  53.228 +  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
  53.229 +
  53.230 +else
  53.231 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  53.232 +as_found=false
  53.233 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  53.234  do
  53.235 -  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
  53.236 -    eval $as_var=C; export $as_var
  53.237 +  IFS=$as_save_IFS
  53.238 +  test -z "$as_dir" && as_dir=.
  53.239 +  as_found=:
  53.240 +  case $as_dir in #(
  53.241 +	 /*)
  53.242 +	   for as_base in sh bash ksh sh5; do
  53.243 +	     # Try only shells that exist, to save several forks.
  53.244 +	     as_shell=$as_dir/$as_base
  53.245 +	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
  53.246 +		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
  53.247 +  CONFIG_SHELL=$as_shell as_have_required=yes
  53.248 +		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
  53.249 +  break 2
  53.250 +fi
  53.251 +fi
  53.252 +	   done;;
  53.253 +       esac
  53.254 +  as_found=false
  53.255 +done
  53.256 +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
  53.257 +	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
  53.258 +  CONFIG_SHELL=$SHELL as_have_required=yes
  53.259 +fi; }
  53.260 +IFS=$as_save_IFS
  53.261 +
  53.262 +
  53.263 +      if test "x$CONFIG_SHELL" != x; then :
  53.264 +  # We cannot yet assume a decent shell, so we have to provide a
  53.265 +	# neutralization value for shells without unset; and this also
  53.266 +	# works around shells that cannot unset nonexistent variables.
  53.267 +	# Preserve -v and -x to the replacement shell.
  53.268 +	BASH_ENV=/dev/null
  53.269 +	ENV=/dev/null
  53.270 +	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
  53.271 +	export CONFIG_SHELL
  53.272 +	case $- in # ((((
  53.273 +	  *v*x* | *x*v* ) as_opts=-vx ;;
  53.274 +	  *v* ) as_opts=-v ;;
  53.275 +	  *x* ) as_opts=-x ;;
  53.276 +	  * ) as_opts= ;;
  53.277 +	esac
  53.278 +	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
  53.279 +fi
  53.280 +
  53.281 +    if test x$as_have_required = xno; then :
  53.282 +  $as_echo "$0: This script requires a shell more modern than all"
  53.283 +  $as_echo "$0: the shells that I found on your system."
  53.284 +  if test x${ZSH_VERSION+set} = xset ; then
  53.285 +    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
  53.286 +    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
  53.287    else
  53.288 -    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
  53.289 +    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
  53.290 +$0: including any error possibly output before this
  53.291 +$0: message. Then install a modern shell, or manually run
  53.292 +$0: the script under such a shell if you do have one."
  53.293    fi
  53.294 -done
  53.295 -
  53.296 -# Required to use basename.
  53.297 +  exit 1
  53.298 +fi
  53.299 +fi
  53.300 +fi
  53.301 +SHELL=${CONFIG_SHELL-/bin/sh}
  53.302 +export SHELL
  53.303 +# Unset more variables known to interfere with behavior of common tools.
  53.304 +CLICOLOR_FORCE= GREP_OPTIONS=
  53.305 +unset CLICOLOR_FORCE GREP_OPTIONS
  53.306 +
  53.307 +## --------------------- ##
  53.308 +## M4sh Shell Functions. ##
  53.309 +## --------------------- ##
  53.310 +# as_fn_unset VAR
  53.311 +# ---------------
  53.312 +# Portably unset VAR.
  53.313 +as_fn_unset ()
  53.314 +{
  53.315 +  { eval $1=; unset $1;}
  53.316 +}
  53.317 +as_unset=as_fn_unset
  53.318 +
  53.319 +# as_fn_set_status STATUS
  53.320 +# -----------------------
  53.321 +# Set $? to STATUS, without forking.
  53.322 +as_fn_set_status ()
  53.323 +{
  53.324 +  return $1
  53.325 +} # as_fn_set_status
  53.326 +
  53.327 +# as_fn_exit STATUS
  53.328 +# -----------------
  53.329 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
  53.330 +as_fn_exit ()
  53.331 +{
  53.332 +  set +e
  53.333 +  as_fn_set_status $1
  53.334 +  exit $1
  53.335 +} # as_fn_exit
  53.336 +
  53.337 +# as_fn_mkdir_p
  53.338 +# -------------
  53.339 +# Create "$as_dir" as a directory, including parents if necessary.
  53.340 +as_fn_mkdir_p ()
  53.341 +{
  53.342 +
  53.343 +  case $as_dir in #(
  53.344 +  -*) as_dir=./$as_dir;;
  53.345 +  esac
  53.346 +  test -d "$as_dir" || eval $as_mkdir_p || {
  53.347 +    as_dirs=
  53.348 +    while :; do
  53.349 +      case $as_dir in #(
  53.350 +      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
  53.351 +      *) as_qdir=$as_dir;;
  53.352 +      esac
  53.353 +      as_dirs="'$as_qdir' $as_dirs"
  53.354 +      as_dir=`$as_dirname -- "$as_dir" ||
  53.355 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  53.356 +	 X"$as_dir" : 'X\(//\)[^/]' \| \
  53.357 +	 X"$as_dir" : 'X\(//\)$' \| \
  53.358 +	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
  53.359 +$as_echo X"$as_dir" |
  53.360 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  53.361 +	    s//\1/
  53.362 +	    q
  53.363 +	  }
  53.364 +	  /^X\(\/\/\)[^/].*/{
  53.365 +	    s//\1/
  53.366 +	    q
  53.367 +	  }
  53.368 +	  /^X\(\/\/\)$/{
  53.369 +	    s//\1/
  53.370 +	    q
  53.371 +	  }
  53.372 +	  /^X\(\/\).*/{
  53.373 +	    s//\1/
  53.374 +	    q
  53.375 +	  }
  53.376 +	  s/.*/./; q'`
  53.377 +      test -d "$as_dir" && break
  53.378 +    done
  53.379 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
  53.380 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
  53.381 +
  53.382 +
  53.383 +} # as_fn_mkdir_p
  53.384 +# as_fn_append VAR VALUE
  53.385 +# ----------------------
  53.386 +# Append the text in VALUE to the end of the definition contained in VAR. Take
  53.387 +# advantage of any shell optimizations that allow amortized linear growth over
  53.388 +# repeated appends, instead of the typical quadratic growth present in naive
  53.389 +# implementations.
  53.390 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
  53.391 +  eval 'as_fn_append ()
  53.392 +  {
  53.393 +    eval $1+=\$2
  53.394 +  }'
  53.395 +else
  53.396 +  as_fn_append ()
  53.397 +  {
  53.398 +    eval $1=\$$1\$2
  53.399 +  }
  53.400 +fi # as_fn_append
  53.401 +
  53.402 +# as_fn_arith ARG...
  53.403 +# ------------------
  53.404 +# Perform arithmetic evaluation on the ARGs, and store the result in the
  53.405 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
  53.406 +# must be portable across $(()) and expr.
  53.407 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
  53.408 +  eval 'as_fn_arith ()
  53.409 +  {
  53.410 +    as_val=$(( $* ))
  53.411 +  }'
  53.412 +else
  53.413 +  as_fn_arith ()
  53.414 +  {
  53.415 +    as_val=`expr "$@" || test $? -eq 1`
  53.416 +  }
  53.417 +fi # as_fn_arith
  53.418 +
  53.419 +
  53.420 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
  53.421 +# ----------------------------------------
  53.422 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
  53.423 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
  53.424 +# script with STATUS, using 1 if that was 0.
  53.425 +as_fn_error ()
  53.426 +{
  53.427 +  as_status=$1; test $as_status -eq 0 && as_status=1
  53.428 +  if test "$4"; then
  53.429 +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  53.430 +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
  53.431 +  fi
  53.432 +  $as_echo "$as_me: error: $2" >&2
  53.433 +  as_fn_exit $as_status
  53.434 +} # as_fn_error
  53.435 +
  53.436  if expr a : '\(a\)' >/dev/null 2>&1 &&
  53.437     test "X`expr 00001 : '.*\(...\)'`" = X001; then
  53.438    as_expr=expr
  53.439 @@ -126,13 +392,17 @@
  53.440    as_basename=false
  53.441  fi
  53.442  
  53.443 -
  53.444 -# Name of the executable.
  53.445 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
  53.446 +  as_dirname=dirname
  53.447 +else
  53.448 +  as_dirname=false
  53.449 +fi
  53.450 +
  53.451  as_me=`$as_basename -- "$0" ||
  53.452  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  53.453  	 X"$0" : 'X\(//\)$' \| \
  53.454  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
  53.455 -echo X/"$0" |
  53.456 +$as_echo X/"$0" |
  53.457      sed '/^.*\/\([^/][^/]*\)\/*$/{
  53.458  	    s//\1/
  53.459  	    q
  53.460 @@ -147,294 +417,19 @@
  53.461  	  }
  53.462  	  s/.*/./; q'`
  53.463  
  53.464 -# CDPATH.
  53.465 -$as_unset CDPATH
  53.466 -
  53.467 -
  53.468 -if test "x$CONFIG_SHELL" = x; then
  53.469 -  if (eval ":") 2>/dev/null; then
  53.470 -  as_have_required=yes
  53.471 -else
  53.472 -  as_have_required=no
  53.473 -fi
  53.474 -
  53.475 -  if test $as_have_required = yes && 	 (eval ":
  53.476 -(as_func_return () {
  53.477 -  (exit \$1)
  53.478 -}
  53.479 -as_func_success () {
  53.480 -  as_func_return 0
  53.481 -}
  53.482 -as_func_failure () {
  53.483 -  as_func_return 1
  53.484 -}
  53.485 -as_func_ret_success () {
  53.486 -  return 0
  53.487 -}
  53.488 -as_func_ret_failure () {
  53.489 -  return 1
  53.490 -}
  53.491 -
  53.492 -exitcode=0
  53.493 -if as_func_success; then
  53.494 -  :
  53.495 -else
  53.496 -  exitcode=1
  53.497 -  echo as_func_success failed.
  53.498 -fi
  53.499 -
  53.500 -if as_func_failure; then
  53.501 -  exitcode=1
  53.502 -  echo as_func_failure succeeded.
  53.503 -fi
  53.504 -
  53.505 -if as_func_ret_success; then
  53.506 -  :
  53.507 -else
  53.508 -  exitcode=1
  53.509 -  echo as_func_ret_success failed.
  53.510 -fi
  53.511 -
  53.512 -if as_func_ret_failure; then
  53.513 -  exitcode=1
  53.514 -  echo as_func_ret_failure succeeded.
  53.515 -fi
  53.516 -
  53.517 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
  53.518 -  :
  53.519 -else
  53.520 -  exitcode=1
  53.521 -  echo positional parameters were not saved.
  53.522 -fi
  53.523 -
  53.524 -test \$exitcode = 0) || { (exit 1); exit 1; }
  53.525 -
  53.526 -(
  53.527 -  as_lineno_1=\$LINENO
  53.528 -  as_lineno_2=\$LINENO
  53.529 -  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
  53.530 -  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
  53.531 -") 2> /dev/null; then
  53.532 -  :
  53.533 -else
  53.534 -  as_candidate_shells=
  53.535 -    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  53.536 -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  53.537 -do
  53.538 -  IFS=$as_save_IFS
  53.539 -  test -z "$as_dir" && as_dir=.
  53.540 -  case $as_dir in
  53.541 -	 /*)
  53.542 -	   for as_base in sh bash ksh sh5; do
  53.543 -	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
  53.544 -	   done;;
  53.545 -       esac
  53.546 -done
  53.547 -IFS=$as_save_IFS
  53.548 -
  53.549 -
  53.550 -      for as_shell in $as_candidate_shells $SHELL; do
  53.551 -	 # Try only shells that exist, to save several forks.
  53.552 -	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
  53.553 -		{ ("$as_shell") 2> /dev/null <<\_ASEOF
  53.554 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  53.555 -  emulate sh
  53.556 -  NULLCMD=:
  53.557 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
  53.558 -  # is contrary to our usage.  Disable this feature.
  53.559 -  alias -g '${1+"$@"}'='"$@"'
  53.560 -  setopt NO_GLOB_SUBST
  53.561 -else
  53.562 -  case `(set -o) 2>/dev/null` in
  53.563 -  *posix*) set -o posix ;;
  53.564 -esac
  53.565 -
  53.566 -fi
  53.567 -
  53.568 -
  53.569 -:
  53.570 -_ASEOF
  53.571 -}; then
  53.572 -  CONFIG_SHELL=$as_shell
  53.573 -	       as_have_required=yes
  53.574 -	       if { "$as_shell" 2> /dev/null <<\_ASEOF
  53.575 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
  53.576 -  emulate sh
  53.577 -  NULLCMD=:
  53.578 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
  53.579 -  # is contrary to our usage.  Disable this feature.
  53.580 -  alias -g '${1+"$@"}'='"$@"'
  53.581 -  setopt NO_GLOB_SUBST
  53.582 -else
  53.583 -  case `(set -o) 2>/dev/null` in
  53.584 -  *posix*) set -o posix ;;
  53.585 -esac
  53.586 -
  53.587 -fi
  53.588 -
  53.589 -
  53.590 -:
  53.591 -(as_func_return () {
  53.592 -  (exit $1)
  53.593 -}
  53.594 -as_func_success () {
  53.595 -  as_func_return 0
  53.596 -}
  53.597 -as_func_failure () {
  53.598 -  as_func_return 1
  53.599 -}
  53.600 -as_func_ret_success () {
  53.601 -  return 0
  53.602 -}
  53.603 -as_func_ret_failure () {
  53.604 -  return 1
  53.605 -}
  53.606 -
  53.607 -exitcode=0
  53.608 -if as_func_success; then
  53.609 -  :
  53.610 -else
  53.611 -  exitcode=1
  53.612 -  echo as_func_success failed.
  53.613 -fi
  53.614 -
  53.615 -if as_func_failure; then
  53.616 -  exitcode=1
  53.617 -  echo as_func_failure succeeded.
  53.618 -fi
  53.619 -
  53.620 -if as_func_ret_success; then
  53.621 -  :
  53.622 -else
  53.623 -  exitcode=1
  53.624 -  echo as_func_ret_success failed.
  53.625 -fi
  53.626 -
  53.627 -if as_func_ret_failure; then
  53.628 -  exitcode=1
  53.629 -  echo as_func_ret_failure succeeded.
  53.630 -fi
  53.631 -
  53.632 -if ( set x; as_func_ret_success y && test x = "$1" ); then
  53.633 -  :
  53.634 -else
  53.635 -  exitcode=1
  53.636 -  echo positional parameters were not saved.
  53.637 -fi
  53.638 -
  53.639 -test $exitcode = 0) || { (exit 1); exit 1; }
  53.640 -
  53.641 -(
  53.642 -  as_lineno_1=$LINENO
  53.643 -  as_lineno_2=$LINENO
  53.644 -  test "x$as_lineno_1" != "x$as_lineno_2" &&
  53.645 -  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
  53.646 -
  53.647 -_ASEOF
  53.648 -}; then
  53.649 -  break
  53.650 -fi
  53.651 -
  53.652 -fi
  53.653 -
  53.654 -      done
  53.655 -
  53.656 -      if test "x$CONFIG_SHELL" != x; then
  53.657 -  for as_var in BASH_ENV ENV
  53.658 -        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
  53.659 -        done
  53.660 -        export CONFIG_SHELL
  53.661 -        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
  53.662 -fi
  53.663 -
  53.664 -
  53.665 -    if test $as_have_required = no; then
  53.666 -  echo This script requires a shell more modern than all the
  53.667 -      echo shells that I found on your system.  Please install a
  53.668 -      echo modern shell, or manually run the script under such a
  53.669 -      echo shell if you do have one.
  53.670 -      { (exit 1); exit 1; }
  53.671 -fi
  53.672 -
  53.673 -
  53.674 -fi
  53.675 -
  53.676 -fi
  53.677 -
  53.678 -
  53.679 -
  53.680 -(eval "as_func_return () {
  53.681 -  (exit \$1)
  53.682 -}
  53.683 -as_func_success () {
  53.684 -  as_func_return 0
  53.685 -}
  53.686 -as_func_failure () {
  53.687 -  as_func_return 1
  53.688 -}
  53.689 -as_func_ret_success () {
  53.690 -  return 0
  53.691 -}
  53.692 -as_func_ret_failure () {
  53.693 -  return 1
  53.694 -}
  53.695 -
  53.696 -exitcode=0
  53.697 -if as_func_success; then
  53.698 -  :
  53.699 -else
  53.700 -  exitcode=1
  53.701 -  echo as_func_success failed.
  53.702 -fi
  53.703 -
  53.704 -if as_func_failure; then
  53.705 -  exitcode=1
  53.706 -  echo as_func_failure succeeded.
  53.707 -fi
  53.708 -
  53.709 -if as_func_ret_success; then
  53.710 -  :
  53.711 -else
  53.712 -  exitcode=1
  53.713 -  echo as_func_ret_success failed.
  53.714 -fi
  53.715 -
  53.716 -if as_func_ret_failure; then
  53.717 -  exitcode=1
  53.718 -  echo as_func_ret_failure succeeded.
  53.719 -fi
  53.720 -
  53.721 -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
  53.722 -  :
  53.723 -else
  53.724 -  exitcode=1
  53.725 -  echo positional parameters were not saved.
  53.726 -fi
  53.727 -
  53.728 -test \$exitcode = 0") || {
  53.729 -  echo No shell found that supports shell functions.
  53.730 -  echo Please tell autoconf@gnu.org about your system,
  53.731 -  echo including any error possibly output before this
  53.732 -  echo message
  53.733 -}
  53.734 -
  53.735 -
  53.736 -
  53.737 -  as_lineno_1=$LINENO
  53.738 -  as_lineno_2=$LINENO
  53.739 -  test "x$as_lineno_1" != "x$as_lineno_2" &&
  53.740 -  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
  53.741 -
  53.742 -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
  53.743 -  # uniformly replaced by the line number.  The first 'sed' inserts a
  53.744 -  # line-number line after each line using $LINENO; the second 'sed'
  53.745 -  # does the real work.  The second script uses 'N' to pair each
  53.746 -  # line-number line with the line containing $LINENO, and appends
  53.747 -  # trailing '-' during substitution so that $LINENO is not a special
  53.748 -  # case at line end.
  53.749 -  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
  53.750 -  # scripts with optimization help from Paolo Bonzini.  Blame Lee
  53.751 -  # E. McMahon (1931-1989) for sed's syntax.  :-)
  53.752 +# Avoid depending upon Character Ranges.
  53.753 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  53.754 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
  53.755 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
  53.756 +as_cr_digits='0123456789'
  53.757 +as_cr_alnum=$as_cr_Letters$as_cr_digits
  53.758 +
  53.759 +
  53.760 +  as_lineno_1=$LINENO as_lineno_1a=$LINENO
  53.761 +  as_lineno_2=$LINENO as_lineno_2a=$LINENO
  53.762 +  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
  53.763 +  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
  53.764 +  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
  53.765    sed -n '
  53.766      p
  53.767      /[$]LINENO/=
  53.768 @@ -451,8 +446,7 @@
  53.769        s/-\n.*//
  53.770      ' >$as_me.lineno &&
  53.771    chmod +x "$as_me.lineno" ||
  53.772 -    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
  53.773 -   { (exit 1); exit 1; }; }
  53.774 +    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
  53.775  
  53.776    # Don't try to exec as it changes $[0], causing all sort of problems
  53.777    # (the dirname of $[0] is not the place where we might find the
  53.778 @@ -462,49 +456,40 @@
  53.779    exit
  53.780  }
  53.781  
  53.782 -
  53.783 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
  53.784 -  as_dirname=dirname
  53.785 -else
  53.786 -  as_dirname=false
  53.787 -fi
  53.788 -
  53.789  ECHO_C= ECHO_N= ECHO_T=
  53.790 -case `echo -n x` in
  53.791 +case `echo -n x` in #(((((
  53.792  -n*)
  53.793 -  case `echo 'x\c'` in
  53.794 +  case `echo 'xy\c'` in
  53.795    *c*) ECHO_T='	';;	# ECHO_T is single tab character.
  53.796 -  *)   ECHO_C='\c';;
  53.797 +  xy)  ECHO_C='\c';;
  53.798 +  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
  53.799 +       ECHO_T='	';;
  53.800    esac;;
  53.801  *)
  53.802    ECHO_N='-n';;
  53.803  esac
  53.804  
  53.805 -if expr a : '\(a\)' >/dev/null 2>&1 &&
  53.806 -   test "X`expr 00001 : '.*\(...\)'`" = X001; then
  53.807 -  as_expr=expr
  53.808 -else
  53.809 -  as_expr=false
  53.810 -fi
  53.811 -
  53.812  rm -f conf$$ conf$$.exe conf$$.file
  53.813  if test -d conf$$.dir; then
  53.814    rm -f conf$$.dir/conf$$.file
  53.815  else
  53.816    rm -f conf$$.dir
  53.817 -  mkdir conf$$.dir
  53.818 +  mkdir conf$$.dir 2>/dev/null
  53.819  fi
  53.820 -echo >conf$$.file
  53.821 -if ln -s conf$$.file conf$$ 2>/dev/null; then
  53.822 -  as_ln_s='ln -s'
  53.823 -  # ... but there are two gotchas:
  53.824 -  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
  53.825 -  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
  53.826 -  # In both cases, we have to default to `cp -p'.
  53.827 -  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
  53.828 +if (echo >conf$$.file) 2>/dev/null; then
  53.829 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
  53.830 +    as_ln_s='ln -s'
  53.831 +    # ... but there are two gotchas:
  53.832 +    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
  53.833 +    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
  53.834 +    # In both cases, we have to default to `cp -p'.
  53.835 +    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
  53.836 +      as_ln_s='cp -p'
  53.837 +  elif ln conf$$.file conf$$ 2>/dev/null; then
  53.838 +    as_ln_s=ln
  53.839 +  else
  53.840      as_ln_s='cp -p'
  53.841 -elif ln conf$$.file conf$$ 2>/dev/null; then
  53.842 -  as_ln_s=ln
  53.843 +  fi
  53.844  else
  53.845    as_ln_s='cp -p'
  53.846  fi
  53.847 @@ -512,7 +497,7 @@
  53.848  rmdir conf$$.dir 2>/dev/null
  53.849  
  53.850  if mkdir -p . 2>/dev/null; then
  53.851 -  as_mkdir_p=:
  53.852 +  as_mkdir_p='mkdir -p "$as_dir"'
  53.853  else
  53.854    test -d ./-p && rmdir ./-p
  53.855    as_mkdir_p=false
  53.856 @@ -529,12 +514,12 @@
  53.857    as_test_x='
  53.858      eval sh -c '\''
  53.859        if test -d "$1"; then
  53.860 -        test -d "$1/.";
  53.861 +	test -d "$1/.";
  53.862        else
  53.863 -	case $1 in
  53.864 -        -*)set "./$1";;
  53.865 +	case $1 in #(
  53.866 +	-*)set "./$1";;
  53.867  	esac;
  53.868 -	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  53.869 +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
  53.870  	???[sx]*):;;*)false;;esac;fi
  53.871      '\'' sh
  53.872    '
  53.873 @@ -548,11 +533,11 @@
  53.874  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  53.875  
  53.876  
  53.877 -
  53.878 -exec 7<&0 </dev/null 6>&1
  53.879 +test -n "$DJDIR" || exec 7<&0 </dev/null
  53.880 +exec 6>&1
  53.881  
  53.882  # Name of the host.
  53.883 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  53.884 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
  53.885  # so uname gets run too.
  53.886  ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
  53.887  
  53.888 @@ -567,7 +552,6 @@
  53.889  subdirs=
  53.890  MFLAGS=
  53.891  MAKEFLAGS=
  53.892 -SHELL=${CONFIG_SHELL-/bin/sh}
  53.893  
  53.894  # Identity of this package.
  53.895  PACKAGE_NAME=
  53.896 @@ -575,76 +559,88 @@
  53.897  PACKAGE_VERSION=
  53.898  PACKAGE_STRING=
  53.899  PACKAGE_BUGREPORT=
  53.900 +PACKAGE_URL=
  53.901  
  53.902  ac_unique_file="README"
  53.903 -ac_subst_vars='SHELL
  53.904 +ac_subst_vars='LTLIBOBJS
  53.905 +LIBOBJS
  53.906 +SDL_TTF_LIB
  53.907 +GLLIB
  53.908 +CPP
  53.909 +XMKMF
  53.910 +SDL_CONFIG
  53.911 +SDL_LIBS
  53.912 +SDL_CFLAGS
  53.913 +PKG_CONFIG_LIBDIR
  53.914 +PKG_CONFIG_PATH
  53.915 +PKG_CONFIG
  53.916 +ISUNIX
  53.917 +ISWINDOWS
  53.918 +ISMACOSX
  53.919 +MATHLIB
  53.920 +EXE
  53.921 +OSMESA_CONFIG
  53.922 +OBJEXT
  53.923 +EXEEXT
  53.924 +ac_ct_CC
  53.925 +CPPFLAGS
  53.926 +LDFLAGS
  53.927 +CFLAGS
  53.928 +CC
  53.929 +host_os
  53.930 +host_vendor
  53.931 +host_cpu
  53.932 +host
  53.933 +build_os
  53.934 +build_vendor
  53.935 +build_cpu
  53.936 +build
  53.937 +target_alias
  53.938 +host_alias
  53.939 +build_alias
  53.940 +LIBS
  53.941 +ECHO_T
  53.942 +ECHO_N
  53.943 +ECHO_C
  53.944 +DEFS
  53.945 +mandir
  53.946 +localedir
  53.947 +libdir
  53.948 +psdir
  53.949 +pdfdir
  53.950 +dvidir
  53.951 +htmldir
  53.952 +infodir
  53.953 +docdir
  53.954 +oldincludedir
  53.955 +includedir
  53.956 +localstatedir
  53.957 +sharedstatedir
  53.958 +sysconfdir
  53.959 +datadir
  53.960 +datarootdir
  53.961 +libexecdir
  53.962 +sbindir
  53.963 +bindir
  53.964 +program_transform_name
  53.965 +prefix
  53.966 +exec_prefix
  53.967 +PACKAGE_URL
  53.968 +PACKAGE_BUGREPORT
  53.969 +PACKAGE_STRING
  53.970 +PACKAGE_VERSION
  53.971 +PACKAGE_TARNAME
  53.972 +PACKAGE_NAME
  53.973  PATH_SEPARATOR
  53.974 -PACKAGE_NAME
  53.975 -PACKAGE_TARNAME
  53.976 -PACKAGE_VERSION
  53.977 -PACKAGE_STRING
  53.978 -PACKAGE_BUGREPORT
  53.979 -exec_prefix
  53.980 -prefix
  53.981 -program_transform_name
  53.982 -bindir
  53.983 -sbindir
  53.984 -libexecdir
  53.985 -datarootdir
  53.986 -datadir
  53.987 -sysconfdir
  53.988 -sharedstatedir
  53.989 -localstatedir
  53.990 -includedir
  53.991 -oldincludedir
  53.992 -docdir
  53.993 -infodir
  53.994 -htmldir
  53.995 -dvidir
  53.996 -pdfdir
  53.997 -psdir
  53.998 -libdir
  53.999 -localedir
 53.1000 -mandir
 53.1001 -DEFS
 53.1002 -ECHO_C
 53.1003 -ECHO_N
 53.1004 -ECHO_T
 53.1005 -LIBS
 53.1006 -build_alias
 53.1007 -host_alias
 53.1008 -target_alias
 53.1009 -build
 53.1010 -build_cpu
 53.1011 -build_vendor
 53.1012 -build_os
 53.1013 -host
 53.1014 -host_cpu
 53.1015 -host_vendor
 53.1016 -host_os
 53.1017 -CC
 53.1018 -CFLAGS
 53.1019 -LDFLAGS
 53.1020 -CPPFLAGS
 53.1021 -ac_ct_CC
 53.1022 -EXEEXT
 53.1023 -OBJEXT
 53.1024 -OSMESA_CONFIG
 53.1025 -EXE
 53.1026 -MATHLIB
 53.1027 -PKG_CONFIG
 53.1028 -PKG_CONFIG_PATH
 53.1029 -PKG_CONFIG_LIBDIR
 53.1030 -SDL_CFLAGS
 53.1031 -SDL_LIBS
 53.1032 -SDL_CONFIG
 53.1033 -XMKMF
 53.1034 -CPP
 53.1035 -GLLIB
 53.1036 -SDL_TTF_LIB
 53.1037 -LIBOBJS
 53.1038 -LTLIBOBJS'
 53.1039 +SHELL'
 53.1040  ac_subst_files=''
 53.1041 +ac_user_opts='
 53.1042 +enable_option_checking
 53.1043 +with_sdl_prefix
 53.1044 +with_sdl_exec_prefix
 53.1045 +enable_sdltest
 53.1046 +with_x
 53.1047 +'
 53.1048        ac_precious_vars='build_alias
 53.1049  host_alias
 53.1050  target_alias
 53.1051 @@ -665,6 +661,8 @@
 53.1052  # Initialize some variables set by options.
 53.1053  ac_init_help=
 53.1054  ac_init_version=false
 53.1055 +ac_unrecognized_opts=
 53.1056 +ac_unrecognized_sep=
 53.1057  # The variables have the same names as the options, with
 53.1058  # dashes changed to underlines.
 53.1059  cache_file=/dev/null
 53.1060 @@ -720,8 +718,9 @@
 53.1061    fi
 53.1062  
 53.1063    case $ac_option in
 53.1064 -  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
 53.1065 -  *)	ac_optarg=yes ;;
 53.1066 +  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
 53.1067 +  *=)   ac_optarg= ;;
 53.1068 +  *)    ac_optarg=yes ;;
 53.1069    esac
 53.1070  
 53.1071    # Accept the important Cygnus configure options, so we can diagnose typos.
 53.1072 @@ -763,13 +762,20 @@
 53.1073      datarootdir=$ac_optarg ;;
 53.1074  
 53.1075    -disable-* | --disable-*)
 53.1076 -    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
 53.1077 +    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
 53.1078      # Reject names that are not valid shell variable names.
 53.1079 -    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 53.1080 -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 53.1081 -   { (exit 1); exit 1; }; }
 53.1082 -    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 53.1083 -    eval enable_$ac_feature=no ;;
 53.1084 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 53.1085 +      as_fn_error $? "invalid feature name: $ac_useropt"
 53.1086 +    ac_useropt_orig=$ac_useropt
 53.1087 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 53.1088 +    case $ac_user_opts in
 53.1089 +      *"
 53.1090 +"enable_$ac_useropt"
 53.1091 +"*) ;;
 53.1092 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 53.1093 +	 ac_unrecognized_sep=', ';;
 53.1094 +    esac
 53.1095 +    eval enable_$ac_useropt=no ;;
 53.1096  
 53.1097    -docdir | --docdir | --docdi | --doc | --do)
 53.1098      ac_prev=docdir ;;
 53.1099 @@ -782,13 +788,20 @@
 53.1100      dvidir=$ac_optarg ;;
 53.1101  
 53.1102    -enable-* | --enable-*)
 53.1103 -    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
 53.1104 +    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
 53.1105      # Reject names that are not valid shell variable names.
 53.1106 -    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 53.1107 -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 53.1108 -   { (exit 1); exit 1; }; }
 53.1109 -    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 53.1110 -    eval enable_$ac_feature=\$ac_optarg ;;
 53.1111 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 53.1112 +      as_fn_error $? "invalid feature name: $ac_useropt"
 53.1113 +    ac_useropt_orig=$ac_useropt
 53.1114 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 53.1115 +    case $ac_user_opts in
 53.1116 +      *"
 53.1117 +"enable_$ac_useropt"
 53.1118 +"*) ;;
 53.1119 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 53.1120 +	 ac_unrecognized_sep=', ';;
 53.1121 +    esac
 53.1122 +    eval enable_$ac_useropt=\$ac_optarg ;;
 53.1123  
 53.1124    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
 53.1125    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
 53.1126 @@ -979,22 +992,36 @@
 53.1127      ac_init_version=: ;;
 53.1128  
 53.1129    -with-* | --with-*)
 53.1130 -    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
 53.1131 +    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
 53.1132      # Reject names that are not valid shell variable names.
 53.1133 -    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 53.1134 -      { echo "$as_me: error: invalid package name: $ac_package" >&2
 53.1135 -   { (exit 1); exit 1; }; }
 53.1136 -    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 53.1137 -    eval with_$ac_package=\$ac_optarg ;;
 53.1138 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 53.1139 +      as_fn_error $? "invalid package name: $ac_useropt"
 53.1140 +    ac_useropt_orig=$ac_useropt
 53.1141 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 53.1142 +    case $ac_user_opts in
 53.1143 +      *"
 53.1144 +"with_$ac_useropt"
 53.1145 +"*) ;;
 53.1146 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 53.1147 +	 ac_unrecognized_sep=', ';;
 53.1148 +    esac
 53.1149 +    eval with_$ac_useropt=\$ac_optarg ;;
 53.1150  
 53.1151    -without-* | --without-*)
 53.1152 -    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
 53.1153 +    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
 53.1154      # Reject names that are not valid shell variable names.
 53.1155 -    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 53.1156 -      { echo "$as_me: error: invalid package name: $ac_package" >&2
 53.1157 -   { (exit 1); exit 1; }; }
 53.1158 -    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 53.1159 -    eval with_$ac_package=no ;;
 53.1160 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 53.1161 +      as_fn_error $? "invalid package name: $ac_useropt"
 53.1162 +    ac_useropt_orig=$ac_useropt
 53.1163 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 53.1164 +    case $ac_user_opts in
 53.1165 +      *"
 53.1166 +"with_$ac_useropt"
 53.1167 +"*) ;;
 53.1168 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 53.1169 +	 ac_unrecognized_sep=', ';;
 53.1170 +    esac
 53.1171 +    eval with_$ac_useropt=no ;;
 53.1172  
 53.1173    --x)
 53.1174      # Obsolete; use --with-x.
 53.1175 @@ -1014,26 +1041,26 @@
 53.1176    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
 53.1177      x_libraries=$ac_optarg ;;
 53.1178  
 53.1179 -  -*) { echo "$as_me: error: unrecognized option: $ac_option
 53.1180 -Try \`$0 --help' for more information." >&2
 53.1181 -   { (exit 1); exit 1; }; }
 53.1182 +  -*) as_fn_error $? "unrecognized option: \`$ac_option'
 53.1183 +Try \`$0 --help' for more information"
 53.1184      ;;
 53.1185  
 53.1186    *=*)
 53.1187      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
 53.1188      # Reject names that are not valid shell variable names.
 53.1189 -    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
 53.1190 -      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
 53.1191 -   { (exit 1); exit 1; }; }
 53.1192 +    case $ac_envvar in #(
 53.1193 +      '' | [0-9]* | *[!_$as_cr_alnum]* )
 53.1194 +      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
 53.1195 +    esac
 53.1196      eval $ac_envvar=\$ac_optarg
 53.1197      export $ac_envvar ;;
 53.1198  
 53.1199    *)
 53.1200      # FIXME: should be removed in autoconf 3.0.
 53.1201 -    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 53.1202 +    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 53.1203      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 53.1204 -      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 53.1205 -    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
 53.1206 +      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 53.1207 +    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
 53.1208      ;;
 53.1209  
 53.1210    esac
 53.1211 @@ -1041,23 +1068,36 @@
 53.1212  
 53.1213  if test -n "$ac_prev"; then
 53.1214    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
 53.1215 -  { echo "$as_me: error: missing argument to $ac_option" >&2
 53.1216 -   { (exit 1); exit 1; }; }
 53.1217 +  as_fn_error $? "missing argument to $ac_option"
 53.1218  fi
 53.1219  
 53.1220 -# Be sure to have absolute directory names.
 53.1221 +if test -n "$ac_unrecognized_opts"; then
 53.1222 +  case $enable_option_checking in
 53.1223 +    no) ;;
 53.1224 +    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
 53.1225 +    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
 53.1226 +  esac
 53.1227 +fi
 53.1228 +
 53.1229 +# Check all directory arguments for consistency.
 53.1230  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 53.1231  		datadir sysconfdir sharedstatedir localstatedir includedir \
 53.1232  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 53.1233  		libdir localedir mandir
 53.1234  do
 53.1235    eval ac_val=\$$ac_var
 53.1236 +  # Remove trailing slashes.
 53.1237 +  case $ac_val in
 53.1238 +    */ )
 53.1239 +      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
 53.1240 +      eval $ac_var=\$ac_val;;
 53.1241 +  esac
 53.1242 +  # Be sure to have absolute directory names.
 53.1243    case $ac_val in
 53.1244      [\\/$]* | ?:[\\/]* )  continue;;
 53.1245      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
 53.1246    esac
 53.1247 -  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 53.1248 -   { (exit 1); exit 1; }; }
 53.1249 +  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 53.1250  done
 53.1251  
 53.1252  # There might be people who depend on the old broken behavior: `$host'
 53.1253 @@ -1071,8 +1111,8 @@
 53.1254  if test "x$host_alias" != x; then
 53.1255    if test "x$build_alias" = x; then
 53.1256      cross_compiling=maybe
 53.1257 -    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
 53.1258 -    If a cross compiler is detected then cross compile mode will be used." >&2
 53.1259 +    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
 53.1260 +    If a cross compiler is detected then cross compile mode will be used" >&2
 53.1261    elif test "x$build_alias" != "x$host_alias"; then
 53.1262      cross_compiling=yes
 53.1263    fi
 53.1264 @@ -1087,23 +1127,21 @@
 53.1265  ac_pwd=`pwd` && test -n "$ac_pwd" &&
 53.1266  ac_ls_di=`ls -di .` &&
 53.1267  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
 53.1268 -  { echo "$as_me: error: Working directory cannot be determined" >&2
 53.1269 -   { (exit 1); exit 1; }; }
 53.1270 +  as_fn_error $? "working directory cannot be determined"
 53.1271  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 53.1272 -  { echo "$as_me: error: pwd does not report name of working directory" >&2
 53.1273 -   { (exit 1); exit 1; }; }
 53.1274 +  as_fn_error $? "pwd does not report name of working directory"
 53.1275  
 53.1276  
 53.1277  # Find the source files, if location was not specified.
 53.1278  if test -z "$srcdir"; then
 53.1279    ac_srcdir_defaulted=yes
 53.1280    # Try the directory containing this script, then the parent directory.
 53.1281 -  ac_confdir=`$as_dirname -- "$0" ||
 53.1282 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 53.1283 -	 X"$0" : 'X\(//\)[^/]' \| \
 53.1284 -	 X"$0" : 'X\(//\)$' \| \
 53.1285 -	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 53.1286 -echo X"$0" |
 53.1287 +  ac_confdir=`$as_dirname -- "$as_myself" ||
 53.1288 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 53.1289 +	 X"$as_myself" : 'X\(//\)[^/]' \| \
 53.1290 +	 X"$as_myself" : 'X\(//\)$' \| \
 53.1291 +	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 53.1292 +$as_echo X"$as_myself" |
 53.1293      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 53.1294  	    s//\1/
 53.1295  	    q
 53.1296 @@ -1130,13 +1168,11 @@
 53.1297  fi
 53.1298  if test ! -r "$srcdir/$ac_unique_file"; then
 53.1299    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 53.1300 -  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
 53.1301 -   { (exit 1); exit 1; }; }
 53.1302 +  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 53.1303  fi
 53.1304  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 53.1305  ac_abs_confdir=`(
 53.1306 -	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
 53.1307 -   { (exit 1); exit 1; }; }
 53.1308 +	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 53.1309  	pwd)`
 53.1310  # When building in place, set srcdir=.
 53.1311  if test "$ac_abs_confdir" = "$ac_pwd"; then
 53.1312 @@ -1176,7 +1212,7 @@
 53.1313        --help=short        display options specific to this package
 53.1314        --help=recursive    display the short help of all the included packages
 53.1315    -V, --version           display version information and exit
 53.1316 -  -q, --quiet, --silent   do not print \`checking...' messages
 53.1317 +  -q, --quiet, --silent   do not print \`checking ...' messages
 53.1318        --cache-file=FILE   cache test results in FILE [disabled]
 53.1319    -C, --config-cache      alias for \`--cache-file=config.cache'
 53.1320    -n, --no-create         do not create output files
 53.1321 @@ -1184,9 +1220,9 @@
 53.1322  
 53.1323  Installation directories:
 53.1324    --prefix=PREFIX         install architecture-independent files in PREFIX
 53.1325 -			  [$ac_default_prefix]
 53.1326 +                          [$ac_default_prefix]
 53.1327    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
 53.1328 -			  [PREFIX]
 53.1329 +                          [PREFIX]
 53.1330  
 53.1331  By default, \`make install' will install all the files in
 53.1332  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 53.1333 @@ -1196,25 +1232,25 @@
 53.1334  For better control, use the options below.
 53.1335  
 53.1336  Fine tuning of the installation directories:
 53.1337 -  --bindir=DIR           user executables [EPREFIX/bin]
 53.1338 -  --sbindir=DIR          system admin executables [EPREFIX/sbin]
 53.1339 -  --libexecdir=DIR       program executables [EPREFIX/libexec]
 53.1340 -  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
 53.1341 -  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
 53.1342 -  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
 53.1343 -  --libdir=DIR           object code libraries [EPREFIX/lib]
 53.1344 -  --includedir=DIR       C header files [PREFIX/include]
 53.1345 -  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
 53.1346 -  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
 53.1347 -  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
 53.1348 -  --infodir=DIR          info documentation [DATAROOTDIR/info]
 53.1349 -  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
 53.1350 -  --mandir=DIR           man documentation [DATAROOTDIR/man]
 53.1351 -  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
 53.1352 -  --htmldir=DIR          html documentation [DOCDIR]
 53.1353 -  --dvidir=DIR           dvi documentation [DOCDIR]
 53.1354 -  --pdfdir=DIR           pdf documentation [DOCDIR]
 53.1355 -  --psdir=DIR            ps documentation [DOCDIR]
 53.1356 +  --bindir=DIR            user executables [EPREFIX/bin]
 53.1357 +  --sbindir=DIR           system admin executables [EPREFIX/sbin]
 53.1358 +  --libexecdir=DIR        program executables [EPREFIX/libexec]
 53.1359 +  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
 53.1360 +  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
 53.1361 +  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
 53.1362 +  --libdir=DIR            object code libraries [EPREFIX/lib]
 53.1363 +  --includedir=DIR        C header files [PREFIX/include]
 53.1364 +  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
 53.1365 +  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
 53.1366 +  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
 53.1367 +  --infodir=DIR           info documentation [DATAROOTDIR/info]
 53.1368 +  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
 53.1369 +  --mandir=DIR            man documentation [DATAROOTDIR/man]
 53.1370 +  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
 53.1371 +  --htmldir=DIR           html documentation [DOCDIR]
 53.1372 +  --dvidir=DIR            dvi documentation [DOCDIR]
 53.1373 +  --pdfdir=DIR            pdf documentation [DOCDIR]
 53.1374 +  --psdir=DIR             ps documentation [DOCDIR]
 53.1375  _ACEOF
 53.1376  
 53.1377    cat <<\_ACEOF
 53.1378 @@ -1234,6 +1270,7 @@
 53.1379    cat <<\_ACEOF
 53.1380  
 53.1381  Optional Features:
 53.1382 +  --disable-option-checking  ignore unrecognized --enable/--with options
 53.1383    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
 53.1384    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
 53.1385    --disable-sdltest       Do not try to compile and run a test SDL program
 53.1386 @@ -1251,7 +1288,7 @@
 53.1387    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
 53.1388                nonstandard directory <lib dir>
 53.1389    LIBS        libraries to pass to the linker, e.g. -l<library>
 53.1390 -  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 53.1391 +  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 53.1392                you have headers in a nonstandard directory <include dir>
 53.1393    PKG_CONFIG  path to pkg-config utility
 53.1394    PKG_CONFIG_PATH
 53.1395 @@ -1266,6 +1303,7 @@
 53.1396  Use these variables to override the choices made by `configure' or to help
 53.1397  it to find libraries and programs with nonstandard names/locations.
 53.1398  
 53.1399 +Report bugs to the package provider.
 53.1400  _ACEOF
 53.1401  ac_status=$?
 53.1402  fi
 53.1403 @@ -1273,15 +1311,17 @@
 53.1404  if test "$ac_init_help" = "recursive"; then
 53.1405    # If there are subdirs, report their specific --help.
 53.1406    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
 53.1407 -    test -d "$ac_dir" || continue
 53.1408 +    test -d "$ac_dir" ||
 53.1409 +      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
 53.1410 +      continue
 53.1411      ac_builddir=.
 53.1412  
 53.1413  case "$ac_dir" in
 53.1414  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 53.1415  *)
 53.1416 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
 53.1417 +  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 53.1418    # A ".." for each directory in $ac_dir_suffix.
 53.1419 -  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
 53.1420 +  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 53.1421    case $ac_top_builddir_sub in
 53.1422    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 53.1423    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
 53.1424 @@ -1317,7 +1357,7 @@
 53.1425        echo &&
 53.1426        $SHELL "$ac_srcdir/configure" --help=recursive
 53.1427      else
 53.1428 -      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 53.1429 +      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 53.1430      fi || ac_status=$?
 53.1431      cd "$ac_pwd" || { ac_status=$?; break; }
 53.1432    done
 53.1433 @@ -1327,21 +1367,187 @@
 53.1434  if $ac_init_version; then
 53.1435    cat <<\_ACEOF
 53.1436  configure
 53.1437 -generated by GNU Autoconf 2.61
 53.1438 -
 53.1439 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 53.1440 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 53.1441 +generated by GNU Autoconf 2.68
 53.1442 +
 53.1443 +Copyright (C) 2010 Free Software Foundation, Inc.
 53.1444  This configure script is free software; the Free Software Foundation
 53.1445  gives unlimited permission to copy, distribute and modify it.
 53.1446  _ACEOF
 53.1447    exit
 53.1448  fi
 53.1449 +
 53.1450 +## ------------------------ ##
 53.1451 +## Autoconf initialization. ##
 53.1452 +## ------------------------ ##
 53.1453 +
 53.1454 +# ac_fn_c_try_compile LINENO
 53.1455 +# --------------------------
 53.1456 +# Try to compile conftest.$ac_ext, and return whether this succeeded.
 53.1457 +ac_fn_c_try_compile ()
 53.1458 +{
 53.1459 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 53.1460 +  rm -f conftest.$ac_objext
 53.1461 +  if { { ac_try="$ac_compile"
 53.1462 +case "(($ac_try" in
 53.1463 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.1464 +  *) ac_try_echo=$ac_try;;
 53.1465 +esac
 53.1466 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.1467 +$as_echo "$ac_try_echo"; } >&5
 53.1468 +  (eval "$ac_compile") 2>conftest.err
 53.1469 +  ac_status=$?
 53.1470 +  if test -s conftest.err; then
 53.1471 +    grep -v '^ *+' conftest.err >conftest.er1
 53.1472 +    cat conftest.er1 >&5
 53.1473 +    mv -f conftest.er1 conftest.err
 53.1474 +  fi
 53.1475 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.1476 +  test $ac_status = 0; } && {
 53.1477 +	 test -z "$ac_c_werror_flag" ||
 53.1478 +	 test ! -s conftest.err
 53.1479 +       } && test -s conftest.$ac_objext; then :
 53.1480 +  ac_retval=0
 53.1481 +else
 53.1482 +  $as_echo "$as_me: failed program was:" >&5
 53.1483 +sed 's/^/| /' conftest.$ac_ext >&5
 53.1484 +
 53.1485 +	ac_retval=1
 53.1486 +fi
 53.1487 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 53.1488 +  as_fn_set_status $ac_retval
 53.1489 +
 53.1490 +} # ac_fn_c_try_compile
 53.1491 +
 53.1492 +# ac_fn_c_try_run LINENO
 53.1493 +# ----------------------
 53.1494 +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
 53.1495 +# that executables *can* be run.
 53.1496 +ac_fn_c_try_run ()
 53.1497 +{
 53.1498 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 53.1499 +  if { { ac_try="$ac_link"
 53.1500 +case "(($ac_try" in
 53.1501 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.1502 +  *) ac_try_echo=$ac_try;;
 53.1503 +esac
 53.1504 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.1505 +$as_echo "$ac_try_echo"; } >&5
 53.1506 +  (eval "$ac_link") 2>&5
 53.1507 +  ac_status=$?
 53.1508 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.1509 +  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
 53.1510 +  { { case "(($ac_try" in
 53.1511 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.1512 +  *) ac_try_echo=$ac_try;;
 53.1513 +esac
 53.1514 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.1515 +$as_echo "$ac_try_echo"; } >&5
 53.1516 +  (eval "$ac_try") 2>&5
 53.1517 +  ac_status=$?
 53.1518 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.1519 +  test $ac_status = 0; }; }; then :
 53.1520 +  ac_retval=0
 53.1521 +else
 53.1522 +  $as_echo "$as_me: program exited with status $ac_status" >&5
 53.1523 +       $as_echo "$as_me: failed program was:" >&5
 53.1524 +sed 's/^/| /' conftest.$ac_ext >&5
 53.1525 +
 53.1526 +       ac_retval=$ac_status
 53.1527 +fi
 53.1528 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 53.1529 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 53.1530 +  as_fn_set_status $ac_retval
 53.1531 +
 53.1532 +} # ac_fn_c_try_run
 53.1533 +
 53.1534 +# ac_fn_c_try_link LINENO
 53.1535 +# -----------------------
 53.1536 +# Try to link conftest.$ac_ext, and return whether this succeeded.
 53.1537 +ac_fn_c_try_link ()
 53.1538 +{
 53.1539 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 53.1540 +  rm -f conftest.$ac_objext conftest$ac_exeext
 53.1541 +  if { { ac_try="$ac_link"
 53.1542 +case "(($ac_try" in
 53.1543 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.1544 +  *) ac_try_echo=$ac_try;;
 53.1545 +esac
 53.1546 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.1547 +$as_echo "$ac_try_echo"; } >&5
 53.1548 +  (eval "$ac_link") 2>conftest.err
 53.1549 +  ac_status=$?
 53.1550 +  if test -s conftest.err; then
 53.1551 +    grep -v '^ *+' conftest.err >conftest.er1
 53.1552 +    cat conftest.er1 >&5
 53.1553 +    mv -f conftest.er1 conftest.err
 53.1554 +  fi
 53.1555 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.1556 +  test $ac_status = 0; } && {
 53.1557 +	 test -z "$ac_c_werror_flag" ||
 53.1558 +	 test ! -s conftest.err
 53.1559 +       } && test -s conftest$ac_exeext && {
 53.1560 +	 test "$cross_compiling" = yes ||
 53.1561 +	 $as_test_x conftest$ac_exeext
 53.1562 +       }; then :
 53.1563 +  ac_retval=0
 53.1564 +else
 53.1565 +  $as_echo "$as_me: failed program was:" >&5
 53.1566 +sed 's/^/| /' conftest.$ac_ext >&5
 53.1567 +
 53.1568 +	ac_retval=1
 53.1569 +fi
 53.1570 +  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
 53.1571 +  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
 53.1572 +  # interfere with the next link command; also delete a directory that is
 53.1573 +  # left behind by Apple's compiler.  We do this before executing the actions.
 53.1574 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 53.1575 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 53.1576 +  as_fn_set_status $ac_retval
 53.1577 +
 53.1578 +} # ac_fn_c_try_link
 53.1579 +
 53.1580 +# ac_fn_c_try_cpp LINENO
 53.1581 +# ----------------------
 53.1582 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 53.1583 +ac_fn_c_try_cpp ()
 53.1584 +{
 53.1585 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 53.1586 +  if { { ac_try="$ac_cpp conftest.$ac_ext"
 53.1587 +case "(($ac_try" in
 53.1588 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.1589 +  *) ac_try_echo=$ac_try;;
 53.1590 +esac
 53.1591 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.1592 +$as_echo "$ac_try_echo"; } >&5
 53.1593 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 53.1594 +  ac_status=$?
 53.1595 +  if test -s conftest.err; then
 53.1596 +    grep -v '^ *+' conftest.err >conftest.er1
 53.1597 +    cat conftest.er1 >&5
 53.1598 +    mv -f conftest.er1 conftest.err
 53.1599 +  fi
 53.1600 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.1601 +  test $ac_status = 0; } > conftest.i && {
 53.1602 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 53.1603 +	 test ! -s conftest.err
 53.1604 +       }; then :
 53.1605 +  ac_retval=0
 53.1606 +else
 53.1607 +  $as_echo "$as_me: failed program was:" >&5
 53.1608 +sed 's/^/| /' conftest.$ac_ext >&5
 53.1609 +
 53.1610 +    ac_retval=1
 53.1611 +fi
 53.1612 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 53.1613 +  as_fn_set_status $ac_retval
 53.1614 +
 53.1615 +} # ac_fn_c_try_cpp
 53.1616  cat >config.log <<_ACEOF
 53.1617  This file contains any messages produced by compilers while
 53.1618  running configure, to aid debugging if configure makes a mistake.
 53.1619  
 53.1620  It was created by $as_me, which was
 53.1621 -generated by GNU Autoconf 2.61.  Invocation command line was
 53.1622 +generated by GNU Autoconf 2.68.  Invocation command line was
 53.1623  
 53.1624    $ $0 $@
 53.1625  
 53.1626 @@ -1377,8 +1583,8 @@
 53.1627  do
 53.1628    IFS=$as_save_IFS
 53.1629    test -z "$as_dir" && as_dir=.
 53.1630 -  echo "PATH: $as_dir"
 53.1631 -done
 53.1632 +    $as_echo "PATH: $as_dir"
 53.1633 +  done
 53.1634  IFS=$as_save_IFS
 53.1635  
 53.1636  } >&5
 53.1637 @@ -1412,12 +1618,12 @@
 53.1638      | -silent | --silent | --silen | --sile | --sil)
 53.1639        continue ;;
 53.1640      *\'*)
 53.1641 -      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 53.1642 +      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 53.1643      esac
 53.1644      case $ac_pass in
 53.1645 -    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
 53.1646 +    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
 53.1647      2)
 53.1648 -      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
 53.1649 +      as_fn_append ac_configure_args1 " '$ac_arg'"
 53.1650        if test $ac_must_keep_next = true; then
 53.1651  	ac_must_keep_next=false # Got value, back to normal.
 53.1652        else
 53.1653 @@ -1433,13 +1639,13 @@
 53.1654  	  -* ) ac_must_keep_next=true ;;
 53.1655  	esac
 53.1656        fi
 53.1657 -      ac_configure_args="$ac_configure_args '$ac_arg'"
 53.1658 +      as_fn_append ac_configure_args " '$ac_arg'"
 53.1659        ;;
 53.1660      esac
 53.1661    done
 53.1662  done
 53.1663 -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
 53.1664 -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
 53.1665 +{ ac_configure_args0=; unset ac_configure_args0;}
 53.1666 +{ ac_configure_args1=; unset ac_configure_args1;}
 53.1667  
 53.1668  # When interrupted or exit'd, cleanup temporary files, and complete
 53.1669  # config.log.  We remove comments because anyway the quotes in there
 53.1670 @@ -1451,11 +1657,9 @@
 53.1671    {
 53.1672      echo
 53.1673  
 53.1674 -    cat <<\_ASBOX
 53.1675 -## ---------------- ##
 53.1676 +    $as_echo "## ---------------- ##
 53.1677  ## Cache variables. ##
 53.1678 -## ---------------- ##
 53.1679 -_ASBOX
 53.1680 +## ---------------- ##"
 53.1681      echo
 53.1682      # The following way of writing the cache mishandles newlines in values,
 53.1683  (
 53.1684 @@ -1464,12 +1668,13 @@
 53.1685      case $ac_val in #(
 53.1686      *${as_nl}*)
 53.1687        case $ac_var in #(
 53.1688 -      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
 53.1689 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 53.1690 +      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 53.1691 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 53.1692        esac
 53.1693        case $ac_var in #(
 53.1694        _ | IFS | as_nl) ;; #(
 53.1695 -      *) $as_unset $ac_var ;;
 53.1696 +      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
 53.1697 +      *) { eval $ac_var=; unset $ac_var;} ;;
 53.1698        esac ;;
 53.1699      esac
 53.1700    done
 53.1701 @@ -1488,128 +1693,136 @@
 53.1702  )
 53.1703      echo
 53.1704  
 53.1705 -    cat <<\_ASBOX
 53.1706 -## ----------------- ##
 53.1707 +    $as_echo "## ----------------- ##
 53.1708  ## Output variables. ##
 53.1709 -## ----------------- ##
 53.1710 -_ASBOX
 53.1711 +## ----------------- ##"
 53.1712      echo
 53.1713      for ac_var in $ac_subst_vars
 53.1714      do
 53.1715        eval ac_val=\$$ac_var
 53.1716        case $ac_val in
 53.1717 -      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 53.1718 +      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 53.1719        esac
 53.1720 -      echo "$ac_var='\''$ac_val'\''"
 53.1721 +      $as_echo "$ac_var='\''$ac_val'\''"
 53.1722      done | sort
 53.1723      echo
 53.1724  
 53.1725      if test -n "$ac_subst_files"; then
 53.1726 -      cat <<\_ASBOX
 53.1727 -## ------------------- ##
 53.1728 +      $as_echo "## ------------------- ##
 53.1729  ## File substitutions. ##
 53.1730 -## ------------------- ##
 53.1731 -_ASBOX
 53.1732 +## ------------------- ##"
 53.1733        echo
 53.1734        for ac_var in $ac_subst_files
 53.1735        do
 53.1736  	eval ac_val=\$$ac_var
 53.1737  	case $ac_val in
 53.1738 -	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 53.1739 +	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 53.1740  	esac
 53.1741 -	echo "$ac_var='\''$ac_val'\''"
 53.1742 +	$as_echo "$ac_var='\''$ac_val'\''"
 53.1743        done | sort
 53.1744        echo
 53.1745      fi
 53.1746  
 53.1747      if test -s confdefs.h; then
 53.1748 -      cat <<\_ASBOX
 53.1749 -## ----------- ##
 53.1750 +      $as_echo "## ----------- ##
 53.1751  ## confdefs.h. ##
 53.1752 -## ----------- ##
 53.1753 -_ASBOX
 53.1754 +## ----------- ##"
 53.1755        echo
 53.1756        cat confdefs.h
 53.1757        echo
 53.1758      fi
 53.1759      test "$ac_signal" != 0 &&
 53.1760 -      echo "$as_me: caught signal $ac_signal"
 53.1761 -    echo "$as_me: exit $exit_status"
 53.1762 +      $as_echo "$as_me: caught signal $ac_signal"
 53.1763 +    $as_echo "$as_me: exit $exit_status"
 53.1764    } >&5
 53.1765    rm -f core *.core core.conftest.* &&
 53.1766      rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
 53.1767      exit $exit_status
 53.1768  ' 0
 53.1769  for ac_signal in 1 2 13 15; do
 53.1770 -  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 53.1771 +  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 53.1772  done
 53.1773  ac_signal=0
 53.1774  
 53.1775  # confdefs.h avoids OS command line length limits that DEFS can exceed.
 53.1776  rm -f -r conftest* confdefs.h
 53.1777  
 53.1778 +$as_echo "/* confdefs.h */" > confdefs.h
 53.1779 +
 53.1780  # Predefined preprocessor variables.
 53.1781  
 53.1782  cat >>confdefs.h <<_ACEOF
 53.1783  #define PACKAGE_NAME "$PACKAGE_NAME"
 53.1784  _ACEOF
 53.1785  
 53.1786 -
 53.1787  cat >>confdefs.h <<_ACEOF
 53.1788  #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 53.1789  _ACEOF
 53.1790  
 53.1791 -
 53.1792  cat >>confdefs.h <<_ACEOF
 53.1793  #define PACKAGE_VERSION "$PACKAGE_VERSION"
 53.1794  _ACEOF
 53.1795  
 53.1796 -
 53.1797  cat >>confdefs.h <<_ACEOF
 53.1798  #define PACKAGE_STRING "$PACKAGE_STRING"
 53.1799  _ACEOF
 53.1800  
 53.1801 -
 53.1802  cat >>confdefs.h <<_ACEOF
 53.1803  #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 53.1804  _ACEOF
 53.1805  
 53.1806 +cat >>confdefs.h <<_ACEOF
 53.1807 +#define PACKAGE_URL "$PACKAGE_URL"
 53.1808 +_ACEOF
 53.1809 +
 53.1810  
 53.1811  # Let the site file select an alternate cache file if it wants to.
 53.1812 -# Prefer explicitly selected file to automatically selected ones.
 53.1813 +# Prefer an explicitly selected file to automatically selected ones.
 53.1814 +ac_site_file1=NONE
 53.1815 +ac_site_file2=NONE
 53.1816  if test -n "$CONFIG_SITE"; then
 53.1817 -  set x "$CONFIG_SITE"
 53.1818 +  # We do not want a PATH search for config.site.
 53.1819 +  case $CONFIG_SITE in #((
 53.1820 +    -*)  ac_site_file1=./$CONFIG_SITE;;
 53.1821 +    */*) ac_site_file1=$CONFIG_SITE;;
 53.1822 +    *)   ac_site_file1=./$CONFIG_SITE;;
 53.1823 +  esac
 53.1824  elif test "x$prefix" != xNONE; then
 53.1825 -  set x "$prefix/share/config.site" "$prefix/etc/config.site"
 53.1826 +  ac_site_file1=$prefix/share/config.site
 53.1827 +  ac_site_file2=$prefix/etc/config.site
 53.1828  else
 53.1829 -  set x "$ac_default_prefix/share/config.site" \
 53.1830 -	"$ac_default_prefix/etc/config.site"
 53.1831 +  ac_site_file1=$ac_default_prefix/share/config.site
 53.1832 +  ac_site_file2=$ac_default_prefix/etc/config.site
 53.1833  fi
 53.1834 -shift
 53.1835 -for ac_site_file
 53.1836 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 53.1837  do
 53.1838 -  if test -r "$ac_site_file"; then
 53.1839 -    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 53.1840 -echo "$as_me: loading site script $ac_site_file" >&6;}
 53.1841 +  test "x$ac_site_file" = xNONE && continue
 53.1842 +  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 53.1843 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 53.1844 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
 53.1845      sed 's/^/| /' "$ac_site_file" >&5
 53.1846 -    . "$ac_site_file"
 53.1847 +    . "$ac_site_file" \
 53.1848 +      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.1849 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.1850 +as_fn_error $? "failed to load site script $ac_site_file
 53.1851 +See \`config.log' for more details" "$LINENO" 5; }
 53.1852    fi
 53.1853  done
 53.1854  
 53.1855  if test -r "$cache_file"; then
 53.1856 -  # Some versions of bash will fail to source /dev/null (special
 53.1857 -  # files actually), so we avoid doing that.
 53.1858 -  if test -f "$cache_file"; then
 53.1859 -    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 53.1860 -echo "$as_me: loading cache $cache_file" >&6;}
 53.1861 +  # Some versions of bash will fail to source /dev/null (special files
 53.1862 +  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
 53.1863 +  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
 53.1864 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 53.1865 +$as_echo "$as_me: loading cache $cache_file" >&6;}
 53.1866      case $cache_file in
 53.1867        [\\/]* | ?:[\\/]* ) . "$cache_file";;
 53.1868        *)                      . "./$cache_file";;
 53.1869      esac
 53.1870    fi
 53.1871  else
 53.1872 -  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
 53.1873 -echo "$as_me: creating cache $cache_file" >&6;}
 53.1874 +  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 53.1875 +$as_echo "$as_me: creating cache $cache_file" >&6;}
 53.1876    >$cache_file
 53.1877  fi
 53.1878  
 53.1879 @@ -1623,60 +1836,56 @@
 53.1880    eval ac_new_val=\$ac_env_${ac_var}_value
 53.1881    case $ac_old_set,$ac_new_set in
 53.1882      set,)
 53.1883 -      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 53.1884 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
 53.1885 +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 53.1886 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
 53.1887        ac_cache_corrupted=: ;;
 53.1888      ,set)
 53.1889 -      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 53.1890 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 53.1891 +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 53.1892 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 53.1893        ac_cache_corrupted=: ;;
 53.1894      ,);;
 53.1895      *)
 53.1896        if test "x$ac_old_val" != "x$ac_new_val"; then
 53.1897 -	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 53.1898 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 53.1899 -	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 53.1900 -echo "$as_me:   former value:  $ac_old_val" >&2;}
 53.1901 -	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 53.1902 -echo "$as_me:   current value: $ac_new_val" >&2;}
 53.1903 -	ac_cache_corrupted=:
 53.1904 +	# differences in whitespace do not lead to failure.
 53.1905 +	ac_old_val_w=`echo x $ac_old_val`
 53.1906 +	ac_new_val_w=`echo x $ac_new_val`
 53.1907 +	if test "$ac_old_val_w" != "$ac_new_val_w"; then
 53.1908 +	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 53.1909 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 53.1910 +	  ac_cache_corrupted=:
 53.1911 +	else
 53.1912 +	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 53.1913 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 53.1914 +	  eval $ac_var=\$ac_old_val
 53.1915 +	fi
 53.1916 +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 53.1917 +$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
 53.1918 +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 53.1919 +$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
 53.1920        fi;;
 53.1921    esac
 53.1922    # Pass precious variables to config.status.
 53.1923    if test "$ac_new_set" = set; then
 53.1924      case $ac_new_val in
 53.1925 -    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 53.1926 +    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 53.1927      *) ac_arg=$ac_var=$ac_new_val ;;
 53.1928      esac
 53.1929      case " $ac_configure_args " in
 53.1930        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
 53.1931 -      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
 53.1932 +      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
 53.1933      esac
 53.1934    fi
 53.1935  done
 53.1936  if $ac_cache_corrupted; then
 53.1937 -  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 53.1938 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 53.1939 -  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 53.1940 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
 53.1941 -   { (exit 1); exit 1; }; }
 53.1942 +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.1943 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.1944 +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 53.1945 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 53.1946 +  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 53.1947  fi
 53.1948 -
 53.1949 -
 53.1950 -
 53.1951 -
 53.1952 -
 53.1953 -
 53.1954 -
 53.1955 -
 53.1956 -
 53.1957 -
 53.1958 -
 53.1959 -
 53.1960 -
 53.1961 -
 53.1962 -
 53.1963 -
 53.1964 +## -------------------- ##
 53.1965 +## Main body of script. ##
 53.1966 +## -------------------- ##
 53.1967  
 53.1968  ac_ext=c
 53.1969  ac_cpp='$CPP $CPPFLAGS'
 53.1970 @@ -1703,9 +1912,7 @@
 53.1971    fi
 53.1972  done
 53.1973  if test -z "$ac_aux_dir"; then
 53.1974 -  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir/../build-scripts" >&5
 53.1975 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir/../build-scripts" >&2;}
 53.1976 -   { (exit 1); exit 1; }; }
 53.1977 +  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $srcdir/../build-scripts" "$LINENO" 5
 53.1978  fi
 53.1979  
 53.1980  # These three variables are undocumented and unsupported,
 53.1981 @@ -1719,35 +1926,27 @@
 53.1982  
 53.1983  # Make sure we can run config.sub.
 53.1984  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 53.1985 -  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
 53.1986 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
 53.1987 -   { (exit 1); exit 1; }; }
 53.1988 -
 53.1989 -{ echo "$as_me:$LINENO: checking build system type" >&5
 53.1990 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 53.1991 -if test "${ac_cv_build+set}" = set; then
 53.1992 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.1993 +  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 53.1994 +
 53.1995 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 53.1996 +$as_echo_n "checking build system type... " >&6; }
 53.1997 +if ${ac_cv_build+:} false; then :
 53.1998 +  $as_echo_n "(cached) " >&6
 53.1999  else
 53.2000    ac_build_alias=$build_alias
 53.2001  test "x$ac_build_alias" = x &&
 53.2002    ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 53.2003  test "x$ac_build_alias" = x &&
 53.2004 -  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 53.2005 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
 53.2006 -   { (exit 1); exit 1; }; }
 53.2007 +  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 53.2008  ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
 53.2009 -  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
 53.2010 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
 53.2011 -   { (exit 1); exit 1; }; }
 53.2012 +  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 53.2013  
 53.2014  fi
 53.2015 -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 53.2016 -echo "${ECHO_T}$ac_cv_build" >&6; }
 53.2017 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 53.2018 +$as_echo "$ac_cv_build" >&6; }
 53.2019  case $ac_cv_build in
 53.2020  *-*-*) ;;
 53.2021 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
 53.2022 -echo "$as_me: error: invalid value of canonical build" >&2;}
 53.2023 -   { (exit 1); exit 1; }; };;
 53.2024 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 53.2025  esac
 53.2026  build=$ac_cv_build
 53.2027  ac_save_IFS=$IFS; IFS='-'
 53.2028 @@ -1763,28 +1962,24 @@
 53.2029  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 53.2030  
 53.2031  
 53.2032 -{ echo "$as_me:$LINENO: checking host system type" >&5
 53.2033 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 53.2034 -if test "${ac_cv_host+set}" = set; then
 53.2035 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2036 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 53.2037 +$as_echo_n "checking host system type... " >&6; }
 53.2038 +if ${ac_cv_host+:} false; then :
 53.2039 +  $as_echo_n "(cached) " >&6
 53.2040  else
 53.2041    if test "x$host_alias" = x; then
 53.2042    ac_cv_host=$ac_cv_build
 53.2043  else
 53.2044    ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
 53.2045 -    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
 53.2046 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
 53.2047 -   { (exit 1); exit 1; }; }
 53.2048 +    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 53.2049  fi
 53.2050  
 53.2051  fi
 53.2052 -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 53.2053 -echo "${ECHO_T}$ac_cv_host" >&6; }
 53.2054 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 53.2055 +$as_echo "$ac_cv_host" >&6; }
 53.2056  case $ac_cv_host in
 53.2057  *-*-*) ;;
 53.2058 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
 53.2059 -echo "$as_me: error: invalid value of canonical host" >&2;}
 53.2060 -   { (exit 1); exit 1; }; };;
 53.2061 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 53.2062  esac
 53.2063  host=$ac_cv_host
 53.2064  ac_save_IFS=$IFS; IFS='-'
 53.2065 @@ -1810,10 +2005,10 @@
 53.2066  if test -n "$ac_tool_prefix"; then
 53.2067    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 53.2068  set dummy ${ac_tool_prefix}gcc; ac_word=$2
 53.2069 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.2070 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.2071 -if test "${ac_cv_prog_CC+set}" = set; then
 53.2072 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2073 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.2074 +$as_echo_n "checking for $ac_word... " >&6; }
 53.2075 +if ${ac_cv_prog_CC+:} false; then :
 53.2076 +  $as_echo_n "(cached) " >&6
 53.2077  else
 53.2078    if test -n "$CC"; then
 53.2079    ac_cv_prog_CC="$CC" # Let the user override the test.
 53.2080 @@ -1823,25 +2018,25 @@
 53.2081  do
 53.2082    IFS=$as_save_IFS
 53.2083    test -z "$as_dir" && as_dir=.
 53.2084 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.2085 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.2086    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.2087      ac_cv_prog_CC="${ac_tool_prefix}gcc"
 53.2088 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2089 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2090      break 2
 53.2091    fi
 53.2092  done
 53.2093 -done
 53.2094 +  done
 53.2095  IFS=$as_save_IFS
 53.2096  
 53.2097  fi
 53.2098  fi
 53.2099  CC=$ac_cv_prog_CC
 53.2100  if test -n "$CC"; then
 53.2101 -  { echo "$as_me:$LINENO: result: $CC" >&5
 53.2102 -echo "${ECHO_T}$CC" >&6; }
 53.2103 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 53.2104 +$as_echo "$CC" >&6; }
 53.2105  else
 53.2106 -  { echo "$as_me:$LINENO: result: no" >&5
 53.2107 -echo "${ECHO_T}no" >&6; }
 53.2108 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.2109 +$as_echo "no" >&6; }
 53.2110  fi
 53.2111  
 53.2112  
 53.2113 @@ -1850,10 +2045,10 @@
 53.2114    ac_ct_CC=$CC
 53.2115    # Extract the first word of "gcc", so it can be a program name with args.
 53.2116  set dummy gcc; ac_word=$2
 53.2117 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.2118 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.2119 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 53.2120 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2121 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.2122 +$as_echo_n "checking for $ac_word... " >&6; }
 53.2123 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
 53.2124 +  $as_echo_n "(cached) " >&6
 53.2125  else
 53.2126    if test -n "$ac_ct_CC"; then
 53.2127    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 53.2128 @@ -1863,25 +2058,25 @@
 53.2129  do
 53.2130    IFS=$as_save_IFS
 53.2131    test -z "$as_dir" && as_dir=.
 53.2132 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.2133 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.2134    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.2135      ac_cv_prog_ac_ct_CC="gcc"
 53.2136 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2137 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2138      break 2
 53.2139    fi
 53.2140  done
 53.2141 -done
 53.2142 +  done
 53.2143  IFS=$as_save_IFS
 53.2144  
 53.2145  fi
 53.2146  fi
 53.2147  ac_ct_CC=$ac_cv_prog_ac_ct_CC
 53.2148  if test -n "$ac_ct_CC"; then
 53.2149 -  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 53.2150 -echo "${ECHO_T}$ac_ct_CC" >&6; }
 53.2151 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 53.2152 +$as_echo "$ac_ct_CC" >&6; }
 53.2153  else
 53.2154 -  { echo "$as_me:$LINENO: result: no" >&5
 53.2155 -echo "${ECHO_T}no" >&6; }
 53.2156 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.2157 +$as_echo "no" >&6; }
 53.2158  fi
 53.2159  
 53.2160    if test "x$ac_ct_CC" = x; then
 53.2161 @@ -1889,12 +2084,8 @@
 53.2162    else
 53.2163      case $cross_compiling:$ac_tool_warned in
 53.2164  yes:)
 53.2165 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 53.2166 -whose name does not start with the host triplet.  If you think this
 53.2167 -configuration is useful to you, please write to autoconf@gnu.org." >&5
 53.2168 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 53.2169 -whose name does not start with the host triplet.  If you think this
 53.2170 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 53.2171 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 53.2172 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 53.2173  ac_tool_warned=yes ;;
 53.2174  esac
 53.2175      CC=$ac_ct_CC
 53.2176 @@ -1907,10 +2098,10 @@
 53.2177            if test -n "$ac_tool_prefix"; then
 53.2178      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 53.2179  set dummy ${ac_tool_prefix}cc; ac_word=$2
 53.2180 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.2181 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.2182 -if test "${ac_cv_prog_CC+set}" = set; then
 53.2183 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2184 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.2185 +$as_echo_n "checking for $ac_word... " >&6; }
 53.2186 +if ${ac_cv_prog_CC+:} false; then :
 53.2187 +  $as_echo_n "(cached) " >&6
 53.2188  else
 53.2189    if test -n "$CC"; then
 53.2190    ac_cv_prog_CC="$CC" # Let the user override the test.
 53.2191 @@ -1920,25 +2111,25 @@
 53.2192  do
 53.2193    IFS=$as_save_IFS
 53.2194    test -z "$as_dir" && as_dir=.
 53.2195 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.2196 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.2197    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.2198      ac_cv_prog_CC="${ac_tool_prefix}cc"
 53.2199 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2200 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2201      break 2
 53.2202    fi
 53.2203  done
 53.2204 -done
 53.2205 +  done
 53.2206  IFS=$as_save_IFS
 53.2207  
 53.2208  fi
 53.2209  fi
 53.2210  CC=$ac_cv_prog_CC
 53.2211  if test -n "$CC"; then
 53.2212 -  { echo "$as_me:$LINENO: result: $CC" >&5
 53.2213 -echo "${ECHO_T}$CC" >&6; }
 53.2214 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 53.2215 +$as_echo "$CC" >&6; }
 53.2216  else
 53.2217 -  { echo "$as_me:$LINENO: result: no" >&5
 53.2218 -echo "${ECHO_T}no" >&6; }
 53.2219 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.2220 +$as_echo "no" >&6; }
 53.2221  fi
 53.2222  
 53.2223  
 53.2224 @@ -1947,10 +2138,10 @@
 53.2225  if test -z "$CC"; then
 53.2226    # Extract the first word of "cc", so it can be a program name with args.
 53.2227  set dummy cc; ac_word=$2
 53.2228 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.2229 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.2230 -if test "${ac_cv_prog_CC+set}" = set; then
 53.2231 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2232 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.2233 +$as_echo_n "checking for $ac_word... " >&6; }
 53.2234 +if ${ac_cv_prog_CC+:} false; then :
 53.2235 +  $as_echo_n "(cached) " >&6
 53.2236  else
 53.2237    if test -n "$CC"; then
 53.2238    ac_cv_prog_CC="$CC" # Let the user override the test.
 53.2239 @@ -1961,18 +2152,18 @@
 53.2240  do
 53.2241    IFS=$as_save_IFS
 53.2242    test -z "$as_dir" && as_dir=.
 53.2243 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.2244 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.2245    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.2246      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 53.2247         ac_prog_rejected=yes
 53.2248         continue
 53.2249       fi
 53.2250      ac_cv_prog_CC="cc"
 53.2251 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2252 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2253      break 2
 53.2254    fi
 53.2255  done
 53.2256 -done
 53.2257 +  done
 53.2258  IFS=$as_save_IFS
 53.2259  
 53.2260  if test $ac_prog_rejected = yes; then
 53.2261 @@ -1991,11 +2182,11 @@
 53.2262  fi
 53.2263  CC=$ac_cv_prog_CC
 53.2264  if test -n "$CC"; then
 53.2265 -  { echo "$as_me:$LINENO: result: $CC" >&5
 53.2266 -echo "${ECHO_T}$CC" >&6; }
 53.2267 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 53.2268 +$as_echo "$CC" >&6; }
 53.2269  else
 53.2270 -  { echo "$as_me:$LINENO: result: no" >&5
 53.2271 -echo "${ECHO_T}no" >&6; }
 53.2272 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.2273 +$as_echo "no" >&6; }
 53.2274  fi
 53.2275  
 53.2276  
 53.2277 @@ -2006,10 +2197,10 @@
 53.2278    do
 53.2279      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 53.2280  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 53.2281 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.2282 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.2283 -if test "${ac_cv_prog_CC+set}" = set; then
 53.2284 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2285 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.2286 +$as_echo_n "checking for $ac_word... " >&6; }
 53.2287 +if ${ac_cv_prog_CC+:} false; then :
 53.2288 +  $as_echo_n "(cached) " >&6
 53.2289  else
 53.2290    if test -n "$CC"; then
 53.2291    ac_cv_prog_CC="$CC" # Let the user override the test.
 53.2292 @@ -2019,25 +2210,25 @@
 53.2293  do
 53.2294    IFS=$as_save_IFS
 53.2295    test -z "$as_dir" && as_dir=.
 53.2296 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.2297 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.2298    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.2299      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 53.2300 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2301 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2302      break 2
 53.2303    fi
 53.2304  done
 53.2305 -done
 53.2306 +  done
 53.2307  IFS=$as_save_IFS
 53.2308  
 53.2309  fi
 53.2310  fi
 53.2311  CC=$ac_cv_prog_CC
 53.2312  if test -n "$CC"; then
 53.2313 -  { echo "$as_me:$LINENO: result: $CC" >&5
 53.2314 -echo "${ECHO_T}$CC" >&6; }
 53.2315 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 53.2316 +$as_echo "$CC" >&6; }
 53.2317  else
 53.2318 -  { echo "$as_me:$LINENO: result: no" >&5
 53.2319 -echo "${ECHO_T}no" >&6; }
 53.2320 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.2321 +$as_echo "no" >&6; }
 53.2322  fi
 53.2323  
 53.2324  
 53.2325 @@ -2050,10 +2241,10 @@
 53.2326  do
 53.2327    # Extract the first word of "$ac_prog", so it can be a program name with args.
 53.2328  set dummy $ac_prog; ac_word=$2
 53.2329 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.2330 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.2331 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 53.2332 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2333 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.2334 +$as_echo_n "checking for $ac_word... " >&6; }
 53.2335 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
 53.2336 +  $as_echo_n "(cached) " >&6
 53.2337  else
 53.2338    if test -n "$ac_ct_CC"; then
 53.2339    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 53.2340 @@ -2063,25 +2254,25 @@
 53.2341  do
 53.2342    IFS=$as_save_IFS
 53.2343    test -z "$as_dir" && as_dir=.
 53.2344 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.2345 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.2346    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.2347      ac_cv_prog_ac_ct_CC="$ac_prog"
 53.2348 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2349 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.2350      break 2
 53.2351    fi
 53.2352  done
 53.2353 -done
 53.2354 +  done
 53.2355  IFS=$as_save_IFS
 53.2356  
 53.2357  fi
 53.2358  fi
 53.2359  ac_ct_CC=$ac_cv_prog_ac_ct_CC
 53.2360  if test -n "$ac_ct_CC"; then
 53.2361 -  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 53.2362 -echo "${ECHO_T}$ac_ct_CC" >&6; }
 53.2363 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 53.2364 +$as_echo "$ac_ct_CC" >&6; }
 53.2365  else
 53.2366 -  { echo "$as_me:$LINENO: result: no" >&5
 53.2367 -echo "${ECHO_T}no" >&6; }
 53.2368 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.2369 +$as_echo "no" >&6; }
 53.2370  fi
 53.2371  
 53.2372  
 53.2373 @@ -2093,12 +2284,8 @@
 53.2374    else
 53.2375      case $cross_compiling:$ac_tool_warned in
 53.2376  yes:)
 53.2377 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 53.2378 -whose name does not start with the host triplet.  If you think this
 53.2379 -configuration is useful to you, please write to autoconf@gnu.org." >&5
 53.2380 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 53.2381 -whose name does not start with the host triplet.  If you think this
 53.2382 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 53.2383 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 53.2384 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 53.2385  ac_tool_warned=yes ;;
 53.2386  esac
 53.2387      CC=$ac_ct_CC
 53.2388 @@ -2108,51 +2295,37 @@
 53.2389  fi
 53.2390  
 53.2391  
 53.2392 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 53.2393 -See \`config.log' for more details." >&5
 53.2394 -echo "$as_me: error: no acceptable C compiler found in \$PATH
 53.2395 -See \`config.log' for more details." >&2;}
 53.2396 -   { (exit 1); exit 1; }; }
 53.2397 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.2398 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.2399 +as_fn_error $? "no acceptable C compiler found in \$PATH
 53.2400 +See \`config.log' for more details" "$LINENO" 5; }
 53.2401  
 53.2402  # Provide some information about the compiler.
 53.2403 -echo "$as_me:$LINENO: checking for C compiler version" >&5
 53.2404 -ac_compiler=`set X $ac_compile; echo $2`
 53.2405 -{ (ac_try="$ac_compiler --version >&5"
 53.2406 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 53.2407 +set X $ac_compile
 53.2408 +ac_compiler=$2
 53.2409 +for ac_option in --version -v -V -qversion; do
 53.2410 +  { { ac_try="$ac_compiler $ac_option >&5"
 53.2411  case "(($ac_try" in
 53.2412    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2413    *) ac_try_echo=$ac_try;;
 53.2414  esac
 53.2415 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2416 -  (eval "$ac_compiler --version >&5") 2>&5
 53.2417 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.2418 +$as_echo "$ac_try_echo"; } >&5
 53.2419 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
 53.2420    ac_status=$?
 53.2421 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2422 -  (exit $ac_status); }
 53.2423 -{ (ac_try="$ac_compiler -v >&5"
 53.2424 -case "(($ac_try" in
 53.2425 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2426 -  *) ac_try_echo=$ac_try;;
 53.2427 -esac
 53.2428 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2429 -  (eval "$ac_compiler -v >&5") 2>&5
 53.2430 -  ac_status=$?
 53.2431 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2432 -  (exit $ac_status); }
 53.2433 -{ (ac_try="$ac_compiler -V >&5"
 53.2434 -case "(($ac_try" in
 53.2435 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2436 -  *) ac_try_echo=$ac_try;;
 53.2437 -esac
 53.2438 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2439 -  (eval "$ac_compiler -V >&5") 2>&5
 53.2440 -  ac_status=$?
 53.2441 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2442 -  (exit $ac_status); }
 53.2443 -
 53.2444 -cat >conftest.$ac_ext <<_ACEOF
 53.2445 -/* confdefs.h.  */
 53.2446 -_ACEOF
 53.2447 -cat confdefs.h >>conftest.$ac_ext
 53.2448 -cat >>conftest.$ac_ext <<_ACEOF
 53.2449 +  if test -s conftest.err; then
 53.2450 +    sed '10a\
 53.2451 +... rest of stderr output deleted ...
 53.2452 +         10q' conftest.err >conftest.er1
 53.2453 +    cat conftest.er1 >&5
 53.2454 +  fi
 53.2455 +  rm -f conftest.er1 conftest.err
 53.2456 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.2457 +  test $ac_status = 0; }
 53.2458 +done
 53.2459 +
 53.2460 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.2461  /* end confdefs.h.  */
 53.2462  
 53.2463  int
 53.2464 @@ -2164,42 +2337,38 @@
 53.2465  }
 53.2466  _ACEOF
 53.2467  ac_clean_files_save=$ac_clean_files
 53.2468 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
 53.2469 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 53.2470  # Try to create an executable without -o first, disregard a.out.
 53.2471  # It will help us diagnose broken compilers, and finding out an intuition
 53.2472  # of exeext.
 53.2473 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
 53.2474 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 53.2475 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 53.2476 -#
 53.2477 -# List of possible output files, starting from the most likely.
 53.2478 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
 53.2479 -# only as a last resort.  b.out is created by i960 compilers.
 53.2480 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
 53.2481 -#
 53.2482 -# The IRIX 6 linker writes into existing files which may not be
 53.2483 -# executable, retaining their permissions.  Remove them first so a
 53.2484 -# subsequent execution test works.
 53.2485 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 53.2486 +$as_echo_n "checking whether the C compiler works... " >&6; }
 53.2487 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 53.2488 +
 53.2489 +# The possible output files:
 53.2490 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 53.2491 +
 53.2492  ac_rmfiles=
 53.2493  for ac_file in $ac_files
 53.2494  do
 53.2495    case $ac_file in
 53.2496 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
 53.2497 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 53.2498      * ) ac_rmfiles="$ac_rmfiles $ac_file";;
 53.2499    esac
 53.2500  done
 53.2501  rm -f $ac_rmfiles
 53.2502  
 53.2503 -if { (ac_try="$ac_link_default"
 53.2504 +if { { ac_try="$ac_link_default"
 53.2505  case "(($ac_try" in
 53.2506    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2507    *) ac_try_echo=$ac_try;;
 53.2508  esac
 53.2509 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2510 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.2511 +$as_echo "$ac_try_echo"; } >&5
 53.2512    (eval "$ac_link_default") 2>&5
 53.2513    ac_status=$?
 53.2514 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2515 -  (exit $ac_status); }; then
 53.2516 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.2517 +  test $ac_status = 0; }; then :
 53.2518    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 53.2519  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 53.2520  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 53.2521 @@ -2209,14 +2378,14 @@
 53.2522  do
 53.2523    test -f "$ac_file" || continue
 53.2524    case $ac_file in
 53.2525 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 53.2526 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 53.2527  	;;
 53.2528      [ab].out )
 53.2529  	# We found the default executable, but exeext='' is most
 53.2530  	# certainly right.
 53.2531  	break;;
 53.2532      *.* )
 53.2533 -        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 53.2534 +	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 53.2535  	then :; else
 53.2536  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 53.2537  	fi
 53.2538 @@ -2235,78 +2404,41 @@
 53.2539  else
 53.2540    ac_file=''
 53.2541  fi
 53.2542 -
 53.2543 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
 53.2544 -echo "${ECHO_T}$ac_file" >&6; }
 53.2545 -if test -z "$ac_file"; then
 53.2546 -  echo "$as_me: failed program was:" >&5
 53.2547 +if test -z "$ac_file"; then :
 53.2548 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.2549 +$as_echo "no" >&6; }
 53.2550 +$as_echo "$as_me: failed program was:" >&5
 53.2551  sed 's/^/| /' conftest.$ac_ext >&5
 53.2552  
 53.2553 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 53.2554 -See \`config.log' for more details." >&5
 53.2555 -echo "$as_me: error: C compiler cannot create executables
 53.2556 -See \`config.log' for more details." >&2;}
 53.2557 -   { (exit 77); exit 77; }; }
 53.2558 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.2559 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.2560 +as_fn_error 77 "C compiler cannot create executables
 53.2561 +See \`config.log' for more details" "$LINENO" 5; }
 53.2562 +else
 53.2563 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 53.2564 +$as_echo "yes" >&6; }
 53.2565  fi
 53.2566 -
 53.2567 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 53.2568 +$as_echo_n "checking for C compiler default output file name... " >&6; }
 53.2569 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 53.2570 +$as_echo "$ac_file" >&6; }
 53.2571  ac_exeext=$ac_cv_exeext
 53.2572  
 53.2573 -# Check that the compiler produces executables we can run.  If not, either
 53.2574 -# the compiler is broken, or we cross compile.
 53.2575 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
 53.2576 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 53.2577 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 53.2578 -# If not cross compiling, check that we can run a simple program.
 53.2579 -if test "$cross_compiling" != yes; then
 53.2580 -  if { ac_try='./$ac_file'
 53.2581 -  { (case "(($ac_try" in
 53.2582 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2583 -  *) ac_try_echo=$ac_try;;
 53.2584 -esac
 53.2585 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2586 -  (eval "$ac_try") 2>&5
 53.2587 -  ac_status=$?
 53.2588 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2589 -  (exit $ac_status); }; }; then
 53.2590 -    cross_compiling=no
 53.2591 -  else
 53.2592 -    if test "$cross_compiling" = maybe; then
 53.2593 -	cross_compiling=yes
 53.2594 -    else
 53.2595 -	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
 53.2596 -If you meant to cross compile, use \`--host'.
 53.2597 -See \`config.log' for more details." >&5
 53.2598 -echo "$as_me: error: cannot run C compiled programs.
 53.2599 -If you meant to cross compile, use \`--host'.
 53.2600 -See \`config.log' for more details." >&2;}
 53.2601 -   { (exit 1); exit 1; }; }
 53.2602 -    fi
 53.2603 -  fi
 53.2604 -fi
 53.2605 -{ echo "$as_me:$LINENO: result: yes" >&5
 53.2606 -echo "${ECHO_T}yes" >&6; }
 53.2607 -
 53.2608 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
 53.2609 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 53.2610  ac_clean_files=$ac_clean_files_save
 53.2611 -# Check that the compiler produces executables we can run.  If not, either
 53.2612 -# the compiler is broken, or we cross compile.
 53.2613 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 53.2614 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
 53.2615 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
 53.2616 -echo "${ECHO_T}$cross_compiling" >&6; }
 53.2617 -
 53.2618 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
 53.2619 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
 53.2620 -if { (ac_try="$ac_link"
 53.2621 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 53.2622 +$as_echo_n "checking for suffix of executables... " >&6; }
 53.2623 +if { { ac_try="$ac_link"
 53.2624  case "(($ac_try" in
 53.2625    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2626    *) ac_try_echo=$ac_try;;
 53.2627  esac
 53.2628 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2629 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.2630 +$as_echo "$ac_try_echo"; } >&5
 53.2631    (eval "$ac_link") 2>&5
 53.2632    ac_status=$?
 53.2633 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2634 -  (exit $ac_status); }; then
 53.2635 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.2636 +  test $ac_status = 0; }; then :
 53.2637    # If both `conftest.exe' and `conftest' are `present' (well, observable)
 53.2638  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 53.2639  # work properly (i.e., refer to `conftest.exe'), while it won't with
 53.2640 @@ -2314,37 +2446,90 @@
 53.2641  for ac_file in conftest.exe conftest conftest.*; do
 53.2642    test -f "$ac_file" || continue
 53.2643    case $ac_file in
 53.2644 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
 53.2645 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 53.2646      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 53.2647  	  break;;
 53.2648      * ) break;;
 53.2649    esac
 53.2650  done
 53.2651  else
 53.2652 -  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 53.2653 -See \`config.log' for more details." >&5
 53.2654 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 53.2655 -See \`config.log' for more details." >&2;}
 53.2656 -   { (exit 1); exit 1; }; }
 53.2657 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.2658 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.2659 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 53.2660 +See \`config.log' for more details" "$LINENO" 5; }
 53.2661  fi
 53.2662 -
 53.2663 -rm -f conftest$ac_cv_exeext
 53.2664 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 53.2665 -echo "${ECHO_T}$ac_cv_exeext" >&6; }
 53.2666 +rm -f conftest conftest$ac_cv_exeext
 53.2667 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 53.2668 +$as_echo "$ac_cv_exeext" >&6; }
 53.2669  
 53.2670  rm -f conftest.$ac_ext
 53.2671  EXEEXT=$ac_cv_exeext
 53.2672  ac_exeext=$EXEEXT
 53.2673 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
 53.2674 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 53.2675 -if test "${ac_cv_objext+set}" = set; then
 53.2676 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2677 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.2678 +/* end confdefs.h.  */
 53.2679 +#include <stdio.h>
 53.2680 +int
 53.2681 +main ()
 53.2682 +{
 53.2683 +FILE *f = fopen ("conftest.out", "w");
 53.2684 + return ferror (f) || fclose (f) != 0;
 53.2685 +
 53.2686 +  ;
 53.2687 +  return 0;
 53.2688 +}
 53.2689 +_ACEOF
 53.2690 +ac_clean_files="$ac_clean_files conftest.out"
 53.2691 +# Check that the compiler produces executables we can run.  If not, either
 53.2692 +# the compiler is broken, or we cross compile.
 53.2693 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 53.2694 +$as_echo_n "checking whether we are cross compiling... " >&6; }
 53.2695 +if test "$cross_compiling" != yes; then
 53.2696 +  { { ac_try="$ac_link"
 53.2697 +case "(($ac_try" in
 53.2698 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2699 +  *) ac_try_echo=$ac_try;;
 53.2700 +esac
 53.2701 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.2702 +$as_echo "$ac_try_echo"; } >&5
 53.2703 +  (eval "$ac_link") 2>&5
 53.2704 +  ac_status=$?
 53.2705 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.2706 +  test $ac_status = 0; }
 53.2707 +  if { ac_try='./conftest$ac_cv_exeext'
 53.2708 +  { { case "(($ac_try" in
 53.2709 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2710 +  *) ac_try_echo=$ac_try;;
 53.2711 +esac
 53.2712 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.2713 +$as_echo "$ac_try_echo"; } >&5
 53.2714 +  (eval "$ac_try") 2>&5
 53.2715 +  ac_status=$?
 53.2716 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.2717 +  test $ac_status = 0; }; }; then
 53.2718 +    cross_compiling=no
 53.2719 +  else
 53.2720 +    if test "$cross_compiling" = maybe; then
 53.2721 +	cross_compiling=yes
 53.2722 +    else
 53.2723 +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.2724 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.2725 +as_fn_error $? "cannot run C compiled programs.
 53.2726 +If you meant to cross compile, use \`--host'.
 53.2727 +See \`config.log' for more details" "$LINENO" 5; }
 53.2728 +    fi
 53.2729 +  fi
 53.2730 +fi
 53.2731 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 53.2732 +$as_echo "$cross_compiling" >&6; }
 53.2733 +
 53.2734 +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 53.2735 +ac_clean_files=$ac_clean_files_save
 53.2736 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 53.2737 +$as_echo_n "checking for suffix of object files... " >&6; }
 53.2738 +if ${ac_cv_objext+:} false; then :
 53.2739 +  $as_echo_n "(cached) " >&6
 53.2740  else
 53.2741 -  cat >conftest.$ac_ext <<_ACEOF
 53.2742 -/* confdefs.h.  */
 53.2743 -_ACEOF
 53.2744 -cat confdefs.h >>conftest.$ac_ext
 53.2745 -cat >>conftest.$ac_ext <<_ACEOF
 53.2746 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.2747  /* end confdefs.h.  */
 53.2748  
 53.2749  int
 53.2750 @@ -2356,51 +2541,46 @@
 53.2751  }
 53.2752  _ACEOF
 53.2753  rm -f conftest.o conftest.obj
 53.2754 -if { (ac_try="$ac_compile"
 53.2755 +if { { ac_try="$ac_compile"
 53.2756  case "(($ac_try" in
 53.2757    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2758    *) ac_try_echo=$ac_try;;
 53.2759  esac
 53.2760 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2761 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 53.2762 +$as_echo "$ac_try_echo"; } >&5
 53.2763    (eval "$ac_compile") 2>&5
 53.2764    ac_status=$?
 53.2765 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2766 -  (exit $ac_status); }; then
 53.2767 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.2768 +  test $ac_status = 0; }; then :
 53.2769    for ac_file in conftest.o conftest.obj conftest.*; do
 53.2770    test -f "$ac_file" || continue;
 53.2771    case $ac_file in
 53.2772 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
 53.2773 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
 53.2774      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
 53.2775         break;;
 53.2776    esac
 53.2777  done
 53.2778  else
 53.2779 -  echo "$as_me: failed program was:" >&5
 53.2780 +  $as_echo "$as_me: failed program was:" >&5
 53.2781  sed 's/^/| /' conftest.$ac_ext >&5
 53.2782  
 53.2783 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 53.2784 -See \`config.log' for more details." >&5
 53.2785 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
 53.2786 -See \`config.log' for more details." >&2;}
 53.2787 -   { (exit 1); exit 1; }; }
 53.2788 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.2789 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.2790 +as_fn_error $? "cannot compute suffix of object files: cannot compile
 53.2791 +See \`config.log' for more details" "$LINENO" 5; }
 53.2792  fi
 53.2793 -
 53.2794  rm -f conftest.$ac_cv_objext conftest.$ac_ext
 53.2795  fi
 53.2796 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 53.2797 -echo "${ECHO_T}$ac_cv_objext" >&6; }
 53.2798 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 53.2799 +$as_echo "$ac_cv_objext" >&6; }
 53.2800  OBJEXT=$ac_cv_objext
 53.2801  ac_objext=$OBJEXT
 53.2802 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 53.2803 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 53.2804 -if test "${ac_cv_c_compiler_gnu+set}" = set; then
 53.2805 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2806 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 53.2807 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 53.2808 +if ${ac_cv_c_compiler_gnu+:} false; then :
 53.2809 +  $as_echo_n "(cached) " >&6
 53.2810  else
 53.2811 -  cat >conftest.$ac_ext <<_ACEOF
 53.2812 -/* confdefs.h.  */
 53.2813 -_ACEOF
 53.2814 -cat confdefs.h >>conftest.$ac_ext
 53.2815 -cat >>conftest.$ac_ext <<_ACEOF
 53.2816 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.2817  /* end confdefs.h.  */
 53.2818  
 53.2819  int
 53.2820 @@ -2414,54 +2594,34 @@
 53.2821    return 0;
 53.2822  }
 53.2823  _ACEOF
 53.2824 -rm -f conftest.$ac_objext
 53.2825 -if { (ac_try="$ac_compile"
 53.2826 -case "(($ac_try" in
 53.2827 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2828 -  *) ac_try_echo=$ac_try;;
 53.2829 -esac
 53.2830 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2831 -  (eval "$ac_compile") 2>conftest.er1
 53.2832 -  ac_status=$?
 53.2833 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.2834 -  rm -f conftest.er1
 53.2835 -  cat conftest.err >&5
 53.2836 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2837 -  (exit $ac_status); } && {
 53.2838 -	 test -z "$ac_c_werror_flag" ||
 53.2839 -	 test ! -s conftest.err
 53.2840 -       } && test -s conftest.$ac_objext; then
 53.2841 +if ac_fn_c_try_compile "$LINENO"; then :
 53.2842    ac_compiler_gnu=yes
 53.2843  else
 53.2844 -  echo "$as_me: failed program was:" >&5
 53.2845 -sed 's/^/| /' conftest.$ac_ext >&5
 53.2846 -
 53.2847 -	ac_compiler_gnu=no
 53.2848 +  ac_compiler_gnu=no
 53.2849  fi
 53.2850 -
 53.2851  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.2852  ac_cv_c_compiler_gnu=$ac_compiler_gnu
 53.2853  
 53.2854  fi
 53.2855 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 53.2856 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 53.2857 -GCC=`test $ac_compiler_gnu = yes && echo yes`
 53.2858 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 53.2859 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 53.2860 +if test $ac_compiler_gnu = yes; then
 53.2861 +  GCC=yes
 53.2862 +else
 53.2863 +  GCC=
 53.2864 +fi
 53.2865  ac_test_CFLAGS=${CFLAGS+set}
 53.2866  ac_save_CFLAGS=$CFLAGS
 53.2867 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
 53.2868 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 53.2869 -if test "${ac_cv_prog_cc_g+set}" = set; then
 53.2870 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.2871 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 53.2872 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
 53.2873 +if ${ac_cv_prog_cc_g+:} false; then :
 53.2874 +  $as_echo_n "(cached) " >&6
 53.2875  else
 53.2876    ac_save_c_werror_flag=$ac_c_werror_flag
 53.2877     ac_c_werror_flag=yes
 53.2878     ac_cv_prog_cc_g=no
 53.2879     CFLAGS="-g"
 53.2880 -   cat >conftest.$ac_ext <<_ACEOF
 53.2881 -/* confdefs.h.  */
 53.2882 -_ACEOF
 53.2883 -cat confdefs.h >>conftest.$ac_ext
 53.2884 -cat >>conftest.$ac_ext <<_ACEOF
 53.2885 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.2886  /* end confdefs.h.  */
 53.2887  
 53.2888  int
 53.2889 @@ -2472,34 +2632,11 @@
 53.2890    return 0;
 53.2891  }
 53.2892  _ACEOF
 53.2893 -rm -f conftest.$ac_objext
 53.2894 -if { (ac_try="$ac_compile"
 53.2895 -case "(($ac_try" in
 53.2896 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2897 -  *) ac_try_echo=$ac_try;;
 53.2898 -esac
 53.2899 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2900 -  (eval "$ac_compile") 2>conftest.er1
 53.2901 -  ac_status=$?
 53.2902 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.2903 -  rm -f conftest.er1
 53.2904 -  cat conftest.err >&5
 53.2905 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2906 -  (exit $ac_status); } && {
 53.2907 -	 test -z "$ac_c_werror_flag" ||
 53.2908 -	 test ! -s conftest.err
 53.2909 -       } && test -s conftest.$ac_objext; then
 53.2910 +if ac_fn_c_try_compile "$LINENO"; then :
 53.2911    ac_cv_prog_cc_g=yes
 53.2912  else
 53.2913 -  echo "$as_me: failed program was:" >&5
 53.2914 -sed 's/^/| /' conftest.$ac_ext >&5
 53.2915 -
 53.2916 -	CFLAGS=""
 53.2917 -      cat >conftest.$ac_ext <<_ACEOF
 53.2918 -/* confdefs.h.  */
 53.2919 -_ACEOF
 53.2920 -cat confdefs.h >>conftest.$ac_ext
 53.2921 -cat >>conftest.$ac_ext <<_ACEOF
 53.2922 +  CFLAGS=""
 53.2923 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.2924  /* end confdefs.h.  */
 53.2925  
 53.2926  int
 53.2927 @@ -2510,35 +2647,12 @@
 53.2928    return 0;
 53.2929  }
 53.2930  _ACEOF
 53.2931 -rm -f conftest.$ac_objext
 53.2932 -if { (ac_try="$ac_compile"
 53.2933 -case "(($ac_try" in
 53.2934 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2935 -  *) ac_try_echo=$ac_try;;
 53.2936 -esac
 53.2937 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2938 -  (eval "$ac_compile") 2>conftest.er1
 53.2939 -  ac_status=$?
 53.2940 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.2941 -  rm -f conftest.er1
 53.2942 -  cat conftest.err >&5
 53.2943 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2944 -  (exit $ac_status); } && {
 53.2945 -	 test -z "$ac_c_werror_flag" ||
 53.2946 -	 test ! -s conftest.err
 53.2947 -       } && test -s conftest.$ac_objext; then
 53.2948 -  :
 53.2949 +if ac_fn_c_try_compile "$LINENO"; then :
 53.2950 +
 53.2951  else
 53.2952 -  echo "$as_me: failed program was:" >&5
 53.2953 -sed 's/^/| /' conftest.$ac_ext >&5
 53.2954 -
 53.2955 -	ac_c_werror_flag=$ac_save_c_werror_flag
 53.2956 +  ac_c_werror_flag=$ac_save_c_werror_flag
 53.2957  	 CFLAGS="-g"
 53.2958 -	 cat >conftest.$ac_ext <<_ACEOF
 53.2959 -/* confdefs.h.  */
 53.2960 -_ACEOF
 53.2961 -cat confdefs.h >>conftest.$ac_ext
 53.2962 -cat >>conftest.$ac_ext <<_ACEOF
 53.2963 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.2964  /* end confdefs.h.  */
 53.2965  
 53.2966  int
 53.2967 @@ -2549,42 +2663,18 @@
 53.2968    return 0;
 53.2969  }
 53.2970  _ACEOF
 53.2971 -rm -f conftest.$ac_objext
 53.2972 -if { (ac_try="$ac_compile"
 53.2973 -case "(($ac_try" in
 53.2974 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.2975 -  *) ac_try_echo=$ac_try;;
 53.2976 -esac
 53.2977 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.2978 -  (eval "$ac_compile") 2>conftest.er1
 53.2979 -  ac_status=$?
 53.2980 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.2981 -  rm -f conftest.er1
 53.2982 -  cat conftest.err >&5
 53.2983 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.2984 -  (exit $ac_status); } && {
 53.2985 -	 test -z "$ac_c_werror_flag" ||
 53.2986 -	 test ! -s conftest.err
 53.2987 -       } && test -s conftest.$ac_objext; then
 53.2988 +if ac_fn_c_try_compile "$LINENO"; then :
 53.2989    ac_cv_prog_cc_g=yes
 53.2990 -else
 53.2991 -  echo "$as_me: failed program was:" >&5
 53.2992 -sed 's/^/| /' conftest.$ac_ext >&5
 53.2993 -
 53.2994 -
 53.2995  fi
 53.2996 -
 53.2997  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.2998  fi
 53.2999 -
 53.3000  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.3001  fi
 53.3002 -
 53.3003  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.3004     ac_c_werror_flag=$ac_save_c_werror_flag
 53.3005  fi
 53.3006 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 53.3007 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 53.3008 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 53.3009 +$as_echo "$ac_cv_prog_cc_g" >&6; }
 53.3010  if test "$ac_test_CFLAGS" = set; then
 53.3011    CFLAGS=$ac_save_CFLAGS
 53.3012  elif test $ac_cv_prog_cc_g = yes; then
 53.3013 @@ -2600,18 +2690,14 @@
 53.3014      CFLAGS=
 53.3015    fi
 53.3016  fi
 53.3017 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 53.3018 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 53.3019 -if test "${ac_cv_prog_cc_c89+set}" = set; then
 53.3020 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3021 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 53.3022 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 53.3023 +if ${ac_cv_prog_cc_c89+:} false; then :
 53.3024 +  $as_echo_n "(cached) " >&6
 53.3025  else
 53.3026    ac_cv_prog_cc_c89=no
 53.3027  ac_save_CC=$CC
 53.3028 -cat >conftest.$ac_ext <<_ACEOF
 53.3029 -/* confdefs.h.  */
 53.3030 -_ACEOF
 53.3031 -cat confdefs.h >>conftest.$ac_ext
 53.3032 -cat >>conftest.$ac_ext <<_ACEOF
 53.3033 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3034  /* end confdefs.h.  */
 53.3035  #include <stdarg.h>
 53.3036  #include <stdio.h>
 53.3037 @@ -2668,31 +2754,9 @@
 53.3038  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 53.3039  do
 53.3040    CC="$ac_save_CC $ac_arg"
 53.3041 -  rm -f conftest.$ac_objext
 53.3042 -if { (ac_try="$ac_compile"
 53.3043 -case "(($ac_try" in
 53.3044 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3045 -  *) ac_try_echo=$ac_try;;
 53.3046 -esac
 53.3047 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3048 -  (eval "$ac_compile") 2>conftest.er1
 53.3049 -  ac_status=$?
 53.3050 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.3051 -  rm -f conftest.er1
 53.3052 -  cat conftest.err >&5
 53.3053 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3054 -  (exit $ac_status); } && {
 53.3055 -	 test -z "$ac_c_werror_flag" ||
 53.3056 -	 test ! -s conftest.err
 53.3057 -       } && test -s conftest.$ac_objext; then
 53.3058 +  if ac_fn_c_try_compile "$LINENO"; then :
 53.3059    ac_cv_prog_cc_c89=$ac_arg
 53.3060 -else
 53.3061 -  echo "$as_me: failed program was:" >&5
 53.3062 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3063 -
 53.3064 -
 53.3065  fi
 53.3066 -
 53.3067  rm -f core conftest.err conftest.$ac_objext
 53.3068    test "x$ac_cv_prog_cc_c89" != "xno" && break
 53.3069  done
 53.3070 @@ -2703,17 +2767,19 @@
 53.3071  # AC_CACHE_VAL
 53.3072  case "x$ac_cv_prog_cc_c89" in
 53.3073    x)
 53.3074 -    { echo "$as_me:$LINENO: result: none needed" >&5
 53.3075 -echo "${ECHO_T}none needed" >&6; } ;;
 53.3076 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 53.3077 +$as_echo "none needed" >&6; } ;;
 53.3078    xno)
 53.3079 -    { echo "$as_me:$LINENO: result: unsupported" >&5
 53.3080 -echo "${ECHO_T}unsupported" >&6; } ;;
 53.3081 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 53.3082 +$as_echo "unsupported" >&6; } ;;
 53.3083    *)
 53.3084      CC="$CC $ac_cv_prog_cc_c89"
 53.3085 -    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
 53.3086 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 53.3087 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 53.3088 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 53.3089  esac
 53.3090 -
 53.3091 +if test "x$ac_cv_prog_cc_c89" != xno; then :
 53.3092 +
 53.3093 +fi
 53.3094  
 53.3095  ac_ext=c
 53.3096  ac_cpp='$CPP $CPPFLAGS'
 53.3097 @@ -2724,16 +2790,12 @@
 53.3098  
 53.3099  
 53.3100  
 53.3101 -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 53.3102 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
 53.3103 -if test "${ac_cv_c_const+set}" = set; then
 53.3104 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3105 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 53.3106 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 53.3107 +if ${ac_cv_c_const+:} false; then :
 53.3108 +  $as_echo_n "(cached) " >&6
 53.3109  else
 53.3110 -  cat >conftest.$ac_ext <<_ACEOF
 53.3111 -/* confdefs.h.  */
 53.3112 -_ACEOF
 53.3113 -cat confdefs.h >>conftest.$ac_ext
 53.3114 -cat >>conftest.$ac_ext <<_ACEOF
 53.3115 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3116  /* end confdefs.h.  */
 53.3117  
 53.3118  int
 53.3119 @@ -2793,46 +2855,29 @@
 53.3120    return 0;
 53.3121  }
 53.3122  _ACEOF
 53.3123 -rm -f conftest.$ac_objext
 53.3124 -if { (ac_try="$ac_compile"
 53.3125 -case "(($ac_try" in
 53.3126 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3127 -  *) ac_try_echo=$ac_try;;
 53.3128 -esac
 53.3129 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3130 -  (eval "$ac_compile") 2>conftest.er1
 53.3131 -  ac_status=$?
 53.3132 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.3133 -  rm -f conftest.er1
 53.3134 -  cat conftest.err >&5
 53.3135 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3136 -  (exit $ac_status); } && {
 53.3137 -	 test -z "$ac_c_werror_flag" ||
 53.3138 -	 test ! -s conftest.err
 53.3139 -       } && test -s conftest.$ac_objext; then
 53.3140 +if ac_fn_c_try_compile "$LINENO"; then :
 53.3141    ac_cv_c_const=yes
 53.3142  else
 53.3143 -  echo "$as_me: failed program was:" >&5
 53.3144 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3145 -
 53.3146 -	ac_cv_c_const=no
 53.3147 +  ac_cv_c_const=no
 53.3148  fi
 53.3149 -
 53.3150  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.3151  fi
 53.3152 -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 53.3153 -echo "${ECHO_T}$ac_cv_c_const" >&6; }
 53.3154 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 53.3155 +$as_echo "$ac_cv_c_const" >&6; }
 53.3156  if test $ac_cv_c_const = no; then
 53.3157  
 53.3158 -cat >>confdefs.h <<\_ACEOF
 53.3159 -#define const
 53.3160 -_ACEOF
 53.3161 +$as_echo "#define const /**/" >>confdefs.h
 53.3162  
 53.3163  fi
 53.3164  
 53.3165  
 53.3166 +ISUNIX="false"
 53.3167 +ISWINDOWS="false"
 53.3168 +ISMACOSX="false"
 53.3169 +
 53.3170  case "$host" in
 53.3171      *-*-cygwin* | *-*-mingw32*)
 53.3172 +        ISWINDOWS="true"
 53.3173          EXE=".exe"
 53.3174          MATHLIB=""
 53.3175          SYS_GL_LIBS="-lopengl32"
 53.3176 @@ -2843,11 +2888,13 @@
 53.3177          SYS_GL_LIBS="-lGL"
 53.3178          ;;
 53.3179      *-*-darwin* )
 53.3180 +        ISMACOSX="true"
 53.3181          EXE=""
 53.3182          MATHLIB=""
 53.3183          SYS_GL_LIBS="-Wl,-framework,OpenGL"
 53.3184          ;;
 53.3185      *-*-aix*)
 53.3186 +        ISUNIX="true"
 53.3187          EXE=""
 53.3188          if test x$ac_cv_c_compiler_gnu = xyes; then
 53.3189              CFLAGS="-mthreads"
 53.3190 @@ -2859,10 +2906,10 @@
 53.3191          MATHLIB=""
 53.3192          # Extract the first word of "osmesa-config", so it can be a program name with args.
 53.3193  set dummy osmesa-config; ac_word=$2
 53.3194 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.3195 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.3196 -if test "${ac_cv_path_OSMESA_CONFIG+set}" = set; then
 53.3197 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3198 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.3199 +$as_echo_n "checking for $ac_word... " >&6; }
 53.3200 +if ${ac_cv_path_OSMESA_CONFIG+:} false; then :
 53.3201 +  $as_echo_n "(cached) " >&6
 53.3202  else
 53.3203    case $OSMESA_CONFIG in
 53.3204    [\\/]* | ?:[\\/]*)
 53.3205 @@ -2874,14 +2921,14 @@
 53.3206  do
 53.3207    IFS=$as_save_IFS
 53.3208    test -z "$as_dir" && as_dir=.
 53.3209 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.3210 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.3211    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.3212      ac_cv_path_OSMESA_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 53.3213 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3214 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3215      break 2
 53.3216    fi
 53.3217  done
 53.3218 -done
 53.3219 +  done
 53.3220  IFS=$as_save_IFS
 53.3221  
 53.3222    test -z "$ac_cv_path_OSMESA_CONFIG" && ac_cv_path_OSMESA_CONFIG="no"
 53.3223 @@ -2890,11 +2937,11 @@
 53.3224  fi
 53.3225  OSMESA_CONFIG=$ac_cv_path_OSMESA_CONFIG
 53.3226  if test -n "$OSMESA_CONFIG"; then
 53.3227 -  { echo "$as_me:$LINENO: result: $OSMESA_CONFIG" >&5
 53.3228 -echo "${ECHO_T}$OSMESA_CONFIG" >&6; }
 53.3229 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSMESA_CONFIG" >&5
 53.3230 +$as_echo "$OSMESA_CONFIG" >&6; }
 53.3231  else
 53.3232 -  { echo "$as_me:$LINENO: result: no" >&5
 53.3233 -echo "${ECHO_T}no" >&6; }
 53.3234 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3235 +$as_echo "no" >&6; }
 53.3236  fi
 53.3237  
 53.3238  
 53.3239 @@ -2913,6 +2960,7 @@
 53.3240          SYS_GL_LIBS="-lGLES_CM"
 53.3241          ;;
 53.3242      *)
 53.3243 +                ISUNIX="true"
 53.3244          EXE=""
 53.3245          MATHLIB="-lm"
 53.3246          SYS_GL_LIBS="-lGL"
 53.3247 @@ -2921,6 +2969,9 @@
 53.3248  
 53.3249  
 53.3250  
 53.3251 +
 53.3252 +
 53.3253 +
 53.3254  SDL_VERSION=2.0.0
 53.3255  
 53.3256  
 53.3257 @@ -2932,10 +2983,10 @@
 53.3258  	if test -n "$ac_tool_prefix"; then
 53.3259    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 53.3260  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 53.3261 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.3262 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.3263 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
 53.3264 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3265 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.3266 +$as_echo_n "checking for $ac_word... " >&6; }
 53.3267 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
 53.3268 +  $as_echo_n "(cached) " >&6
 53.3269  else
 53.3270    case $PKG_CONFIG in
 53.3271    [\\/]* | ?:[\\/]*)
 53.3272 @@ -2947,14 +2998,14 @@
 53.3273  do
 53.3274    IFS=$as_save_IFS
 53.3275    test -z "$as_dir" && as_dir=.
 53.3276 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.3277 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.3278    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.3279      ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 53.3280 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3281 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3282      break 2
 53.3283    fi
 53.3284  done
 53.3285 -done
 53.3286 +  done
 53.3287  IFS=$as_save_IFS
 53.3288  
 53.3289    ;;
 53.3290 @@ -2962,11 +3013,11 @@
 53.3291  fi
 53.3292  PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 53.3293  if test -n "$PKG_CONFIG"; then
 53.3294 -  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
 53.3295 -echo "${ECHO_T}$PKG_CONFIG" >&6; }
 53.3296 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 53.3297 +$as_echo "$PKG_CONFIG" >&6; }
 53.3298  else
 53.3299 -  { echo "$as_me:$LINENO: result: no" >&5
 53.3300 -echo "${ECHO_T}no" >&6; }
 53.3301 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3302 +$as_echo "no" >&6; }
 53.3303  fi
 53.3304  
 53.3305  
 53.3306 @@ -2975,10 +3026,10 @@
 53.3307    ac_pt_PKG_CONFIG=$PKG_CONFIG
 53.3308    # Extract the first word of "pkg-config", so it can be a program name with args.
 53.3309  set dummy pkg-config; ac_word=$2
 53.3310 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.3311 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.3312 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
 53.3313 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3314 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.3315 +$as_echo_n "checking for $ac_word... " >&6; }
 53.3316 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
 53.3317 +  $as_echo_n "(cached) " >&6
 53.3318  else
 53.3319    case $ac_pt_PKG_CONFIG in
 53.3320    [\\/]* | ?:[\\/]*)
 53.3321 @@ -2990,14 +3041,14 @@
 53.3322  do
 53.3323    IFS=$as_save_IFS
 53.3324    test -z "$as_dir" && as_dir=.
 53.3325 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.3326 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.3327    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.3328      ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 53.3329 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3330 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3331      break 2
 53.3332    fi
 53.3333  done
 53.3334 -done
 53.3335 +  done
 53.3336  IFS=$as_save_IFS
 53.3337  
 53.3338    ;;
 53.3339 @@ -3005,11 +3056,11 @@
 53.3340  fi
 53.3341  ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 53.3342  if test -n "$ac_pt_PKG_CONFIG"; then
 53.3343 -  { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
 53.3344 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
 53.3345 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 53.3346 +$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 53.3347  else
 53.3348 -  { echo "$as_me:$LINENO: result: no" >&5
 53.3349 -echo "${ECHO_T}no" >&6; }
 53.3350 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3351 +$as_echo "no" >&6; }
 53.3352  fi
 53.3353  
 53.3354    if test "x$ac_pt_PKG_CONFIG" = x; then
 53.3355 @@ -3017,12 +3068,8 @@
 53.3356    else
 53.3357      case $cross_compiling:$ac_tool_warned in
 53.3358  yes:)
 53.3359 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 53.3360 -whose name does not start with the host triplet.  If you think this
 53.3361 -configuration is useful to you, please write to autoconf@gnu.org." >&5
 53.3362 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 53.3363 -whose name does not start with the host triplet.  If you think this
 53.3364 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
 53.3365 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 53.3366 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 53.3367  ac_tool_warned=yes ;;
 53.3368  esac
 53.3369      PKG_CONFIG=$ac_pt_PKG_CONFIG
 53.3370 @@ -3034,20 +3081,20 @@
 53.3371  fi
 53.3372  if test -n "$PKG_CONFIG"; then
 53.3373  	_pkg_min_version=0.9.0
 53.3374 -	{ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
 53.3375 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
 53.3376 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 53.3377 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 53.3378  	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
 53.3379 -		{ echo "$as_me:$LINENO: result: yes" >&5
 53.3380 -echo "${ECHO_T}yes" >&6; }
 53.3381 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 53.3382 +$as_echo "yes" >&6; }
 53.3383  	else
 53.3384 -		{ echo "$as_me:$LINENO: result: no" >&5
 53.3385 -echo "${ECHO_T}no" >&6; }
 53.3386 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3387 +$as_echo "no" >&6; }
 53.3388  		PKG_CONFIG=""
 53.3389  	fi
 53.3390  fi
 53.3391  
 53.3392  # Check whether --with-sdl-prefix was given.
 53.3393 -if test "${with_sdl_prefix+set}" = set; then
 53.3394 +if test "${with_sdl_prefix+set}" = set; then :
 53.3395    withval=$with_sdl_prefix; sdl_prefix="$withval"
 53.3396  else
 53.3397    sdl_prefix=""
 53.3398 @@ -3055,14 +3102,14 @@
 53.3399  
 53.3400  
 53.3401  # Check whether --with-sdl-exec-prefix was given.
 53.3402 -if test "${with_sdl_exec_prefix+set}" = set; then
 53.3403 +if test "${with_sdl_exec_prefix+set}" = set; then :
 53.3404    withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
 53.3405  else
 53.3406    sdl_exec_prefix=""
 53.3407  fi
 53.3408  
 53.3409  # Check whether --enable-sdltest was given.
 53.3410 -if test "${enable_sdltest+set}" = set; then
 53.3411 +if test "${enable_sdltest+set}" = set; then :
 53.3412    enableval=$enable_sdltest;
 53.3413  else
 53.3414    enable_sdltest=yes
 53.3415 @@ -3074,18 +3121,18 @@
 53.3416    if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
 53.3417  
 53.3418  pkg_failed=no
 53.3419 -{ echo "$as_me:$LINENO: checking for SDL" >&5
 53.3420 -echo $ECHO_N "checking for SDL... $ECHO_C" >&6; }
 53.3421 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
 53.3422 +$as_echo_n "checking for SDL... " >&6; }
 53.3423  
 53.3424  if test -n "$SDL_CFLAGS"; then
 53.3425      pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
 53.3426   elif test -n "$PKG_CONFIG"; then
 53.3427      if test -n "$PKG_CONFIG" && \
 53.3428 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
 53.3429 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\""; } >&5
 53.3430    ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
 53.3431    ac_status=$?
 53.3432 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3433 -  (exit $ac_status); }; then
 53.3434 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.3435 +  test $ac_status = 0; }; then
 53.3436    pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $min_sdl_version" 2>/dev/null`
 53.3437  else
 53.3438    pkg_failed=yes
 53.3439 @@ -3097,11 +3144,11 @@
 53.3440      pkg_cv_SDL_LIBS="$SDL_LIBS"
 53.3441   elif test -n "$PKG_CONFIG"; then
 53.3442      if test -n "$PKG_CONFIG" && \
 53.3443 -    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\"") >&5
 53.3444 +    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= \$min_sdl_version\""; } >&5
 53.3445    ($PKG_CONFIG --exists --print-errors "sdl2 >= $min_sdl_version") 2>&5
 53.3446    ac_status=$?
 53.3447 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3448 -  (exit $ac_status); }; then
 53.3449 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 53.3450 +  test $ac_status = 0; }; then
 53.3451    pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $min_sdl_version" 2>/dev/null`
 53.3452  else
 53.3453    pkg_failed=yes
 53.3454 @@ -3113,8 +3160,8 @@
 53.3455  
 53.3456  
 53.3457  if test $pkg_failed = yes; then
 53.3458 -   	{ echo "$as_me:$LINENO: result: no" >&5
 53.3459 -echo "${ECHO_T}no" >&6; }
 53.3460 +   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3461 +$as_echo "no" >&6; }
 53.3462  
 53.3463  if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 53.3464          _pkg_short_errors_supported=yes
 53.3465 @@ -3131,14 +3178,14 @@
 53.3466  
 53.3467  	sdl_pc=no
 53.3468  elif test $pkg_failed = untried; then
 53.3469 -     	{ echo "$as_me:$LINENO: result: no" >&5
 53.3470 -echo "${ECHO_T}no" >&6; }
 53.3471 +     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3472 +$as_echo "no" >&6; }
 53.3473  	sdl_pc=no
 53.3474  else
 53.3475  	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
 53.3476  	SDL_LIBS=$pkg_cv_SDL_LIBS
 53.3477 -        { echo "$as_me:$LINENO: result: yes" >&5
 53.3478 -echo "${ECHO_T}yes" >&6; }
 53.3479 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 53.3480 +$as_echo "yes" >&6; }
 53.3481  	sdl_pc=yes
 53.3482  fi
 53.3483    else
 53.3484 @@ -3167,10 +3214,10 @@
 53.3485      fi
 53.3486      # Extract the first word of "sdl2-config", so it can be a program name with args.
 53.3487  set dummy sdl2-config; ac_word=$2
 53.3488 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 53.3489 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 53.3490 -if test "${ac_cv_path_SDL_CONFIG+set}" = set; then
 53.3491 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3492 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 53.3493 +$as_echo_n "checking for $ac_word... " >&6; }
 53.3494 +if ${ac_cv_path_SDL_CONFIG+:} false; then :
 53.3495 +  $as_echo_n "(cached) " >&6
 53.3496  else
 53.3497    case $SDL_CONFIG in
 53.3498    [\\/]* | ?:[\\/]*)
 53.3499 @@ -3182,14 +3229,14 @@
 53.3500  do
 53.3501    IFS=$as_save_IFS
 53.3502    test -z "$as_dir" && as_dir=.
 53.3503 -  for ac_exec_ext in '' $ac_executable_extensions; do
 53.3504 +    for ac_exec_ext in '' $ac_executable_extensions; do
 53.3505    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 53.3506      ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 53.3507 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3508 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 53.3509      break 2
 53.3510    fi
 53.3511  done
 53.3512 -done
 53.3513 +  done
 53.3514  IFS=$as_save_IFS
 53.3515  
 53.3516    test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
 53.3517 @@ -3198,17 +3245,17 @@
 53.3518  fi
 53.3519  SDL_CONFIG=$ac_cv_path_SDL_CONFIG
 53.3520  if test -n "$SDL_CONFIG"; then
 53.3521 -  { echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
 53.3522 -echo "${ECHO_T}$SDL_CONFIG" >&6; }
 53.3523 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
 53.3524 +$as_echo "$SDL_CONFIG" >&6; }
 53.3525  else
 53.3526 -  { echo "$as_me:$LINENO: result: no" >&5
 53.3527 -echo "${ECHO_T}no" >&6; }
 53.3528 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3529 +$as_echo "no" >&6; }
 53.3530  fi
 53.3531  
 53.3532  
 53.3533      PATH="$as_save_PATH"
 53.3534 -    { echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
 53.3535 -echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6; }
 53.3536 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
 53.3537 +$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
 53.3538      no_sdl=""
 53.3539  
 53.3540      if test "$SDL_CONFIG" = "no" ; then
 53.3541 @@ -3231,14 +3278,10 @@
 53.3542          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
 53.3543          LIBS="$LIBS $SDL_LIBS"
 53.3544        rm -f conf.sdltest
 53.3545 -      if test "$cross_compiling" = yes; then
 53.3546 +      if test "$cross_compiling" = yes; then :
 53.3547    echo $ac_n "cross compiling; assumed OK... $ac_c"
 53.3548  else
 53.3549 -  cat >conftest.$ac_ext <<_ACEOF
 53.3550 -/* confdefs.h.  */
 53.3551 -_ACEOF
 53.3552 -cat confdefs.h >>conftest.$ac_ext
 53.3553 -cat >>conftest.$ac_ext <<_ACEOF
 53.3554 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3555  /* end confdefs.h.  */
 53.3556  
 53.3557  #include <stdio.h>
 53.3558 @@ -3299,50 +3342,26 @@
 53.3559  
 53.3560  
 53.3561  _ACEOF
 53.3562 -rm -f conftest$ac_exeext
 53.3563 -if { (ac_try="$ac_link"
 53.3564 -case "(($ac_try" in
 53.3565 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3566 -  *) ac_try_echo=$ac_try;;
 53.3567 -esac
 53.3568 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3569 -  (eval "$ac_link") 2>&5
 53.3570 -  ac_status=$?
 53.3571 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3572 -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 53.3573 -  { (case "(($ac_try" in
 53.3574 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3575 -  *) ac_try_echo=$ac_try;;
 53.3576 -esac
 53.3577 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3578 -  (eval "$ac_try") 2>&5
 53.3579 -  ac_status=$?
 53.3580 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3581 -  (exit $ac_status); }; }; then
 53.3582 -  :
 53.3583 +if ac_fn_c_try_run "$LINENO"; then :
 53.3584 +
 53.3585  else
 53.3586 -  echo "$as_me: program exited with status $ac_status" >&5
 53.3587 -echo "$as_me: failed program was:" >&5
 53.3588 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3589 -
 53.3590 -( exit $ac_status )
 53.3591 -no_sdl=yes
 53.3592 +  no_sdl=yes
 53.3593  fi
 53.3594 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 53.3595 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 53.3596 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 53.3597  fi
 53.3598  
 53.3599 -
 53.3600          CFLAGS="$ac_save_CFLAGS"
 53.3601          CXXFLAGS="$ac_save_CXXFLAGS"
 53.3602          LIBS="$ac_save_LIBS"
 53.3603        fi
 53.3604      fi
 53.3605      if test "x$no_sdl" = x ; then
 53.3606 -      { echo "$as_me:$LINENO: result: yes" >&5
 53.3607 -echo "${ECHO_T}yes" >&6; }
 53.3608 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 53.3609 +$as_echo "yes" >&6; }
 53.3610      else
 53.3611 -      { echo "$as_me:$LINENO: result: no" >&5
 53.3612 -echo "${ECHO_T}no" >&6; }
 53.3613 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 53.3614 +$as_echo "no" >&6; }
 53.3615      fi
 53.3616    fi
 53.3617    if test "x$no_sdl" = x ; then
 53.3618 @@ -3361,11 +3380,7 @@
 53.3619            CFLAGS="$CFLAGS $SDL_CFLAGS"
 53.3620            CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
 53.3621            LIBS="$LIBS $SDL_LIBS"
 53.3622 -          cat >conftest.$ac_ext <<_ACEOF
 53.3623 -/* confdefs.h.  */
 53.3624 -_ACEOF
 53.3625 -cat confdefs.h >>conftest.$ac_ext
 53.3626 -cat >>conftest.$ac_ext <<_ACEOF
 53.3627 +          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3628  /* end confdefs.h.  */
 53.3629  
 53.3630  #include <stdio.h>
 53.3631 @@ -3384,24 +3399,7 @@
 53.3632    return 0;
 53.3633  }
 53.3634  _ACEOF
 53.3635 -rm -f conftest.$ac_objext conftest$ac_exeext
 53.3636 -if { (ac_try="$ac_link"
 53.3637 -case "(($ac_try" in
 53.3638 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3639 -  *) ac_try_echo=$ac_try;;
 53.3640 -esac
 53.3641 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3642 -  (eval "$ac_link") 2>conftest.er1
 53.3643 -  ac_status=$?
 53.3644 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.3645 -  rm -f conftest.er1
 53.3646 -  cat conftest.err >&5
 53.3647 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3648 -  (exit $ac_status); } && {
 53.3649 -	 test -z "$ac_c_werror_flag" ||
 53.3650 -	 test ! -s conftest.err
 53.3651 -       } && test -s conftest$ac_exeext &&
 53.3652 -       $as_test_x conftest$ac_exeext; then
 53.3653 +if ac_fn_c_try_link "$LINENO"; then :
 53.3654     echo "*** The test program compiled, but did not run. This usually means"
 53.3655            echo "*** that the run-time linker is not finding SDL or finding the wrong"
 53.3656            echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
 53.3657 @@ -3412,17 +3410,13 @@
 53.3658            echo "*** If you have an old version installed, it is best to remove it, although"
 53.3659            echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
 53.3660  else
 53.3661 -  echo "$as_me: failed program was:" >&5
 53.3662 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3663 -
 53.3664 -	 echo "*** The test program failed to compile or link. See the file config.log for the"
 53.3665 +   echo "*** The test program failed to compile or link. See the file config.log for the"
 53.3666            echo "*** exact error that occured. This usually means SDL was incorrectly installed"
 53.3667            echo "*** or that you have moved SDL since it was installed. In the latter case, you"
 53.3668            echo "*** may want to edit the sdl2-config script: $SDL_CONFIG"
 53.3669  fi
 53.3670 -
 53.3671 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 53.3672 -      conftest$ac_exeext conftest.$ac_ext
 53.3673 +rm -f core conftest.err conftest.$ac_objext \
 53.3674 +    conftest$ac_exeext conftest.$ac_ext
 53.3675            CFLAGS="$ac_save_CFLAGS"
 53.3676            CXXFLAGS="$ac_save_CXXFLAGS"
 53.3677            LIBS="$ac_save_LIBS"
 53.3678 @@ -3430,9 +3424,7 @@
 53.3679       fi
 53.3680       SDL_CFLAGS=""
 53.3681       SDL_LIBS=""
 53.3682 -     { { echo "$as_me:$LINENO: error: *** SDL version $SDL_VERSION not found!" >&5
 53.3683 -echo "$as_me: error: *** SDL version $SDL_VERSION not found!" >&2;}
 53.3684 -   { (exit 1); exit 1; }; }
 53.3685 +     as_fn_error $? "*** SDL version $SDL_VERSION not found!" "$LINENO" 5
 53.3686  
 53.3687    fi
 53.3688  
 53.3689 @@ -3447,15 +3439,15 @@
 53.3690  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 53.3691  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 53.3692  ac_compiler_gnu=$ac_cv_c_compiler_gnu
 53.3693 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 53.3694 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
 53.3695 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 53.3696 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
 53.3697  # On Suns, sometimes $CPP names a directory.
 53.3698  if test -n "$CPP" && test -d "$CPP"; then
 53.3699    CPP=
 53.3700  fi
 53.3701  if test -z "$CPP"; then
 53.3702 -  if test "${ac_cv_prog_CPP+set}" = set; then
 53.3703 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3704 +  if ${ac_cv_prog_CPP+:} false; then :
 53.3705 +  $as_echo_n "(cached) " >&6
 53.3706  else
 53.3707        # Double quotes because CPP needs to be expanded
 53.3708      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 53.3709 @@ -3469,11 +3461,7 @@
 53.3710    # <limits.h> exists even on freestanding compilers.
 53.3711    # On the NeXT, cc -E runs the code through the compiler's parser,
 53.3712    # not just through cpp. "Syntax error" is here to catch this case.
 53.3713 -  cat >conftest.$ac_ext <<_ACEOF
 53.3714 -/* confdefs.h.  */
 53.3715 -_ACEOF
 53.3716 -cat confdefs.h >>conftest.$ac_ext
 53.3717 -cat >>conftest.$ac_ext <<_ACEOF
 53.3718 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3719  /* end confdefs.h.  */
 53.3720  #ifdef __STDC__
 53.3721  # include <limits.h>
 53.3722 @@ -3482,76 +3470,34 @@
 53.3723  #endif
 53.3724  		     Syntax error
 53.3725  _ACEOF
 53.3726 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 53.3727 -case "(($ac_try" in
 53.3728 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3729 -  *) ac_try_echo=$ac_try;;
 53.3730 -esac
 53.3731 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3732 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 53.3733 -  ac_status=$?
 53.3734 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.3735 -  rm -f conftest.er1
 53.3736 -  cat conftest.err >&5
 53.3737 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3738 -  (exit $ac_status); } >/dev/null && {
 53.3739 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 53.3740 -	 test ! -s conftest.err
 53.3741 -       }; then
 53.3742 -  :
 53.3743 +if ac_fn_c_try_cpp "$LINENO"; then :
 53.3744 +
 53.3745  else
 53.3746 -  echo "$as_me: failed program was:" >&5
 53.3747 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3748 -
 53.3749    # Broken: fails on valid input.
 53.3750  continue
 53.3751  fi
 53.3752 -
 53.3753 -rm -f conftest.err conftest.$ac_ext
 53.3754 +rm -f conftest.err conftest.i conftest.$ac_ext
 53.3755  
 53.3756    # OK, works on sane cases.  Now check whether nonexistent headers
 53.3757    # can be detected and how.
 53.3758 -  cat >conftest.$ac_ext <<_ACEOF
 53.3759 -/* confdefs.h.  */
 53.3760 -_ACEOF
 53.3761 -cat confdefs.h >>conftest.$ac_ext
 53.3762 -cat >>conftest.$ac_ext <<_ACEOF
 53.3763 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3764  /* end confdefs.h.  */
 53.3765  #include <ac_nonexistent.h>
 53.3766  _ACEOF
 53.3767 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 53.3768 -case "(($ac_try" in
 53.3769 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3770 -  *) ac_try_echo=$ac_try;;
 53.3771 -esac
 53.3772 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3773 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 53.3774 -  ac_status=$?
 53.3775 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.3776 -  rm -f conftest.er1
 53.3777 -  cat conftest.err >&5
 53.3778 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3779 -  (exit $ac_status); } >/dev/null && {
 53.3780 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 53.3781 -	 test ! -s conftest.err
 53.3782 -       }; then
 53.3783 +if ac_fn_c_try_cpp "$LINENO"; then :
 53.3784    # Broken: success on invalid input.
 53.3785  continue
 53.3786  else
 53.3787 -  echo "$as_me: failed program was:" >&5
 53.3788 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3789 -
 53.3790    # Passes both tests.
 53.3791  ac_preproc_ok=:
 53.3792  break
 53.3793  fi
 53.3794 -
 53.3795 -rm -f conftest.err conftest.$ac_ext
 53.3796 +rm -f conftest.err conftest.i conftest.$ac_ext
 53.3797  
 53.3798  done
 53.3799  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 53.3800 -rm -f conftest.err conftest.$ac_ext
 53.3801 -if $ac_preproc_ok; then
 53.3802 +rm -f conftest.i conftest.err conftest.$ac_ext
 53.3803 +if $ac_preproc_ok; then :
 53.3804    break
 53.3805  fi
 53.3806  
 53.3807 @@ -3563,8 +3509,8 @@
 53.3808  else
 53.3809    ac_cv_prog_CPP=$CPP
 53.3810  fi
 53.3811 -{ echo "$as_me:$LINENO: result: $CPP" >&5
 53.3812 -echo "${ECHO_T}$CPP" >&6; }
 53.3813 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 53.3814 +$as_echo "$CPP" >&6; }
 53.3815  ac_preproc_ok=false
 53.3816  for ac_c_preproc_warn_flag in '' yes
 53.3817  do
 53.3818 @@ -3574,11 +3520,7 @@
 53.3819    # <limits.h> exists even on freestanding compilers.
 53.3820    # On the NeXT, cc -E runs the code through the compiler's parser,
 53.3821    # not just through cpp. "Syntax error" is here to catch this case.
 53.3822 -  cat >conftest.$ac_ext <<_ACEOF
 53.3823 -/* confdefs.h.  */
 53.3824 -_ACEOF
 53.3825 -cat confdefs.h >>conftest.$ac_ext
 53.3826 -cat >>conftest.$ac_ext <<_ACEOF
 53.3827 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3828  /* end confdefs.h.  */
 53.3829  #ifdef __STDC__
 53.3830  # include <limits.h>
 53.3831 @@ -3587,83 +3529,40 @@
 53.3832  #endif
 53.3833  		     Syntax error
 53.3834  _ACEOF
 53.3835 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 53.3836 -case "(($ac_try" in
 53.3837 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3838 -  *) ac_try_echo=$ac_try;;
 53.3839 -esac
 53.3840 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3841 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 53.3842 -  ac_status=$?
 53.3843 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.3844 -  rm -f conftest.er1
 53.3845 -  cat conftest.err >&5
 53.3846 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3847 -  (exit $ac_status); } >/dev/null && {
 53.3848 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 53.3849 -	 test ! -s conftest.err
 53.3850 -       }; then
 53.3851 -  :
 53.3852 +if ac_fn_c_try_cpp "$LINENO"; then :
 53.3853 +
 53.3854  else
 53.3855 -  echo "$as_me: failed program was:" >&5
 53.3856 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3857 -
 53.3858    # Broken: fails on valid input.
 53.3859  continue
 53.3860  fi
 53.3861 -
 53.3862 -rm -f conftest.err conftest.$ac_ext
 53.3863 +rm -f conftest.err conftest.i conftest.$ac_ext
 53.3864  
 53.3865    # OK, works on sane cases.  Now check whether nonexistent headers
 53.3866    # can be detected and how.
 53.3867 -  cat >conftest.$ac_ext <<_ACEOF
 53.3868 -/* confdefs.h.  */
 53.3869 -_ACEOF
 53.3870 -cat confdefs.h >>conftest.$ac_ext
 53.3871 -cat >>conftest.$ac_ext <<_ACEOF
 53.3872 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.3873  /* end confdefs.h.  */
 53.3874  #include <ac_nonexistent.h>
 53.3875  _ACEOF
 53.3876 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 53.3877 -case "(($ac_try" in
 53.3878 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.3879 -  *) ac_try_echo=$ac_try;;
 53.3880 -esac
 53.3881 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.3882 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 53.3883 -  ac_status=$?
 53.3884 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.3885 -  rm -f conftest.er1
 53.3886 -  cat conftest.err >&5
 53.3887 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.3888 -  (exit $ac_status); } >/dev/null && {
 53.3889 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 53.3890 -	 test ! -s conftest.err
 53.3891 -       }; then
 53.3892 +if ac_fn_c_try_cpp "$LINENO"; then :
 53.3893    # Broken: success on invalid input.
 53.3894  continue
 53.3895  else
 53.3896 -  echo "$as_me: failed program was:" >&5
 53.3897 -sed 's/^/| /' conftest.$ac_ext >&5
 53.3898 -
 53.3899    # Passes both tests.
 53.3900  ac_preproc_ok=:
 53.3901  break
 53.3902  fi
 53.3903 -
 53.3904 -rm -f conftest.err conftest.$ac_ext
 53.3905 +rm -f conftest.err conftest.i conftest.$ac_ext
 53.3906  
 53.3907  done
 53.3908  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 53.3909 -rm -f conftest.err conftest.$ac_ext
 53.3910 -if $ac_preproc_ok; then
 53.3911 -  :
 53.3912 +rm -f conftest.i conftest.err conftest.$ac_ext
 53.3913 +if $ac_preproc_ok; then :
 53.3914 +
 53.3915  else
 53.3916 -  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 53.3917 -See \`config.log' for more details." >&5
 53.3918 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 53.3919 -See \`config.log' for more details." >&2;}
 53.3920 -   { (exit 1); exit 1; }; }
 53.3921 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 53.3922 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 53.3923 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 53.3924 +See \`config.log' for more details" "$LINENO" 5; }
 53.3925  fi
 53.3926  
 53.3927  ac_ext=c
 53.3928 @@ -3673,12 +3572,12 @@
 53.3929  ac_compiler_gnu=$ac_cv_c_compiler_gnu
 53.3930  
 53.3931  
 53.3932 -{ echo "$as_me:$LINENO: checking for X" >&5
 53.3933 -echo $ECHO_N "checking for X... $ECHO_C" >&6; }
 53.3934 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 53.3935 +$as_echo_n "checking for X... " >&6; }
 53.3936  
 53.3937  
 53.3938  # Check whether --with-x was given.
 53.3939 -if test "${with_x+set}" = set; then
 53.3940 +if test "${with_x+set}" = set; then :
 53.3941    withval=$with_x;
 53.3942  fi
 53.3943  
 53.3944 @@ -3688,11 +3587,9 @@
 53.3945    have_x=disabled
 53.3946  else
 53.3947    case $x_includes,$x_libraries in #(
 53.3948 -    *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5
 53.3949 -echo "$as_me: error: Cannot use X directory names containing '" >&2;}
 53.3950 -   { (exit 1); exit 1; }; };; #(
 53.3951 -    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
 53.3952 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 53.3953 +    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
 53.3954 +    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
 53.3955 +  $as_echo_n "(cached) " >&6
 53.3956  else
 53.3957    # One or both of the vars are not set, and there is no cached value.
 53.3958  ac_x_includes=no ac_x_libraries=no
 53.3959 @@ -3708,7 +3605,7 @@
 53.3960  	@echo libdir='${LIBDIR}'
 53.3961  _ACEOF
 53.3962    if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
 53.3963 -    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 53.3964 +    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 53.3965      for ac_var in incroot usrlibdir libdir; do
 53.3966        eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
 53.3967      done
 53.3968 @@ -3727,7 +3624,7 @@
 53.3969  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
 53.3970      esac
 53.3971      case $ac_im_usrlibdir in
 53.3972 -	/usr/lib | /lib) ;;
 53.3973 +	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 53.3974  	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
 53.3975      esac
 53.3976    fi
 53.3977 @@ -3739,21 +3636,25 @@
 53.3978  # Check X11 before X11Rn because it is often a symlink to the current release.
 53.3979  ac_x_header_dirs='
 53.3980  /usr/X11/include
 53.3981 +/usr/X11R7/include
 53.3982  /usr/X11R6/include
 53.3983  /usr/X11R5/include
 53.3984  /usr/X11R4/include
 53.3985  
 53.3986  /usr/include/X11
 53.3987 +/usr/include/X11R7
 53.3988  /usr/include/X11R6
 53.3989  /usr/include/X11R5
 53.3990  /usr/include/X11R4
 53.3991  
 53.3992  /usr/local/X11/include
 53.3993 +/usr/local/X11R7/include
 53.3994  /usr/local/X11R6/include
 53.3995  /usr/local/X11R5/include
 53.3996  /usr/local/X11R4/include
 53.3997  
 53.3998  /usr/local/include/X11
 53.3999 +/usr/local/include/X11R7
 53.4000  /usr/local/include/X11R6
 53.4001  /usr/local/include/X11R5
 53.4002  /usr/local/include/X11R4
 53.4003 @@ -3775,36 +3676,14 @@
 53.4004  if test "$ac_x_includes" = no; then
 53.4005    # Guess where to find include files, by looking for Xlib.h.
 53.4006    # First, try using that file with no special directory specified.
 53.4007 -  cat >conftest.$ac_ext <<_ACEOF
 53.4008 -/* confdefs.h.  */
 53.4009 -_ACEOF
 53.4010 -cat confdefs.h >>conftest.$ac_ext
 53.4011 -cat >>conftest.$ac_ext <<_ACEOF
 53.4012 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.4013  /* end confdefs.h.  */
 53.4014  #include <X11/Xlib.h>
 53.4015  _ACEOF
 53.4016 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 53.4017 -case "(($ac_try" in
 53.4018 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.4019 -  *) ac_try_echo=$ac_try;;
 53.4020 -esac
 53.4021 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.4022 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 53.4023 -  ac_status=$?
 53.4024 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.4025 -  rm -f conftest.er1
 53.4026 -  cat conftest.err >&5
 53.4027 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.4028 -  (exit $ac_status); } >/dev/null && {
 53.4029 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 53.4030 -	 test ! -s conftest.err
 53.4031 -       }; then
 53.4032 +if ac_fn_c_try_cpp "$LINENO"; then :
 53.4033    # We can compile using X headers with no special include directory.
 53.4034  ac_x_includes=
 53.4035  else
 53.4036 -  echo "$as_me: failed program was:" >&5
 53.4037 -sed 's/^/| /' conftest.$ac_ext >&5
 53.4038 -
 53.4039    for ac_dir in $ac_x_header_dirs; do
 53.4040    if test -r "$ac_dir/X11/Xlib.h"; then
 53.4041      ac_x_includes=$ac_dir
 53.4042 @@ -3812,8 +3691,7 @@
 53.4043    fi
 53.4044  done
 53.4045  fi
 53.4046 -
 53.4047 -rm -f conftest.err conftest.$ac_ext
 53.4048 +rm -f conftest.err conftest.i conftest.$ac_ext
 53.4049  fi # $ac_x_includes = no
 53.4050  
 53.4051  if test "$ac_x_libraries" = no; then
 53.4052 @@ -3822,11 +3700,7 @@
 53.4053    # Don't add to $LIBS permanently.
 53.4054    ac_save_LIBS=$LIBS
 53.4055    LIBS="-lX11 $LIBS"
 53.4056 -  cat >conftest.$ac_ext <<_ACEOF
 53.4057 -/* confdefs.h.  */
 53.4058 -_ACEOF
 53.4059 -cat confdefs.h >>conftest.$ac_ext
 53.4060 -cat >>conftest.$ac_ext <<_ACEOF
 53.4061 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.4062  /* end confdefs.h.  */
 53.4063  #include <X11/Xlib.h>
 53.4064  int
 53.4065 @@ -3837,33 +3711,13 @@
 53.4066    return 0;
 53.4067  }
 53.4068  _ACEOF
 53.4069 -rm -f conftest.$ac_objext conftest$ac_exeext
 53.4070 -if { (ac_try="$ac_link"
 53.4071 -case "(($ac_try" in
 53.4072 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.4073 -  *) ac_try_echo=$ac_try;;
 53.4074 -esac
 53.4075 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.4076 -  (eval "$ac_link") 2>conftest.er1
 53.4077 -  ac_status=$?
 53.4078 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.4079 -  rm -f conftest.er1
 53.4080 -  cat conftest.err >&5
 53.4081 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.4082 -  (exit $ac_status); } && {
 53.4083 -	 test -z "$ac_c_werror_flag" ||
 53.4084 -	 test ! -s conftest.err
 53.4085 -       } && test -s conftest$ac_exeext &&
 53.4086 -       $as_test_x conftest$ac_exeext; then
 53.4087 +if ac_fn_c_try_link "$LINENO"; then :
 53.4088    LIBS=$ac_save_LIBS
 53.4089  # We can link X programs with no special library path.
 53.4090  ac_x_libraries=
 53.4091  else
 53.4092 -  echo "$as_me: failed program was:" >&5
 53.4093 -sed 's/^/| /' conftest.$ac_ext >&5
 53.4094 -
 53.4095 -	LIBS=$ac_save_LIBS
 53.4096 -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 53.4097 +  LIBS=$ac_save_LIBS
 53.4098 +for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 53.4099  do
 53.4100    # Don't even attempt the hair of trying to link an X program!
 53.4101    for ac_extension in a so sl dylib la dll; do
 53.4102 @@ -3874,9 +3728,8 @@
 53.4103    done
 53.4104  done
 53.4105  fi
 53.4106 -
 53.4107 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 53.4108 -      conftest$ac_exeext conftest.$ac_ext
 53.4109 +rm -f core conftest.err conftest.$ac_objext \
 53.4110 +    conftest$ac_exeext conftest.$ac_ext
 53.4111  fi # $ac_x_libraries = no
 53.4112  
 53.4113  case $ac_x_includes,$ac_x_libraries in #(
 53.4114 @@ -3897,8 +3750,8 @@
 53.4115  fi # $with_x != no
 53.4116  
 53.4117  if test "$have_x" != yes; then
 53.4118 -  { echo "$as_me:$LINENO: result: $have_x" >&5
 53.4119 -echo "${ECHO_T}$have_x" >&6; }
 53.4120 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
 53.4121 +$as_echo "$have_x" >&6; }
 53.4122    no_x=yes
 53.4123  else
 53.4124    # If each of the values was on the command line, it overrides each guess.
 53.4125 @@ -3908,8 +3761,8 @@
 53.4126    ac_cv_have_x="have_x=yes\
 53.4127  	ac_x_includes='$x_includes'\
 53.4128  	ac_x_libraries='$x_libraries'"
 53.4129 -  { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
 53.4130 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; }
 53.4131 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
 53.4132 +$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 53.4133  fi
 53.4134  
 53.4135  if test x$have_x = xyes; then
 53.4136 @@ -3925,14 +3778,10 @@
 53.4137      fi
 53.4138  fi
 53.4139  
 53.4140 -{ echo "$as_me:$LINENO: checking for OpenGL support" >&5
 53.4141 -echo $ECHO_N "checking for OpenGL support... $ECHO_C" >&6; }
 53.4142 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL support" >&5
 53.4143 +$as_echo_n "checking for OpenGL support... " >&6; }
 53.4144  have_opengl=no
 53.4145 -cat >conftest.$ac_ext <<_ACEOF
 53.4146 -/* confdefs.h.  */
 53.4147 -_ACEOF
 53.4148 -cat confdefs.h >>conftest.$ac_ext
 53.4149 -cat >>conftest.$ac_ext <<_ACEOF
 53.4150 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.4151  /* end confdefs.h.  */
 53.4152  
 53.4153   #include "SDL_opengl.h"
 53.4154 @@ -3946,45 +3795,19 @@
 53.4155    return 0;
 53.4156  }
 53.4157  _ACEOF
 53.4158 -rm -f conftest.$ac_objext
 53.4159 -if { (ac_try="$ac_compile"
 53.4160 -case "(($ac_try" in
 53.4161 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.4162 -  *) ac_try_echo=$ac_try;;
 53.4163 -esac
 53.4164 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.4165 -  (eval "$ac_compile") 2>conftest.er1
 53.4166 -  ac_status=$?
 53.4167 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.4168 -  rm -f conftest.er1
 53.4169 -  cat conftest.err >&5
 53.4170 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.4171 -  (exit $ac_status); } && {
 53.4172 -	 test -z "$ac_c_werror_flag" ||
 53.4173 -	 test ! -s conftest.err
 53.4174 -       } && test -s conftest.$ac_objext; then
 53.4175 +if ac_fn_c_try_compile "$LINENO"; then :
 53.4176  
 53.4177  have_opengl=yes
 53.4178  
 53.4179 -else
 53.4180 -  echo "$as_me: failed program was:" >&5
 53.4181 -sed 's/^/| /' conftest.$ac_ext >&5
 53.4182 -
 53.4183 -
 53.4184  fi
 53.4185 -
 53.4186  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.4187 -{ echo "$as_me:$LINENO: result: $have_opengl" >&5
 53.4188 -echo "${ECHO_T}$have_opengl" >&6; }
 53.4189 -
 53.4190 -{ echo "$as_me:$LINENO: checking for OpenGL ES support" >&5
 53.4191 -echo $ECHO_N "checking for OpenGL ES support... $ECHO_C" >&6; }
 53.4192 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_opengl" >&5
 53.4193 +$as_echo "$have_opengl" >&6; }
 53.4194 +
 53.4195 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL ES support" >&5
 53.4196 +$as_echo_n "checking for OpenGL ES support... " >&6; }
 53.4197  have_opengles=no
 53.4198 -cat >conftest.$ac_ext <<_ACEOF
 53.4199 -/* confdefs.h.  */
 53.4200 -_ACEOF
 53.4201 -cat confdefs.h >>conftest.$ac_ext
 53.4202 -cat >>conftest.$ac_ext <<_ACEOF
 53.4203 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.4204  /* end confdefs.h.  */
 53.4205  
 53.4206   #if defined (__IPHONEOS__)
 53.4207 @@ -4002,36 +3825,14 @@
 53.4208    return 0;
 53.4209  }
 53.4210  _ACEOF
 53.4211 -rm -f conftest.$ac_objext
 53.4212 -if { (ac_try="$ac_compile"
 53.4213 -case "(($ac_try" in
 53.4214 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.4215 -  *) ac_try_echo=$ac_try;;
 53.4216 -esac
 53.4217 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.4218 -  (eval "$ac_compile") 2>conftest.er1
 53.4219 -  ac_status=$?
 53.4220 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.4221 -  rm -f conftest.er1
 53.4222 -  cat conftest.err >&5
 53.4223 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.4224 -  (exit $ac_status); } && {
 53.4225 -	 test -z "$ac_c_werror_flag" ||
 53.4226 -	 test ! -s conftest.err
 53.4227 -       } && test -s conftest.$ac_objext; then
 53.4228 +if ac_fn_c_try_compile "$LINENO"; then :
 53.4229  
 53.4230  have_opengles=yes
 53.4231  
 53.4232 -else
 53.4233 -  echo "$as_me: failed program was:" >&5
 53.4234 -sed 's/^/| /' conftest.$ac_ext >&5
 53.4235 -
 53.4236 -
 53.4237  fi
 53.4238 -
 53.4239  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.4240 -{ echo "$as_me:$LINENO: result: $have_opengles" >&5
 53.4241 -echo "${ECHO_T}$have_opengles" >&6; }
 53.4242 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_opengles" >&5
 53.4243 +$as_echo "$have_opengles" >&6; }
 53.4244  
 53.4245  GLLIB=""
 53.4246  if test x$have_opengles = xyes; then
 53.4247 @@ -4046,14 +3847,10 @@
 53.4248  
 53.4249  
 53.4250  
 53.4251 -{ echo "$as_me:$LINENO: checking for SDL_ttf" >&5
 53.4252 -echo $ECHO_N "checking for SDL_ttf... $ECHO_C" >&6; }
 53.4253 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL_ttf" >&5
 53.4254 +$as_echo_n "checking for SDL_ttf... " >&6; }
 53.4255  have_SDL_ttf=no
 53.4256 -cat >conftest.$ac_ext <<_ACEOF
 53.4257 -/* confdefs.h.  */
 53.4258 -_ACEOF
 53.4259 -cat confdefs.h >>conftest.$ac_ext
 53.4260 -cat >>conftest.$ac_ext <<_ACEOF
 53.4261 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 53.4262  /* end confdefs.h.  */
 53.4263  
 53.4264   #include "SDL_ttf.h"
 53.4265 @@ -4067,36 +3864,14 @@
 53.4266    return 0;
 53.4267  }
 53.4268  _ACEOF
 53.4269 -rm -f conftest.$ac_objext
 53.4270 -if { (ac_try="$ac_compile"
 53.4271 -case "(($ac_try" in
 53.4272 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 53.4273 -  *) ac_try_echo=$ac_try;;
 53.4274 -esac
 53.4275 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 53.4276 -  (eval "$ac_compile") 2>conftest.er1
 53.4277 -  ac_status=$?
 53.4278 -  grep -v '^ *+' conftest.er1 >conftest.err
 53.4279 -  rm -f conftest.er1
 53.4280 -  cat conftest.err >&5
 53.4281 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 53.4282 -  (exit $ac_status); } && {
 53.4283 -	 test -z "$ac_c_werror_flag" ||
 53.4284 -	 test ! -s conftest.err
 53.4285 -       } && test -s conftest.$ac_objext; then
 53.4286 +if ac_fn_c_try_compile "$LINENO"; then :
 53.4287  
 53.4288  have_SDL_ttf=yes
 53.4289  
 53.4290 -else
 53.4291 -  echo "$as_me: failed program was:" >&5
 53.4292 -sed 's/^/| /' conftest.$ac_ext >&5
 53.4293 -
 53.4294 -
 53.4295  fi
 53.4296 -
 53.4297  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 53.4298 -{ echo "$as_me:$LINENO: result: $have_SDL_ttf" >&5
 53.4299 -echo "${ECHO_T}$have_SDL_ttf" >&6; }
 53.4300 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_SDL_ttf" >&5
 53.4301 +$as_echo "$have_SDL_ttf" >&6; }
 53.4302  
 53.4303  if test x$have_SDL_ttf = xyes; then
 53.4304      CFLAGS="$CFLAGS -DHAVE_SDL_TTF"
 53.4305 @@ -4134,12 +3909,13 @@
 53.4306      case $ac_val in #(
 53.4307      *${as_nl}*)
 53.4308        case $ac_var in #(
 53.4309 -      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
 53.4310 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 53.4311 +      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 53.4312 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 53.4313        esac
 53.4314        case $ac_var in #(
 53.4315        _ | IFS | as_nl) ;; #(
 53.4316 -      *) $as_unset $ac_var ;;
 53.4317 +      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
 53.4318 +      *) { eval $ac_var=; unset $ac_var;} ;;
 53.4319        esac ;;
 53.4320      esac
 53.4321    done
 53.4322 @@ -4147,8 +3923,8 @@
 53.4323    (set) 2>&1 |
 53.4324      case $as_nl`(ac_space=' '; set) 2>&1` in #(
 53.4325      *${as_nl}ac_space=\ *)
 53.4326 -      # `set' does not quote correctly, so add quotes (double-quote
 53.4327 -      # substitution turns \\\\ into \\, and sed turns \\ into \).
 53.4328 +      # `set' does not quote correctly, so add quotes: double-quote
 53.4329 +      # substitution turns \\\\ into \\, and sed turns \\ into \.
 53.4330        sed -n \
 53.4331  	"s/'/'\\\\''/g;
 53.4332  	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
 53.4333 @@ -4170,13 +3946,24 @@
 53.4334       :end' >>confcache
 53.4335  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 53.4336    if test -w "$cache_file"; then
 53.4337 -    test "x$cache_file" != "x/dev/null" &&
 53.4338 -      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
 53.4339 -echo "$as_me: updating cache $cache_file" >&6;}
 53.4340 -    cat confcache >$cache_file
 53.4341 +    if test "x$cache_file" != "x/dev/null"; then
 53.4342 +      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 53.4343 +$as_echo "$as_me: updating cache $cache_file" >&6;}
 53.4344 +      if test ! -f "$cache_file" || test -h "$cache_file"; then
 53.4345 +	cat confcache >"$cache_file"
 53.4346 +      else
 53.4347 +        case $cache_file in #(
 53.4348 +        */* | ?:*)
 53.4349 +	  mv -f confcache "$cache_file"$$ &&
 53.4350 +	  mv -f "$cache_file"$$ "$cache_file" ;; #(
 53.4351 +        *)
 53.4352 +	  mv -f confcache "$cache_file" ;;
 53.4353 +	esac
 53.4354 +      fi
 53.4355 +    fi
 53.4356    else
 53.4357 -    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
 53.4358 -echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 53.4359 +    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 53.4360 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
 53.4361    fi
 53.4362  fi
 53.4363  rm -f confcache
 53.4364 @@ -4193,6 +3980,12 @@
 53.4365  # take arguments), then branch to the quote section.  Otherwise,
 53.4366  # look for a macro that doesn't take arguments.
 53.4367  ac_script='
 53.4368 +:mline
 53.4369 +/\\$/{
 53.4370 + N
 53.4371 + s,\\\n,,
 53.4372 + b mline
 53.4373 +}
 53.4374  t clear
 53.4375  :clear
 53.4376  s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
 53.4377 @@ -4219,14 +4012,15 @@
 53.4378  
 53.4379  ac_libobjs=
 53.4380  ac_ltlibobjs=
 53.4381 +U=
 53.4382  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
 53.4383    # 1. Remove the extension, and $U if already installed.
 53.4384    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
 53.4385 -  ac_i=`echo "$ac_i" | sed "$ac_script"`
 53.4386 +  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
 53.4387    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
 53.4388    #    will be set to the directory where LIBOBJS objects are built.
 53.4389 -  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
 53.4390 -  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 53.4391 +  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
 53.4392 +  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 53.4393  done
 53.4394  LIBOBJS=$ac_libobjs
 53.4395  
 53.4396 @@ -4234,12 +4028,14 @@
 53.4397  
 53.4398  
 53.4399  
 53.4400 -: ${CONFIG_STATUS=./config.status}
 53.4401 +: "${CONFIG_STATUS=./config.status}"
 53.4402 +ac_write_fail=0
 53.4403  ac_clean_files_save=$ac_clean_files
 53.4404  ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 53.4405 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
 53.4406 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
 53.4407 -cat >$CONFIG_STATUS <<_ACEOF
 53.4408 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 53.4409 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 53.4410 +as_write_fail=0
 53.4411 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 53.4412  #! $SHELL
 53.4413  # Generated by $as_me.
 53.4414  # Run this file to recreate the current configuration.
 53.4415 @@ -4249,59 +4045,79 @@
 53.4416  debug=false
 53.4417  ac_cs_recheck=false
 53.4418  ac_cs_silent=false
 53.4419 +
 53.4420  SHELL=\${CONFIG_SHELL-$SHELL}
 53.4421 -_ACEOF
 53.4422 -
 53.4423 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.4424 -## --------------------- ##
 53.4425 -## M4sh Initialization.  ##
 53.4426 -## --------------------- ##
 53.4427 +export SHELL
 53.4428 +_ASEOF
 53.4429 +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 53.4430 +## -------------------- ##
 53.4431 +## M4sh Initialization. ##
 53.4432 +## -------------------- ##
 53.4433  
 53.4434  # Be more Bourne compatible
 53.4435  DUALCASE=1; export DUALCASE # for MKS sh
 53.4436 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 53.4437 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
 53.4438    emulate sh
 53.4439    NULLCMD=:
 53.4440 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
 53.4441 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 53.4442    # is contrary to our usage.  Disable this feature.
 53.4443    alias -g '${1+"$@"}'='"$@"'
 53.4444    setopt NO_GLOB_SUBST
 53.4445  else
 53.4446 -  case `(set -o) 2>/dev/null` in
 53.4447 -  *posix*) set -o posix ;;
 53.4448 +  case `(set -o) 2>/dev/null` in #(
 53.4449 +  *posix*) :
 53.4450 +    set -o posix ;; #(
 53.4451 +  *) :
 53.4452 +     ;;
 53.4453  esac
 53.4454 -
 53.4455  fi
 53.4456  
 53.4457  
 53.4458 -
 53.4459 -
 53.4460 -# PATH needs CR
 53.4461 -# Avoid depending upon Character Ranges.
 53.4462 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 53.4463 -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 53.4464 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 53.4465 -as_cr_digits='0123456789'
 53.4466 -as_cr_alnum=$as_cr_Letters$as_cr_digits
 53.4467 +as_nl='
 53.4468 +'
 53.4469 +export as_nl
 53.4470 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
 53.4471 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 53.4472 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 53.4473 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 53.4474 +# Prefer a ksh shell builtin over an external printf program on Solaris,
 53.4475 +# but without wasting forks for bash or zsh.
 53.4476 +if test -z "$BASH_VERSION$ZSH_VERSION" \
 53.4477 +    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
 53.4478 +  as_echo='print -r --'
 53.4479 +  as_echo_n='print -rn --'
 53.4480 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
 53.4481 +  as_echo='printf %s\n'
 53.4482 +  as_echo_n='printf %s'
 53.4483 +else
 53.4484 +  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
 53.4485 +    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
 53.4486 +    as_echo_n='/usr/ucb/echo -n'
 53.4487 +  else
 53.4488 +    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
 53.4489 +    as_echo_n_body='eval
 53.4490 +      arg=$1;
 53.4491 +      case $arg in #(
 53.4492 +      *"$as_nl"*)
 53.4493 +	expr "X$arg" : "X\\(.*\\)$as_nl";
 53.4494 +	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
 53.4495 +      esac;
 53.4496 +      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
 53.4497 +    '
 53.4498 +    export as_echo_n_body
 53.4499 +    as_echo_n='sh -c $as_echo_n_body as_echo'
 53.4500 +  fi
 53.4501 +  export as_echo_body
 53.4502 +  as_echo='sh -c $as_echo_body as_echo'
 53.4503 +fi
 53.4504  
 53.4505  # The user is always right.
 53.4506  if test "${PATH_SEPARATOR+set}" != set; then
 53.4507 -  echo "#! /bin/sh" >conf$$.sh
 53.4508 -  echo  "exit 0"   >>conf$$.sh
 53.4509 -  chmod +x conf$$.sh
 53.4510 -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 53.4511 -    PATH_SEPARATOR=';'
 53.4512 -  else
 53.4513 -    PATH_SEPARATOR=:
 53.4514 -  fi
 53.4515 -  rm -f conf$$.sh
 53.4516 -fi
 53.4517 -
 53.4518 -# Support unset when possible.
 53.4519 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 53.4520 -  as_unset=unset
 53.4521 -else
 53.4522 -  as_unset=false
 53.4523 +  PATH_SEPARATOR=:
 53.4524 +  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 53.4525 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 53.4526 +      PATH_SEPARATOR=';'
 53.4527 +  }
 53.4528  fi
 53.4529  
 53.4530  
 53.4531 @@ -4310,20 +4126,19 @@
 53.4532  # there to prevent editors from complaining about space-tab.
 53.4533  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 53.4534  # splitting by setting IFS to empty value.)
 53.4535 -as_nl='
 53.4536 -'
 53.4537  IFS=" ""	$as_nl"
 53.4538  
 53.4539  # Find who we are.  Look in the path if we contain no directory separator.
 53.4540 -case $0 in
 53.4541 +as_myself=
 53.4542 +case $0 in #((
 53.4543    *[\\/]* ) as_myself=$0 ;;
 53.4544    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 53.4545  for as_dir in $PATH
 53.4546  do
 53.4547    IFS=$as_save_IFS
 53.4548    test -z "$as_dir" && as_dir=.
 53.4549 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 53.4550 -done
 53.4551 +    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 53.4552 +  done
 53.4553  IFS=$as_save_IFS
 53.4554  
 53.4555       ;;
 53.4556 @@ -4334,32 +4149,111 @@
 53.4557    as_myself=$0
 53.4558  fi
 53.4559  if test ! -f "$as_myself"; then
 53.4560 -  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 53.4561 -  { (exit 1); exit 1; }
 53.4562 +  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 53.4563 +  exit 1
 53.4564  fi
 53.4565  
 53.4566 -# Work around bugs in pre-3.0 UWIN ksh.
 53.4567 -for as_var in ENV MAIL MAILPATH
 53.4568 -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 53.4569 +# Unset variables that we do not need and which cause bugs (e.g. in
 53.4570 +# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 53.4571 +# suppresses any "Segmentation fault" message there.  '((' could
 53.4572 +# trigger a bug in pdksh 5.2.14.
 53.4573 +for as_var in BASH_ENV ENV MAIL MAILPATH
 53.4574 +do eval test x\${$as_var+set} = xset \
 53.4575 +  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 53.4576  done
 53.4577  PS1='$ '
 53.4578  PS2='> '
 53.4579  PS4='+ '
 53.4580  
 53.4581  # NLS nuisances.
 53.4582 -for as_var in \
 53.4583 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 53.4584 -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 53.4585 -  LC_TELEPHONE LC_TIME
 53.4586 -do
 53.4587 -  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 53.4588 -    eval $as_var=C; export $as_var
 53.4589 -  else
 53.4590 -    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 53.4591 +LC_ALL=C
 53.4592 +export LC_ALL
 53.4593 +LANGUAGE=C
 53.4594 +export LANGUAGE
 53.4595 +
 53.4596 +# CDPATH.
 53.4597 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 53.4598 +
 53.4599 +
 53.4600 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
 53.4601 +# ----------------------------------------
 53.4602 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 53.4603 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 53.4604 +# script with STATUS, using 1 if that was 0.
 53.4605 +as_fn_error ()
 53.4606 +{
 53.4607 +  as_status=$1; test $as_status -eq 0 && as_status=1
 53.4608 +  if test "$4"; then
 53.4609 +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 53.4610 +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 53.4611    fi
 53.4612 -done
 53.4613 -
 53.4614 -# Required to use basename.
 53.4615 +  $as_echo "$as_me: error: $2" >&2
 53.4616 +  as_fn_exit $as_status
 53.4617 +} # as_fn_error
 53.4618 +
 53.4619 +
 53.4620 +# as_fn_set_status STATUS
 53.4621 +# -----------------------
 53.4622 +# Set $? to STATUS, without forking.
 53.4623 +as_fn_set_status ()
 53.4624 +{
 53.4625 +  return $1
 53.4626 +} # as_fn_set_status
 53.4627 +
 53.4628 +# as_fn_exit STATUS
 53.4629 +# -----------------
 53.4630 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 53.4631 +as_fn_exit ()
 53.4632 +{
 53.4633 +  set +e
 53.4634 +  as_fn_set_status $1
 53.4635 +  exit $1
 53.4636 +} # as_fn_exit
 53.4637 +
 53.4638 +# as_fn_unset VAR
 53.4639 +# ---------------
 53.4640 +# Portably unset VAR.
 53.4641 +as_fn_unset ()
 53.4642 +{
 53.4643 +  { eval $1=; unset $1;}
 53.4644 +}
 53.4645 +as_unset=as_fn_unset
 53.4646 +# as_fn_append VAR VALUE
 53.4647 +# ----------------------
 53.4648 +# Append the text in VALUE to the end of the definition contained in VAR. Take
 53.4649 +# advantage of any shell optimizations that allow amortized linear growth over
 53.4650 +# repeated appends, instead of the typical quadratic growth present in naive
 53.4651 +# implementations.
 53.4652 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
 53.4653 +  eval 'as_fn_append ()
 53.4654 +  {
 53.4655 +    eval $1+=\$2
 53.4656 +  }'
 53.4657 +else
 53.4658 +  as_fn_append ()
 53.4659 +  {
 53.4660 +    eval $1=\$$1\$2
 53.4661 +  }
 53.4662 +fi # as_fn_append
 53.4663 +
 53.4664 +# as_fn_arith ARG...
 53.4665 +# ------------------
 53.4666 +# Perform arithmetic evaluation on the ARGs, and store the result in the
 53.4667 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
 53.4668 +# must be portable across $(()) and expr.
 53.4669 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
 53.4670 +  eval 'as_fn_arith ()
 53.4671 +  {
 53.4672 +    as_val=$(( $* ))
 53.4673 +  }'
 53.4674 +else
 53.4675 +  as_fn_arith ()
 53.4676 +  {
 53.4677 +    as_val=`expr "$@" || test $? -eq 1`
 53.4678 +  }
 53.4679 +fi # as_fn_arith
 53.4680 +
 53.4681 +
 53.4682  if expr a : '\(a\)' >/dev/null 2>&1 &&
 53.4683     test "X`expr 00001 : '.*\(...\)'`" = X001; then
 53.4684    as_expr=expr
 53.4685 @@ -4373,13 +4267,17 @@
 53.4686    as_basename=false
 53.4687  fi
 53.4688  
 53.4689 -
 53.4690 -# Name of the executable.
 53.4691 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 53.4692 +  as_dirname=dirname
 53.4693 +else
 53.4694 +  as_dirname=false
 53.4695 +fi
 53.4696 +
 53.4697  as_me=`$as_basename -- "$0" ||
 53.4698  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 53.4699  	 X"$0" : 'X\(//\)$' \| \
 53.4700  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 53.4701 -echo X/"$0" |
 53.4702 +$as_echo X/"$0" |
 53.4703      sed '/^.*\/\([^/][^/]*\)\/*$/{
 53.4704  	    s//\1/
 53.4705  	    q
 53.4706 @@ -4394,566 +4292,68 @@
 53.4707  	  }
 53.4708  	  s/.*/./; q'`
 53.4709  
 53.4710 -# CDPATH.
 53.4711 -$as_unset CDPATH
 53.4712 -
 53.4713 -
 53.4714 -
 53.4715 -  as_lineno_1=$LINENO
 53.4716 -  as_lineno_2=$LINENO
 53.4717 -  test "x$as_lineno_1" != "x$as_lineno_2" &&
 53.4718 -  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
 53.4719 -
 53.4720 -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
 53.4721 -  # uniformly replaced by the line number.  The first 'sed' inserts a
 53.4722 -  # line-number line after each line using $LINENO; the second 'sed'
 53.4723 -  # does the real work.  The second script uses 'N' to pair each
 53.4724 -  # line-number line with the line containing $LINENO, and appends
 53.4725 -  # trailing '-' during substitution so that $LINENO is not a special
 53.4726 -  # case at line end.
 53.4727 -  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
 53.4728 -  # scripts with optimization help from Paolo Bonzini.  Blame Lee
 53.4729 -  # E. McMahon (1931-1989) for sed's syntax.  :-)
 53.4730 -  sed -n '
 53.4731 -    p
 53.4732 -    /[$]LINENO/=
 53.4733 -  ' <$as_myself |
 53.4734 -    sed '
 53.4735 -      s/[$]LINENO.*/&-/
 53.4736 -      t lineno
 53.4737 -      b
 53.4738 -      :lineno
 53.4739 -      N
 53.4740 -      :loop
 53.4741 -      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
 53.4742 -      t loop
 53.4743 -      s/-\n.*//
 53.4744 -    ' >$as_me.lineno &&
 53.4745 -  chmod +x "$as_me.lineno" ||
 53.4746 -    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 53.4747 -   { (exit 1); exit 1; }; }
 53.4748 -
 53.4749 -  # Don't try to exec as it changes $[0], causing all sort of problems
 53.4750 -  # (the dirname of $[0] is not the place where we might find the
 53.4751 -  # original and so on.  Autoconf is especially sensitive to this).
 53.4752 -  . "./$as_me.lineno"
 53.4753 -  # Exit status is that of the last command.
 53.4754 -  exit
 53.4755 -}
 53.4756 -
 53.4757 -
 53.4758 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 53.4759 -  as_dirname=dirname
 53.4760 -else
 53.4761 -  as_dirname=false
 53.4762 -fi
 53.4763 +# Avoid depending upon Character Ranges.
 53.4764 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 53.4765 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 53.4766 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 53.4767 +as_cr_digits='0123456789'
 53.4768 +as_cr_alnum=$as_cr_Letters$as_cr_digits
 53.4769  
 53.4770  ECHO_C= ECHO_N= ECHO_T=
 53.4771 -case `echo -n x` in
 53.4772 +case `echo -n x` in #(((((
 53.4773  -n*)
 53.4774 -  case `echo 'x\c'` in
 53.4775 +  case `echo 'xy\c'` in
 53.4776    *c*) ECHO_T='	';;	# ECHO_T is single tab character.
 53.4777 -  *)   ECHO_C='\c';;
 53.4778 +  xy)  ECHO_C='\c';;
 53.4779 +  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
 53.4780 +       ECHO_T='	';;
 53.4781    esac;;
 53.4782  *)
 53.4783    ECHO_N='-n';;
 53.4784  esac
 53.4785  
 53.4786 -if expr a : '\(a\)' >/dev/null 2>&1 &&
 53.4787 -   test "X`expr 00001 : '.*\(...\)'`" = X001; then
 53.4788 -  as_expr=expr
 53.4789 -else
 53.4790 -  as_expr=false
 53.4791 -fi
 53.4792 -
 53.4793  rm -f conf$$ conf$$.exe conf$$.file
 53.4794  if test -d conf$$.dir; then
 53.4795    rm -f conf$$.dir/conf$$.file
 53.4796  else
 53.4797    rm -f conf$$.dir
 53.4798 -  mkdir conf$$.dir
 53.4799 +  mkdir conf$$.dir 2>/dev/null
 53.4800  fi
 53.4801 -echo >conf$$.file
 53.4802 -if ln -s conf$$.file conf$$ 2>/dev/null; then
 53.4803 -  as_ln_s='ln -s'
 53.4804 -  # ... but there are two gotchas:
 53.4805 -  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 53.4806 -  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 53.4807 -  # In both cases, we have to default to `cp -p'.
 53.4808 -  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 53.4809 +if (echo >conf$$.file) 2>/dev/null; then
 53.4810 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
 53.4811 +    as_ln_s='ln -s'
 53.4812 +    # ... but there are two gotchas:
 53.4813 +    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 53.4814 +    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 53.4815 +    # In both cases, we have to default to `cp -p'.
 53.4816 +    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 53.4817 +      as_ln_s='cp -p'
 53.4818 +  elif ln conf$$.file conf$$ 2>/dev/null; then
 53.4819 +    as_ln_s=ln
 53.4820 +  else
 53.4821      as_ln_s='cp -p'
 53.4822 -elif ln conf$$.file conf$$ 2>/dev/null; then
 53.4823 -  as_ln_s=ln
 53.4824 +  fi
 53.4825  else
 53.4826    as_ln_s='cp -p'
 53.4827  fi
 53.4828  rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 53.4829  rmdir conf$$.dir 2>/dev/null
 53.4830  
 53.4831 -if mkdir -p . 2>/dev/null; then
 53.4832 -  as_mkdir_p=:
 53.4833 -else
 53.4834 -  test -d ./-p && rmdir ./-p
 53.4835 -  as_mkdir_p=false
 53.4836 -fi
 53.4837 -
 53.4838 -if test -x / >/dev/null 2>&1; then
 53.4839 -  as_test_x='test -x'
 53.4840 -else
 53.4841 -  if ls -dL / >/dev/null 2>&1; then
 53.4842 -    as_ls_L_option=L
 53.4843 -  else
 53.4844 -    as_ls_L_option=
 53.4845 -  fi
 53.4846 -  as_test_x='
 53.4847 -    eval sh -c '\''
 53.4848 -      if test -d "$1"; then
 53.4849 -        test -d "$1/.";
 53.4850 -      else
 53.4851 -	case $1 in
 53.4852 -        -*)set "./$1";;
 53.4853 -	esac;
 53.4854 -	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 53.4855 -	???[sx]*):;;*)false;;esac;fi
 53.4856 -    '\'' sh
 53.4857 -  '
 53.4858 -fi
 53.4859 -as_executable_p=$as_test_x
 53.4860 -
 53.4861 -# Sed expression to map a string onto a valid CPP name.
 53.4862 -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 53.4863 -
 53.4864 -# Sed expression to map a string onto a valid variable name.
 53.4865 -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 53.4866 -
 53.4867 -
 53.4868 -exec 6>&1
 53.4869 -
 53.4870 -# Save the log message, to keep $[0] and so on meaningful, and to
 53.4871 -# report actual input values of CONFIG_FILES etc. instead of their
 53.4872 -# values after options handling.
 53.4873 -ac_log="
 53.4874 -This file was extended by $as_me, which was
 53.4875 -generated by GNU Autoconf 2.61.  Invocation command line was
 53.4876 -
 53.4877 -  CONFIG_FILES    = $CONFIG_FILES
 53.4878 -  CONFIG_HEADERS  = $CONFIG_HEADERS
 53.4879 -  CONFIG_LINKS    = $CONFIG_LINKS
 53.4880 -  CONFIG_COMMANDS = $CONFIG_COMMANDS
 53.4881 -  $ $0 $@
 53.4882 -
 53.4883 -on `(hostname || uname -n) 2>/dev/null | sed 1q`
 53.4884 -"
 53.4885 -
 53.4886 -_ACEOF
 53.4887 -
 53.4888 -cat >>$CONFIG_STATUS <<_ACEOF
 53.4889 -# Files that config.status was made for.
 53.4890 -config_files="$ac_config_files"
 53.4891 -
 53.4892 -_ACEOF
 53.4893 -
 53.4894 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.4895 -ac_cs_usage="\
 53.4896 -\`$as_me' instantiates files from templates according to the
 53.4897 -current configuration.
 53.4898 -
 53.4899 -Usage: $0 [OPTIONS] [FILE]...
 53.4900 -
 53.4901 -  -h, --help       print this help, then exit
 53.4902 -  -V, --version    print version number and configuration settings, then exit
 53.4903 -  -q, --quiet      do not print progress messages
 53.4904 -  -d, --debug      don't remove temporary files
 53.4905 -      --recheck    update $as_me by reconfiguring in the same conditions
 53.4906 -  --file=FILE[:TEMPLATE]
 53.4907 -		   instantiate the configuration file FILE
 53.4908 -
 53.4909 -Configuration files:
 53.4910 -$config_files
 53.4911 -
 53.4912 -Report bugs to <bug-autoconf@gnu.org>."
 53.4913 -
 53.4914 -_ACEOF
 53.4915 -cat >>$CONFIG_STATUS <<_ACEOF
 53.4916 -ac_cs_version="\\
 53.4917 -config.status
 53.4918 -configured by $0, generated by GNU Autoconf 2.61,
 53.4919 -  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 53.4920 -
 53.4921 -Copyright (C) 2006 Free Software Foundation, Inc.
 53.4922 -This config.status script is free software; the Free Software Foundation
 53.4923 -gives unlimited permission to copy, distribute and modify it."
 53.4924 -
 53.4925 -ac_pwd='$ac_pwd'
 53.4926 -srcdir='$srcdir'
 53.4927 -_ACEOF
 53.4928 -
 53.4929 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.4930 -# If no file are specified by the user, then we need to provide default
 53.4931 -# value.  By we need to know if files were specified by the user.
 53.4932 -ac_need_defaults=:
 53.4933 -while test $# != 0
 53.4934 -do
 53.4935 -  case $1 in
 53.4936 -  --*=*)
 53.4937 -    ac_option=`expr "X$1" : 'X\([^=]*\)='`
 53.4938 -    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
 53.4939 -    ac_shift=:
 53.4940 -    ;;
 53.4941 -  *)
 53.4942 -    ac_option=$1
 53.4943 -    ac_optarg=$2
 53.4944 -    ac_shift=shift
 53.4945 -    ;;
 53.4946 -  esac
 53.4947 -
 53.4948 -  case $ac_option in
 53.4949 -  # Handling of the options.
 53.4950 -  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 53.4951 -    ac_cs_recheck=: ;;
 53.4952 -  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 53.4953 -    echo "$ac_cs_version"; exit ;;
 53.4954 -  --debug | --debu | --deb | --de | --d | -d )
 53.4955 -    debug=: ;;
 53.4956 -  --file | --fil | --fi | --f )
 53.4957 -    $ac_shift
 53.4958 -    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
 53.4959 -    ac_need_defaults=false;;
 53.4960 -  --he | --h |  --help | --hel | -h )
 53.4961 -    echo "$ac_cs_usage"; exit ;;
 53.4962 -  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 53.4963 -  | -silent | --silent | --silen | --sile | --sil | --si | --s)
 53.4964 -    ac_cs_silent=: ;;
 53.4965 -
 53.4966 -  # This is an error.
 53.4967 -  -*) { echo "$as_me: error: unrecognized option: $1
 53.4968 -Try \`$0 --help' for more information." >&2
 53.4969 -   { (exit 1); exit 1; }; } ;;
 53.4970 -
 53.4971 -  *) ac_config_targets="$ac_config_targets $1"
 53.4972 -     ac_need_defaults=false ;;
 53.4973 -
 53.4974 -  esac
 53.4975 -  shift
 53.4976 -done
 53.4977 -
 53.4978 -ac_configure_extra_args=
 53.4979 -
 53.4980 -if $ac_cs_silent; then
 53.4981 -  exec 6>/dev/null
 53.4982 -  ac_configure_extra_args="$ac_configure_extra_args --silent"
 53.4983 -fi
 53.4984 -
 53.4985 -_ACEOF
 53.4986 -cat >>$CONFIG_STATUS <<_ACEOF
 53.4987 -if \$ac_cs_recheck; then
 53.4988 -  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
 53.4989 -  CONFIG_SHELL=$SHELL
 53.4990 -  export CONFIG_SHELL
 53.4991 -  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 53.4992 -fi
 53.4993 -
 53.4994 -_ACEOF
 53.4995 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.4996 -exec 5>>config.log
 53.4997 +
 53.4998 +# as_fn_mkdir_p
 53.4999 +# -------------
 53.5000 +# Create "$as_dir" as a directory, including parents if necessary.
 53.5001 +as_fn_mkdir_p ()
 53.5002  {
 53.5003 -  echo
 53.5004 -  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 53.5005 -## Running $as_me. ##
 53.5006 -_ASBOX
 53.5007 -  echo "$ac_log"
 53.5008 -} >&5
 53.5009 -
 53.5010 -_ACEOF
 53.5011 -cat >>$CONFIG_STATUS <<_ACEOF
 53.5012 -_ACEOF
 53.5013 -
 53.5014 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.5015 -
 53.5016 -# Handling of arguments.
 53.5017 -for ac_config_target in $ac_config_targets
 53.5018 -do
 53.5019 -  case $ac_config_target in
 53.5020 -    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 53.5021 -
 53.5022 -  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 53.5023 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 53.5024 -   { (exit 1); exit 1; }; };;
 53.5025 -  esac
 53.5026 -done
 53.5027 -
 53.5028 -
 53.5029 -# If the user did not use the arguments to specify the items to instantiate,
 53.5030 -# then the envvar interface is used.  Set only those that are not.
 53.5031 -# We use the long form for the default assignment because of an extremely
 53.5032 -# bizarre bug on SunOS 4.1.3.
 53.5033 -if $ac_need_defaults; then
 53.5034 -  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
 53.5035 -fi
 53.5036 -
 53.5037 -# Have a temporary directory for convenience.  Make it in the build tree
 53.5038 -# simply because there is no reason against having it here, and in addition,
 53.5039 -# creating and moving files from /tmp can sometimes cause problems.
 53.5040 -# Hook for its removal unless debugging.
 53.5041 -# Note that there is a small window in which the directory will not be cleaned:
 53.5042 -# after its creation but before its name has been assigned to `$tmp'.
 53.5043 -$debug ||
 53.5044 -{
 53.5045 -  tmp=
 53.5046 -  trap 'exit_status=$?
 53.5047 -  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 53.5048 -' 0
 53.5049 -  trap '{ (exit 1); exit 1; }' 1 2 13 15
 53.5050 -}
 53.5051 -# Create a (secure) tmp directory for tmp files.
 53.5052 -
 53.5053 -{
 53.5054 -  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
 53.5055 -  test -n "$tmp" && test -d "$tmp"
 53.5056 -}  ||
 53.5057 -{
 53.5058 -  tmp=./conf$$-$RANDOM
 53.5059 -  (umask 077 && mkdir "$tmp")
 53.5060 -} ||
 53.5061 -{
 53.5062 -   echo "$me: cannot create a temporary directory in ." >&2
 53.5063 -   { (exit 1); exit 1; }
 53.5064 -}
 53.5065 -
 53.5066 -#
 53.5067 -# Set up the sed scripts for CONFIG_FILES section.
 53.5068 -#
 53.5069 -
 53.5070 -# No need to generate the scripts if there are no CONFIG_FILES.
 53.5071 -# This happens for instance when ./config.status config.h
 53.5072 -if test -n "$CONFIG_FILES"; then
 53.5073 -
 53.5074 -_ACEOF
 53.5075 -
 53.5076 -
 53.5077 -
 53.5078 -ac_delim='%!_!# '
 53.5079 -for ac_last_try in false false false false false :; do
 53.5080 -  cat >conf$$subs.sed <<_ACEOF
 53.5081 -SHELL!$SHELL$ac_delim
 53.5082 -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
 53.5083 -PACKAGE_NAME!$PACKAGE_NAME$ac_delim
 53.5084 -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
 53.5085 -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
 53.5086 -PACKAGE_STRING!$PACKAGE_STRING$ac_delim
 53.5087 -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
 53.5088 -exec_prefix!$exec_prefix$ac_delim
 53.5089 -prefix!$prefix$ac_delim
 53.5090 -program_transform_name!$program_transform_name$ac_delim
 53.5091 -bindir!$bindir$ac_delim
 53.5092 -sbindir!$sbindir$ac_delim
 53.5093 -libexecdir!$libexecdir$ac_delim
 53.5094 -datarootdir!$datarootdir$ac_delim
 53.5095 -datadir!$datadir$ac_delim
 53.5096 -sysconfdir!$sysconfdir$ac_delim
 53.5097 -sharedstatedir!$sharedstatedir$ac_delim
 53.5098 -localstatedir!$localstatedir$ac_delim
 53.5099 -includedir!$includedir$ac_delim
 53.5100 -oldincludedir!$oldincludedir$ac_delim
 53.5101 -docdir!$docdir$ac_delim
 53.5102 -infodir!$infodir$ac_delim
 53.5103 -htmldir!$htmldir$ac_delim
 53.5104 -dvidir!$dvidir$ac_delim
 53.5105 -pdfdir!$pdfdir$ac_delim
 53.5106 -psdir!$psdir$ac_delim
 53.5107 -libdir!$libdir$ac_delim
 53.5108 -localedir!$localedir$ac_delim
 53.5109 -mandir!$mandir$ac_delim
 53.5110 -DEFS!$DEFS$ac_delim
 53.5111 -ECHO_C!$ECHO_C$ac_delim
 53.5112 -ECHO_N!$ECHO_N$ac_delim
 53.5113 -ECHO_T!$ECHO_T$ac_delim
 53.5114 -LIBS!$LIBS$ac_delim
 53.5115 -build_alias!$build_alias$ac_delim
 53.5116 -host_alias!$host_alias$ac_delim
 53.5117 -target_alias!$target_alias$ac_delim
 53.5118 -build!$build$ac_delim
 53.5119 -build_cpu!$build_cpu$ac_delim
 53.5120 -build_vendor!$build_vendor$ac_delim
 53.5121 -build_os!$build_os$ac_delim
 53.5122 -host!$host$ac_delim
 53.5123 -host_cpu!$host_cpu$ac_delim
 53.5124 -host_vendor!$host_vendor$ac_delim
 53.5125 -host_os!$host_os$ac_delim
 53.5126 -CC!$CC$ac_delim
 53.5127 -CFLAGS!$CFLAGS$ac_delim
 53.5128 -LDFLAGS!$LDFLAGS$ac_delim
 53.5129 -CPPFLAGS!$CPPFLAGS$ac_delim
 53.5130 -ac_ct_CC!$ac_ct_CC$ac_delim
 53.5131 -EXEEXT!$EXEEXT$ac_delim
 53.5132 -OBJEXT!$OBJEXT$ac_delim
 53.5133 -OSMESA_CONFIG!$OSMESA_CONFIG$ac_delim
 53.5134 -EXE!$EXE$ac_delim
 53.5135 -MATHLIB!$MATHLIB$ac_delim
 53.5136 -PKG_CONFIG!$PKG_CONFIG$ac_delim
 53.5137 -PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim
 53.5138 -PKG_CONFIG_LIBDIR!$PKG_CONFIG_LIBDIR$ac_delim
 53.5139 -SDL_CFLAGS!$SDL_CFLAGS$ac_delim
 53.5140 -SDL_LIBS!$SDL_LIBS$ac_delim
 53.5141 -SDL_CONFIG!$SDL_CONFIG$ac_delim
 53.5142 -XMKMF!$XMKMF$ac_delim
 53.5143 -CPP!$CPP$ac_delim
 53.5144 -GLLIB!$GLLIB$ac_delim
 53.5145 -SDL_TTF_LIB!$SDL_TTF_LIB$ac_delim
 53.5146 -LIBOBJS!$LIBOBJS$ac_delim
 53.5147 -LTLIBOBJS!$LTLIBOBJS$ac_delim
 53.5148 -_ACEOF
 53.5149 -
 53.5150 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
 53.5151 -    break
 53.5152 -  elif $ac_last_try; then
 53.5153 -    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 53.5154 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 53.5155 -   { (exit 1); exit 1; }; }
 53.5156 -  else
 53.5157 -    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 53.5158 -  fi
 53.5159 -done
 53.5160 -
 53.5161 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 53.5162 -if test -n "$ac_eof"; then
 53.5163 -  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
 53.5164 -  ac_eof=`expr $ac_eof + 1`
 53.5165 -fi
 53.5166 -
 53.5167 -cat >>$CONFIG_STATUS <<_ACEOF
 53.5168 -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
 53.5169 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
 53.5170 -_ACEOF
 53.5171 -sed '
 53.5172 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 53.5173 -s/^/s,@/; s/!/@,|#_!!_#|/
 53.5174 -:n
 53.5175 -t n
 53.5176 -s/'"$ac_delim"'$/,g/; t
 53.5177 -s/$/\\/; p
 53.5178 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
 53.5179 -' >>$CONFIG_STATUS <conf$$subs.sed
 53.5180 -rm -f conf$$subs.sed
 53.5181 -cat >>$CONFIG_STATUS <<_ACEOF
 53.5182 -:end
 53.5183 -s/|#_!!_#|//g
 53.5184 -CEOF$ac_eof
 53.5185 -_ACEOF
 53.5186 -
 53.5187 -
 53.5188 -# VPATH may cause trouble with some makes, so we remove $(srcdir),
 53.5189 -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 53.5190 -# trailing colons and then remove the whole line if VPATH becomes empty
 53.5191 -# (actually we leave an empty line to preserve line numbers).
 53.5192 -if test "x$srcdir" = x.; then
 53.5193 -  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
 53.5194 -s/:*\$(srcdir):*/:/
 53.5195 -s/:*\${srcdir}:*/:/
 53.5196 -s/:*@srcdir@:*/:/
 53.5197 -s/^\([^=]*=[	 ]*\):*/\1/
 53.5198 -s/:*$//
 53.5199 -s/^[^=]*=[	 ]*$//
 53.5200 -}'
 53.5201 -fi
 53.5202 -
 53.5203 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.5204 -fi # test -n "$CONFIG_FILES"
 53.5205 -
 53.5206 -
 53.5207 -for ac_tag in  :F $CONFIG_FILES
 53.5208 -do
 53.5209 -  case $ac_tag in
 53.5210 -  :[FHLC]) ac_mode=$ac_tag; continue;;
 53.5211 -  esac
 53.5212 -  case $ac_mode$ac_tag in
 53.5213 -  :[FHL]*:*);;
 53.5214 -  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
 53.5215 -echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 53.5216 -   { (exit 1); exit 1; }; };;
 53.5217 -  :[FH]-) ac_tag=-:-;;
 53.5218 -  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
 53.5219 -  esac
 53.5220 -  ac_save_IFS=$IFS
 53.5221 -  IFS=:
 53.5222 -  set x $ac_tag
 53.5223 -  IFS=$ac_save_IFS
 53.5224 -  shift
 53.5225 -  ac_file=$1
 53.5226 -  shift
 53.5227 -
 53.5228 -  case $ac_mode in
 53.5229 -  :L) ac_source=$1;;
 53.5230 -  :[FH])
 53.5231 -    ac_file_inputs=
 53.5232 -    for ac_f
 53.5233 -    do
 53.5234 -      case $ac_f in
 53.5235 -      -) ac_f="$tmp/stdin";;
 53.5236 -      *) # Look for the file first in the build tree, then in the source tree
 53.5237 -	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 53.5238 -	 # because $ac_f cannot contain `:'.
 53.5239 -	 test -f "$ac_f" ||
 53.5240 -	   case $ac_f in
 53.5241 -	   [\\/$]*) false;;
 53.5242 -	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 53.5243 -	   esac ||
 53.5244 -	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
 53.5245 -echo "$as_me: error: cannot find input file: $ac_f" >&2;}
 53.5246 -   { (exit 1); exit 1; }; };;
 53.5247 -      esac
 53.5248 -      ac_file_inputs="$ac_file_inputs $ac_f"
 53.5249 -    done
 53.5250 -
 53.5251 -    # Let's still pretend it is `configure' which instantiates (i.e., don't
 53.5252 -    # use $as_me), people would be surprised to read:
 53.5253 -    #    /* config.h.  Generated by config.status.  */
 53.5254 -    configure_input="Generated from "`IFS=:
 53.5255 -	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
 53.5256 -    if test x"$ac_file" != x-; then
 53.5257 -      configure_input="$ac_file.  $configure_input"
 53.5258 -      { echo "$as_me:$LINENO: creating $ac_file" >&5
 53.5259 -echo "$as_me: creating $ac_file" >&6;}
 53.5260 -    fi
 53.5261 -
 53.5262 -    case $ac_tag in
 53.5263 -    *:-:* | *:-) cat >"$tmp/stdin";;
 53.5264 -    esac
 53.5265 -    ;;
 53.5266 -  esac
 53.5267 -
 53.5268 -  ac_dir=`$as_dirname -- "$ac_file" ||
 53.5269 -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 53.5270 -	 X"$ac_file" : 'X\(//\)[^/]' \| \
 53.5271 -	 X"$ac_file" : 'X\(//\)$' \| \
 53.5272 -	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 53.5273 -echo X"$ac_file" |
 53.5274 -    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 53.5275 -	    s//\1/
 53.5276 -	    q
 53.5277 -	  }
 53.5278 -	  /^X\(\/\/\)[^/].*/{
 53.5279 -	    s//\1/
 53.5280 -	    q
 53.5281 -	  }
 53.5282 -	  /^X\(\/\/\)$/{
 53.5283 -	    s//\1/
 53.5284 -	    q
 53.5285 -	  }
 53.5286 -	  /^X\(\/\).*/{
 53.5287 -	    s//\1/
 53.5288 -	    q
 53.5289 -	  }
 53.5290 -	  s/.*/./; q'`
 53.5291 -  { as_dir="$ac_dir"
 53.5292 +
 53.5293    case $as_dir in #(
 53.5294    -*) as_dir=./$as_dir;;
 53.5295    esac
 53.5296 -  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
 53.5297 +  test -d "$as_dir" || eval $as_mkdir_p || {
 53.5298      as_dirs=
 53.5299      while :; do
 53.5300        case $as_dir in #(
 53.5301 -      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
 53.5302 +      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 53.5303        *) as_qdir=$as_dir;;
 53.5304        esac
 53.5305        as_dirs="'$as_qdir' $as_dirs"
 53.5306 @@ -4962,7 +4362,7 @@
 53.5307  	 X"$as_dir" : 'X\(//\)[^/]' \| \
 53.5308  	 X"$as_dir" : 'X\(//\)$' \| \
 53.5309  	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 53.5310 -echo X"$as_dir" |
 53.5311 +$as_echo X"$as_dir" |
 53.5312      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 53.5313  	    s//\1/
 53.5314  	    q
 53.5315 @@ -4983,17 +4383,524 @@
 53.5316        test -d "$as_dir" && break
 53.5317      done
 53.5318      test -z "$as_dirs" || eval "mkdir $as_dirs"
 53.5319 -  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
 53.5320 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
 53.5321 -   { (exit 1); exit 1; }; }; }
 53.5322 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 53.5323 +
 53.5324 +
 53.5325 +} # as_fn_mkdir_p
 53.5326 +if mkdir -p . 2>/dev/null; then
 53.5327 +  as_mkdir_p='mkdir -p "$as_dir"'
 53.5328 +else
 53.5329 +  test -d ./-p && rmdir ./-p
 53.5330 +  as_mkdir_p=false
 53.5331 +fi
 53.5332 +
 53.5333 +if test -x / >/dev/null 2>&1; then
 53.5334 +  as_test_x='test -x'
 53.5335 +else
 53.5336 +  if ls -dL / >/dev/null 2>&1; then
 53.5337 +    as_ls_L_option=L
 53.5338 +  else
 53.5339 +    as_ls_L_option=
 53.5340 +  fi
 53.5341 +  as_test_x='
 53.5342 +    eval sh -c '\''
 53.5343 +      if test -d "$1"; then
 53.5344 +	test -d "$1/.";
 53.5345 +      else
 53.5346 +	case $1 in #(
 53.5347 +	-*)set "./$1";;
 53.5348 +	esac;
 53.5349 +	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 53.5350 +	???[sx]*):;;*)false;;esac;fi
 53.5351 +    '\'' sh
 53.5352 +  '
 53.5353 +fi
 53.5354 +as_executable_p=$as_test_x
 53.5355 +
 53.5356 +# Sed expression to map a string onto a valid CPP name.
 53.5357 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 53.5358 +
 53.5359 +# Sed expression to map a string onto a valid variable name.
 53.5360 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 53.5361 +
 53.5362 +
 53.5363 +exec 6>&1
 53.5364 +## ----------------------------------- ##
 53.5365 +## Main body of $CONFIG_STATUS script. ##
 53.5366 +## ----------------------------------- ##
 53.5367 +_ASEOF
 53.5368 +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 53.5369 +
 53.5370 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5371 +# Save the log message, to keep $0 and so on meaningful, and to
 53.5372 +# report actual input values of CONFIG_FILES etc. instead of their
 53.5373 +# values after options handling.
 53.5374 +ac_log="
 53.5375 +This file was extended by $as_me, which was
 53.5376 +generated by GNU Autoconf 2.68.  Invocation command line was
 53.5377 +
 53.5378 +  CONFIG_FILES    = $CONFIG_FILES
 53.5379 +  CONFIG_HEADERS  = $CONFIG_HEADERS
 53.5380 +  CONFIG_LINKS    = $CONFIG_LINKS
 53.5381 +  CONFIG_COMMANDS = $CONFIG_COMMANDS
 53.5382 +  $ $0 $@
 53.5383 +
 53.5384 +on `(hostname || uname -n) 2>/dev/null | sed 1q`
 53.5385 +"
 53.5386 +
 53.5387 +_ACEOF
 53.5388 +
 53.5389 +case $ac_config_files in *"
 53.5390 +"*) set x $ac_config_files; shift; ac_config_files=$*;;
 53.5391 +esac
 53.5392 +
 53.5393 +
 53.5394 +
 53.5395 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5396 +# Files that config.status was made for.
 53.5397 +config_files="$ac_config_files"
 53.5398 +
 53.5399 +_ACEOF
 53.5400 +
 53.5401 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5402 +ac_cs_usage="\
 53.5403 +\`$as_me' instantiates files and other configuration actions
 53.5404 +from templates according to the current configuration.  Unless the files
 53.5405 +and actions are specified as TAGs, all are instantiated by default.
 53.5406 +
 53.5407 +Usage: $0 [OPTION]... [TAG]...
 53.5408 +
 53.5409 +  -h, --help       print this help, then exit
 53.5410 +  -V, --version    print version number and configuration settings, then exit
 53.5411 +      --config     print configuration, then exit
 53.5412 +  -q, --quiet, --silent
 53.5413 +                   do not print progress messages
 53.5414 +  -d, --debug      don't remove temporary files
 53.5415 +      --recheck    update $as_me by reconfiguring in the same conditions
 53.5416 +      --file=FILE[:TEMPLATE]
 53.5417 +                   instantiate the configuration file FILE
 53.5418 +
 53.5419 +Configuration files:
 53.5420 +$config_files
 53.5421 +
 53.5422 +Report bugs to the package provider."
 53.5423 +
 53.5424 +_ACEOF
 53.5425 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5426 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 53.5427 +ac_cs_version="\\
 53.5428 +config.status
 53.5429 +configured by $0, generated by GNU Autoconf 2.68,
 53.5430 +  with options \\"\$ac_cs_config\\"
 53.5431 +
 53.5432 +Copyright (C) 2010 Free Software Foundation, Inc.
 53.5433 +This config.status script is free software; the Free Software Foundation
 53.5434 +gives unlimited permission to copy, distribute and modify it."
 53.5435 +
 53.5436 +ac_pwd='$ac_pwd'
 53.5437 +srcdir='$srcdir'
 53.5438 +test -n "\$AWK" || AWK=awk
 53.5439 +_ACEOF
 53.5440 +
 53.5441 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5442 +# The default lists apply if the user does not specify any file.
 53.5443 +ac_need_defaults=:
 53.5444 +while test $# != 0
 53.5445 +do
 53.5446 +  case $1 in
 53.5447 +  --*=?*)
 53.5448 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
 53.5449 +    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
 53.5450 +    ac_shift=:
 53.5451 +    ;;
 53.5452 +  --*=)
 53.5453 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
 53.5454 +    ac_optarg=
 53.5455 +    ac_shift=:
 53.5456 +    ;;
 53.5457 +  *)
 53.5458 +    ac_option=$1
 53.5459 +    ac_optarg=$2
 53.5460 +    ac_shift=shift
 53.5461 +    ;;
 53.5462 +  esac
 53.5463 +
 53.5464 +  case $ac_option in
 53.5465 +  # Handling of the options.
 53.5466 +  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 53.5467 +    ac_cs_recheck=: ;;
 53.5468 +  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 53.5469 +    $as_echo "$ac_cs_version"; exit ;;
 53.5470 +  --config | --confi | --conf | --con | --co | --c )
 53.5471 +    $as_echo "$ac_cs_config"; exit ;;
 53.5472 +  --debug | --debu | --deb | --de | --d | -d )
 53.5473 +    debug=: ;;
 53.5474 +  --file | --fil | --fi | --f )
 53.5475 +    $ac_shift
 53.5476 +    case $ac_optarg in
 53.5477 +    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 53.5478 +    '') as_fn_error $? "missing file argument" ;;
 53.5479 +    esac
 53.5480 +    as_fn_append CONFIG_FILES " '$ac_optarg'"
 53.5481 +    ac_need_defaults=false;;
 53.5482 +  --he | --h |  --help | --hel | -h )
 53.5483 +    $as_echo "$ac_cs_usage"; exit ;;
 53.5484 +  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 53.5485 +  | -silent | --silent | --silen | --sile | --sil | --si | --s)
 53.5486 +    ac_cs_silent=: ;;
 53.5487 +
 53.5488 +  # This is an error.
 53.5489 +  -*) as_fn_error $? "unrecognized option: \`$1'
 53.5490 +Try \`$0 --help' for more information." ;;
 53.5491 +
 53.5492 +  *) as_fn_append ac_config_targets " $1"
 53.5493 +     ac_need_defaults=false ;;
 53.5494 +
 53.5495 +  esac
 53.5496 +  shift
 53.5497 +done
 53.5498 +
 53.5499 +ac_configure_extra_args=
 53.5500 +
 53.5501 +if $ac_cs_silent; then
 53.5502 +  exec 6>/dev/null
 53.5503 +  ac_configure_extra_args="$ac_configure_extra_args --silent"
 53.5504 +fi
 53.5505 +
 53.5506 +_ACEOF
 53.5507 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5508 +if \$ac_cs_recheck; then
 53.5509 +  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 53.5510 +  shift
 53.5511 +  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
 53.5512 +  CONFIG_SHELL='$SHELL'
 53.5513 +  export CONFIG_SHELL
 53.5514 +  exec "\$@"
 53.5515 +fi
 53.5516 +
 53.5517 +_ACEOF
 53.5518 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5519 +exec 5>>config.log
 53.5520 +{
 53.5521 +  echo
 53.5522 +  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 53.5523 +## Running $as_me. ##
 53.5524 +_ASBOX
 53.5525 +  $as_echo "$ac_log"
 53.5526 +} >&5
 53.5527 +
 53.5528 +_ACEOF
 53.5529 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5530 +_ACEOF
 53.5531 +
 53.5532 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5533 +
 53.5534 +# Handling of arguments.
 53.5535 +for ac_config_target in $ac_config_targets
 53.5536 +do
 53.5537 +  case $ac_config_target in
 53.5538 +    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 53.5539 +
 53.5540 +  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
 53.5541 +  esac
 53.5542 +done
 53.5543 +
 53.5544 +
 53.5545 +# If the user did not use the arguments to specify the items to instantiate,
 53.5546 +# then the envvar interface is used.  Set only those that are not.
 53.5547 +# We use the long form for the default assignment because of an extremely
 53.5548 +# bizarre bug on SunOS 4.1.3.
 53.5549 +if $ac_need_defaults; then
 53.5550 +  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
 53.5551 +fi
 53.5552 +
 53.5553 +# Have a temporary directory for convenience.  Make it in the build tree
 53.5554 +# simply because there is no reason against having it here, and in addition,
 53.5555 +# creating and moving files from /tmp can sometimes cause problems.
 53.5556 +# Hook for its removal unless debugging.
 53.5557 +# Note that there is a small window in which the directory will not be cleaned:
 53.5558 +# after its creation but before its name has been assigned to `$tmp'.
 53.5559 +$debug ||
 53.5560 +{
 53.5561 +  tmp= ac_tmp=
 53.5562 +  trap 'exit_status=$?
 53.5563 +  : "${ac_tmp:=$tmp}"
 53.5564 +  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 53.5565 +' 0
 53.5566 +  trap 'as_fn_exit 1' 1 2 13 15
 53.5567 +}
 53.5568 +# Create a (secure) tmp directory for tmp files.
 53.5569 +
 53.5570 +{
 53.5571 +  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
 53.5572 +  test -d "$tmp"
 53.5573 +}  ||
 53.5574 +{
 53.5575 +  tmp=./conf$$-$RANDOM
 53.5576 +  (umask 077 && mkdir "$tmp")
 53.5577 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 53.5578 +ac_tmp=$tmp
 53.5579 +
 53.5580 +# Set up the scripts for CONFIG_FILES section.
 53.5581 +# No need to generate them if there are no CONFIG_FILES.
 53.5582 +# This happens for instance with `./config.status config.h'.
 53.5583 +if test -n "$CONFIG_FILES"; then
 53.5584 +
 53.5585 +
 53.5586 +ac_cr=`echo X | tr X '\015'`
 53.5587 +# On cygwin, bash can eat \r inside `` if the user requested igncr.
 53.5588 +# But we know of no other shell where ac_cr would be empty at this
 53.5589 +# point, so we can use a bashism as a fallback.
 53.5590 +if test "x$ac_cr" = x; then
 53.5591 +  eval ac_cr=\$\'\\r\'
 53.5592 +fi
 53.5593 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 53.5594 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
 53.5595 +  ac_cs_awk_cr='\\r'
 53.5596 +else
 53.5597 +  ac_cs_awk_cr=$ac_cr
 53.5598 +fi
 53.5599 +
 53.5600 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 53.5601 +_ACEOF
 53.5602 +
 53.5603 +
 53.5604 +{
 53.5605 +  echo "cat >conf$$subs.awk <<_ACEOF" &&
 53.5606 +  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
 53.5607 +  echo "_ACEOF"
 53.5608 +} >conf$$subs.sh ||
 53.5609 +  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 53.5610 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 53.5611 +ac_delim='%!_!# '
 53.5612 +for ac_last_try in false false false false false :; do
 53.5613 +  . ./conf$$subs.sh ||
 53.5614 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 53.5615 +
 53.5616 +  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
 53.5617 +  if test $ac_delim_n = $ac_delim_num; then
 53.5618 +    break
 53.5619 +  elif $ac_last_try; then
 53.5620 +    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 53.5621 +  else
 53.5622 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 53.5623 +  fi
 53.5624 +done
 53.5625 +rm -f conf$$subs.sh
 53.5626 +
 53.5627 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5628 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 53.5629 +_ACEOF
 53.5630 +sed -n '
 53.5631 +h
 53.5632 +s/^/S["/; s/!.*/"]=/
 53.5633 +p
 53.5634 +g
 53.5635 +s/^[^!]*!//
 53.5636 +:repl
 53.5637 +t repl
 53.5638 +s/'"$ac_delim"'$//
 53.5639 +t delim
 53.5640 +:nl
 53.5641 +h
 53.5642 +s/\(.\{148\}\)..*/\1/
 53.5643 +t more1
 53.5644 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 53.5645 +p
 53.5646 +n
 53.5647 +b repl
 53.5648 +:more1
 53.5649 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 53.5650 +p
 53.5651 +g
 53.5652 +s/.\{148\}//
 53.5653 +t nl
 53.5654 +:delim
 53.5655 +h
 53.5656 +s/\(.\{148\}\)..*/\1/
 53.5657 +t more2
 53.5658 +s/["\\]/\\&/g; s/^/"/; s/$/"/
 53.5659 +p
 53.5660 +b
 53.5661 +:more2
 53.5662 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 53.5663 +p
 53.5664 +g
 53.5665 +s/.\{148\}//
 53.5666 +t delim
 53.5667 +' <conf$$subs.awk | sed '
 53.5668 +/^[^""]/{
 53.5669 +  N
 53.5670 +  s/\n//
 53.5671 +}
 53.5672 +' >>$CONFIG_STATUS || ac_write_fail=1
 53.5673 +rm -f conf$$subs.awk
 53.5674 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5675 +_ACAWK
 53.5676 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
 53.5677 +  for (key in S) S_is_set[key] = 1
 53.5678 +  FS = ""
 53.5679 +
 53.5680 +}
 53.5681 +{
 53.5682 +  line = $ 0
 53.5683 +  nfields = split(line, field, "@")
 53.5684 +  substed = 0
 53.5685 +  len = length(field[1])
 53.5686 +  for (i = 2; i < nfields; i++) {
 53.5687 +    key = field[i]
 53.5688 +    keylen = length(key)
 53.5689 +    if (S_is_set[key]) {
 53.5690 +      value = S[key]
 53.5691 +      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
 53.5692 +      len += length(value) + length(field[++i])
 53.5693 +      substed = 1
 53.5694 +    } else
 53.5695 +      len += 1 + keylen
 53.5696 +  }
 53.5697 +
 53.5698 +  print line
 53.5699 +}
 53.5700 +
 53.5701 +_ACAWK
 53.5702 +_ACEOF
 53.5703 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5704 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 53.5705 +  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 53.5706 +else
 53.5707 +  cat
 53.5708 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
 53.5709 +  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 53.5710 +_ACEOF
 53.5711 +
 53.5712 +# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
 53.5713 +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 53.5714 +# trailing colons and then remove the whole line if VPATH becomes empty
 53.5715 +# (actually we leave an empty line to preserve line numbers).
 53.5716 +if test "x$srcdir" = x.; then
 53.5717 +  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
 53.5718 +h
 53.5719 +s///
 53.5720 +s/^/:/
 53.5721 +s/[	 ]*$/:/
 53.5722 +s/:\$(srcdir):/:/g
 53.5723 +s/:\${srcdir}:/:/g
 53.5724 +s/:@srcdir@:/:/g
 53.5725 +s/^:*//
 53.5726 +s/:*$//
 53.5727 +x
 53.5728 +s/\(=[	 ]*\).*/\1/
 53.5729 +G
 53.5730 +s/\n//
 53.5731 +s/^[^=]*=[	 ]*$//
 53.5732 +}'
 53.5733 +fi
 53.5734 +
 53.5735 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5736 +fi # test -n "$CONFIG_FILES"
 53.5737 +
 53.5738 +
 53.5739 +eval set X "  :F $CONFIG_FILES      "
 53.5740 +shift
 53.5741 +for ac_tag
 53.5742 +do
 53.5743 +  case $ac_tag in
 53.5744 +  :[FHLC]) ac_mode=$ac_tag; continue;;
 53.5745 +  esac
 53.5746 +  case $ac_mode$ac_tag in
 53.5747 +  :[FHL]*:*);;
 53.5748 +  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
 53.5749 +  :[FH]-) ac_tag=-:-;;
 53.5750 +  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
 53.5751 +  esac
 53.5752 +  ac_save_IFS=$IFS
 53.5753 +  IFS=:
 53.5754 +  set x $ac_tag
 53.5755 +  IFS=$ac_save_IFS
 53.5756 +  shift
 53.5757 +  ac_file=$1
 53.5758 +  shift
 53.5759 +
 53.5760 +  case $ac_mode in
 53.5761 +  :L) ac_source=$1;;
 53.5762 +  :[FH])
 53.5763 +    ac_file_inputs=
 53.5764 +    for ac_f
 53.5765 +    do
 53.5766 +      case $ac_f in
 53.5767 +      -) ac_f="$ac_tmp/stdin";;
 53.5768 +      *) # Look for the file first in the build tree, then in the source tree
 53.5769 +	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 53.5770 +	 # because $ac_f cannot contain `:'.
 53.5771 +	 test -f "$ac_f" ||
 53.5772 +	   case $ac_f in
 53.5773 +	   [\\/$]*) false;;
 53.5774 +	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 53.5775 +	   esac ||
 53.5776 +	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
 53.5777 +      esac
 53.5778 +      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 53.5779 +      as_fn_append ac_file_inputs " '$ac_f'"
 53.5780 +    done
 53.5781 +
 53.5782 +    # Let's still pretend it is `configure' which instantiates (i.e., don't
 53.5783 +    # use $as_me), people would be surprised to read:
 53.5784 +    #    /* config.h.  Generated by config.status.  */
 53.5785 +    configure_input='Generated from '`
 53.5786 +	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 53.5787 +	`' by configure.'
 53.5788 +    if test x"$ac_file" != x-; then
 53.5789 +      configure_input="$ac_file.  $configure_input"
 53.5790 +      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 53.5791 +$as_echo "$as_me: creating $ac_file" >&6;}
 53.5792 +    fi
 53.5793 +    # Neutralize special characters interpreted by sed in replacement strings.
 53.5794 +    case $configure_input in #(
 53.5795 +    *\&* | *\|* | *\\* )
 53.5796 +       ac_sed_conf_input=`$as_echo "$configure_input" |
 53.5797 +       sed 's/[\\\\&|]/\\\\&/g'`;; #(
 53.5798 +    *) ac_sed_conf_input=$configure_input;;
 53.5799 +    esac
 53.5800 +
 53.5801 +    case $ac_tag in
 53.5802 +    *:-:* | *:-) cat >"$ac_tmp/stdin" \
 53.5803 +      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
 53.5804 +    esac
 53.5805 +    ;;
 53.5806 +  esac
 53.5807 +
 53.5808 +  ac_dir=`$as_dirname -- "$ac_file" ||
 53.5809 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 53.5810 +	 X"$ac_file" : 'X\(//\)[^/]' \| \
 53.5811 +	 X"$ac_file" : 'X\(//\)$' \| \
 53.5812 +	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 53.5813 +$as_echo X"$ac_file" |
 53.5814 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 53.5815 +	    s//\1/
 53.5816 +	    q
 53.5817 +	  }
 53.5818 +	  /^X\(\/\/\)[^/].*/{
 53.5819 +	    s//\1/
 53.5820 +	    q
 53.5821 +	  }
 53.5822 +	  /^X\(\/\/\)$/{
 53.5823 +	    s//\1/
 53.5824 +	    q
 53.5825 +	  }
 53.5826 +	  /^X\(\/\).*/{
 53.5827 +	    s//\1/
 53.5828 +	    q
 53.5829 +	  }
 53.5830 +	  s/.*/./; q'`
 53.5831 +  as_dir="$ac_dir"; as_fn_mkdir_p
 53.5832    ac_builddir=.
 53.5833  
 53.5834  case "$ac_dir" in
 53.5835  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 53.5836  *)
 53.5837 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
 53.5838 +  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 53.5839    # A ".." for each directory in $ac_dir_suffix.
 53.5840 -  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
 53.5841 +  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 53.5842    case $ac_top_builddir_sub in
 53.5843    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 53.5844    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
 53.5845 @@ -5029,12 +4936,12 @@
 53.5846  
 53.5847  _ACEOF
 53.5848  
 53.5849 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.5850 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5851  # If the template does not know about datarootdir, expand it.
 53.5852  # FIXME: This hack should be removed a few years after 2.60.
 53.5853  ac_datarootdir_hack=; ac_datarootdir_seen=
 53.5854 -
 53.5855 -case `sed -n '/datarootdir/ {
 53.5856 +ac_sed_dataroot='
 53.5857 +/datarootdir/ {
 53.5858    p
 53.5859    q
 53.5860  }
 53.5861 @@ -5042,36 +4949,37 @@
 53.5862  /@docdir@/p
 53.5863  /@infodir@/p
 53.5864  /@localedir@/p
 53.5865 -/@mandir@/p
 53.5866 -' $ac_file_inputs` in
 53.5867 +/@mandir@/p'
 53.5868 +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 53.5869  *datarootdir*) ac_datarootdir_seen=yes;;
 53.5870  *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
 53.5871 -  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 53.5872 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 53.5873 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 53.5874 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 53.5875  _ACEOF
 53.5876 -cat >>$CONFIG_STATUS <<_ACEOF
 53.5877 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5878    ac_datarootdir_hack='
 53.5879    s&@datadir@&$datadir&g
 53.5880    s&@docdir@&$docdir&g
 53.5881    s&@infodir@&$infodir&g
 53.5882    s&@localedir@&$localedir&g
 53.5883    s&@mandir@&$mandir&g
 53.5884 -    s&\\\${datarootdir}&$datarootdir&g' ;;
 53.5885 +  s&\\\${datarootdir}&$datarootdir&g' ;;
 53.5886  esac
 53.5887  _ACEOF
 53.5888  
 53.5889  # Neutralize VPATH when `$srcdir' = `.'.
 53.5890  # Shell code in configure.ac might set extrasub.
 53.5891  # FIXME: do we really want to maintain this feature?
 53.5892 -cat >>$CONFIG_STATUS <<_ACEOF
 53.5893 -  sed "$ac_vpsub
 53.5894 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 53.5895 +ac_sed_extra="$ac_vpsub
 53.5896  $extrasub
 53.5897  _ACEOF
 53.5898 -cat >>$CONFIG_STATUS <<\_ACEOF
 53.5899 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 53.5900  :t
 53.5901  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 53.5902 -s&@configure_input@&$configure_input&;t t
 53.5903 +s|@configure_input@|$ac_sed_conf_input|;t t
 53.5904  s&@top_builddir@&$ac_top_builddir_sub&;t t
 53.5905 +s&@top_build_prefix@&$ac_top_build_prefix&;t t
 53.5906  s&@srcdir@&$ac_srcdir&;t t
 53.5907  s&@abs_srcdir@&$ac_abs_srcdir&;t t
 53.5908  s&@top_srcdir@&$ac_top_srcdir&;t t
 53.5909 @@ -5080,35 +4988,41 @@
 53.5910  s&@abs_builddir@&$ac_abs_builddir&;t t
 53.5911  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 53.5912  $ac_datarootdir_hack
 53.5913 -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
 53.5914 +"
 53.5915 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
 53.5916 +  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 53.5917  
 53.5918  test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 53.5919 -  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
 53.5920 -  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
 53.5921 -  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 53.5922 -which seems to be undefined.  Please make sure it is defined." >&5
 53.5923 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 53.5924 -which seems to be undefined.  Please make sure it is defined." >&2;}
 53.5925 -
 53.5926 -  rm -f "$tmp/stdin"
 53.5927 +  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
 53.5928 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
 53.5929 +      "$ac_tmp/out"`; test -z "$ac_out"; } &&
 53.5930 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 53.5931 +which seems to be undefined.  Please make sure it is defined" >&5
 53.5932 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 53.5933 +which seems to be undefined.  Please make sure it is defined" >&2;}