merged with the latest, official, SDL 2 sources
authorDavidLudwig
Mon, 15 Oct 2012 21:14:13 -0400
changeset 831424f2de48557b
parent 8313 14f5f5fdcc75
parent 6589 46d985073364
child 8315 76c317e41b53
merged with the latest, official, SDL 2 sources
README.iOS
Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj
acinclude/ltdl.m4
src/thread/windows/win_ce_semaphore.c
src/thread/windows/win_ce_semaphore.h
src/timer/wince/SDL_systimer.c
src/video/uikit/SDL_uikitevents.m
src/video/uikit/SDL_uikitopengles.m
src/video/uikit/SDL_uikitview.m
src/video/uikit/SDL_uikitwindow.m
     1.1 --- a/.hgignore	Sat Sep 01 09:17:34 2012 -0400
     1.2 +++ b/.hgignore	Mon Oct 15 21:14:13 2012 -0400
     1.3 @@ -61,6 +61,8 @@
     1.4  test/testoverlay2
     1.5  test/testplatform
     1.6  test/testpower
     1.7 +test/testrelative
     1.8 +test/testrendercopyex
     1.9  test/testrendertarget
    1.10  test/testresample
    1.11  test/testrumble
     2.1 --- a/Android.mk	Sat Sep 01 09:17:34 2012 -0400
     2.2 +++ b/Android.mk	Mon Oct 15 21:14:13 2012 -0400
     2.3 @@ -30,6 +30,7 @@
     2.4  	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
     2.5  	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
     2.6  	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
     2.7 +	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
     2.8  	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
     2.9  	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
    2.10  	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \
     3.1 --- a/README.WinCE	Sat Sep 01 09:17:34 2012 -0400
     3.2 +++ b/README.WinCE	Mon Oct 15 21:14:13 2012 -0400
     3.3 @@ -1,55 +1,9 @@
     3.4  
     3.5 -Project files for embedded Visual C++ 3.0, 4.0 and 
     3.6 -Visual Studio 2005 can be found in VisualCE.zip
     3.7 -
     3.8 -SDL supports GAPI and WinDib output for Windows CE.
     3.9 -
    3.10 -GAPI driver supports:
    3.11 -
    3.12 -- all possible WinCE devices (Pocket PC, Smartphones, HPC)
    3.13 -  with different orientations of video memory and resolutions.
    3.14 -- 4, 8 and 16 bpp devices
    3.15 -- special handling of 8bpp on 8bpp devices
    3.16 -- VGA mode, you can even switch between VGA and GAPI in runtime
    3.17 -  (between 240x320 and 480x640 for example). On VGA devices you can
    3.18 -  use either GAPI or VGA.
    3.19 -- Landscape mode and automatic rotation of buttons and stylus coordinates.
    3.20 -  To enable landscape mode make width of video screen bigger than height.
    3.21 -  For example: 
    3.22 -    SDL_SetVideoMode(320,240,16,SDL_FULLSCREEN)
    3.23 -- WM2005
    3.24 -- SDL_ListModes
    3.25 -
    3.26 -NOTE:
    3.27 -There are several SDL features not available in the WinCE port of SDL.
    3.28 +Windows CE is no longer supported by SDL.
    3.29  
    3.30 -- DirectX is not yet available
    3.31 -- Semaphores are not available
    3.32 -- Joystick support is not available
    3.33 -- CD-ROM control is not available
    3.34 -
    3.35 -In addition, there are several features that run in "degraded" mode:
    3.36 -
    3.37 -Preprocessor Symbol		Effect
    3.38 -===================		=================================
    3.39 -
    3.40 -SDL_systimer.c:
    3.41 -USE_GETTICKCOUNT		Less accurate values for SDL time functions
    3.42 -USE_SETTIMER			Use only a single marginally accurate timer
    3.43 +We have left the CE support in SDL 1.2 for those that must have it, and we
    3.44 +will accept patches that support more modern Windows Mobile platforms for
    3.45 +SDL 2.0.
    3.46  
    3.47 -SDL_syswm.c:
    3.48 -DISABLE_ICON_SUPPORT		Can't set the runtime window icon
    3.49 -
    3.50 -SDL_sysmouse.c:
    3.51 -USE_STATIC_CURSOR		Only the arrow cursor is available
    3.52 +--ryan.
    3.53  
    3.54 -SDL_sysevents.c:
    3.55 -NO_GETKEYBOARDSTATE		Can't get modifier state on keyboard focus
    3.56 -
    3.57 -SDL_dibevents.c:
    3.58 -NO_GETKEYBOARDSTATE		Very limited keycode translation
    3.59 -
    3.60 -SDL_dibvideo.c:
    3.61 -NO_GETDIBITS			Can't distinguish between 15 bpp and 16 bpp
    3.62 -NO_CHANGEDISPLAYSETTINGS	No fullscreen support
    3.63 -NO_GAMMA_SUPPORT		Gamma correction not available
     4.1 --- a/README.iOS	Sat Sep 01 09:17:34 2012 -0400
     4.2 +++ b/README.iOS	Mon Oct 15 21:14:13 2012 -0400
     4.3 @@ -115,17 +115,48 @@
     4.4  ==============================================================================
     4.5  
     4.6  Windows:
     4.7 -	Full-size, single window applications only.  You cannot create multi-window SDL applications for iPhone OS.  The application window will fill the display, though you have the option of turning on or off the menu-bar (pass SDL_CreateWindow the flag SDL_WINDOW_BORDERLESS).  Presently, landscape mode is not supported.
     4.8 -
     4.9 -Video:
    4.10 -	For real time frame-rates, you are advised to use strictly SDL 2.0 video calls.  Using compatibility video calls uploads an OpenGL texture for each frame drawn, and this operation is excruciatingly slow.
    4.11 +	Full-size, single window applications only.  You cannot create multi-window SDL applications for iPhone OS.  The application window will fill the display, though you have the option of turning on or off the menu-bar (pass SDL_CreateWindow the flag SDL_WINDOW_BORDERLESS).
    4.12  
    4.13  Textures:
    4.14 -	SDL for iPhone Textures supports only SDL_PIXELFORMAT_ABGR8888 and SDL_PIXELFORMAT_RGB24 pixel formats.  This is because texture support in SDL for iPhone is done through OpenGL ES, which supports fewer pixel formats than OpenGL, will not re-order pixel data for you, and has no support for color-paletted formats (without extensions).
    4.15 -
    4.16 -Audio:
    4.17 -	SDL for iPhone does not yet support audio input.
    4.18 +	The optimal texture formats on iOS are SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, and SDL_PIXELFORMAT_RGB24 pixel formats.
    4.19  
    4.20  Loading Shared Objects:
    4.21  	This is disabled by default since it seems to break the terms of the iPhone SDK agreement.  It can be re-enabled in SDL_config_iphoneos.h.
    4.22  
    4.23 +==============================================================================
    4.24 +Game Center 
    4.25 +==============================================================================
    4.26 +
    4.27 +Game Center integration requires that you break up your main loop in order to yield control back to the system. In other words, instead of running an endless main loop, you run each frame in a callback function, using:
    4.28 +    
    4.29 +int SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
    4.30 +
    4.31 +This will set up the given function to be called back on the animation callback, and then you have to return from main() to let the Cocoa event loop run.
    4.32 +
    4.33 +e.g.
    4.34 +
    4.35 +extern "C"
    4.36 +void ShowFrame(void*)
    4.37 +{
    4.38 +    ... do event handling, frame logic and rendering
    4.39 +}
    4.40 +
    4.41 +int main(int argc, char *argv[])
    4.42 +{
    4.43 +   ... initialize game ...
    4.44 +
    4.45 +#if __IPHONEOS__
    4.46 +        // Initialize the Game Center for scoring and matchmaking
    4.47 +        InitGameCenter();
    4.48 +
    4.49 +        // Set up the game to run in the window animation callback on iOS
    4.50 +        // so that Game Center and so forth works correctly.
    4.51 +        SDL_iPhoneSetAnimationCallback(window, 1, ShowFrame, NULL);
    4.52 +#else
    4.53 +        while ( running ) {
    4.54 +                ShowFrame(0);
    4.55 +                DelayFrame();
    4.56 +        }
    4.57 +#endif
    4.58 +        return 0;
    4.59 +}
     5.1 --- a/TODO	Sat Sep 01 09:17:34 2012 -0400
     5.2 +++ b/TODO	Mon Oct 15 21:14:13 2012 -0400
     5.3 @@ -6,6 +6,7 @@
     5.4   * Write automated test case for multi-draw APIs
     5.5   * Implement assertion code on iPhone
     5.6   * Add __WINDOWS__ in addition to __WIN32__
     5.7 + * Write test for fullscreen gamma to check X11 colormap handling
     5.8  
     5.9   * Check 1.2 revisions:
    5.10  	3554 - Need to resolve semantics for locking keys on different platforms
    5.11 @@ -14,3 +15,4 @@
    5.12  	4484, 4485 - Verify that SDL's Windows keyboard handling works correctly
    5.13  	4865 - See if this is still needed (mouse coordinate clamping)
    5.14  	4866 - See if this is still needed (blocking window repositioning)
    5.15 +
     6.1 --- a/VisualC/SDL/SDL_VS2008.vcproj	Sat Sep 01 09:17:34 2012 -0400
     6.2 +++ b/VisualC/SDL/SDL_VS2008.vcproj	Mon Oct 15 21:14:13 2012 -0400
     6.3 @@ -809,6 +809,14 @@
     6.4  			>
     6.5  		</File>
     6.6  		<File
     6.7 +			RelativePath="..\..\src\events\SDL_dropevents.c"
     6.8 +			>
     6.9 +		</File>
    6.10 +		<File
    6.11 +			RelativePath="..\..\src\events\SDL_dropevents_c.h"
    6.12 +			>
    6.13 +		</File>
    6.14 +		<File
    6.15  			RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.c"
    6.16  			>
    6.17  		</File>
     7.1 --- a/VisualC/SDL/SDL_VS2010.vcxproj	Sat Sep 01 09:17:34 2012 -0400
     7.2 +++ b/VisualC/SDL/SDL_VS2010.vcxproj	Mon Oct 15 21:14:13 2012 -0400
     7.3 @@ -273,6 +273,7 @@
     7.4      <ClInclude Include="..\..\src\render\software\SDL_draw.h" />
     7.5      <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
     7.6      <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
     7.7 +    <ClInclude Include="..\..\src\events\SDL_dropevents_c.h" />
     7.8      <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
     7.9      <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
    7.10      <ClInclude Include="..\..\src\video\dummy\SDL_nullframebuffer_c.h" />
    7.11 @@ -386,6 +387,7 @@
    7.12      <ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" />
    7.13      <ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" />
    7.14      <ClCompile Include="..\..\src\audio\directsound\SDL_directsound.c" />
    7.15 +    <ClCompile Include="..\..\src\events\SDL_dropevents.c" />
    7.16      <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />
    7.17      <ClCompile Include="..\..\src\joystick\windows\SDL_dxjoystick.c" />
    7.18      <ClCompile Include="..\..\src\SDL_error.c" />
     8.1 --- a/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj	Sat Sep 01 09:17:34 2012 -0400
     8.2 +++ b/Xcode-iOS/Demos/Demos.xcodeproj/project.pbxproj	Mon Oct 15 21:14:13 2012 -0400
     8.3 @@ -373,7 +373,7 @@
     8.4  		FD1B48930E313154007AB34E /* Products */ = {
     8.5  			isa = PBXGroup;
     8.6  			children = (
     8.7 -				FD1B489E0E313154007AB34E /* libSDL.a */,
     8.8 +				FD1B489E0E313154007AB34E /* libSDL2.a */,
     8.9  				04AB757111E563D200BE9753 /* testsdl.app */,
    8.10  			);
    8.11  			name = Products;
    8.12 @@ -604,7 +604,7 @@
    8.13  			remoteRef = 04AB757011E563D200BE9753 /* PBXContainerItemProxy */;
    8.14  			sourceTree = BUILT_PRODUCTS_DIR;
    8.15  		};
    8.16 -		FD1B489E0E313154007AB34E /* libSDL.a */ = {
    8.17 +		FD1B489E0E313154007AB34E /* libSDL2.a */ = {
    8.18  			isa = PBXReferenceProxy;
    8.19  			fileType = archive.ar;
    8.20  			path = libSDL2.a;
     9.1 --- a/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Sat Sep 01 09:17:34 2012 -0400
     9.2 +++ b/Xcode-iOS/SDL/SDL.xcodeproj/project.pbxproj	Mon Oct 15 21:14:13 2012 -0400
     9.3 @@ -98,8 +98,12 @@
     9.4  		56ED04E3118A8EFD00A56AA6 /* SDL_syspower.m in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */; };
     9.5  		93CB792313FC5E5200BD3E05 /* SDL_uikitviewcontroller.h in Headers */ = {isa = PBXBuildFile; fileRef = 93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */; };
     9.6  		93CB792613FC5F5300BD3E05 /* SDL_uikitviewcontroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */; };
     9.7 +		AA126AD41617C5E7005ABC8F /* SDL_uikitmodes.h in Headers */ = {isa = PBXBuildFile; fileRef = AA126AD21617C5E6005ABC8F /* SDL_uikitmodes.h */; };
     9.8 +		AA126AD51617C5E7005ABC8F /* SDL_uikitmodes.m in Sources */ = {isa = PBXBuildFile; fileRef = AA126AD31617C5E6005ABC8F /* SDL_uikitmodes.m */; };
     9.9  		AA628ADB159369E3005138DD /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628AD9159369E3005138DD /* SDL_rotate.c */; };
    9.10  		AA628ADC159369E3005138DD /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628ADA159369E3005138DD /* SDL_rotate.h */; };
    9.11 +		AA704DD6162AA90A0076D1C1 /* SDL_dropevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = AA704DD4162AA90A0076D1C1 /* SDL_dropevents_c.h */; };
    9.12 +		AA704DD7162AA90A0076D1C1 /* SDL_dropevents.c in Sources */ = {isa = PBXBuildFile; fileRef = AA704DD5162AA90A0076D1C1 /* SDL_dropevents.c */; };
    9.13  		AA7558981595D55500BBD41B /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558651595D55500BBD41B /* begin_code.h */; };
    9.14  		AA7558991595D55500BBD41B /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558661595D55500BBD41B /* close_code.h */; };
    9.15  		AA75589A1595D55500BBD41B /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558671595D55500BBD41B /* SDL_assert.h */; };
    9.16 @@ -152,7 +156,6 @@
    9.17  		AA7558C91595D55500BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558961595D55500BBD41B /* SDL_video.h */; };
    9.18  		AA7558CA1595D55500BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7558971595D55500BBD41B /* SDL.h */; };
    9.19  		AA9781C91576A7FA00472542 /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FD6526630DE8FCCB002AD96B /* libSDL2.a */; };
    9.20 -		FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */; };
    9.21  		FD3F4A760DEA620800C5B771 /* SDL_getenv.c in Sources */ = {isa = PBXBuildFile; fileRef = FD3F4A700DEA620800C5B771 /* SDL_getenv.c */; };
    9.22  		FD3F4A770DEA620800C5B771 /* SDL_iconv.c in Sources */ = {isa = PBXBuildFile; fileRef = FD3F4A710DEA620800C5B771 /* SDL_iconv.c */; };
    9.23  		FD3F4A780DEA620800C5B771 /* SDL_malloc.c in Sources */ = {isa = PBXBuildFile; fileRef = FD3F4A720DEA620800C5B771 /* SDL_malloc.c */; };
    9.24 @@ -350,8 +353,12 @@
    9.25  		56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_syspower.m; path = ../../src/power/uikit/SDL_syspower.m; sourceTree = SOURCE_ROOT; };
    9.26  		93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitviewcontroller.h; sourceTree = "<group>"; };
    9.27  		93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitviewcontroller.m; sourceTree = "<group>"; };
    9.28 +		AA126AD21617C5E6005ABC8F /* SDL_uikitmodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitmodes.h; sourceTree = "<group>"; };
    9.29 +		AA126AD31617C5E6005ABC8F /* SDL_uikitmodes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDL_uikitmodes.m; sourceTree = "<group>"; };
    9.30  		AA628AD9159369E3005138DD /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = "<group>"; };
    9.31  		AA628ADA159369E3005138DD /* SDL_rotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rotate.h; sourceTree = "<group>"; };
    9.32 +		AA704DD4162AA90A0076D1C1 /* SDL_dropevents_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_dropevents_c.h; sourceTree = "<group>"; };
    9.33 +		AA704DD5162AA90A0076D1C1 /* SDL_dropevents.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_dropevents.c; sourceTree = "<group>"; };
    9.34  		AA7558651595D55500BBD41B /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = begin_code.h; sourceTree = "<group>"; };
    9.35  		AA7558661595D55500BBD41B /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = close_code.h; sourceTree = "<group>"; };
    9.36  		AA7558671595D55500BBD41B /* SDL_assert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_assert.h; sourceTree = "<group>"; };
    9.37 @@ -404,7 +411,6 @@
    9.38  		AA7558961595D55500BBD41B /* SDL_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_video.h; sourceTree = "<group>"; };
    9.39  		AA7558971595D55500BBD41B /* SDL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL.h; sourceTree = "<group>"; };
    9.40  		FD0BBFEF0E3933DD00D833B1 /* SDL_uikitview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitview.h; sourceTree = "<group>"; };
    9.41 -		FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitkeyboard.h; sourceTree = "<group>"; };
    9.42  		FD3F4A700DEA620800C5B771 /* SDL_getenv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_getenv.c; sourceTree = "<group>"; };
    9.43  		FD3F4A710DEA620800C5B771 /* SDL_iconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_iconv.c; sourceTree = "<group>"; };
    9.44  		FD3F4A720DEA620800C5B771 /* SDL_malloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_malloc.c; sourceTree = "<group>"; };
    9.45 @@ -840,26 +846,27 @@
    9.46  		FD689F090E26E5D900F90B21 /* uikit */ = {
    9.47  			isa = PBXGroup;
    9.48  			children = (
    9.49 +				FDC656440E560DF800311C8E /* jumphack.c */,
    9.50  				FDC656450E560DF800311C8E /* jumphack.h */,
    9.51 -				FDC656440E560DF800311C8E /* jumphack.c */,
    9.52 +				FDC261780E3A3FC8001C4554 /* keyinfotable.h */,
    9.53 +				FD689FCD0E26E9D400F90B21 /* SDL_uikitappdelegate.h */,
    9.54 +				FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */,
    9.55  				FD689F0C0E26E5D900F90B21 /* SDL_uikitevents.h */,
    9.56  				FD689F0D0E26E5D900F90B21 /* SDL_uikitevents.m */,
    9.57 +				AA126AD21617C5E6005ABC8F /* SDL_uikitmodes.h */,
    9.58 +				AA126AD31617C5E6005ABC8F /* SDL_uikitmodes.m */,
    9.59  				FD689F0E0E26E5D900F90B21 /* SDL_uikitopengles.h */,
    9.60  				FD689F0F0E26E5D900F90B21 /* SDL_uikitopengles.m */,
    9.61 +				FD689F160E26E5D900F90B21 /* SDL_uikitopenglview.h */,
    9.62 +				FD689F170E26E5D900F90B21 /* SDL_uikitopenglview.m */,
    9.63  				FD689F100E26E5D900F90B21 /* SDL_uikitvideo.h */,
    9.64  				FD689F110E26E5D900F90B21 /* SDL_uikitvideo.m */,
    9.65 -				FDC261780E3A3FC8001C4554 /* keyinfotable.h */,
    9.66 -				FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */,
    9.67  				FD0BBFEF0E3933DD00D833B1 /* SDL_uikitview.h */,
    9.68  				FD689F130E26E5D900F90B21 /* SDL_uikitview.m */,
    9.69 +				93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */,
    9.70 +				93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */,
    9.71  				FD689F140E26E5D900F90B21 /* SDL_uikitwindow.h */,
    9.72  				FD689F150E26E5D900F90B21 /* SDL_uikitwindow.m */,
    9.73 -				FD689F160E26E5D900F90B21 /* SDL_uikitopenglview.h */,
    9.74 -				FD689F170E26E5D900F90B21 /* SDL_uikitopenglview.m */,
    9.75 -				FD689FCD0E26E9D400F90B21 /* SDL_uikitappdelegate.h */,
    9.76 -				FD689FCC0E26E9D400F90B21 /* SDL_uikitappdelegate.m */,
    9.77 -				93CB792213FC5E5200BD3E05 /* SDL_uikitviewcontroller.h */,
    9.78 -				93CB792513FC5F5300BD3E05 /* SDL_uikitviewcontroller.m */,
    9.79  			);
    9.80  			path = uikit;
    9.81  			sourceTree = "<group>";
    9.82 @@ -1012,25 +1019,27 @@
    9.83  		FD99B98C0DD52EDC00FB1D6B /* events */ = {
    9.84  			isa = PBXGroup;
    9.85  			children = (
    9.86 -				04BA9D5F11EF474A00B60E01 /* SDL_gesture_c.h */,
    9.87 -				04BA9D6011EF474A00B60E01 /* SDL_gesture.c */,
    9.88 -				04BA9D6111EF474A00B60E01 /* SDL_touch_c.h */,
    9.89 -				04BA9D6211EF474A00B60E01 /* SDL_touch.c */,
    9.90  				FD99B98D0DD52EDC00FB1D6B /* blank_cursor.h */,
    9.91  				FD99B98E0DD52EDC00FB1D6B /* default_cursor.h */,
    9.92  				FD99B98F0DD52EDC00FB1D6B /* scancodes_darwin.h */,
    9.93  				FD99B9900DD52EDC00FB1D6B /* scancodes_linux.h */,
    9.94  				FD99B9920DD52EDC00FB1D6B /* scancodes_xfree86.h */,
    9.95 +				0420496F11E6F03D007E7EC9 /* SDL_clipboardevents.c */,
    9.96  				0420496E11E6F03D007E7EC9 /* SDL_clipboardevents_c.h */,
    9.97 -				0420496F11E6F03D007E7EC9 /* SDL_clipboardevents.c */,
    9.98 +				AA704DD5162AA90A0076D1C1 /* SDL_dropevents.c */,
    9.99 +				AA704DD4162AA90A0076D1C1 /* SDL_dropevents_c.h */,
   9.100  				FD99B9930DD52EDC00FB1D6B /* SDL_events.c */,
   9.101  				FD99B9940DD52EDC00FB1D6B /* SDL_events_c.h */,
   9.102 +				04BA9D6011EF474A00B60E01 /* SDL_gesture.c */,
   9.103 +				04BA9D5F11EF474A00B60E01 /* SDL_gesture_c.h */,
   9.104  				FD99B9950DD52EDC00FB1D6B /* SDL_keyboard.c */,
   9.105  				FD99B9960DD52EDC00FB1D6B /* SDL_keyboard_c.h */,
   9.106  				FD99B9970DD52EDC00FB1D6B /* SDL_mouse.c */,
   9.107  				FD99B9980DD52EDC00FB1D6B /* SDL_mouse_c.h */,
   9.108  				FD99B9990DD52EDC00FB1D6B /* SDL_quit.c */,
   9.109  				FD99B99A0DD52EDC00FB1D6B /* SDL_sysevents.h */,
   9.110 +				04BA9D6211EF474A00B60E01 /* SDL_touch.c */,
   9.111 +				04BA9D6111EF474A00B60E01 /* SDL_touch_c.h */,
   9.112  				FD99B99B0DD52EDC00FB1D6B /* SDL_windowevents.c */,
   9.113  				FD99B99C0DD52EDC00FB1D6B /* SDL_windowevents_c.h */,
   9.114  			);
   9.115 @@ -1164,7 +1173,6 @@
   9.116  				FD689F260E26E5D900F90B21 /* SDL_uikitopenglview.h in Headers */,
   9.117  				FD689FCF0E26E9D400F90B21 /* SDL_uikitappdelegate.h in Headers */,
   9.118  				FDC656490E560DF800311C8E /* jumphack.h in Headers */,
   9.119 -				FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */,
   9.120  				047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */,
   9.121  				046387420F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */,
   9.122  				006E9888119552DD001DE610 /* SDL_rwopsbundlesupport.h in Headers */,
   9.123 @@ -1239,6 +1247,8 @@
   9.124  				AA7558C81595D55500BBD41B /* SDL_version.h in Headers */,
   9.125  				AA7558C91595D55500BBD41B /* SDL_video.h in Headers */,
   9.126  				AA7558CA1595D55500BBD41B /* SDL.h in Headers */,
   9.127 +				AA126AD41617C5E7005ABC8F /* SDL_uikitmodes.h in Headers */,
   9.128 +				AA704DD6162AA90A0076D1C1 /* SDL_dropevents_c.h in Headers */,
   9.129  			);
   9.130  			runOnlyForDeploymentPostprocessing = 0;
   9.131  		};
   9.132 @@ -1455,6 +1465,8 @@
   9.133  				56EA86FB13E9EC2B002E47EB /* SDL_coreaudio.c in Sources */,
   9.134  				93CB792613FC5F5300BD3E05 /* SDL_uikitviewcontroller.m in Sources */,
   9.135  				AA628ADB159369E3005138DD /* SDL_rotate.c in Sources */,
   9.136 +				AA126AD51617C5E7005ABC8F /* SDL_uikitmodes.m in Sources */,
   9.137 +				AA704DD7162AA90A0076D1C1 /* SDL_dropevents.c in Sources */,
   9.138  			);
   9.139  			runOnlyForDeploymentPostprocessing = 0;
   9.140  		};
    10.1 --- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Sat Sep 01 09:17:34 2012 -0400
    10.2 +++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj	Mon Oct 15 21:14:13 2012 -0400
    10.3 @@ -437,107 +437,107 @@
    10.4  		AA628AD2159367F2005138DD /* SDL_x11xinput2.c in Sources */ = {isa = PBXBuildFile; fileRef = AA628ACF159367F2005138DD /* SDL_x11xinput2.c */; };
    10.5  		AA628AD3159367F2005138DD /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
    10.6  		AA628AD4159367F2005138DD /* SDL_x11xinput2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA628AD0159367F2005138DD /* SDL_x11xinput2.h */; };
    10.7 -		AA7557FA1595D4D800BBD41B /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; };
    10.8 +		AA7557FA1595D4D800BBD41B /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
    10.9  		AA7557FB1595D4D800BBD41B /* begin_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C71595D4D800BBD41B /* begin_code.h */; };
   10.10 -		AA7557FC1595D4D800BBD41B /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; };
   10.11 +		AA7557FC1595D4D800BBD41B /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.12  		AA7557FD1595D4D800BBD41B /* close_code.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C81595D4D800BBD41B /* close_code.h */; };
   10.13 -		AA7557FE1595D4D800BBD41B /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; };
   10.14 +		AA7557FE1595D4D800BBD41B /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.15  		AA7557FF1595D4D800BBD41B /* SDL_assert.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557C91595D4D800BBD41B /* SDL_assert.h */; };
   10.16 -		AA7558001595D4D800BBD41B /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; };
   10.17 +		AA7558001595D4D800BBD41B /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.18  		AA7558011595D4D800BBD41B /* SDL_atomic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CA1595D4D800BBD41B /* SDL_atomic.h */; };
   10.19 -		AA7558021595D4D800BBD41B /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; };
   10.20 +		AA7558021595D4D800BBD41B /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.21  		AA7558031595D4D800BBD41B /* SDL_audio.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CB1595D4D800BBD41B /* SDL_audio.h */; };
   10.22 -		AA7558041595D4D800BBD41B /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; };
   10.23 +		AA7558041595D4D800BBD41B /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.24  		AA7558051595D4D800BBD41B /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CC1595D4D800BBD41B /* SDL_blendmode.h */; };
   10.25 -		AA7558061595D4D800BBD41B /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; };
   10.26 +		AA7558061595D4D800BBD41B /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.27  		AA7558071595D4D800BBD41B /* SDL_clipboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CD1595D4D800BBD41B /* SDL_clipboard.h */; };
   10.28 -		AA7558081595D4D800BBD41B /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; };
   10.29 +		AA7558081595D4D800BBD41B /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.30  		AA7558091595D4D800BBD41B /* SDL_config_macosx.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CE1595D4D800BBD41B /* SDL_config_macosx.h */; };
   10.31 -		AA75580A1595D4D800BBD41B /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; };
   10.32 +		AA75580A1595D4D800BBD41B /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.33  		AA75580B1595D4D800BBD41B /* SDL_config.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557CF1595D4D800BBD41B /* SDL_config.h */; };
   10.34 -		AA75580C1595D4D800BBD41B /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; };
   10.35 +		AA75580C1595D4D800BBD41B /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.36  		AA75580D1595D4D800BBD41B /* SDL_copying.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D01595D4D800BBD41B /* SDL_copying.h */; };
   10.37 -		AA75580E1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; };
   10.38 +		AA75580E1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.39  		AA75580F1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D11595D4D800BBD41B /* SDL_cpuinfo.h */; };
   10.40 -		AA7558101595D4D800BBD41B /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; };
   10.41 +		AA7558101595D4D800BBD41B /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.42  		AA7558111595D4D800BBD41B /* SDL_endian.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D21595D4D800BBD41B /* SDL_endian.h */; };
   10.43 -		AA7558121595D4D800BBD41B /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; };
   10.44 +		AA7558121595D4D800BBD41B /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.45  		AA7558131595D4D800BBD41B /* SDL_error.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D31595D4D800BBD41B /* SDL_error.h */; };
   10.46 -		AA7558141595D4D800BBD41B /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; };
   10.47 +		AA7558141595D4D800BBD41B /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.48  		AA7558151595D4D800BBD41B /* SDL_events.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D41595D4D800BBD41B /* SDL_events.h */; };
   10.49 -		AA7558161595D4D800BBD41B /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; };
   10.50 +		AA7558161595D4D800BBD41B /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.51  		AA7558171595D4D800BBD41B /* SDL_gesture.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D51595D4D800BBD41B /* SDL_gesture.h */; };
   10.52 -		AA7558181595D4D800BBD41B /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; };
   10.53 +		AA7558181595D4D800BBD41B /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.54  		AA7558191595D4D800BBD41B /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D61595D4D800BBD41B /* SDL_haptic.h */; };
   10.55 -		AA75581A1595D4D800BBD41B /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; };
   10.56 +		AA75581A1595D4D800BBD41B /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.57  		AA75581B1595D4D800BBD41B /* SDL_hints.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D71595D4D800BBD41B /* SDL_hints.h */; };
   10.58 -		AA75581C1595D4D800BBD41B /* SDL_input.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D81595D4D800BBD41B /* SDL_input.h */; };
   10.59 +		AA75581C1595D4D800BBD41B /* SDL_input.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D81595D4D800BBD41B /* SDL_input.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.60  		AA75581D1595D4D800BBD41B /* SDL_input.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D81595D4D800BBD41B /* SDL_input.h */; };
   10.61 -		AA75581E1595D4D800BBD41B /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; };
   10.62 +		AA75581E1595D4D800BBD41B /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.63  		AA75581F1595D4D800BBD41B /* SDL_joystick.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557D91595D4D800BBD41B /* SDL_joystick.h */; };
   10.64 -		AA7558201595D4D800BBD41B /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; };
   10.65 +		AA7558201595D4D800BBD41B /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.66  		AA7558211595D4D800BBD41B /* SDL_keyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DA1595D4D800BBD41B /* SDL_keyboard.h */; };
   10.67 -		AA7558221595D4D800BBD41B /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; };
   10.68 +		AA7558221595D4D800BBD41B /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.69  		AA7558231595D4D800BBD41B /* SDL_keycode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DB1595D4D800BBD41B /* SDL_keycode.h */; };
   10.70 -		AA7558241595D4D800BBD41B /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; };
   10.71 +		AA7558241595D4D800BBD41B /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.72  		AA7558251595D4D800BBD41B /* SDL_loadso.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DC1595D4D800BBD41B /* SDL_loadso.h */; };
   10.73 -		AA7558261595D4D800BBD41B /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; };
   10.74 +		AA7558261595D4D800BBD41B /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.75  		AA7558271595D4D800BBD41B /* SDL_log.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DD1595D4D800BBD41B /* SDL_log.h */; };
   10.76 -		AA7558281595D4D800BBD41B /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; };
   10.77 +		AA7558281595D4D800BBD41B /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.78  		AA7558291595D4D800BBD41B /* SDL_main.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DE1595D4D800BBD41B /* SDL_main.h */; };
   10.79 -		AA75582A1595D4D800BBD41B /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; };
   10.80 +		AA75582A1595D4D800BBD41B /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.81  		AA75582B1595D4D800BBD41B /* SDL_mouse.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557DF1595D4D800BBD41B /* SDL_mouse.h */; };
   10.82 -		AA75582C1595D4D800BBD41B /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; };
   10.83 +		AA75582C1595D4D800BBD41B /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.84  		AA75582D1595D4D800BBD41B /* SDL_mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E01595D4D800BBD41B /* SDL_mutex.h */; };
   10.85 -		AA75582E1595D4D800BBD41B /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; };
   10.86 +		AA75582E1595D4D800BBD41B /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.87  		AA75582F1595D4D800BBD41B /* SDL_name.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E11595D4D800BBD41B /* SDL_name.h */; };
   10.88 -		AA7558301595D4D800BBD41B /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; };
   10.89 +		AA7558301595D4D800BBD41B /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.90  		AA7558311595D4D800BBD41B /* SDL_opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E21595D4D800BBD41B /* SDL_opengl.h */; };
   10.91 -		AA7558321595D4D800BBD41B /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; };
   10.92 +		AA7558321595D4D800BBD41B /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.93  		AA7558331595D4D800BBD41B /* SDL_opengles.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E31595D4D800BBD41B /* SDL_opengles.h */; };
   10.94 -		AA7558341595D4D800BBD41B /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; };
   10.95 +		AA7558341595D4D800BBD41B /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.96  		AA7558351595D4D800BBD41B /* SDL_opengles2.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E41595D4D800BBD41B /* SDL_opengles2.h */; };
   10.97 -		AA7558361595D4D800BBD41B /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; };
   10.98 +		AA7558361595D4D800BBD41B /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; settings = {ATTRIBUTES = (Public, ); }; };
   10.99  		AA7558371595D4D800BBD41B /* SDL_pixels.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E51595D4D800BBD41B /* SDL_pixels.h */; };
  10.100 -		AA7558381595D4D800BBD41B /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; };
  10.101 +		AA7558381595D4D800BBD41B /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.102  		AA7558391595D4D800BBD41B /* SDL_platform.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E61595D4D800BBD41B /* SDL_platform.h */; };
  10.103 -		AA75583A1595D4D800BBD41B /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; };
  10.104 +		AA75583A1595D4D800BBD41B /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.105  		AA75583B1595D4D800BBD41B /* SDL_power.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E71595D4D800BBD41B /* SDL_power.h */; };
  10.106 -		AA75583C1595D4D800BBD41B /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; };
  10.107 +		AA75583C1595D4D800BBD41B /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.108  		AA75583D1595D4D800BBD41B /* SDL_quit.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E81595D4D800BBD41B /* SDL_quit.h */; };
  10.109 -		AA75583E1595D4D800BBD41B /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; };
  10.110 +		AA75583E1595D4D800BBD41B /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.111  		AA75583F1595D4D800BBD41B /* SDL_rect.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557E91595D4D800BBD41B /* SDL_rect.h */; };
  10.112 -		AA7558401595D4D800BBD41B /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; };
  10.113 +		AA7558401595D4D800BBD41B /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.114  		AA7558411595D4D800BBD41B /* SDL_render.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EA1595D4D800BBD41B /* SDL_render.h */; };
  10.115 -		AA7558421595D4D800BBD41B /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; };
  10.116 +		AA7558421595D4D800BBD41B /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.117  		AA7558431595D4D800BBD41B /* SDL_revision.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EB1595D4D800BBD41B /* SDL_revision.h */; };
  10.118 -		AA7558441595D4D800BBD41B /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; };
  10.119 +		AA7558441595D4D800BBD41B /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.120  		AA7558451595D4D800BBD41B /* SDL_rwops.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EC1595D4D800BBD41B /* SDL_rwops.h */; };
  10.121 -		AA7558461595D4D800BBD41B /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; };
  10.122 +		AA7558461595D4D800BBD41B /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.123  		AA7558471595D4D800BBD41B /* SDL_scancode.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557ED1595D4D800BBD41B /* SDL_scancode.h */; };
  10.124 -		AA7558481595D4D800BBD41B /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; };
  10.125 +		AA7558481595D4D800BBD41B /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.126  		AA7558491595D4D800BBD41B /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EE1595D4D800BBD41B /* SDL_shape.h */; };
  10.127 -		AA75584A1595D4D800BBD41B /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; };
  10.128 +		AA75584A1595D4D800BBD41B /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.129  		AA75584B1595D4D800BBD41B /* SDL_stdinc.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557EF1595D4D800BBD41B /* SDL_stdinc.h */; };
  10.130 -		AA75584C1595D4D800BBD41B /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; };
  10.131 +		AA75584C1595D4D800BBD41B /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.132  		AA75584D1595D4D800BBD41B /* SDL_surface.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F01595D4D800BBD41B /* SDL_surface.h */; };
  10.133 -		AA75584E1595D4D800BBD41B /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; };
  10.134 +		AA75584E1595D4D800BBD41B /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.135  		AA75584F1595D4D800BBD41B /* SDL_system.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F11595D4D800BBD41B /* SDL_system.h */; };
  10.136 -		AA7558501595D4D800BBD41B /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; };
  10.137 +		AA7558501595D4D800BBD41B /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.138  		AA7558511595D4D800BBD41B /* SDL_syswm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F21595D4D800BBD41B /* SDL_syswm.h */; };
  10.139 -		AA7558521595D4D800BBD41B /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; };
  10.140 +		AA7558521595D4D800BBD41B /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.141  		AA7558531595D4D800BBD41B /* SDL_thread.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F31595D4D800BBD41B /* SDL_thread.h */; };
  10.142 -		AA7558541595D4D800BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; };
  10.143 +		AA7558541595D4D800BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.144  		AA7558551595D4D800BBD41B /* SDL_timer.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F41595D4D800BBD41B /* SDL_timer.h */; };
  10.145 -		AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; };
  10.146 +		AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.147  		AA7558571595D4D800BBD41B /* SDL_touch.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F51595D4D800BBD41B /* SDL_touch.h */; };
  10.148 -		AA7558581595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; };
  10.149 +		AA7558581595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.150  		AA7558591595D4D800BBD41B /* SDL_types.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F61595D4D800BBD41B /* SDL_types.h */; };
  10.151 -		AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; };
  10.152 +		AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.153  		AA75585B1595D4D800BBD41B /* SDL_version.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F71595D4D800BBD41B /* SDL_version.h */; };
  10.154 -		AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; };
  10.155 +		AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.156  		AA75585D1595D4D800BBD41B /* SDL_video.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F81595D4D800BBD41B /* SDL_video.h */; };
  10.157 -		AA75585E1595D4D800BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; };
  10.158 +		AA75585E1595D4D800BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; settings = {ATTRIBUTES = (Public, ); }; };
  10.159  		AA75585F1595D4D800BBD41B /* SDL.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7557F91595D4D800BBD41B /* SDL.h */; };
  10.160  /* End PBXBuildFile section */
  10.161  
  10.162 @@ -1646,6 +1646,57 @@
  10.163  			isa = PBXHeadersBuildPhase;
  10.164  			buildActionMask = 2147483647;
  10.165  			files = (
  10.166 +				AA7557FA1595D4D800BBD41B /* begin_code.h in Headers */,
  10.167 +				AA7557FC1595D4D800BBD41B /* close_code.h in Headers */,
  10.168 +				AA7557FE1595D4D800BBD41B /* SDL_assert.h in Headers */,
  10.169 +				AA7558001595D4D800BBD41B /* SDL_atomic.h in Headers */,
  10.170 +				AA7558021595D4D800BBD41B /* SDL_audio.h in Headers */,
  10.171 +				AA7558041595D4D800BBD41B /* SDL_blendmode.h in Headers */,
  10.172 +				AA7558061595D4D800BBD41B /* SDL_clipboard.h in Headers */,
  10.173 +				AA7558081595D4D800BBD41B /* SDL_config_macosx.h in Headers */,
  10.174 +				AA75580A1595D4D800BBD41B /* SDL_config.h in Headers */,
  10.175 +				AA75580C1595D4D800BBD41B /* SDL_copying.h in Headers */,
  10.176 +				AA75580E1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */,
  10.177 +				AA7558101595D4D800BBD41B /* SDL_endian.h in Headers */,
  10.178 +				AA7558121595D4D800BBD41B /* SDL_error.h in Headers */,
  10.179 +				AA7558141595D4D800BBD41B /* SDL_events.h in Headers */,
  10.180 +				AA7558161595D4D800BBD41B /* SDL_gesture.h in Headers */,
  10.181 +				AA7558181595D4D800BBD41B /* SDL_haptic.h in Headers */,
  10.182 +				AA75581A1595D4D800BBD41B /* SDL_hints.h in Headers */,
  10.183 +				AA75581C1595D4D800BBD41B /* SDL_input.h in Headers */,
  10.184 +				AA75581E1595D4D800BBD41B /* SDL_joystick.h in Headers */,
  10.185 +				AA7558201595D4D800BBD41B /* SDL_keyboard.h in Headers */,
  10.186 +				AA7558221595D4D800BBD41B /* SDL_keycode.h in Headers */,
  10.187 +				AA7558241595D4D800BBD41B /* SDL_loadso.h in Headers */,
  10.188 +				AA7558261595D4D800BBD41B /* SDL_log.h in Headers */,
  10.189 +				AA7558281595D4D800BBD41B /* SDL_main.h in Headers */,
  10.190 +				AA75582A1595D4D800BBD41B /* SDL_mouse.h in Headers */,
  10.191 +				AA75582C1595D4D800BBD41B /* SDL_mutex.h in Headers */,
  10.192 +				AA75582E1595D4D800BBD41B /* SDL_name.h in Headers */,
  10.193 +				AA7558301595D4D800BBD41B /* SDL_opengl.h in Headers */,
  10.194 +				AA7558321595D4D800BBD41B /* SDL_opengles.h in Headers */,
  10.195 +				AA7558341595D4D800BBD41B /* SDL_opengles2.h in Headers */,
  10.196 +				AA7558361595D4D800BBD41B /* SDL_pixels.h in Headers */,
  10.197 +				AA7558381595D4D800BBD41B /* SDL_platform.h in Headers */,
  10.198 +				AA75583A1595D4D800BBD41B /* SDL_power.h in Headers */,
  10.199 +				AA75583C1595D4D800BBD41B /* SDL_quit.h in Headers */,
  10.200 +				AA75583E1595D4D800BBD41B /* SDL_rect.h in Headers */,
  10.201 +				AA7558401595D4D800BBD41B /* SDL_render.h in Headers */,
  10.202 +				AA7558421595D4D800BBD41B /* SDL_revision.h in Headers */,
  10.203 +				AA7558441595D4D800BBD41B /* SDL_rwops.h in Headers */,
  10.204 +				AA7558461595D4D800BBD41B /* SDL_scancode.h in Headers */,
  10.205 +				AA7558481595D4D800BBD41B /* SDL_shape.h in Headers */,
  10.206 +				AA75584A1595D4D800BBD41B /* SDL_stdinc.h in Headers */,
  10.207 +				AA75584C1595D4D800BBD41B /* SDL_surface.h in Headers */,
  10.208 +				AA75584E1595D4D800BBD41B /* SDL_system.h in Headers */,
  10.209 +				AA7558501595D4D800BBD41B /* SDL_syswm.h in Headers */,
  10.210 +				AA7558521595D4D800BBD41B /* SDL_thread.h in Headers */,
  10.211 +				AA7558541595D4D800BBD41B /* SDL_timer.h in Headers */,
  10.212 +				AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */,
  10.213 +				AA7558581595D4D800BBD41B /* SDL_types.h in Headers */,
  10.214 +				AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */,
  10.215 +				AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */,
  10.216 +				AA75585E1595D4D800BBD41B /* SDL.h in Headers */,
  10.217  				04BD000912E6671800899322 /* SDL_diskaudio.h in Headers */,
  10.218  				04BD001112E6671800899322 /* SDL_dummyaudio.h in Headers */,
  10.219  				04BD001912E6671800899322 /* SDL_coreaudio.h in Headers */,
  10.220 @@ -1731,57 +1782,6 @@
  10.221  				566CDE8F148F0AC200C5A9BB /* SDL_dropevents_c.h in Headers */,
  10.222  				AA628ACC159367B7005138DD /* SDL_rotate.h in Headers */,
  10.223  				AA628AD3159367F2005138DD /* SDL_x11xinput2.h in Headers */,
  10.224 -				AA7557FA1595D4D800BBD41B /* begin_code.h in Headers */,
  10.225 -				AA7557FC1595D4D800BBD41B /* close_code.h in Headers */,
  10.226 -				AA7557FE1595D4D800BBD41B /* SDL_assert.h in Headers */,
  10.227 -				AA7558001595D4D800BBD41B /* SDL_atomic.h in Headers */,
  10.228 -				AA7558021595D4D800BBD41B /* SDL_audio.h in Headers */,
  10.229 -				AA7558041595D4D800BBD41B /* SDL_blendmode.h in Headers */,
  10.230 -				AA7558061595D4D800BBD41B /* SDL_clipboard.h in Headers */,
  10.231 -				AA7558081595D4D800BBD41B /* SDL_config_macosx.h in Headers */,
  10.232 -				AA75580A1595D4D800BBD41B /* SDL_config.h in Headers */,
  10.233 -				AA75580C1595D4D800BBD41B /* SDL_copying.h in Headers */,
  10.234 -				AA75580E1595D4D800BBD41B /* SDL_cpuinfo.h in Headers */,
  10.235 -				AA7558101595D4D800BBD41B /* SDL_endian.h in Headers */,
  10.236 -				AA7558121595D4D800BBD41B /* SDL_error.h in Headers */,
  10.237 -				AA7558141595D4D800BBD41B /* SDL_events.h in Headers */,
  10.238 -				AA7558161595D4D800BBD41B /* SDL_gesture.h in Headers */,
  10.239 -				AA7558181595D4D800BBD41B /* SDL_haptic.h in Headers */,
  10.240 -				AA75581A1595D4D800BBD41B /* SDL_hints.h in Headers */,
  10.241 -				AA75581C1595D4D800BBD41B /* SDL_input.h in Headers */,
  10.242 -				AA75581E1595D4D800BBD41B /* SDL_joystick.h in Headers */,
  10.243 -				AA7558201595D4D800BBD41B /* SDL_keyboard.h in Headers */,
  10.244 -				AA7558221595D4D800BBD41B /* SDL_keycode.h in Headers */,
  10.245 -				AA7558241595D4D800BBD41B /* SDL_loadso.h in Headers */,
  10.246 -				AA7558261595D4D800BBD41B /* SDL_log.h in Headers */,
  10.247 -				AA7558281595D4D800BBD41B /* SDL_main.h in Headers */,
  10.248 -				AA75582A1595D4D800BBD41B /* SDL_mouse.h in Headers */,
  10.249 -				AA75582C1595D4D800BBD41B /* SDL_mutex.h in Headers */,
  10.250 -				AA75582E1595D4D800BBD41B /* SDL_name.h in Headers */,
  10.251 -				AA7558301595D4D800BBD41B /* SDL_opengl.h in Headers */,
  10.252 -				AA7558321595D4D800BBD41B /* SDL_opengles.h in Headers */,
  10.253 -				AA7558341595D4D800BBD41B /* SDL_opengles2.h in Headers */,
  10.254 -				AA7558361595D4D800BBD41B /* SDL_pixels.h in Headers */,
  10.255 -				AA7558381595D4D800BBD41B /* SDL_platform.h in Headers */,
  10.256 -				AA75583A1595D4D800BBD41B /* SDL_power.h in Headers */,
  10.257 -				AA75583C1595D4D800BBD41B /* SDL_quit.h in Headers */,
  10.258 -				AA75583E1595D4D800BBD41B /* SDL_rect.h in Headers */,
  10.259 -				AA7558401595D4D800BBD41B /* SDL_render.h in Headers */,
  10.260 -				AA7558421595D4D800BBD41B /* SDL_revision.h in Headers */,
  10.261 -				AA7558441595D4D800BBD41B /* SDL_rwops.h in Headers */,
  10.262 -				AA7558461595D4D800BBD41B /* SDL_scancode.h in Headers */,
  10.263 -				AA7558481595D4D800BBD41B /* SDL_shape.h in Headers */,
  10.264 -				AA75584A1595D4D800BBD41B /* SDL_stdinc.h in Headers */,
  10.265 -				AA75584C1595D4D800BBD41B /* SDL_surface.h in Headers */,
  10.266 -				AA75584E1595D4D800BBD41B /* SDL_system.h in Headers */,
  10.267 -				AA7558501595D4D800BBD41B /* SDL_syswm.h in Headers */,
  10.268 -				AA7558521595D4D800BBD41B /* SDL_thread.h in Headers */,
  10.269 -				AA7558541595D4D800BBD41B /* SDL_timer.h in Headers */,
  10.270 -				AA7558561595D4D800BBD41B /* SDL_touch.h in Headers */,
  10.271 -				AA7558581595D4D800BBD41B /* SDL_types.h in Headers */,
  10.272 -				AA75585A1595D4D800BBD41B /* SDL_version.h in Headers */,
  10.273 -				AA75585C1595D4D800BBD41B /* SDL_video.h in Headers */,
  10.274 -				AA75585E1595D4D800BBD41B /* SDL.h in Headers */,
  10.275  			);
  10.276  			runOnlyForDeploymentPostprocessing = 0;
  10.277  		};
    11.1 --- a/acinclude/ac_check_define.m4	Sat Sep 01 09:17:34 2012 -0400
    11.2 +++ b/acinclude/ac_check_define.m4	Mon Oct 15 21:14:13 2012 -0400
    11.3 @@ -1,4 +1,4 @@
    11.4 -define(AC_CHECK_DEFINE,[dnl
    11.5 +AC_DEFUN([AC_CHECK_DEFINE],[dnl
    11.6    AC_CACHE_CHECK(for $1 in $2, ac_cv_define_$1,
    11.7      AC_EGREP_CPP([YES_IS_DEFINED], [
    11.8  #include <$2>
    12.1 --- a/acinclude/libtool.m4	Sat Sep 01 09:17:34 2012 -0400
    12.2 +++ b/acinclude/libtool.m4	Mon Oct 15 21:14:13 2012 -0400
    12.3 @@ -1,9 +1,10 @@
    12.4  ##############################################################################
    12.5 -# Based on libtool-2.2.6a
    12.6 +# Based on libtool-2.4.2
    12.7  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
    12.8  #
    12.9  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
   12.10 -#                 2006, 2007, 2008 Free Software Foundation, Inc.
   12.11 +#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
   12.12 +#                 Foundation, Inc.
   12.13  #   Written by Gordon Matzigkeit, 1996
   12.14  #
   12.15  # This file is free software; the Free Software Foundation gives
   12.16 @@ -12,7 +13,8 @@
   12.17  
   12.18  m4_define([_LT_COPYING], [dnl
   12.19  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
   12.20 -#                 2006, 2007, 2008 Free Software Foundation, Inc.
   12.21 +#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
   12.22 +#                 Foundation, Inc.
   12.23  #   Written by Gordon Matzigkeit, 1996
   12.24  #
   12.25  #   This file is part of GNU Libtool.
   12.26 @@ -39,7 +41,7 @@
   12.27  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   12.28  ])
   12.29  
   12.30 -# serial 56 LT_INIT
   12.31 +# serial 57 LT_INIT
   12.32  
   12.33  
   12.34  # LT_PREREQ(VERSION)
   12.35 @@ -68,6 +70,7 @@
   12.36  # ------------------
   12.37  AC_DEFUN([LT_INIT],
   12.38  [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
   12.39 +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
   12.40  AC_BEFORE([$0], [LT_LANG])dnl
   12.41  AC_BEFORE([$0], [LT_OUTPUT])dnl
   12.42  AC_BEFORE([$0], [LTDL_INIT])dnl
   12.43 @@ -84,6 +87,8 @@
   12.44  AC_REQUIRE([LTOBSOLETE_VERSION])dnl
   12.45  m4_require([_LT_PROG_LTMAIN])dnl
   12.46  
   12.47 +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
   12.48 +
   12.49  dnl Parse OPTIONS
   12.50  _LT_SET_OPTIONS([$0], [$1])
   12.51  
   12.52 @@ -120,7 +125,7 @@
   12.53      *) break;;
   12.54    esac
   12.55  done
   12.56 -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
   12.57 +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
   12.58  ])
   12.59  
   12.60  
   12.61 @@ -140,6 +145,11 @@
   12.62  m4_defun([_LT_SETUP],
   12.63  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
   12.64  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
   12.65 +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
   12.66 +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
   12.67 +
   12.68 +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
   12.69 +dnl
   12.70  _LT_DECL([], [host_alias], [0], [The host system])dnl
   12.71  _LT_DECL([], [host], [0])dnl
   12.72  _LT_DECL([], [host_os], [0])dnl
   12.73 @@ -162,10 +172,13 @@
   12.74  dnl
   12.75  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
   12.76  m4_require([_LT_CHECK_SHELL_FEATURES])dnl
   12.77 +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
   12.78  m4_require([_LT_CMD_RELOAD])dnl
   12.79  m4_require([_LT_CHECK_MAGIC_METHOD])dnl
   12.80 +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
   12.81  m4_require([_LT_CMD_OLD_ARCHIVE])dnl
   12.82  m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
   12.83 +m4_require([_LT_WITH_SYSROOT])dnl
   12.84  
   12.85  _LT_CONFIG_LIBTOOL_INIT([
   12.86  # See if we are running on zsh, and set the options which allow our
   12.87 @@ -181,7 +194,6 @@
   12.88  _LT_CHECK_OBJDIR
   12.89  
   12.90  m4_require([_LT_TAG_COMPILER])dnl
   12.91 -_LT_PROG_ECHO_BACKSLASH
   12.92  
   12.93  case $host_os in
   12.94  aix3*)
   12.95 @@ -195,23 +207,6 @@
   12.96    ;;
   12.97  esac
   12.98  
   12.99 -# Sed substitution that helps us do robust quoting.  It backslashifies
  12.100 -# metacharacters that are still active within double-quoted strings.
  12.101 -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
  12.102 -
  12.103 -# Same as above, but do not quote variable references.
  12.104 -double_quote_subst='s/\([["`\\]]\)/\\\1/g'
  12.105 -
  12.106 -# Sed substitution to delay expansion of an escaped shell variable in a
  12.107 -# double_quote_subst'ed string.
  12.108 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  12.109 -
  12.110 -# Sed substitution to delay expansion of an escaped single quote.
  12.111 -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  12.112 -
  12.113 -# Sed substitution to avoid accidental globbing in evaled expressions
  12.114 -no_glob_subst='s/\*/\\\*/g'
  12.115 -
  12.116  # Global variables:
  12.117  ofile=libtool
  12.118  can_build_shared=yes
  12.119 @@ -252,6 +247,28 @@
  12.120  ])# _LT_SETUP
  12.121  
  12.122  
  12.123 +# _LT_PREPARE_SED_QUOTE_VARS
  12.124 +# --------------------------
  12.125 +# Define a few sed substitution that help us do robust quoting.
  12.126 +m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
  12.127 +[# Backslashify metacharacters that are still active within
  12.128 +# double-quoted strings.
  12.129 +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
  12.130 +
  12.131 +# Same as above, but do not quote variable references.
  12.132 +double_quote_subst='s/\([["`\\]]\)/\\\1/g'
  12.133 +
  12.134 +# Sed substitution to delay expansion of an escaped shell variable in a
  12.135 +# double_quote_subst'ed string.
  12.136 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  12.137 +
  12.138 +# Sed substitution to delay expansion of an escaped single quote.
  12.139 +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  12.140 +
  12.141 +# Sed substitution to avoid accidental globbing in evaled expressions
  12.142 +no_glob_subst='s/\*/\\\*/g'
  12.143 +])
  12.144 +
  12.145  # _LT_PROG_LTMAIN
  12.146  # ---------------
  12.147  # Note that this code is called both from `configure', and `config.status'
  12.148 @@ -410,7 +427,7 @@
  12.149  # declaration there will have the same value as in `configure'.  VARNAME
  12.150  # must have a single quote delimited value for this to work.
  12.151  m4_define([_LT_CONFIG_STATUS_DECLARE],
  12.152 -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
  12.153 +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
  12.154  
  12.155  
  12.156  # _LT_CONFIG_STATUS_DECLARATIONS
  12.157 @@ -420,7 +437,7 @@
  12.158  # embedded single quotes properly.  In configure, this macro expands
  12.159  # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
  12.160  #
  12.161 -#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
  12.162 +#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
  12.163  m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
  12.164  [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
  12.165      [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
  12.166 @@ -519,12 +536,20 @@
  12.167  LTCFLAGS='$LTCFLAGS'
  12.168  compiler='$compiler_DEFAULT'
  12.169  
  12.170 +# A function that is used when there is no print builtin or printf.
  12.171 +func_fallback_echo ()
  12.172 +{
  12.173 +  eval 'cat <<_LTECHO_EOF
  12.174 +\$[]1
  12.175 +_LTECHO_EOF'
  12.176 +}
  12.177 +
  12.178  # Quote evaled strings.
  12.179  for var in lt_decl_all_varnames([[ \
  12.180  ]], lt_decl_quote_varnames); do
  12.181 -    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
  12.182 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  12.183      *[[\\\\\\\`\\"\\\$]]*)
  12.184 -      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
  12.185 +      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
  12.186        ;;
  12.187      *)
  12.188        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
  12.189 @@ -535,9 +560,9 @@
  12.190  # Double-quote double-evaled strings.
  12.191  for var in lt_decl_all_varnames([[ \
  12.192  ]], lt_decl_dquote_varnames); do
  12.193 -    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
  12.194 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  12.195      *[[\\\\\\\`\\"\\\$]]*)
  12.196 -      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  12.197 +      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  12.198        ;;
  12.199      *)
  12.200        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
  12.201 @@ -545,16 +570,38 @@
  12.202      esac
  12.203  done
  12.204  
  12.205 -# Fix-up fallback echo if it was mangled by the above quoting rules.
  12.206 -case \$lt_ECHO in
  12.207 -*'\\\[$]0 --fallback-echo"')dnl "
  12.208 -  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
  12.209 -  ;;
  12.210 -esac
  12.211 -
  12.212  _LT_OUTPUT_LIBTOOL_INIT
  12.213  ])
  12.214  
  12.215 +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
  12.216 +# ------------------------------------
  12.217 +# Generate a child script FILE with all initialization necessary to
  12.218 +# reuse the environment learned by the parent script, and make the
  12.219 +# file executable.  If COMMENT is supplied, it is inserted after the
  12.220 +# `#!' sequence but before initialization text begins.  After this
  12.221 +# macro, additional text can be appended to FILE to form the body of
  12.222 +# the child script.  The macro ends with non-zero status if the
  12.223 +# file could not be fully written (such as if the disk is full).
  12.224 +m4_ifdef([AS_INIT_GENERATED],
  12.225 +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
  12.226 +[m4_defun([_LT_GENERATED_FILE_INIT],
  12.227 +[m4_require([AS_PREPARE])]dnl
  12.228 +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
  12.229 +[lt_write_fail=0
  12.230 +cat >$1 <<_ASEOF || lt_write_fail=1
  12.231 +#! $SHELL
  12.232 +# Generated by $as_me.
  12.233 +$2
  12.234 +SHELL=\${CONFIG_SHELL-$SHELL}
  12.235 +export SHELL
  12.236 +_ASEOF
  12.237 +cat >>$1 <<\_ASEOF || lt_write_fail=1
  12.238 +AS_SHELL_SANITIZE
  12.239 +_AS_PREPARE
  12.240 +exec AS_MESSAGE_FD>&1
  12.241 +_ASEOF
  12.242 +test $lt_write_fail = 0 && chmod +x $1[]dnl
  12.243 +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
  12.244  
  12.245  # LT_OUTPUT
  12.246  # ---------
  12.247 @@ -564,20 +611,11 @@
  12.248  AC_DEFUN([LT_OUTPUT],
  12.249  [: ${CONFIG_LT=./config.lt}
  12.250  AC_MSG_NOTICE([creating $CONFIG_LT])
  12.251 -cat >"$CONFIG_LT" <<_LTEOF
  12.252 -#! $SHELL
  12.253 -# Generated by $as_me.
  12.254 -# Run this file to recreate a libtool stub with the current configuration.
  12.255 -
  12.256 -lt_cl_silent=false
  12.257 -SHELL=\${CONFIG_SHELL-$SHELL}
  12.258 -_LTEOF
  12.259 +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
  12.260 +[# Run this file to recreate a libtool stub with the current configuration.])
  12.261  
  12.262  cat >>"$CONFIG_LT" <<\_LTEOF
  12.263 -AS_SHELL_SANITIZE
  12.264 -_AS_PREPARE
  12.265 -
  12.266 -exec AS_MESSAGE_FD>&1
  12.267 +lt_cl_silent=false
  12.268  exec AS_MESSAGE_LOG_FD>>config.log
  12.269  {
  12.270    echo
  12.271 @@ -603,7 +641,7 @@
  12.272  m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
  12.273  configured by $[0], generated by m4_PACKAGE_STRING.
  12.274  
  12.275 -Copyright (C) 2008 Free Software Foundation, Inc.
  12.276 +Copyright (C) 2011 Free Software Foundation, Inc.
  12.277  This config.lt script is free software; the Free Software Foundation
  12.278  gives unlimited permision to copy, distribute and modify it."
  12.279  
  12.280 @@ -648,15 +686,13 @@
  12.281  # appending to config.log, which fails on DOS, as config.log is still kept
  12.282  # open by configure.  Here we exec the FD to /dev/null, effectively closing
  12.283  # config.log, so it can be properly (re)opened and appended to by config.lt.
  12.284 -if test "$no_create" != yes; then
  12.285 -  lt_cl_success=:
  12.286 -  test "$silent" = yes &&
  12.287 -    lt_config_lt_args="$lt_config_lt_args --quiet"
  12.288 -  exec AS_MESSAGE_LOG_FD>/dev/null
  12.289 -  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
  12.290 -  exec AS_MESSAGE_LOG_FD>>config.log
  12.291 -  $lt_cl_success || AS_EXIT(1)
  12.292 -fi
  12.293 +lt_cl_success=:
  12.294 +test "$silent" = yes &&
  12.295 +  lt_config_lt_args="$lt_config_lt_args --quiet"
  12.296 +exec AS_MESSAGE_LOG_FD>/dev/null
  12.297 +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
  12.298 +exec AS_MESSAGE_LOG_FD>>config.log
  12.299 +$lt_cl_success || AS_EXIT(1)
  12.300  ])# LT_OUTPUT
  12.301  
  12.302  
  12.303 @@ -719,15 +755,12 @@
  12.304    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
  12.305    # text mode, it properly converts lines to CR/LF.  This bash problem
  12.306    # is reportedly fixed, but why not run on old versions too?
  12.307 -  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  12.308 -    || (rm -f "$cfgfile"; exit 1)
  12.309 -
  12.310 -  _LT_PROG_XSI_SHELLFNS
  12.311 -
  12.312 -  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  12.313 -    || (rm -f "$cfgfile"; exit 1)
  12.314 -
  12.315 -  mv -f "$cfgfile" "$ofile" ||
  12.316 +  sed '$q' "$ltmain" >> "$cfgfile" \
  12.317 +     || (rm -f "$cfgfile"; exit 1)
  12.318 +
  12.319 +  _LT_PROG_REPLACE_SHELLFNS
  12.320 +
  12.321 +   mv -f "$cfgfile" "$ofile" ||
  12.322      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  12.323    chmod +x "$ofile"
  12.324  ],
  12.325 @@ -772,6 +805,7 @@
  12.326  m4_case([$1],
  12.327    [C],			[_LT_LANG(C)],
  12.328    [C++],		[_LT_LANG(CXX)],
  12.329 +  [Go],			[_LT_LANG(GO)],
  12.330    [Java],		[_LT_LANG(GCJ)],
  12.331    [Fortran 77],		[_LT_LANG(F77)],
  12.332    [Fortran],		[_LT_LANG(FC)],
  12.333 @@ -793,6 +827,31 @@
  12.334  ])# _LT_LANG
  12.335  
  12.336  
  12.337 +m4_ifndef([AC_PROG_GO], [
  12.338 +############################################################
  12.339 +# NOTE: This macro has been submitted for inclusion into   #
  12.340 +#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
  12.341 +#  a released version of Autoconf we should remove this    #
  12.342 +#  macro and use it instead.                               #
  12.343 +############################################################
  12.344 +m4_defun([AC_PROG_GO],
  12.345 +[AC_LANG_PUSH(Go)dnl
  12.346 +AC_ARG_VAR([GOC],     [Go compiler command])dnl
  12.347 +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
  12.348 +_AC_ARG_VAR_LDFLAGS()dnl
  12.349 +AC_CHECK_TOOL(GOC, gccgo)
  12.350 +if test -z "$GOC"; then
  12.351 +  if test -n "$ac_tool_prefix"; then
  12.352 +    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
  12.353 +  fi
  12.354 +fi
  12.355 +if test -z "$GOC"; then
  12.356 +  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
  12.357 +fi
  12.358 +])#m4_defun
  12.359 +])#m4_ifndef
  12.360 +
  12.361 +
  12.362  # _LT_LANG_DEFAULT_CONFIG
  12.363  # -----------------------
  12.364  m4_defun([_LT_LANG_DEFAULT_CONFIG],
  12.365 @@ -823,6 +882,10 @@
  12.366         m4_ifdef([LT_PROG_GCJ],
  12.367  	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
  12.368  
  12.369 +AC_PROVIDE_IFELSE([AC_PROG_GO],
  12.370 +  [LT_LANG(GO)],
  12.371 +  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
  12.372 +
  12.373  AC_PROVIDE_IFELSE([LT_PROG_RC],
  12.374    [LT_LANG(RC)],
  12.375    [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
  12.376 @@ -833,11 +896,13 @@
  12.377  AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
  12.378  AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
  12.379  AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
  12.380 +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
  12.381  dnl aclocal-1.4 backwards compatibility:
  12.382  dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
  12.383  dnl AC_DEFUN([AC_LIBTOOL_F77], [])
  12.384  dnl AC_DEFUN([AC_LIBTOOL_FC], [])
  12.385  dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
  12.386 +dnl AC_DEFUN([AC_LIBTOOL_RC], [])
  12.387  
  12.388  
  12.389  # _LT_TAG_COMPILER
  12.390 @@ -923,7 +988,13 @@
  12.391  	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
  12.392  	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
  12.393          _lt_result=$?
  12.394 -	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
  12.395 +	# If there is a non-empty error log, and "single_module"
  12.396 +	# appears in it, assume the flag caused a linker warning
  12.397 +        if test -s conftest.err && $GREP single_module conftest.err; then
  12.398 +	  cat conftest.err >&AS_MESSAGE_LOG_FD
  12.399 +	# Otherwise, if the output was created with a 0 exit code from
  12.400 +	# the compiler, it worked.
  12.401 +	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
  12.402  	  lt_cv_apple_cc_single_mod=yes
  12.403  	else
  12.404  	  cat conftest.err >&AS_MESSAGE_LOG_FD
  12.405 @@ -931,6 +1002,7 @@
  12.406  	rm -rf libconftest.dylib*
  12.407  	rm -f conftest.*
  12.408        fi])
  12.409 +
  12.410      AC_CACHE_CHECK([for -exported_symbols_list linker flag],
  12.411        [lt_cv_ld_exported_symbols_list],
  12.412        [lt_cv_ld_exported_symbols_list=no
  12.413 @@ -942,6 +1014,34 @@
  12.414  	[lt_cv_ld_exported_symbols_list=no])
  12.415  	LDFLAGS="$save_LDFLAGS"
  12.416      ])
  12.417 +
  12.418 +    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
  12.419 +      [lt_cv_ld_force_load=no
  12.420 +      cat > conftest.c << _LT_EOF
  12.421 +int forced_loaded() { return 2;}
  12.422 +_LT_EOF
  12.423 +      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
  12.424 +      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
  12.425 +      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
  12.426 +      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
  12.427 +      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
  12.428 +      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
  12.429 +      cat > conftest.c << _LT_EOF
  12.430 +int main() { return 0;}
  12.431 +_LT_EOF
  12.432 +      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
  12.433 +      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
  12.434 +      _lt_result=$?
  12.435 +      if test -s conftest.err && $GREP force_load conftest.err; then
  12.436 +	cat conftest.err >&AS_MESSAGE_LOG_FD
  12.437 +      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
  12.438 +	lt_cv_ld_force_load=yes
  12.439 +      else
  12.440 +	cat conftest.err >&AS_MESSAGE_LOG_FD
  12.441 +      fi
  12.442 +        rm -f conftest.err libconftest.a conftest conftest.c
  12.443 +        rm -rf conftest.dSYM
  12.444 +    ])
  12.445      case $host_os in
  12.446      rhapsody* | darwin1.[[012]])
  12.447        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
  12.448 @@ -969,7 +1069,7 @@
  12.449      else
  12.450        _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
  12.451      fi
  12.452 -    if test "$DSYMUTIL" != ":"; then
  12.453 +    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
  12.454        _lt_dsymutil='~$DSYMUTIL $lib || :'
  12.455      else
  12.456        _lt_dsymutil=
  12.457 @@ -979,8 +1079,8 @@
  12.458  ])
  12.459  
  12.460  
  12.461 -# _LT_DARWIN_LINKER_FEATURES
  12.462 -# --------------------------
  12.463 +# _LT_DARWIN_LINKER_FEATURES([TAG])
  12.464 +# ---------------------------------
  12.465  # Checks for linker and compiler features on darwin
  12.466  m4_defun([_LT_DARWIN_LINKER_FEATURES],
  12.467  [
  12.468 @@ -989,7 +1089,13 @@
  12.469    _LT_TAGVAR(hardcode_direct, $1)=no
  12.470    _LT_TAGVAR(hardcode_automatic, $1)=yes
  12.471    _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
  12.472 -  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
  12.473 +  if test "$lt_cv_ld_force_load" = "yes"; then
  12.474 +    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
  12.475 +    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
  12.476 +                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
  12.477 +  else
  12.478 +    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
  12.479 +  fi
  12.480    _LT_TAGVAR(link_all_deplibs, $1)=yes
  12.481    _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
  12.482    case $cc_basename in
  12.483 @@ -997,7 +1103,7 @@
  12.484       *) _lt_dar_can_shared=$GCC ;;
  12.485    esac
  12.486    if test "$_lt_dar_can_shared" = "yes"; then
  12.487 -    output_verbose_link_cmd=echo
  12.488 +    output_verbose_link_cmd=func_echo_all
  12.489      _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
  12.490      _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
  12.491      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
  12.492 @@ -1013,203 +1119,142 @@
  12.493    fi
  12.494  ])
  12.495  
  12.496 -# _LT_SYS_MODULE_PATH_AIX
  12.497 -# -----------------------
  12.498 +# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
  12.499 +# ----------------------------------
  12.500  # Links a minimal program and checks the executable
  12.501  # for the system default hardcoded library path. In most cases,
  12.502  # this is /usr/lib:/lib, but when the MPI compilers are used
  12.503  # the location of the communication and MPI libs are included too.
  12.504  # If we don't find anything, use the default library path according
  12.505  # to the aix ld manual.
  12.506 +# Store the results from the different compilers for each TAGNAME.
  12.507 +# Allow to override them for all tags through lt_cv_aix_libpath.
  12.508  m4_defun([_LT_SYS_MODULE_PATH_AIX],
  12.509  [m4_require([_LT_DECL_SED])dnl
  12.510 -AC_LINK_IFELSE(AC_LANG_PROGRAM,[
  12.511 -lt_aix_libpath_sed='
  12.512 -    /Import File Strings/,/^$/ {
  12.513 -	/^0/ {
  12.514 -	    s/^0  *\(.*\)$/\1/
  12.515 -	    p
  12.516 -	}
  12.517 -    }'
  12.518 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  12.519 -# Check for a 64-bit object if we didn't find anything.
  12.520 -if test -z "$aix_libpath"; then
  12.521 -  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  12.522 -fi],[])
  12.523 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  12.524 +if test "${lt_cv_aix_libpath+set}" = set; then
  12.525 +  aix_libpath=$lt_cv_aix_libpath
  12.526 +else
  12.527 +  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
  12.528 +  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
  12.529 +  lt_aix_libpath_sed='[
  12.530 +      /Import File Strings/,/^$/ {
  12.531 +	  /^0/ {
  12.532 +	      s/^0  *\([^ ]*\) *$/\1/
  12.533 +	      p
  12.534 +	  }
  12.535 +      }]'
  12.536 +  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  12.537 +  # Check for a 64-bit object if we didn't find anything.
  12.538 +  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  12.539 +    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  12.540 +  fi],[])
  12.541 +  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  12.542 +    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
  12.543 +  fi
  12.544 +  ])
  12.545 +  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
  12.546 +fi
  12.547  ])# _LT_SYS_MODULE_PATH_AIX
  12.548  
  12.549  
  12.550  # _LT_SHELL_INIT(ARG)
  12.551  # -------------------
  12.552  m4_define([_LT_SHELL_INIT],
  12.553 -[ifdef([AC_DIVERSION_NOTICE],
  12.554 -	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
  12.555 -	 [AC_DIVERT_PUSH(NOTICE)])
  12.556 -$1
  12.557 -AC_DIVERT_POP
  12.558 -])# _LT_SHELL_INIT
  12.559 +[m4_divert_text([M4SH-INIT], [$1
  12.560 +])])# _LT_SHELL_INIT
  12.561 +
  12.562  
  12.563  
  12.564  # _LT_PROG_ECHO_BACKSLASH
  12.565  # -----------------------
  12.566 -# Add some code to the start of the generated configure script which
  12.567 -# will find an echo command which doesn't interpret backslashes.
  12.568 +# Find how we can fake an echo command that does not interpret backslash.
  12.569 +# In particular, with Autoconf 2.60 or later we add some code to the start
  12.570 +# of the generated configure script which will find a shell with a builtin
  12.571 +# printf (which we can use as an echo command).
  12.572  m4_defun([_LT_PROG_ECHO_BACKSLASH],
  12.573 -[_LT_SHELL_INIT([
  12.574 -# Check that we are running under the correct shell.
  12.575 -SHELL=${CONFIG_SHELL-/bin/sh}
  12.576 -
  12.577 -case X$lt_ECHO in
  12.578 -X*--fallback-echo)
  12.579 -  # Remove one level of quotation (which was required for Make).
  12.580 -  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
  12.581 -  ;;
  12.582 -esac
  12.583 -
  12.584 -ECHO=${lt_ECHO-echo}
  12.585 -if test "X[$]1" = X--no-reexec; then
  12.586 -  # Discard the --no-reexec flag, and continue.
  12.587 -  shift
  12.588 -elif test "X[$]1" = X--fallback-echo; then
  12.589 -  # Avoid inline document here, it may be left over
  12.590 -  :
  12.591 -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
  12.592 -  # Yippee, $ECHO works!
  12.593 -  :
  12.594 +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  12.595 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
  12.596 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  12.597 +
  12.598 +AC_MSG_CHECKING([how to print strings])
  12.599 +# Test print first, because it will be a builtin if present.
  12.600 +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  12.601 +   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  12.602 +  ECHO='print -r --'
  12.603 +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  12.604 +  ECHO='printf %s\n'
  12.605  else
  12.606 -  # Restart under the correct shell.
  12.607 -  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
  12.608 -fi
  12.609 -
  12.610 -if test "X[$]1" = X--fallback-echo; then
  12.611 -  # used as fallback echo
  12.612 -  shift
  12.613 -  cat <<_LT_EOF
  12.614 -[$]*
  12.615 -_LT_EOF
  12.616 -  exit 0
  12.617 +  # Use this function as a fallback that always works.
  12.618 +  func_fallback_echo ()
  12.619 +  {
  12.620 +    eval 'cat <<_LTECHO_EOF
  12.621 +$[]1
  12.622 +_LTECHO_EOF'
  12.623 +  }
  12.624 +  ECHO='func_fallback_echo'
  12.625  fi
  12.626  
  12.627 -# The HP-UX ksh and POSIX shell print the target directory to stdout
  12.628 -# if CDPATH is set.
  12.629 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  12.630 -
  12.631 -if test -z "$lt_ECHO"; then
  12.632 -  if test "X${echo_test_string+set}" != Xset; then
  12.633 -    # find a string as large as possible, as long as the shell can cope with it
  12.634 -    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
  12.635 -      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
  12.636 -      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
  12.637 -	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
  12.638 -      then
  12.639 -        break
  12.640 -      fi
  12.641 -    done
  12.642 -  fi
  12.643 -
  12.644 -  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
  12.645 -     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
  12.646 -     test "X$echo_testing_string" = "X$echo_test_string"; then
  12.647 -    :
  12.648 -  else
  12.649 -    # The Solaris, AIX, and Digital Unix default echo programs unquote
  12.650 -    # backslashes.  This makes it impossible to quote backslashes using
  12.651 -    #   echo "$something" | sed 's/\\/\\\\/g'
  12.652 -    #
  12.653 -    # So, first we look for a working echo in the user's PATH.
  12.654 -
  12.655 -    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
  12.656 -    for dir in $PATH /usr/ucb; do
  12.657 -      IFS="$lt_save_ifs"
  12.658 -      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
  12.659 -         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
  12.660 -         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
  12.661 -         test "X$echo_testing_string" = "X$echo_test_string"; then
  12.662 -        ECHO="$dir/echo"
  12.663 -        break
  12.664 -      fi
  12.665 -    done
  12.666 -    IFS="$lt_save_ifs"
  12.667 -
  12.668 -    if test "X$ECHO" = Xecho; then
  12.669 -      # We didn't find a better echo, so look for alternatives.
  12.670 -      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
  12.671 -         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
  12.672 -         test "X$echo_testing_string" = "X$echo_test_string"; then
  12.673 -        # This shell has a builtin print -r that does the trick.
  12.674 -        ECHO='print -r'
  12.675 -      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
  12.676 -	   test "X$CONFIG_SHELL" != X/bin/ksh; then
  12.677 -        # If we have ksh, try running configure again with it.
  12.678 -        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
  12.679 -        export ORIGINAL_CONFIG_SHELL
  12.680 -        CONFIG_SHELL=/bin/ksh
  12.681 -        export CONFIG_SHELL
  12.682 -        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
  12.683 -      else
  12.684 -        # Try using printf.
  12.685 -        ECHO='printf %s\n'
  12.686 -        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
  12.687 -	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
  12.688 -	   test "X$echo_testing_string" = "X$echo_test_string"; then
  12.689 -	  # Cool, printf works
  12.690 -	  :
  12.691 -        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
  12.692 -	     test "X$echo_testing_string" = 'X\t' &&
  12.693 -	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
  12.694 -	     test "X$echo_testing_string" = "X$echo_test_string"; then
  12.695 -	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
  12.696 -	  export CONFIG_SHELL
  12.697 -	  SHELL="$CONFIG_SHELL"
  12.698 -	  export SHELL
  12.699 -	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
  12.700 -        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
  12.701 -	     test "X$echo_testing_string" = 'X\t' &&
  12.702 -	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
  12.703 -	     test "X$echo_testing_string" = "X$echo_test_string"; then
  12.704 -	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
  12.705 -        else
  12.706 -	  # maybe with a smaller string...
  12.707 -	  prev=:
  12.708 -
  12.709 -	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
  12.710 -	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
  12.711 -	    then
  12.712 -	      break
  12.713 -	    fi
  12.714 -	    prev="$cmd"
  12.715 -	  done
  12.716 -
  12.717 -	  if test "$prev" != 'sed 50q "[$]0"'; then
  12.718 -	    echo_test_string=`eval $prev`
  12.719 -	    export echo_test_string
  12.720 -	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
  12.721 -	  else
  12.722 -	    # Oops.  We lost completely, so just stick with echo.
  12.723 -	    ECHO=echo
  12.724 -	  fi
  12.725 -        fi
  12.726 -      fi
  12.727 -    fi
  12.728 -  fi
  12.729 -fi
  12.730 -
  12.731 -# Copy echo and quote the copy suitably for passing to libtool from
  12.732 -# the Makefile, instead of quoting the original, which is used later.
  12.733 -lt_ECHO=$ECHO
  12.734 -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
  12.735 -   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
  12.736 -fi
  12.737 -
  12.738 -AC_SUBST(lt_ECHO)
  12.739 -])
  12.740 +# func_echo_all arg...
  12.741 +# Invoke $ECHO with all args, space-separated.
  12.742 +func_echo_all ()
  12.743 +{
  12.744 +    $ECHO "$*" 
  12.745 +}
  12.746 +
  12.747 +case "$ECHO" in
  12.748 +  printf*) AC_MSG_RESULT([printf]) ;;
  12.749 +  print*) AC_MSG_RESULT([print -r]) ;;
  12.750 +  *) AC_MSG_RESULT([cat]) ;;
  12.751 +esac
  12.752 +
  12.753 +m4_ifdef([_AS_DETECT_SUGGESTED],
  12.754 +[_AS_DETECT_SUGGESTED([
  12.755 +  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
  12.756 +    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  12.757 +    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
  12.758 +    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  12.759 +    PATH=/empty FPATH=/empty; export PATH FPATH
  12.760 +    test "X`printf %s $ECHO`" = "X$ECHO" \
  12.761 +      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
  12.762 +
  12.763  _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
  12.764 -_LT_DECL([], [ECHO], [1],
  12.765 -    [An echo program that does not interpret backslashes])
  12.766 +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
  12.767  ])# _LT_PROG_ECHO_BACKSLASH
  12.768  
  12.769  
  12.770 +# _LT_WITH_SYSROOT
  12.771 +# ----------------
  12.772 +AC_DEFUN([_LT_WITH_SYSROOT],
  12.773 +[AC_MSG_CHECKING([for sysroot])
  12.774 +AC_ARG_WITH([sysroot],
  12.775 +[  --with-sysroot[=DIR] Search for dependent libraries within DIR
  12.776 +                        (or the compiler's sysroot if not specified).],
  12.777 +[], [with_sysroot=no])
  12.778 +
  12.779 +dnl lt_sysroot will always be passed unquoted.  We quote it here
  12.780 +dnl in case the user passed a directory name.
  12.781 +lt_sysroot=
  12.782 +case ${with_sysroot} in #(
  12.783 + yes)
  12.784 +   if test "$GCC" = yes; then
  12.785 +     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  12.786 +   fi
  12.787 +   ;; #(
  12.788 + /*)
  12.789 +   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
  12.790 +   ;; #(
  12.791 + no|'')
  12.792 +   ;; #(
  12.793 + *)
  12.794 +   AC_MSG_RESULT([${with_sysroot}])
  12.795 +   AC_MSG_ERROR([The sysroot must be an absolute path.])
  12.796 +   ;;
  12.797 +esac
  12.798 +
  12.799 + AC_MSG_RESULT([${lt_sysroot:-no}])
  12.800 +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
  12.801 +[dependent libraries, and in which our libraries should be installed.])])
  12.802 +
  12.803  # _LT_ENABLE_LOCK
  12.804  # ---------------
  12.805  m4_defun([_LT_ENABLE_LOCK],
  12.806 @@ -1238,7 +1283,7 @@
  12.807    ;;
  12.808  *-*-irix6*)
  12.809    # Find out which ABI we are using.
  12.810 -  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
  12.811 +  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
  12.812    if AC_TRY_EVAL(ac_compile); then
  12.813      if test "$lt_cv_prog_gnu_ld" = yes; then
  12.814        case `/usr/bin/file conftest.$ac_objext` in
  12.815 @@ -1331,14 +1376,27 @@
  12.816      CFLAGS="$SAVE_CFLAGS"
  12.817    fi
  12.818    ;;
  12.819 -sparc*-*solaris*)
  12.820 +*-*solaris*)
  12.821    # Find out which ABI we are using.
  12.822    echo 'int i;' > conftest.$ac_ext
  12.823    if AC_TRY_EVAL(ac_compile); then
  12.824      case `/usr/bin/file conftest.o` in
  12.825      *64-bit*)
  12.826        case $lt_cv_prog_gnu_ld in
  12.827 -      yes*) LD="${LD-ld} -m elf64_sparc" ;;
  12.828 +      yes*)
  12.829 +        case $host in
  12.830 +        i?86-*-solaris*)
  12.831 +          LD="${LD-ld} -m elf_x86_64"
  12.832 +          ;;
  12.833 +        sparc*-*-solaris*)
  12.834 +          LD="${LD-ld} -m elf64_sparc"
  12.835 +          ;;
  12.836 +        esac
  12.837 +        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
  12.838 +        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
  12.839 +          LD="${LD-ld}_sol2"
  12.840 +        fi
  12.841 +        ;;
  12.842        *)
  12.843  	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
  12.844  	  LD="${LD-ld} -64"
  12.845 @@ -1356,14 +1414,47 @@
  12.846  ])# _LT_ENABLE_LOCK
  12.847  
  12.848  
  12.849 +# _LT_PROG_AR
  12.850 +# -----------
  12.851 +m4_defun([_LT_PROG_AR],
  12.852 +[AC_CHECK_TOOLS(AR, [ar], false)
  12.853 +: ${AR=ar}
  12.854 +: ${AR_FLAGS=cru}
  12.855 +_LT_DECL([], [AR], [1], [The archiver])
  12.856 +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
  12.857 +
  12.858 +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
  12.859 +  [lt_cv_ar_at_file=no
  12.860 +   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
  12.861 +     [echo conftest.$ac_objext > conftest.lst
  12.862 +      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
  12.863 +      AC_TRY_EVAL([lt_ar_try])
  12.864 +      if test "$ac_status" -eq 0; then
  12.865 +	# Ensure the archiver fails upon bogus file names.
  12.866 +	rm -f conftest.$ac_objext libconftest.a
  12.867 +	AC_TRY_EVAL([lt_ar_try])
  12.868 +	if test "$ac_status" -ne 0; then
  12.869 +          lt_cv_ar_at_file=@
  12.870 +        fi
  12.871 +      fi
  12.872 +      rm -f conftest.* libconftest.a
  12.873 +     ])
  12.874 +  ])
  12.875 +
  12.876 +if test "x$lt_cv_ar_at_file" = xno; then
  12.877 +  archiver_list_spec=
  12.878 +else
  12.879 +  archiver_list_spec=$lt_cv_ar_at_file
  12.880 +fi
  12.881 +_LT_DECL([], [archiver_list_spec], [1],
  12.882 +  [How to feed a file listing to the archiver])
  12.883 +])# _LT_PROG_AR
  12.884 +
  12.885 +
  12.886  # _LT_CMD_OLD_ARCHIVE
  12.887  # -------------------
  12.888  m4_defun([_LT_CMD_OLD_ARCHIVE],
  12.889 -[AC_CHECK_TOOL(AR, ar, false)
  12.890 -test -z "$AR" && AR=ar
  12.891 -test -z "$AR_FLAGS" && AR_FLAGS=cru
  12.892 -_LT_DECL([], [AR], [1], [The archiver])
  12.893 -_LT_DECL([], [AR_FLAGS], [1])
  12.894 +[_LT_PROG_AR
  12.895  
  12.896  AC_CHECK_TOOL(STRIP, strip, :)
  12.897  test -z "$STRIP" && STRIP=:
  12.898 @@ -1382,18 +1473,27 @@
  12.899  if test -n "$RANLIB"; then
  12.900    case $host_os in
  12.901    openbsd*)
  12.902 -    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
  12.903 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
  12.904      ;;
  12.905    *)
  12.906 -    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
  12.907 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
  12.908      ;;
  12.909    esac
  12.910 -  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  12.911 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
  12.912  fi
  12.913 +
  12.914 +case $host_os in
  12.915 +  darwin*)
  12.916 +    lock_old_archive_extraction=yes ;;
  12.917 +  *)
  12.918 +    lock_old_archive_extraction=no ;;
  12.919 +esac
  12.920  _LT_DECL([], [old_postinstall_cmds], [2])
  12.921  _LT_DECL([], [old_postuninstall_cmds], [2])
  12.922  _LT_TAGDECL([], [old_archive_cmds], [2],
  12.923      [Commands used to build an old-style archive])
  12.924 +_LT_DECL([], [lock_old_archive_extraction], [0],
  12.925 +    [Whether to use a lock for old archive extraction])
  12.926  ])# _LT_CMD_OLD_ARCHIVE
  12.927  
  12.928  
  12.929 @@ -1418,15 +1518,15 @@
  12.930     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  12.931     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
  12.932     -e 's:$: $lt_compiler_flag:'`
  12.933 -   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
  12.934 +   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
  12.935     (eval "$lt_compile" 2>conftest.err)
  12.936     ac_status=$?
  12.937     cat conftest.err >&AS_MESSAGE_LOG_FD
  12.938 -   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
  12.939 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
  12.940     if (exit $ac_status) && test -s "$ac_outfile"; then
  12.941       # The compiler can only warn and ignore the option if not recognized
  12.942       # So say no if there are warnings other than the usual output.
  12.943 -     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
  12.944 +     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
  12.945       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
  12.946       if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
  12.947         $2=yes
  12.948 @@ -1466,7 +1566,7 @@
  12.949       if test -s conftest.err; then
  12.950         # Append any errors to the config.log.
  12.951         cat conftest.err 1>&AS_MESSAGE_LOG_FD
  12.952 -       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
  12.953 +       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
  12.954         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
  12.955         if diff conftest.exp conftest.er2 >/dev/null; then
  12.956           $2=yes
  12.957 @@ -1529,9 +1629,8 @@
  12.958      lt_cv_sys_max_cmd_len=8192;
  12.959      ;;
  12.960  
  12.961 -  beos*)
  12.962 -    # On BeOS, this test takes a really really long time.
  12.963 -    # So we just punt and use a minimum line length of 8192.
  12.964 +  mint*)
  12.965 +    # On MiNT this can take a long time and run out of memory.
  12.966      lt_cv_sys_max_cmd_len=8192;
  12.967      ;;
  12.968  
  12.969 @@ -1560,6 +1659,11 @@
  12.970      lt_cv_sys_max_cmd_len=196608
  12.971      ;;
  12.972  
  12.973 +  os2*)
  12.974 +    # The test takes a long time on OS/2.
  12.975 +    lt_cv_sys_max_cmd_len=8192
  12.976 +    ;;
  12.977 +
  12.978    osf*)
  12.979      # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
  12.980      # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
  12.981 @@ -1599,8 +1703,8 @@
  12.982        # If test is not a shell built-in, we'll probably end up computing a
  12.983        # maximum length that is only half of the actual maximum length, but
  12.984        # we can't tell.
  12.985 -      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
  12.986 -	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
  12.987 +      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
  12.988 +	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
  12.989  	      test $i != 17 # 1/2 MB should be enough
  12.990        do
  12.991          i=`expr $i + 1`
  12.992 @@ -1651,7 +1755,7 @@
  12.993    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  12.994    lt_status=$lt_dlunknown
  12.995    cat > conftest.$ac_ext <<_LT_EOF
  12.996 -[#line __oline__ "configure"
  12.997 +[#line $LINENO "configure"
  12.998  #include "confdefs.h"
  12.999  
 12.1000  #if HAVE_DLFCN_H
 12.1001 @@ -1692,7 +1796,13 @@
 12.1002  #  endif
 12.1003  #endif
 12.1004  
 12.1005 -void fnord() { int i=42;}
 12.1006 +/* When -fvisbility=hidden is used, assume the code has been annotated
 12.1007 +   correspondingly for the symbols needed.  */
 12.1008 +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 12.1009 +int fnord () __attribute__((visibility("default")));
 12.1010 +#endif
 12.1011 +
 12.1012 +int fnord () { return 42; }
 12.1013  int main ()
 12.1014  {
 12.1015    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 12.1016 @@ -1701,7 +1811,11 @@
 12.1017    if (self)
 12.1018      {
 12.1019        if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 12.1020 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 12.1021 +      else
 12.1022 +        {
 12.1023 +	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
 12.1024 +          else puts (dlerror ());
 12.1025 +	}
 12.1026        /* dlclose (self); */
 12.1027      }
 12.1028    else
 12.1029 @@ -1877,16 +1991,16 @@
 12.1030     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 12.1031     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 12.1032     -e 's:$: $lt_compiler_flag:'`
 12.1033 -   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 12.1034 +   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 12.1035     (eval "$lt_compile" 2>out/conftest.err)
 12.1036     ac_status=$?
 12.1037     cat out/conftest.err >&AS_MESSAGE_LOG_FD
 12.1038 -   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 12.1039 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 12.1040     if (exit $ac_status) && test -s out/conftest2.$ac_objext
 12.1041     then
 12.1042       # The compiler can only warn and ignore the option if not recognized
 12.1043       # So say no if there are warnings
 12.1044 -     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 12.1045 +     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
 12.1046       $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 12.1047       if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 12.1048         _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 12.1049 @@ -2045,6 +2159,7 @@
 12.1050  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 12.1051  m4_require([_LT_DECL_OBJDUMP])dnl
 12.1052  m4_require([_LT_DECL_SED])dnl
 12.1053 +m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 12.1054  AC_MSG_CHECKING([dynamic linker characteristics])
 12.1055  m4_if([$1],
 12.1056  	[], [
 12.1057 @@ -2053,16 +2168,23 @@
 12.1058      darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
 12.1059      *) lt_awk_arg="/^libraries:/" ;;
 12.1060    esac
 12.1061 -  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 12.1062 -  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
 12.1063 +  case $host_os in
 12.1064 +    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
 12.1065 +    *) lt_sed_strip_eq="s,=/,/,g" ;;
 12.1066 +  esac
 12.1067 +  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
 12.1068 +  case $lt_search_path_spec in
 12.1069 +  *\;*)
 12.1070      # if the path contains ";" then we assume it to be the separator
 12.1071      # otherwise default to the standard path separator (i.e. ":") - it is
 12.1072      # assumed that no part of a normal pathname contains ";" but that should
 12.1073      # okay in the real world where ";" in dirpaths is itself problematic.
 12.1074 -    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
 12.1075 -  else
 12.1076 -    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 12.1077 -  fi
 12.1078 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
 12.1079 +    ;;
 12.1080 +  *)
 12.1081 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
 12.1082 +    ;;
 12.1083 +  esac
 12.1084    # Ok, now we have the path, separated by spaces, we can step through it
 12.1085    # and add multilib dir if necessary.
 12.1086    lt_tmp_lt_search_path_spec=
 12.1087 @@ -2075,7 +2197,7 @@
 12.1088  	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
 12.1089      fi
 12.1090    done
 12.1091 -  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 12.1092 +  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 12.1093  BEGIN {RS=" "; FS="/|\n";} {
 12.1094    lt_foo="";
 12.1095    lt_count=0;
 12.1096 @@ -2095,7 +2217,13 @@
 12.1097    if (lt_foo != "") { lt_freq[[lt_foo]]++; }
 12.1098    if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 12.1099  }'`
 12.1100 -  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 12.1101 +  # AWK program above erroneously prepends '/' to C:/dos/paths
 12.1102 +  # for these hosts.
 12.1103 +  case $host_os in
 12.1104 +    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
 12.1105 +      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
 12.1106 +  esac
 12.1107 +  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 12.1108  else
 12.1109    sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 12.1110  fi])
 12.1111 @@ -2121,7 +2249,7 @@
 12.1112  
 12.1113  case $host_os in
 12.1114  aix3*)
 12.1115 -  version_type=linux
 12.1116 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1117    library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 12.1118    shlibpath_var=LIBPATH
 12.1119  
 12.1120 @@ -2130,7 +2258,7 @@
 12.1121    ;;
 12.1122  
 12.1123  aix[[4-9]]*)
 12.1124 -  version_type=linux
 12.1125 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1126    need_lib_prefix=no
 12.1127    need_version=no
 12.1128    hardcode_into_libs=yes
 12.1129 @@ -2183,7 +2311,7 @@
 12.1130    m68k)
 12.1131      library_names_spec='$libname.ixlibrary $libname.a'
 12.1132      # Create ${libname}_ixlibrary.a entries in /sys/libs.
 12.1133 -    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 12.1134 +    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 12.1135      ;;
 12.1136    esac
 12.1137    ;;
 12.1138 @@ -2195,7 +2323,7 @@
 12.1139    ;;
 12.1140  
 12.1141  bsdi[[45]]*)
 12.1142 -  version_type=linux
 12.1143 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1144    need_version=no
 12.1145    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 12.1146    soname_spec='${libname}${release}${shared_ext}$major'
 12.1147 @@ -2214,8 +2342,9 @@
 12.1148    need_version=no
 12.1149    need_lib_prefix=no
 12.1150  
 12.1151 -  case $GCC,$host_os in
 12.1152 -  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
 12.1153 +  case $GCC,$cc_basename in
 12.1154 +  yes,*)
 12.1155 +    # gcc
 12.1156      library_names_spec='$libname.dll.a'
 12.1157      # DLL is installed to $(libdir)/../bin by postinstall_cmds
 12.1158      postinstall_cmds='base_file=`basename \${file}`~
 12.1159 @@ -2235,39 +2364,84 @@
 12.1160      case $host_os in
 12.1161      cygwin*)
 12.1162        # Cygwin DLLs use 'cyg' prefix rather than 'lib'
 12.1163 -      #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 12.1164 -      soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}'
 12.1165 -      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
 12.1166 +      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 12.1167 +m4_if([$1], [],[
 12.1168 +      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
 12.1169        ;;
 12.1170      mingw* | cegcc*)
 12.1171        # MinGW DLLs use traditional 'lib' prefix
 12.1172 -      #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 12.1173 -      soname_spec='`echo ${libname} | $SED -e 's/^lib//'`${shared_ext}'
 12.1174 -      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 12.1175 -      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 12.1176 -        # It is most probably a Windows format PATH printed by
 12.1177 -        # mingw gcc, but we are running on Cygwin. Gcc prints its search
 12.1178 -        # path with ; separators, and with drive letters. We can handle the
 12.1179 -        # drive letters (cygwin fileutils understands them), so leave them,
 12.1180 -        # especially as we might pass files found there to a mingw objdump,
 12.1181 -        # which wouldn't understand a cygwinified path. Ahh.
 12.1182 -        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 12.1183 -      else
 12.1184 -        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 12.1185 -      fi
 12.1186 +      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 12.1187        ;;
 12.1188      pw32*)
 12.1189        # pw32 DLLs use 'pw' prefix rather than 'lib'
 12.1190        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 12.1191        ;;
 12.1192      esac
 12.1193 +    dynamic_linker='Win32 ld.exe'
 12.1194 +    ;;
 12.1195 +
 12.1196 +  *,cl*)
 12.1197 +    # Native MSVC
 12.1198 +    libname_spec='$name'
 12.1199 +    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 12.1200 +    library_names_spec='${libname}.dll.lib'
 12.1201 +
 12.1202 +    case $build_os in
 12.1203 +    mingw*)
 12.1204 +      sys_lib_search_path_spec=
 12.1205 +      lt_save_ifs=$IFS
 12.1206 +      IFS=';'
 12.1207 +      for lt_path in $LIB
 12.1208 +      do
 12.1209 +        IFS=$lt_save_ifs
 12.1210 +        # Let DOS variable expansion print the short 8.3 style file name.
 12.1211 +        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
 12.1212 +        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
 12.1213 +      done
 12.1214 +      IFS=$lt_save_ifs
 12.1215 +      # Convert to MSYS style.
 12.1216 +      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
 12.1217 +      ;;
 12.1218 +    cygwin*)
 12.1219 +      # Convert to unix form, then to dos form, then back to unix form
 12.1220 +      # but this time dos style (no spaces!) so that the unix form looks
 12.1221 +      # like /cygdrive/c/PROGRA~1:/cygdr...
 12.1222 +      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
 12.1223 +      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
 12.1224 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 12.1225 +      ;;
 12.1226 +    *)
 12.1227 +      sys_lib_search_path_spec="$LIB"
 12.1228 +      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 12.1229 +        # It is most probably a Windows format PATH.
 12.1230 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 12.1231 +      else
 12.1232 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 12.1233 +      fi
 12.1234 +      # FIXME: find the short name or the path components, as spaces are
 12.1235 +      # common. (e.g. "Program Files" -> "PROGRA~1")
 12.1236 +      ;;
 12.1237 +    esac
 12.1238 +
 12.1239 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
 12.1240 +    postinstall_cmds='base_file=`basename \${file}`~
 12.1241 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
 12.1242 +      dldir=$destdir/`dirname \$dlpath`~
 12.1243 +      test -d \$dldir || mkdir -p \$dldir~
 12.1244 +      $install_prog $dir/$dlname \$dldir/$dlname'
 12.1245 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 12.1246 +      dlpath=$dir/\$dldll~
 12.1247 +       $RM \$dlpath'
 12.1248 +    shlibpath_overrides_runpath=yes
 12.1249 +    dynamic_linker='Win32 link.exe'
 12.1250      ;;
 12.1251  
 12.1252    *)
 12.1253 +    # Assume MSVC wrapper
 12.1254      library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
 12.1255 +    dynamic_linker='Win32 ld.exe'
 12.1256      ;;
 12.1257    esac
 12.1258 -  dynamic_linker='Win32 ld.exe'
 12.1259    # FIXME: first we should search . and the directory the executable is in
 12.1260    shlibpath_var=PATH
 12.1261    ;;
 12.1262 @@ -2288,7 +2462,7 @@
 12.1263    ;;
 12.1264  
 12.1265  dgux*)
 12.1266 -  version_type=linux
 12.1267 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1268    need_lib_prefix=no
 12.1269    need_version=no
 12.1270    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
 12.1271 @@ -2296,10 +2470,6 @@
 12.1272    shlibpath_var=LD_LIBRARY_PATH
 12.1273    ;;
 12.1274  
 12.1275 -freebsd1*)
 12.1276 -  dynamic_linker=no
 12.1277 -  ;;
 12.1278 -
 12.1279  freebsd* | dragonfly*)
 12.1280    # DragonFly does not have aout.  When/if they implement a new
 12.1281    # versioning mechanism, adjust this.
 12.1282 @@ -2307,7 +2477,7 @@
 12.1283      objformat=`/usr/bin/objformat`
 12.1284    else
 12.1285      case $host_os in
 12.1286 -    freebsd[[123]]*) objformat=aout ;;
 12.1287 +    freebsd[[23]].*) objformat=aout ;;
 12.1288      *) objformat=elf ;;
 12.1289      esac
 12.1290    fi
 12.1291 @@ -2325,7 +2495,7 @@
 12.1292    esac
 12.1293    shlibpath_var=LD_LIBRARY_PATH
 12.1294    case $host_os in
 12.1295 -  freebsd2*)
 12.1296 +  freebsd2.*)
 12.1297      shlibpath_overrides_runpath=yes
 12.1298      ;;
 12.1299    freebsd3.[[01]]* | freebsdelf3.[[01]]*)
 12.1300 @@ -2345,12 +2515,26 @@
 12.1301    ;;
 12.1302  
 12.1303  gnu*)
 12.1304 -  version_type=linux
 12.1305 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1306    need_lib_prefix=no
 12.1307    need_version=no
 12.1308    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 12.1309    soname_spec='${libname}${release}${shared_ext}$major'
 12.1310    shlibpath_var=LD_LIBRARY_PATH
 12.1311 +  shlibpath_overrides_runpath=no
 12.1312 +  hardcode_into_libs=yes
 12.1313 +  ;;
 12.1314 +
 12.1315 +haiku*)
 12.1316 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1317 +  need_lib_prefix=no
 12.1318 +  need_version=no
 12.1319 +  dynamic_linker="$host_os runtime_loader"
 12.1320 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 12.1321 +  soname_spec='${libname}${release}${shared_ext}$major'
 12.1322 +  shlibpath_var=LIBRARY_PATH
 12.1323 +  shlibpath_overrides_runpath=yes
 12.1324 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 12.1325    hardcode_into_libs=yes
 12.1326    ;;
 12.1327  
 12.1328 @@ -2396,12 +2580,14 @@
 12.1329      soname_spec='${libname}${release}${shared_ext}$major'
 12.1330      ;;
 12.1331    esac
 12.1332 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 12.1333 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
 12.1334    postinstall_cmds='chmod 555 $lib'
 12.1335 +  # or fails outright, so override atomically:
 12.1336 +  install_override_mode=555
 12.1337    ;;
 12.1338  
 12.1339  interix[[3-9]]*)
 12.1340 -  version_type=linux
 12.1341 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1342    need_lib_prefix=no
 12.1343    need_version=no
 12.1344    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 12.1345 @@ -2417,7 +2603,7 @@
 12.1346      nonstopux*) version_type=nonstopux ;;
 12.1347      *)
 12.1348  	if test "$lt_cv_prog_gnu_ld" = yes; then
 12.1349 -		version_type=linux
 12.1350 +		version_type=linux # correct to gnu/linux during the next big refactor
 12.1351  	else
 12.1352  		version_type=irix
 12.1353  	fi ;;
 12.1354 @@ -2454,9 +2640,9 @@
 12.1355    dynamic_linker=no
 12.1356    ;;
 12.1357  
 12.1358 -# This must be Linux ELF.
 12.1359 -linux* | k*bsd*-gnu)
 12.1360 -  version_type=linux
 12.1361 +# This must be glibc/ELF.
 12.1362 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
 12.1363 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1364    need_lib_prefix=no
 12.1365    need_version=no
 12.1366    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 12.1367 @@ -2464,16 +2650,21 @@
 12.1368    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 12.1369    shlibpath_var=LD_LIBRARY_PATH
 12.1370    shlibpath_overrides_runpath=no
 12.1371 +
 12.1372    # Some binutils ld are patched to set DT_RUNPATH
 12.1373 -  save_LDFLAGS=$LDFLAGS
 12.1374 -  save_libdir=$libdir
 12.1375 -  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
 12.1376 -       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
 12.1377 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 12.1378 -    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
 12.1379 -       [shlibpath_overrides_runpath=yes])])
 12.1380 -  LDFLAGS=$save_LDFLAGS
 12.1381 -  libdir=$save_libdir
 12.1382 +  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
 12.1383 +    [lt_cv_shlibpath_overrides_runpath=no
 12.1384 +    save_LDFLAGS=$LDFLAGS
 12.1385 +    save_libdir=$libdir
 12.1386 +    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
 12.1387 +	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
 12.1388 +    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 12.1389 +      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
 12.1390 +	 [lt_cv_shlibpath_overrides_runpath=yes])])
 12.1391 +    LDFLAGS=$save_LDFLAGS
 12.1392 +    libdir=$save_libdir
 12.1393 +    ])
 12.1394 +  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 12.1395  
 12.1396    # This implies no fast_install, which is unacceptable.
 12.1397    # Some rework will be needed to allow for fast_install
 12.1398 @@ -2482,7 +2673,7 @@
 12.1399  
 12.1400    # Append ld.so.conf contents to the search path
 12.1401    if test -f /etc/ld.so.conf; then
 12.1402 -    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 12.1403 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 12.1404      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 12.1405    fi
 12.1406  
 12.1407 @@ -2514,7 +2705,7 @@
 12.1408    ;;
 12.1409  
 12.1410  newsos6)
 12.1411 -  version_type=linux
 12.1412 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1413    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 12.1414    shlibpath_var=LD_LIBRARY_PATH
 12.1415    shlibpath_overrides_runpath=yes
 12.1416 @@ -2583,7 +2774,7 @@
 12.1417    ;;
 12.1418  
 12.1419  solaris*)
 12.1420 -  version_type=linux
 12.1421 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1422    need_lib_prefix=no
 12.1423    need_version=no
 12.1424    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 12.1425 @@ -2608,7 +2799,7 @@
 12.1426    ;;
 12.1427  
 12.1428  sysv4 | sysv4.3*)
 12.1429 -  version_type=linux
 12.1430 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1431    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 12.1432    soname_spec='${libname}${release}${shared_ext}$major'
 12.1433    shlibpath_var=LD_LIBRARY_PATH
 12.1434 @@ -2632,7 +2823,7 @@
 12.1435  
 12.1436  sysv4*MP*)
 12.1437    if test -d /usr/nec ;then
 12.1438 -    version_type=linux
 12.1439 +    version_type=linux # correct to gnu/linux during the next big refactor
 12.1440      library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
 12.1441      soname_spec='$libname${shared_ext}.$major'
 12.1442      shlibpath_var=LD_LIBRARY_PATH
 12.1443 @@ -2663,7 +2854,7 @@
 12.1444  
 12.1445  tpf*)
 12.1446    # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
 12.1447 -  version_type=linux
 12.1448 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1449    need_lib_prefix=no
 12.1450    need_version=no
 12.1451    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 12.1452 @@ -2673,7 +2864,7 @@
 12.1453    ;;
 12.1454  
 12.1455  uts4*)
 12.1456 -  version_type=linux
 12.1457 +  version_type=linux # correct to gnu/linux during the next big refactor
 12.1458    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 12.1459    soname_spec='${libname}${release}${shared_ext}$major'
 12.1460    shlibpath_var=LD_LIBRARY_PATH
 12.1461 @@ -2715,6 +2906,8 @@
 12.1462      The last name is the one that the linker finds with -lNAME]])
 12.1463  _LT_DECL([], [soname_spec], [1],
 12.1464      [[The coded name of the library, if different from the real name]])
 12.1465 +_LT_DECL([], [install_override_mode], [1],
 12.1466 +    [Permission mode override for installation of shared libraries])
 12.1467  _LT_DECL([], [postinstall_cmds], [2],
 12.1468      [Command to use after installation of a shared archive])
 12.1469  _LT_DECL([], [postuninstall_cmds], [2],
 12.1470 @@ -2827,6 +3020,7 @@
 12.1471  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 12.1472  m4_require([_LT_DECL_SED])dnl
 12.1473  m4_require([_LT_DECL_EGREP])dnl
 12.1474 +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 12.1475  
 12.1476  AC_ARG_WITH([gnu-ld],
 12.1477      [AS_HELP_STRING([--with-gnu-ld],
 12.1478 @@ -2948,6 +3142,11 @@
 12.1479  esac
 12.1480  reload_cmds='$LD$reload_flag -o $output$reload_objs'
 12.1481  case $host_os in
 12.1482 +  cygwin* | mingw* | pw32* | cegcc*)
 12.1483 +    if test "$GCC" != yes; then
 12.1484 +      reload_cmds=false
 12.1485 +    fi
 12.1486 +    ;;
 12.1487    darwin*)
 12.1488      if test "$GCC" = yes; then
 12.1489        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
 12.1490 @@ -2956,8 +3155,8 @@
 12.1491      fi
 12.1492      ;;
 12.1493  esac
 12.1494 -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 12.1495 -_LT_DECL([], [reload_cmds], [2])dnl
 12.1496 +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 12.1497 +_LT_TAGDECL([], [reload_cmds], [2])dnl
 12.1498  ])# _LT_CMD_RELOAD
 12.1499  
 12.1500  
 12.1501 @@ -3002,25 +3201,27 @@
 12.1502  cygwin*)
 12.1503    # func_win32_libid is a shell function defined in ltmain.sh
 12.1504    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 12.1505 +  lt_cv_file_magic_cmd='func_win32_libid'
 12.1506    lt_cv_deplibs_check_method=pass_all
 12.1507 -  lt_cv_file_magic_cmd='func_win32_libid'
 12.1508    ;;
 12.1509  
 12.1510  mingw* | pw32*)
 12.1511    # Base MSYS/MinGW do not provide the 'file' command needed by
 12.1512    # func_win32_libid shell function, so use a weaker test based on 'objdump',
 12.1513    # unless we find 'file', for example because we are cross-compiling.
 12.1514 -  if ( file / ) >/dev/null 2>&1; then
 12.1515 +  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
 12.1516 +  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
 12.1517      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 12.1518      lt_cv_file_magic_cmd='func_win32_libid'
 12.1519    else
 12.1520 +    # Keep this pattern in sync with the one in func_win32_libid.
 12.1521      lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
 12.1522      lt_cv_file_magic_cmd='$OBJDUMP -f'
 12.1523    fi
 12.1524    lt_cv_deplibs_check_method=pass_all
 12.1525    ;;
 12.1526  
 12.1527 -cegcc)
 12.1528 +cegcc*)
 12.1529    # use the weaker test based on 'objdump'. See mingw*.
 12.1530    lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
 12.1531    lt_cv_file_magic_cmd='$OBJDUMP -f'
 12.1532 @@ -3050,6 +3251,10 @@
 12.1533    lt_cv_deplibs_check_method=pass_all
 12.1534    ;;
 12.1535  
 12.1536 +haiku*)
 12.1537 +  lt_cv_deplibs_check_method=pass_all
 12.1538 +  ;;
 12.1539 +
 12.1540  hpux10.20* | hpux11*)
 12.1541    lt_cv_file_magic_cmd=/usr/bin/file
 12.1542    case $host_cpu in
 12.1543 @@ -3058,11 +3263,11 @@
 12.1544      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
 12.1545      ;;
 12.1546    hppa*64*)
 12.1547 -    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
 12.1548 +    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
 12.1549      lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
 12.1550      ;;
 12.1551    *)
 12.1552 -    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
 12.1553 +    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
 12.1554      lt_cv_file_magic_test_file=/usr/lib/libc.sl
 12.1555      ;;
 12.1556    esac
 12.1557 @@ -3083,8 +3288,8 @@
 12.1558    lt_cv_deplibs_check_method=pass_all
 12.1559    ;;
 12.1560  
 12.1561 -# This must be Linux ELF.
 12.1562 -linux* | k*bsd*-gnu)
 12.1563 +# This must be glibc/ELF.
 12.1564 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
 12.1565    lt_cv_deplibs_check_method=pass_all
 12.1566    ;;
 12.1567  
 12.1568 @@ -3162,6 +3367,21 @@
 12.1569    ;;
 12.1570  esac
 12.1571  ])
 12.1572 +
 12.1573 +file_magic_glob=
 12.1574 +want_nocaseglob=no
 12.1575 +if test "$build" = "$host"; then
 12.1576 +  case $host_os in
 12.1577 +  mingw* | pw32*)
 12.1578 +    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
 12.1579 +      want_nocaseglob=yes
 12.1580 +    else
 12.1581 +      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
 12.1582 +    fi
 12.1583 +    ;;
 12.1584 +  esac
 12.1585 +fi
 12.1586 +
 12.1587  file_magic_cmd=$lt_cv_file_magic_cmd
 12.1588  deplibs_check_method=$lt_cv_deplibs_check_method
 12.1589  test -z "$deplibs_check_method" && deplibs_check_method=unknown
 12.1590 @@ -3169,7 +3389,11 @@
 12.1591  _LT_DECL([], [deplibs_check_method], [1],
 12.1592      [Method to check whether dependent libraries are shared objects])
 12.1593  _LT_DECL([], [file_magic_cmd], [1],
 12.1594 -    [Command to use when deplibs_check_method == "file_magic"])
 12.1595 +    [Command to use when deplibs_check_method = "file_magic"])
 12.1596 +_LT_DECL([], [file_magic_glob], [1],
 12.1597 +    [How to find potential files when deplibs_check_method = "file_magic"])
 12.1598 +_LT_DECL([], [want_nocaseglob], [1],
 12.1599 +    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 12.1600  ])# _LT_CHECK_MAGIC_METHOD
 12.1601  
 12.1602  
 12.1603 @@ -3226,7 +3450,19 @@
 12.1604    NM="$lt_cv_path_NM"
 12.1605  else
 12.1606    # Didn't find any BSD compatible name lister, look for dumpbin.
 12.1607 -  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
 12.1608 +  if test -n "$DUMPBIN"; then :
 12.1609 +    # Let the user override the test.
 12.1610 +  else
 12.1611 +    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
 12.1612 +    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
 12.1613 +    *COFF*)
 12.1614 +      DUMPBIN="$DUMPBIN -symbols"
 12.1615 +      ;;
 12.1616 +    *)
 12.1617 +      DUMPBIN=:
 12.1618 +      ;;
 12.1619 +    esac
 12.1620 +  fi
 12.1621    AC_SUBST([DUMPBIN])
 12.1622    if test "$DUMPBIN" != ":"; then
 12.1623      NM="$DUMPBIN"
 12.1624 @@ -3239,13 +3475,13 @@
 12.1625  AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
 12.1626    [lt_cv_nm_interface="BSD nm"
 12.1627    echo "int some_variable = 0;" > conftest.$ac_ext
 12.1628 -  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 12.1629 +  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 12.1630    (eval "$ac_compile" 2>conftest.err)
 12.1631    cat conftest.err >&AS_MESSAGE_LOG_FD
 12.1632 -  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 12.1633 +  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 12.1634    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 12.1635    cat conftest.err >&AS_MESSAGE_LOG_FD
 12.1636 -  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
 12.1637 +  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
 12.1638    cat conftest.out >&AS_MESSAGE_LOG_FD
 12.1639    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 12.1640      lt_cv_nm_interface="MS dumpbin"
 12.1641 @@ -3260,6 +3496,67 @@
 12.1642  dnl AC_DEFUN([AM_PROG_NM], [])
 12.1643  dnl AC_DEFUN([AC_PROG_NM], [])
 12.1644  
 12.1645 +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 12.1646 +# --------------------------------
 12.1647 +# how to determine the name of the shared library
 12.1648 +# associated with a specific link library.
 12.1649 +#  -- PORTME fill in with the dynamic library characteristics
 12.1650 +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
 12.1651 +[m4_require([_LT_DECL_EGREP])
 12.1652 +m4_require([_LT_DECL_OBJDUMP])
 12.1653 +m4_require([_LT_DECL_DLLTOOL])
 12.1654 +AC_CACHE_CHECK([how to associate runtime and link libraries],
 12.1655 +lt_cv_sharedlib_from_linklib_cmd,
 12.1656 +[lt_cv_sharedlib_from_linklib_cmd='unknown'
 12.1657 +
 12.1658 +case $host_os in
 12.1659 +cygwin* | mingw* | pw32* | cegcc*)
 12.1660 +  # two different shell functions defined in ltmain.sh
 12.1661 +  # decide which to use based on capabilities of $DLLTOOL
 12.1662 +  case `$DLLTOOL --help 2>&1` in
 12.1663 +  *--identify-strict*)
 12.1664 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
 12.1665 +    ;;
 12.1666 +  *)
 12.1667 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
 12.1668 +    ;;
 12.1669 +  esac
 12.1670 +  ;;
 12.1671 +*)
 12.1672 +  # fallback: assume linklib IS sharedlib
 12.1673 +  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
 12.1674 +  ;;
 12.1675 +esac
 12.1676 +])
 12.1677 +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 12.1678 +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 12.1679 +
 12.1680 +_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
 12.1681 +    [Command to associate shared and link libraries])
 12.1682 +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 12.1683 +
 12.1684 +
 12.1685 +# _LT_PATH_MANIFEST_TOOL
 12.1686 +# ----------------------
 12.1687 +# locate the manifest tool
 12.1688 +m4_defun([_LT_PATH_MANIFEST_TOOL],
 12.1689 +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
 12.1690 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
 12.1691 +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
 12.1692 +  [lt_cv_path_mainfest_tool=no
 12.1693 +  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
 12.1694 +  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
 12.1695 +  cat conftest.err >&AS_MESSAGE_LOG_FD
 12.1696 +  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
 12.1697 +    lt_cv_path_mainfest_tool=yes
 12.1698 +  fi
 12.1699 +  rm -f conftest*])
 12.1700 +if test "x$lt_cv_path_mainfest_tool" != xyes; then
 12.1701 +  MANIFEST_TOOL=:
 12.1702 +fi
 12.1703 +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
 12.1704 +])# _LT_PATH_MANIFEST_TOOL
 12.1705 +
 12.1706  
 12.1707  # LT_LIB_M
 12.1708  # --------
 12.1709 @@ -3268,7 +3565,7 @@
 12.1710  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 12.1711  LIBM=
 12.1712  case $host in
 12.1713 -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
 12.1714 +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
 12.1715    # These system don't have libm, or don't need it
 12.1716    ;;
 12.1717  *-ncr-sysv4.3*)
 12.1718 @@ -3296,7 +3593,12 @@
 12.1719  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 12.1720  
 12.1721  if test "$GCC" = yes; then
 12.1722 -  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 12.1723 +  case $cc_basename in
 12.1724 +  nvcc*)
 12.1725 +    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
 12.1726 +  *)
 12.1727 +    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
 12.1728 +  esac
 12.1729  
 12.1730    _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
 12.1731      lt_cv_prog_compiler_rtti_exceptions,
 12.1732 @@ -3313,6 +3615,7 @@
 12.1733  m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 12.1734  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 12.1735  AC_REQUIRE([AC_PROG_CC])dnl
 12.1736 +AC_REQUIRE([AC_PROG_AWK])dnl
 12.1737  AC_REQUIRE([LT_PATH_NM])dnl
 12.1738  AC_REQUIRE([LT_PATH_LD])dnl
 12.1739  m4_require([_LT_DECL_SED])dnl
 12.1740 @@ -3380,8 +3683,8 @@
 12.1741  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 12.1742  
 12.1743  # Transform an extracted symbol line into symbol name and symbol address
 12.1744 -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
 12.1745 -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 12.1746 +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
 12.1747 +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 12.1748  
 12.1749  # Handle CRLF in mingw tool chain
 12.1750  opt_cr=
 12.1751 @@ -3405,6 +3708,7 @@
 12.1752      # which start with @ or ?.
 12.1753      lt_cv_sys_global_symbol_pipe="$AWK ['"\
 12.1754  "     {last_section=section; section=\$ 3};"\
 12.1755 +"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 12.1756  "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 12.1757  "     \$ 0!~/External *\|/{next};"\
 12.1758  "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 12.1759 @@ -3417,6 +3721,7 @@
 12.1760    else
 12.1761      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 12.1762    fi
 12.1763 +  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 12.1764  
 12.1765    # Check to see that the pipe works correctly.
 12.1766    pipe_works=no
 12.1767 @@ -3438,7 +3743,7 @@
 12.1768    if AC_TRY_EVAL(ac_compile); then
 12.1769      # Now try to grab the symbols.
 12.1770      nlist=conftest.nm
 12.1771 -    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
 12.1772 +    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
 12.1773        # Try sorting and uniquifying the output.
 12.1774        if sort "$nlist" | uniq > "$nlist"T; then
 12.1775  	mv -f "$nlist"T "$nlist"
 12.1776 @@ -3450,6 +3755,18 @@
 12.1777        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 12.1778  	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 12.1779  	  cat <<_LT_EOF > conftest.$ac_ext
 12.1780 +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
 12.1781 +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
 12.1782 +/* DATA imports from DLLs on WIN32 con't be const, because runtime
 12.1783 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 12.1784 +# define LT@&t@_DLSYM_CONST
 12.1785 +#elif defined(__osf__)
 12.1786 +/* This system does not cope well with relocations in const data.  */
 12.1787 +# define LT@&t@_DLSYM_CONST
 12.1788 +#else
 12.1789 +# define LT@&t@_DLSYM_CONST const
 12.1790 +#endif
 12.1791 +
 12.1792  #ifdef __cplusplus
 12.1793  extern "C" {
 12.1794  #endif
 12.1795 @@ -3461,7 +3778,7 @@
 12.1796  	  cat <<_LT_EOF >> conftest.$ac_ext
 12.1797  
 12.1798  /* The mapping between symbol names and symbols.  */
 12.1799 -const struct {
 12.1800 +LT@&t@_DLSYM_CONST struct {
 12.1801    const char *name;
 12.1802    void       *address;
 12.1803  }
 12.1804 @@ -3487,15 +3804,15 @@
 12.1805  _LT_EOF
 12.1806  	  # Now try linking the two files.
 12.1807  	  mv conftest.$ac_objext conftstm.$ac_objext
 12.1808 -	  lt_save_LIBS="$LIBS"
 12.1809 -	  lt_save_CFLAGS="$CFLAGS"
 12.1810 +	  lt_globsym_save_LIBS=$LIBS
 12.1811 +	  lt_globsym_save_CFLAGS=$CFLAGS
 12.1812  	  LIBS="conftstm.$ac_objext"
 12.1813  	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 12.1814  	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 12.1815  	    pipe_works=yes
 12.1816  	  fi
 12.1817 -	  LIBS="$lt_save_LIBS"
 12.1818 -	  CFLAGS="$lt_save_CFLAGS"
 12.1819 +	  LIBS=$lt_globsym_save_LIBS
 12.1820 +	  CFLAGS=$lt_globsym_save_CFLAGS
 12.1821  	else
 12.1822  	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 12.1823  	fi
 12.1824 @@ -3528,6 +3845,13 @@
 12.1825    AC_MSG_RESULT(ok)
 12.1826  fi
 12.1827  
 12.1828 +# Response file support.
 12.1829 +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 12.1830 +  nm_file_list_spec='@'
 12.1831 +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
 12.1832 +  nm_file_list_spec='@'
 12.1833 +fi
 12.1834 +
 12.1835  _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
 12.1836      [Take the output of nm and produce a listing of raw symbols and C names])
 12.1837  _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
 12.1838 @@ -3538,6 +3862,8 @@
 12.1839  _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
 12.1840      [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
 12.1841      [Transform the output of nm in a C name address pair when lib prefix is needed])
 12.1842 +_LT_DECL([], [nm_file_list_spec], [1],
 12.1843 +    [Specify filename containing input files for $NM])
 12.1844  ]) # _LT_CMD_GLOBAL_SYMBOLS
 12.1845  
 12.1846  
 12.1847 @@ -3549,7 +3875,6 @@
 12.1848  _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 12.1849  _LT_TAGVAR(lt_prog_compiler_static, $1)=
 12.1850  
 12.1851 -AC_MSG_CHECKING([for $compiler option to produce PIC])
 12.1852  m4_if([$1], [CXX], [
 12.1853    # C++ specific cases for pic, static, wl, etc.
 12.1854    if test "$GXX" = yes; then
 12.1855 @@ -3600,6 +3925,11 @@
 12.1856        # DJGPP does not support shared libraries at all
 12.1857        _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 12.1858        ;;
 12.1859 +    haiku*)
 12.1860 +      # PIC is the default for Haiku.
 12.1861 +      # The "-static" flag exists, but is broken.
 12.1862 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=
 12.1863 +      ;;
 12.1864      interix[[3-9]]*)
 12.1865        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 12.1866        # Instead, we relocate shared libraries at runtime.
 12.1867 @@ -3649,6 +3979,12 @@
 12.1868  	  ;;
 12.1869  	esac
 12.1870  	;;
 12.1871 +      mingw* | cygwin* | os2* | pw32* | cegcc*)
 12.1872 +	# This hack is so that the source file can tell whether it is being
 12.1873 +	# built for inclusion in a dll (and should export symbols for example).
 12.1874 +	m4_if([$1], [GCJ], [],
 12.1875 +	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
 12.1876 +	;;
 12.1877        dgux*)
 12.1878  	case $cc_basename in
 12.1879  	  ec++*)
 12.1880 @@ -3705,7 +4041,7 @@
 12.1881  	    ;;
 12.1882  	esac
 12.1883  	;;
 12.1884 -      linux* | k*bsd*-gnu)
 12.1885 +      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 12.1886  	case $cc_basename in
 12.1887  	  KCC*)
 12.1888  	    # KAI C++ Compiler
 12.1889 @@ -3738,8 +4074,8 @@
 12.1890  	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 12.1891  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 12.1892  	    ;;
 12.1893 -	  xlc* | xlC*)
 12.1894 -	    # IBM XL 8.0 on PPC
 12.1895 +	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
 12.1896 +	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 12.1897  	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 12.1898  	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 12.1899  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 12.1900 @@ -3801,7 +4137,7 @@
 12.1901  	;;
 12.1902        solaris*)
 12.1903  	case $cc_basename in
 12.1904 -	  CC*)
 12.1905 +	  CC* | sunCC*)
 12.1906  	    # Sun C++ 4.2, 5.x and Centerline C++
 12.1907  	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 12.1908  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 12.1909 @@ -3905,6 +4241,12 @@
 12.1910        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 12.1911        ;;
 12.1912  
 12.1913 +    haiku*)
 12.1914 +      # PIC is the default for Haiku.
 12.1915 +      # The "-static" flag exists, but is broken.
 12.1916 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=
 12.1917 +      ;;
 12.1918 +
 12.1919      hpux*)
 12.1920        # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
 12.1921        # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
 12.1922 @@ -3947,6 +4289,15 @@
 12.1923        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 12.1924        ;;
 12.1925      esac
 12.1926 +
 12.1927 +    case $cc_basename in
 12.1928 +    nvcc*) # Cuda Compiler Driver 2.2
 12.1929 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
 12.1930 +      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
 12.1931 +        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
 12.1932 +      fi
 12.1933 +      ;;
 12.1934 +    esac
 12.1935    else
 12.1936      # PORTME Check for flag to pass linker flags through the system compiler.
 12.1937      case $host_os in
 12.1938 @@ -3989,7 +4340,7 @@
 12.1939        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 12.1940        ;;
 12.1941  
 12.1942 -    linux* | k*bsd*-gnu)
 12.1943 +    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 12.1944        case $cc_basename in
 12.1945        # old Intel for x86_64 which still supported -KPIC.
 12.1946        ecc*)
 12.1947 @@ -4010,7 +4361,13 @@
 12.1948  	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 12.1949  	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 12.1950  	;;
 12.1951 -      pgcc* | pgf77* | pgf90* | pgf95*)
 12.1952 +      nagfor*)
 12.1953 +	# NAG Fortran compiler
 12.1954 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
 12.1955 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 12.1956 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 12.1957 +	;;
 12.1958 +      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 12.1959          # Portland Group compilers (*not* the Pentium gcc compiler,
 12.1960  	# which looks to be a dead project)
 12.1961  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 12.1962 @@ -4022,25 +4379,40 @@
 12.1963          # All Alpha code is PIC.
 12.1964          _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 12.1965          ;;
 12.1966 -      xl*)
 12.1967 -	# IBM XL C 8.0/Fortran 10.1 on PPC
 12.1968 +      xl* | bgxl* | bgf* | mpixl*)
 12.1969 +	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 12.1970  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 12.1971  	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 12.1972  	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 12.1973  	;;
 12.1974        *)
 12.1975  	case `$CC -V 2>&1 | sed 5q` in
 12.1976 +	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 12.1977 +	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 12.1978 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 12.1979 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 12.1980 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 12.1981 +	  ;;
 12.1982 +	*Sun\ F* | *Sun*Fortran*)
 12.1983 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 12.1984 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 12.1985 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 12.1986 +	  ;;
 12.1987  	*Sun\ C*)
 12.1988  	  # Sun C 5.9
 12.1989  	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 12.1990  	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 12.1991  	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 12.1992  	  ;;
 12.1993 -	*Sun\ F*)
 12.1994 -	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 12.1995 -	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 12.1996 +        *Intel*\ [[CF]]*Compiler*)
 12.1997 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 12.1998 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 12.1999 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 12.2000 +	  ;;
 12.2001 +	*Portland\ Group*)
 12.2002 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 12.2003 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 12.2004  	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 12.2005 -	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 12.2006  	  ;;
 12.2007  	esac
 12.2008  	;;
 12.2009 @@ -4072,7 +4444,7 @@
 12.2010        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 12.2011        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 12.2012        case $cc_basename in
 12.2013 -      f77* | f90* | f95*)
 12.2014 +      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 12.2015  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
 12.2016        *)
 12.2017  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
 12.2018 @@ -4129,9 +4501,11 @@
 12.2019      _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
 12.2020      ;;
 12.2021  esac
 12.2022 -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
 12.2023 -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
 12.2024 -	[How to pass a linker flag through the compiler])
 12.2025 +
 12.2026 +AC_CACHE_CHECK([for $compiler option to produce PIC],
 12.2027 +  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
 12.2028 +  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
 12.2029 +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 12.2030  
 12.2031  #
 12.2032  # Check to make sure the PIC flag actually works.
 12.2033 @@ -4150,6 +4524,8 @@
 12.2034  _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 12.2035  	[Additional compiler flags for building library objects])
 12.2036  
 12.2037 +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
 12.2038 +	[How to pass a linker flag through the compiler])
 12.2039  #
 12.2040  # Check to make sure the static flag actually works.
 12.2041  #
 12.2042 @@ -4170,6 +4546,7 @@
 12.2043  m4_defun([_LT_LINKER_SHLIBS],
 12.2044  [AC_REQUIRE([LT_PATH_LD])dnl
 12.2045  AC_REQUIRE([LT_PATH_NM])dnl
 12.2046 +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 12.2047  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 12.2048  m4_require([_LT_DECL_EGREP])dnl
 12.2049  m4_require([_LT_DECL_SED])dnl
 12.2050 @@ -4178,27 +4555,37 @@
 12.2051  AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 12.2052  m4_if([$1], [CXX], [
 12.2053    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 12.2054 +  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 12.2055    case $host_os in
 12.2056    aix[[4-9]]*)
 12.2057      # If we're using GNU nm, then we don't want the "-C" option.
 12.2058      # -C means demangle to AIX nm, but means don't demangle with GNU nm
 12.2059 +    # Also, AIX nm treats weak defined symbols like other global defined
 12.2060 +    # symbols, whereas GNU nm marks them as "W".
 12.2061      if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 12.2062 -      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 12.2063 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 12.2064      else
 12.2065        _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 12.2066      fi
 12.2067      ;;
 12.2068    pw32*)
 12.2069      _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
 12.2070 -  ;;
 12.2071 +    ;;
 12.2072    cygwin* | mingw* | cegcc*)
 12.2073 -    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 12.2074 -  ;;
 12.2075 +    case $cc_basename in
 12.2076 +    cl*)
 12.2077 +      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 12.2078 +      ;;
 12.2079 +    *)
 12.2080 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 12.2081 +      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 12.2082 +      ;;
 12.2083 +    esac
 12.2084 +    ;;
 12.2085    *)
 12.2086      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 12.2087 -  ;;
 12.2088 +    ;;
 12.2089    esac
 12.2090 -  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 12.2091  ], [
 12.2092    runpath_var=
 12.2093    _LT_TAGVAR(allow_undefined_flag, $1)=
 12.2094 @@ -4213,7 +4600,6 @@
 12.2095    _LT_TAGVAR(hardcode_direct, $1)=no
 12.2096    _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 12.2097    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 12.2098 -  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 12.2099    _LT_TAGVAR(hardcode_libdir_separator, $1)=
 12.2100    _LT_TAGVAR(hardcode_minus_L, $1)=no
 12.2101    _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 12.2102 @@ -4261,7 +4647,33 @@
 12.2103    esac
 12.2104  
 12.2105    _LT_TAGVAR(ld_shlibs, $1)=yes
 12.2106 +
 12.2107 +  # On some targets, GNU ld is compatible enough with the native linker
 12.2108 +  # that we're better off using the native interface for both.
 12.2109 +  lt_use_gnu_ld_interface=no
 12.2110    if test "$with_gnu_ld" = yes; then
 12.2111 +    case $host_os in
 12.2112 +      aix*)
 12.2113 +	# The AIX port of GNU ld has always aspired to compatibility
 12.2114 +	# with the native linker.  However, as the warning in the GNU ld
 12.2115 +	# block says, versions before 2.19.5* couldn't really create working
 12.2116 +	# shared libraries, regardless of the interface used.
 12.2117 +	case `$LD -v 2>&1` in
 12.2118 +	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
 12.2119 +	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
 12.2120 +	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
 12.2121 +	  *)
 12.2122 +	    lt_use_gnu_ld_interface=yes
 12.2123 +	    ;;
 12.2124 +	esac
 12.2125 +	;;
 12.2126 +      *)
 12.2127 +	lt_use_gnu_ld_interface=yes
 12.2128 +	;;
 12.2129 +    esac
 12.2130 +  fi
 12.2131 +
 12.2132 +  if test "$lt_use_gnu_ld_interface" = yes; then
 12.2133      # If archive_cmds runs LD, not CC, wlarc should be empty
 12.2134      wlarc='${wl}'
 12.2135  
 12.2136 @@ -4279,6 +4691,7 @@
 12.2137      fi
 12.2138      supports_anon_versioning=no
 12.2139      case `$LD -v 2>&1` in
 12.2140 +      *GNU\ gold*) supports_anon_versioning=yes ;;
 12.2141        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
 12.2142        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
 12.2143        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
 12.2144 @@ -4294,11 +4707,12 @@
 12.2145  	_LT_TAGVAR(ld_shlibs, $1)=no
 12.2146  	cat <<_LT_EOF 1>&2
 12.2147  
 12.2148 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 12.2149 +*** Warning: the GNU linker, at least up to release 2.19, is reported
 12.2150  *** to be unable to reliably create shared libraries on AIX.
 12.2151  *** Therefore, libtool is disabling shared libraries support.  If you
 12.2152 -*** really care for shared libraries, you may want to modify your PATH
 12.2153 -*** so that a non-GNU linker is found, and then restart.
 12.2154 +*** really care for shared libraries, you may want to install binutils
 12.2155 +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
 12.2156 +*** You will then need to restart the configuration process.
 12.2157  
 12.2158  _LT_EOF
 12.2159        fi
 12.2160 @@ -4334,10 +4748,12 @@
 12.2161        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 12.2162        # as there is no search path for DLLs.
 12.2163        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 12.2164 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
 12.2165        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2166        _LT_TAGVAR(always_export_symbols, $1)=no
 12.2167        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 12.2168 -      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 12.2169 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 12.2170 +      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 12.2171  
 12.2172        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
 12.2173          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2174 @@ -4355,6 +4771,11 @@
 12.2175        fi
 12.2176        ;;
 12.2177  
 12.2178 +    haiku*)
 12.2179 +      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2180 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 12.2181 +      ;;
 12.2182 +
 12.2183      interix[[3-9]]*)
 12.2184        _LT_TAGVAR(hardcode_direct, $1)=no
 12.2185        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 12.2186 @@ -4370,7 +4791,7 @@
 12.2187        _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 12.2188        ;;
 12.2189  
 12.2190 -    gnu* | linux* | tpf* | k*bsd*-gnu)
 12.2191 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 12.2192        tmp_diet=no
 12.2193        if test "$host_os" = linux-dietlibc; then
 12.2194  	case $cc_basename in
 12.2195 @@ -4380,15 +4801,16 @@
 12.2196        if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 12.2197  	 && test "$tmp_diet" = no
 12.2198        then
 12.2199 -	tmp_addflag=
 12.2200 +	tmp_addflag=' $pic_flag'
 12.2201  	tmp_sharedflag='-shared'
 12.2202  	case $cc_basename,$host_cpu in
 12.2203          pgcc*)				# Portland Group C compiler
 12.2204 -	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 12.2205 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 12.2206  	  tmp_addflag=' $pic_flag'
 12.2207  	  ;;
 12.2208 -	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
 12.2209 -	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 12.2210 +	pgf77* | pgf90* | pgf95* | pgfortran*)
 12.2211 +					# Portland Group f77 and f90 compilers
 12.2212 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 12.2213  	  tmp_addflag=' $pic_flag -Mnomain' ;;
 12.2214  	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 12.2215  	  tmp_addflag=' -i_dynamic' ;;
 12.2216 @@ -4399,13 +4821,17 @@
 12.2217  	lf95*)				# Lahey Fortran 8.1
 12.2218  	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 12.2219  	  tmp_sharedflag='--shared' ;;
 12.2220 -	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
 12.2221 +	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 12.2222  	  tmp_sharedflag='-qmkshrobj'
 12.2223  	  tmp_addflag= ;;
 12.2224 +	nvcc*)	# Cuda Compiler Driver 2.2
 12.2225 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 12.2226 +	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 12.2227 +	  ;;
 12.2228  	esac
 12.2229  	case `$CC -V 2>&1 | sed 5q` in
 12.2230  	*Sun\ C*)			# Sun C 5.9
 12.2231 -	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 12.2232 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 12.2233  	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 12.2234  	  tmp_sharedflag='-G' ;;
 12.2235  	*Sun\ F*)			# Sun Fortran 8.3
 12.2236 @@ -4421,17 +4847,16 @@
 12.2237          fi
 12.2238  
 12.2239  	case $cc_basename in
 12.2240 -	xlf*)
 12.2241 +	xlf* | bgf* | bgxlf* | mpixlf*)
 12.2242  	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 12.2243  	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
 12.2244 -	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 12.2245 -	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
 12.2246 -	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
 12.2247 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 12.2248 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 12.2249  	  if test "x$supports_anon_versioning" = xyes; then
 12.2250  	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 12.2251  	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 12.2252  	      echo "local: *; };" >> $output_objdir/$libname.ver~
 12.2253 -	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 12.2254 +	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 12.2255  	  fi
 12.2256  	  ;;
 12.2257  	esac
 12.2258 @@ -4445,8 +4870,8 @@
 12.2259  	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 12.2260  	wlarc=
 12.2261        else
 12.2262 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2263 -	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2264 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2265 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2266        fi
 12.2267        ;;
 12.2268  
 12.2269 @@ -4464,8 +4889,8 @@
 12.2270  
 12.2271  _LT_EOF
 12.2272        elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 12.2273 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2274 -	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2275 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2276 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2277        else
 12.2278  	_LT_TAGVAR(ld_shlibs, $1)=no
 12.2279        fi
 12.2280 @@ -4511,8 +4936,8 @@
 12.2281  
 12.2282      *)
 12.2283        if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 12.2284 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2285 -	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2286 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2287 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2288        else
 12.2289  	_LT_TAGVAR(ld_shlibs, $1)=no
 12.2290        fi
 12.2291 @@ -4552,8 +4977,10 @@
 12.2292        else
 12.2293  	# If we're using GNU nm, then we don't want the "-C" option.
 12.2294  	# -C means demangle to AIX nm, but means don't demangle with GNU nm
 12.2295 +	# Also, AIX nm treats weak defined symbols like other global
 12.2296 +	# defined symbols, whereas GNU nm marks them as "W".
 12.2297  	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 12.2298 -	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 12.2299 +	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 12.2300  	else
 12.2301  	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 12.2302  	fi
 12.2303 @@ -4640,9 +5067,9 @@
 12.2304  	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
 12.2305          # Determine the default libpath from the value encoded in an
 12.2306          # empty executable.
 12.2307 -        _LT_SYS_MODULE_PATH_AIX
 12.2308 +        _LT_SYS_MODULE_PATH_AIX([$1])
 12.2309          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 12.2310 -        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 12.2311 +        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 12.2312        else
 12.2313  	if test "$host_cpu" = ia64; then
 12.2314  	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 12.2315 @@ -4651,14 +5078,19 @@
 12.2316  	else
 12.2317  	 # Determine the default libpath from the value encoded in an
 12.2318  	 # empty executable.
 12.2319 -	 _LT_SYS_MODULE_PATH_AIX
 12.2320 +	 _LT_SYS_MODULE_PATH_AIX([$1])
 12.2321  	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 12.2322  	  # Warning - without using the other run time loading flags,
 12.2323  	  # -berok will link without error, but may produce a broken library.
 12.2324  	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 12.2325  	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
 12.2326 -	  # Exported symbols can be pulled into shared objects from archives
 12.2327 -	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 12.2328 +	  if test "$with_gnu_ld" = yes; then
 12.2329 +	    # We only use this code for GNU lds that support --whole-archive.
 12.2330 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 12.2331 +	  else
 12.2332 +	    # Exported symbols can be pulled into shared objects from archives
 12.2333 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 12.2334 +	  fi
 12.2335  	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 12.2336  	  # This is similar to how AIX traditionally builds its shared libraries.
 12.2337  	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 12.2338 @@ -4690,20 +5122,64 @@
 12.2339        # Microsoft Visual C++.
 12.2340        # hardcode_libdir_flag_spec is actually meaningless, as there is
 12.2341        # no search path for DLLs.
 12.2342 -      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 12.2343 -      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2344 -      # Tell ltmain to make .lib files, not .a files.
 12.2345 -      libext=lib
 12.2346 -      # Tell ltmain to make .dll files, not .so files.
 12.2347 -      shrext_cmds=".dll"
 12.2348 -      # FIXME: Setting linknames here is a bad hack.
 12.2349 -      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
 12.2350 -      # The linker will automatically build a .lib file if we build a DLL.
 12.2351 -      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 12.2352 -      # FIXME: Should let the user specify the lib program.
 12.2353 -      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
 12.2354 -      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
 12.2355 -      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 12.2356 +      case $cc_basename in
 12.2357 +      cl*)
 12.2358 +	# Native MSVC
 12.2359 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 12.2360 +	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2361 +	_LT_TAGVAR(always_export_symbols, $1)=yes
 12.2362 +	_LT_TAGVAR(file_list_spec, $1)='@'
 12.2363 +	# Tell ltmain to make .lib files, not .a files.
 12.2364 +	libext=lib
 12.2365 +	# Tell ltmain to make .dll files, not .so files.
 12.2366 +	shrext_cmds=".dll"
 12.2367 +	# FIXME: Setting linknames here is a bad hack.
 12.2368 +	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
 12.2369 +	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 12.2370 +	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
 12.2371 +	  else
 12.2372 +	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
 12.2373 +	  fi~
 12.2374 +	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
 12.2375 +	  linknames='
 12.2376 +	# The linker will not automatically build a static lib if we build a DLL.
 12.2377 +	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 12.2378 +	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 12.2379 +	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 12.2380 +	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 12.2381 +	# Don't use ranlib
 12.2382 +	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 12.2383 +	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
 12.2384 +	  lt_tool_outputfile="@TOOL_OUTPUT@"~
 12.2385 +	  case $lt_outputfile in
 12.2386 +	    *.exe|*.EXE) ;;
 12.2387 +	    *)
 12.2388 +	      lt_outputfile="$lt_outputfile.exe"
 12.2389 +	      lt_tool_outputfile="$lt_tool_outputfile.exe"
 12.2390 +	      ;;
 12.2391 +	  esac~
 12.2392 +	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
 12.2393 +	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
 12.2394 +	    $RM "$lt_outputfile.manifest";
 12.2395 +	  fi'
 12.2396 +	;;
 12.2397 +      *)
 12.2398 +	# Assume MSVC wrapper
 12.2399 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 12.2400 +	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2401 +	# Tell ltmain to make .lib files, not .a files.
 12.2402 +	libext=lib
 12.2403 +	# Tell ltmain to make .dll files, not .so files.
 12.2404 +	shrext_cmds=".dll"
 12.2405 +	# FIXME: Setting linknames here is a bad hack.
 12.2406 +	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 12.2407 +	# The linker will automatically build a .lib file if we build a DLL.
 12.2408 +	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 12.2409 +	# FIXME: Should let the user specify the lib program.
 12.2410 +	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
 12.2411 +	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 12.2412 +	;;
 12.2413 +      esac
 12.2414        ;;
 12.2415  
 12.2416      darwin* | rhapsody*)
 12.2417 @@ -4716,10 +5192,6 @@
 12.2418        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 12.2419        ;;
 12.2420  
 12.2421 -    freebsd1*)
 12.2422 -      _LT_TAGVAR(ld_shlibs, $1)=no
 12.2423 -      ;;
 12.2424 -
 12.2425      # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 12.2426      # support.  Future versions do this automatically, but an explicit c++rt0.o
 12.2427      # does not break anything, and helps significantly (at the cost of a little
 12.2428 @@ -4732,7 +5204,7 @@
 12.2429        ;;
 12.2430  
 12.2431      # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 12.2432 -    freebsd2*)
 12.2433 +    freebsd2.*)
 12.2434        _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 12.2435        _LT_TAGVAR(hardcode_direct, $1)=yes
 12.2436        _LT_TAGVAR(hardcode_minus_L, $1)=yes
 12.2437 @@ -4741,7 +5213,7 @@
 12.2438  
 12.2439      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 12.2440      freebsd* | dragonfly*)
 12.2441 -      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 12.2442 +      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 12.2443        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 12.2444        _LT_TAGVAR(hardcode_direct, $1)=yes
 12.2445        _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 12.2446 @@ -4749,7 +5221,7 @@
 12.2447  
 12.2448      hpux9*)
 12.2449        if test "$GCC" = yes; then
 12.2450 -	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 12.2451 +	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 12.2452        else
 12.2453  	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 12.2454        fi
 12.2455 @@ -4764,14 +5236,13 @@
 12.2456        ;;
 12.2457  
 12.2458      hpux10*)
 12.2459 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 12.2460 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 12.2461 +      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 12.2462 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 12.2463        else
 12.2464  	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 12.2465        fi
 12.2466        if test "$with_gnu_ld" = no; then
 12.2467  	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 12.2468 -	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 12.2469  	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 12.2470  	_LT_TAGVAR(hardcode_direct, $1)=yes
 12.2471  	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 12.2472 @@ -4783,16 +5254,16 @@
 12.2473        ;;
 12.2474  
 12.2475      hpux11*)
 12.2476 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 12.2477 +      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 12.2478  	case $host_cpu in
 12.2479  	hppa*64*)
 12.2480  	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 12.2481  	  ;;
 12.2482  	ia64*)
 12.2483 -	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 12.2484 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 12.2485  	  ;;
 12.2486  	*)
 12.2487 -	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 12.2488 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 12.2489  	  ;;
 12.2490  	esac
 12.2491        else
 12.2492 @@ -4804,7 +5275,14 @@
 12.2493  	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 12.2494  	  ;;
 12.2495  	*)
 12.2496 -	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 12.2497 +	m4_if($1, [], [
 12.2498 +	  # Older versions of the 11.00 compiler do not understand -b yet
 12.2499 +	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
 12.2500 +	  _LT_LINKER_OPTION([if $CC understands -b],
 12.2501 +	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
 12.2502 +	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
 12.2503 +	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
 12.2504 +	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 12.2505  	  ;;
 12.2506  	esac
 12.2507        fi
 12.2508 @@ -4832,19 +5310,34 @@
 12.2509  
 12.2510      irix5* | irix6* | nonstopux*)
 12.2511        if test "$GCC" = yes; then
 12.2512 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.2513 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.2514  	# Try to use the -exported_symbol ld option, if it does not
 12.2515  	# work, assume that -exports_file does not work either and
 12.2516  	# implicitly export all symbols.
 12.2517 -        save_LDFLAGS="$LDFLAGS"
 12.2518 -        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
 12.2519 -        AC_LINK_IFELSE(int foo(void) {},
 12.2520 -          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 12.2521 -        )
 12.2522 -        LDFLAGS="$save_LDFLAGS"
 12.2523 +	# This should be the same for all languages, so no per-tag cache variable.
 12.2524 +	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
 12.2525 +	  [lt_cv_irix_exported_symbol],
 12.2526 +	  [save_LDFLAGS="$LDFLAGS"
 12.2527 +	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
 12.2528 +	   AC_LINK_IFELSE(
 12.2529 +	     [AC_LANG_SOURCE(
 12.2530 +	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
 12.2531 +			      [C++], [[int foo (void) { return 0; }]],
 12.2532 +			      [Fortran 77], [[
 12.2533 +      subroutine foo
 12.2534 +      end]],
 12.2535 +			      [Fortran], [[
 12.2536 +      subroutine foo
 12.2537 +      end]])])],
 12.2538 +	      [lt_cv_irix_exported_symbol=yes],
 12.2539 +	      [lt_cv_irix_exported_symbol=no])
 12.2540 +           LDFLAGS="$save_LDFLAGS"])
 12.2541 +	if test "$lt_cv_irix_exported_symbol" = yes; then
 12.2542 +          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 12.2543 +	fi
 12.2544        else
 12.2545 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2546 -	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
 12.2547 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2548 +	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
 12.2549        fi
 12.2550        _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
 12.2551        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 12.2552 @@ -4906,17 +5399,17 @@
 12.2553        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 12.2554        _LT_TAGVAR(hardcode_minus_L, $1)=yes
 12.2555        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2556 -      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 12.2557 +      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 12.2558        _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 12.2559        ;;
 12.2560  
 12.2561      osf3*)
 12.2562        if test "$GCC" = yes; then
 12.2563  	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 12.2564 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.2565 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.2566        else
 12.2567  	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 12.2568 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2569 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2570        fi
 12.2571        _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
 12.2572        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 12.2573 @@ -4926,13 +5419,13 @@
 12.2574      osf4* | osf5*)	# as osf3* with the addition of -msym flag
 12.2575        if test "$GCC" = yes; then
 12.2576  	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 12.2577 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.2578 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.2579  	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 12.2580        else
 12.2581  	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 12.2582 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2583 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2584  	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
 12.2585 -	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 12.2586 +	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 12.2587  
 12.2588  	# Both c and cxx compiler support -rpath directly
 12.2589  	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 12.2590 @@ -4945,9 +5438,9 @@
 12.2591        _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
 12.2592        if test "$GCC" = yes; then
 12.2593  	wlarc='${wl}'
 12.2594 -	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 12.2595 +	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 12.2596  	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 12.2597 -	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 12.2598 +	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 12.2599        else
 12.2600  	case `$CC -V 2>&1` in
 12.2601  	*"Compilers 5.0"*)
 12.2602 @@ -5123,36 +5616,38 @@
 12.2603        # Test whether the compiler implicitly links with -lc since on some
 12.2604        # systems, -lgcc has to come before -lc. If gcc already passes -lc
 12.2605        # to ld, don't add -lc before -lgcc.
 12.2606 -      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
 12.2607 -      $RM conftest*
 12.2608 -      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 12.2609 -
 12.2610 -      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
 12.2611 -        soname=conftest
 12.2612 -        lib=conftest
 12.2613 -        libobjs=conftest.$ac_objext
 12.2614 -        deplibs=
 12.2615 -        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
 12.2616 -	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
 12.2617 -        compiler_flags=-v
 12.2618 -        linker_flags=-v
 12.2619 -        verstring=
 12.2620 -        output_objdir=.
 12.2621 -        libname=conftest
 12.2622 -        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
 12.2623 -        _LT_TAGVAR(allow_undefined_flag, $1)=
 12.2624 -        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
 12.2625 -        then
 12.2626 -	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 12.2627 -        else
 12.2628 -	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 12.2629 -        fi
 12.2630 -        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
 12.2631 -      else
 12.2632 -        cat conftest.err 1>&5
 12.2633 -      fi
 12.2634 -      $RM conftest*
 12.2635 -      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
 12.2636 +      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
 12.2637 +	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
 12.2638 +	[$RM conftest*
 12.2639 +	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 12.2640 +
 12.2641 +	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
 12.2642 +	  soname=conftest
 12.2643 +	  lib=conftest
 12.2644 +	  libobjs=conftest.$ac_objext
 12.2645 +	  deplibs=
 12.2646 +	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
 12.2647 +	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
 12.2648 +	  compiler_flags=-v
 12.2649 +	  linker_flags=-v
 12.2650 +	  verstring=
 12.2651 +	  output_objdir=.
 12.2652 +	  libname=conftest
 12.2653 +	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
 12.2654 +	  _LT_TAGVAR(allow_undefined_flag, $1)=
 12.2655 +	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
 12.2656 +	  then
 12.2657 +	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 12.2658 +	  else
 12.2659 +	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 12.2660 +	  fi
 12.2661 +	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
 12.2662 +	else
 12.2663 +	  cat conftest.err 1>&5
 12.2664 +	fi
 12.2665 +	$RM conftest*
 12.2666 +	])
 12.2667 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
 12.2668        ;;
 12.2669      esac
 12.2670    fi
 12.2671 @@ -5189,9 +5684,6 @@
 12.2672  _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
 12.2673      [Flag to hardcode $libdir into a binary during linking.
 12.2674      This must work even if $libdir does not exist])
 12.2675 -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
 12.2676 -    [[If ld is used when linking, flag to hardcode $libdir into a binary
 12.2677 -    during linking.  This must work even if $libdir does not exist]])
 12.2678  _LT_TAGDECL([], [hardcode_libdir_separator], [1],
 12.2679      [Whether we need a single "-rpath" flag with a separated argument])
 12.2680  _LT_TAGDECL([], [hardcode_direct], [0],
 12.2681 @@ -5217,8 +5709,6 @@
 12.2682      to runtime path list])
 12.2683  _LT_TAGDECL([], [link_all_deplibs], [0],
 12.2684      [Whether libtool must link a program against all its dependency libraries])
 12.2685 -_LT_TAGDECL([], [fix_srcfile_path], [1],
 12.2686 -    [Fix the shell variable $srcfile for the compiler])
 12.2687  _LT_TAGDECL([], [always_export_symbols], [0],
 12.2688      [Set to "yes" if exported symbols are required])
 12.2689  _LT_TAGDECL([], [export_symbols_cmds], [2],
 12.2690 @@ -5229,6 +5719,8 @@
 12.2691      [Symbols that must always be exported])
 12.2692  _LT_TAGDECL([], [prelink_cmds], [2],
 12.2693      [Commands necessary for linking programs (against libraries) with templates])
 12.2694 +_LT_TAGDECL([], [postlink_cmds], [2],
 12.2695 +    [Commands necessary for finishing linking programs])
 12.2696  _LT_TAGDECL([], [file_list_spec], [1],
 12.2697      [Specify filename containing input files])
 12.2698  dnl FIXME: Not yet implemented
 12.2699 @@ -5322,14 +5814,15 @@
 12.2700  ])# _LT_LANG_C_CONFIG
 12.2701  
 12.2702  
 12.2703 -# _LT_PROG_CXX
 12.2704 -# ------------
 12.2705 -# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
 12.2706 -# compiler, we have our own version here.
 12.2707 -m4_defun([_LT_PROG_CXX],
 12.2708 -[
 12.2709 -pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
 12.2710 -AC_PROG_CXX
 12.2711 +# _LT_LANG_CXX_CONFIG([TAG])
 12.2712 +# --------------------------
 12.2713 +# Ensure that the configuration variables for a C++ compiler are suitably
 12.2714 +# defined.  These variables are subsequently used by _LT_CONFIG to write
 12.2715 +# the compiler configuration to `libtool'.
 12.2716 +m4_defun([_LT_LANG_CXX_CONFIG],
 12.2717 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 12.2718 +m4_require([_LT_DECL_EGREP])dnl
 12.2719 +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 12.2720  if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 12.2721      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 12.2722      (test "X$CXX" != "Xg++"))) ; then
 12.2723 @@ -5337,22 +5830,6 @@
 12.2724  else
 12.2725    _lt_caught_CXX_error=yes
 12.2726  fi
 12.2727 -popdef([AC_MSG_ERROR])
 12.2728 -])# _LT_PROG_CXX
 12.2729 -
 12.2730 -dnl aclocal-1.4 backwards compatibility:
 12.2731 -dnl AC_DEFUN([_LT_PROG_CXX], [])
 12.2732 -
 12.2733 -
 12.2734 -# _LT_LANG_CXX_CONFIG([TAG])
 12.2735 -# --------------------------
 12.2736 -# Ensure that the configuration variables for a C++ compiler are suitably
 12.2737 -# defined.  These variables are subsequently used by _LT_CONFIG to write
 12.2738 -# the compiler configuration to `libtool'.
 12.2739 -m4_defun([_LT_LANG_CXX_CONFIG],
 12.2740 -[AC_REQUIRE([_LT_PROG_CXX])dnl
 12.2741 -m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 12.2742 -m4_require([_LT_DECL_EGREP])dnl
 12.2743  
 12.2744  AC_LANG_PUSH(C++)
 12.2745  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 12.2746 @@ -5364,7 +5841,6 @@
 12.2747  _LT_TAGVAR(hardcode_direct, $1)=no
 12.2748  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 12.2749  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 12.2750 -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 12.2751  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 12.2752  _LT_TAGVAR(hardcode_minus_L, $1)=no
 12.2753  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 12.2754 @@ -5374,6 +5850,8 @@
 12.2755  _LT_TAGVAR(module_expsym_cmds, $1)=
 12.2756  _LT_TAGVAR(link_all_deplibs, $1)=unknown
 12.2757  _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 12.2758 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 12.2759 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 12.2760  _LT_TAGVAR(no_undefined_flag, $1)=
 12.2761  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 12.2762  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 12.2763 @@ -5405,6 +5883,7 @@
 12.2764  
 12.2765    # Allow CC to be a program name with arguments.
 12.2766    lt_save_CC=$CC
 12.2767 +  lt_save_CFLAGS=$CFLAGS
 12.2768    lt_save_LD=$LD
 12.2769    lt_save_GCC=$GCC
 12.2770    GCC=$GXX
 12.2771 @@ -5422,6 +5901,7 @@
 12.2772    fi
 12.2773    test -z "${LDCXX+set}" || LD=$LDCXX
 12.2774    CC=${CXX-"c++"}
 12.2775 +  CFLAGS=$CXXFLAGS
 12.2776    compiler=$CC
 12.2777    _LT_TAGVAR(compiler, $1)=$CC
 12.2778    _LT_CC_BASENAME([$compiler])
 12.2779 @@ -5443,8 +5923,8 @@
 12.2780        # Check if GNU C++ uses GNU ld as the underlying linker, since the
 12.2781        # archiving commands below assume that GNU ld is being used.
 12.2782        if test "$with_gnu_ld" = yes; then
 12.2783 -        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2784 -        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2785 +        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2786 +        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 12.2787  
 12.2788          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 12.2789          _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 12.2790 @@ -5476,7 +5956,7 @@
 12.2791        # Commands to make compiler produce verbose output that lists
 12.2792        # what "hidden" libraries, object files and flags are used when
 12.2793        # linking a shared library.
 12.2794 -      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 12.2795 +      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 12.2796  
 12.2797      else
 12.2798        GXX=no
 12.2799 @@ -5585,10 +6065,10 @@
 12.2800            _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
 12.2801            # Determine the default libpath from the value encoded in an empty
 12.2802            # executable.
 12.2803 -          _LT_SYS_MODULE_PATH_AIX
 12.2804 +          _LT_SYS_MODULE_PATH_AIX([$1])
 12.2805            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 12.2806  
 12.2807 -          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 12.2808 +          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 12.2809          else
 12.2810            if test "$host_cpu" = ia64; then
 12.2811  	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 12.2812 @@ -5597,14 +6077,19 @@
 12.2813            else
 12.2814  	    # Determine the default libpath from the value encoded in an
 12.2815  	    # empty executable.
 12.2816 -	    _LT_SYS_MODULE_PATH_AIX
 12.2817 +	    _LT_SYS_MODULE_PATH_AIX([$1])
 12.2818  	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 12.2819  	    # Warning - without using the other run time loading flags,
 12.2820  	    # -berok will link without error, but may produce a broken library.
 12.2821  	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 12.2822  	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
 12.2823 -	    # Exported symbols can be pulled into shared objects from archives
 12.2824 -	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 12.2825 +	    if test "$with_gnu_ld" = yes; then
 12.2826 +	      # We only use this code for GNU lds that support --whole-archive.
 12.2827 +	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 12.2828 +	    else
 12.2829 +	      # Exported symbols can be pulled into shared objects from archives
 12.2830 +	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 12.2831 +	    fi
 12.2832  	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 12.2833  	    # This is similar to how AIX traditionally builds its shared
 12.2834  	    # libraries.
 12.2835 @@ -5634,28 +6119,75 @@
 12.2836          ;;
 12.2837  
 12.2838        cygwin* | mingw* | pw32* | cegcc*)
 12.2839 -        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 12.2840 -        # as there is no search path for DLLs.
 12.2841 -        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 12.2842 -        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2843 -        _LT_TAGVAR(always_export_symbols, $1)=no
 12.2844 -        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 12.2845 -
 12.2846 -        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
 12.2847 -          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2848 -          # If the export-symbols file already is a .def file (1st line
 12.2849 -          # is EXPORTS), use it as is; otherwise, prepend...
 12.2850 -          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 12.2851 -	    cp $export_symbols $output_objdir/$soname.def;
 12.2852 -          else
 12.2853 -	    echo EXPORTS > $output_objdir/$soname.def;
 12.2854 -	    cat $export_symbols >> $output_objdir/$soname.def;
 12.2855 -          fi~
 12.2856 -          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2857 -        else
 12.2858 -          _LT_TAGVAR(ld_shlibs, $1)=no
 12.2859 -        fi
 12.2860 -        ;;
 12.2861 +	case $GXX,$cc_basename in
 12.2862 +	,cl* | no,cl*)
 12.2863 +	  # Native MSVC
 12.2864 +	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 12.2865 +	  # no search path for DLLs.
 12.2866 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 12.2867 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2868 +	  _LT_TAGVAR(always_export_symbols, $1)=yes
 12.2869 +	  _LT_TAGVAR(file_list_spec, $1)='@'
 12.2870 +	  # Tell ltmain to make .lib files, not .a files.
 12.2871 +	  libext=lib
 12.2872 +	  # Tell ltmain to make .dll files, not .so files.
 12.2873 +	  shrext_cmds=".dll"
 12.2874 +	  # FIXME: Setting linknames here is a bad hack.
 12.2875 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
 12.2876 +	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 12.2877 +	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
 12.2878 +	    else
 12.2879 +	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
 12.2880 +	    fi~
 12.2881 +	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
 12.2882 +	    linknames='
 12.2883 +	  # The linker will not automatically build a static lib if we build a DLL.
 12.2884 +	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 12.2885 +	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 12.2886 +	  # Don't use ranlib
 12.2887 +	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 12.2888 +	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
 12.2889 +	    lt_tool_outputfile="@TOOL_OUTPUT@"~
 12.2890 +	    case $lt_outputfile in
 12.2891 +	      *.exe|*.EXE) ;;
 12.2892 +	      *)
 12.2893 +		lt_outputfile="$lt_outputfile.exe"
 12.2894 +		lt_tool_outputfile="$lt_tool_outputfile.exe"
 12.2895 +		;;
 12.2896 +	    esac~
 12.2897 +	    func_to_tool_file "$lt_outputfile"~
 12.2898 +	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
 12.2899 +	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
 12.2900 +	      $RM "$lt_outputfile.manifest";
 12.2901 +	    fi'
 12.2902 +	  ;;
 12.2903 +	*)
 12.2904 +	  # g++
 12.2905 +	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 12.2906 +	  # as there is no search path for DLLs.
 12.2907 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 12.2908 +	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
 12.2909 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 12.2910 +	  _LT_TAGVAR(always_export_symbols, $1)=no
 12.2911 +	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 12.2912 +
 12.2913 +	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
 12.2914 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2915 +	    # If the export-symbols file already is a .def file (1st line
 12.2916 +	    # is EXPORTS), use it as is; otherwise, prepend...
 12.2917 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 12.2918 +	      cp $export_symbols $output_objdir/$soname.def;
 12.2919 +	    else
 12.2920 +	      echo EXPORTS > $output_objdir/$soname.def;
 12.2921 +	      cat $export_symbols >> $output_objdir/$soname.def;
 12.2922 +	    fi~
 12.2923 +	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 12.2924 +	  else
 12.2925 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 12.2926 +	  fi
 12.2927 +	  ;;
 12.2928 +	esac
 12.2929 +	;;
 12.2930        darwin* | rhapsody*)
 12.2931          _LT_DARWIN_LINKER_FEATURES($1)
 12.2932  	;;
 12.2933 @@ -5678,7 +6210,7 @@
 12.2934          esac
 12.2935          ;;
 12.2936  
 12.2937 -      freebsd[[12]]*)
 12.2938 +      freebsd2.*)
 12.2939          # C++ shared libraries reported to be fairly broken before
 12.2940  	# switch to ELF
 12.2941          _LT_TAGVAR(ld_shlibs, $1)=no
 12.2942 @@ -5697,6 +6229,11 @@
 12.2943        gnu*)
 12.2944          ;;
 12.2945  
 12.2946 +      haiku*)
 12.2947 +        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 12.2948 +        _LT_TAGVAR(link_all_deplibs, $1)=yes
 12.2949 +        ;;
 12.2950 +
 12.2951        hpux9*)
 12.2952          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 12.2953          _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 12.2954 @@ -5721,11 +6258,11 @@
 12.2955              # explicitly linking system object files so we need to strip them
 12.2956              # from the output so that they don't get included in the library
 12.2957              # dependencies.
 12.2958 -            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 12.2959 +            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 12.2960              ;;
 12.2961            *)
 12.2962              if test "$GXX" = yes; then
 12.2963 -              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 12.2964 +              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 12.2965              else
 12.2966                # FIXME: insert proper C++ library support
 12.2967                _LT_TAGVAR(ld_shlibs, $1)=no
 12.2968 @@ -5786,7 +6323,7 @@
 12.2969  	    # explicitly linking system object files so we need to strip them
 12.2970  	    # from the output so that they don't get included in the library
 12.2971  	    # dependencies.
 12.2972 -	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 12.2973 +	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 12.2974  	    ;;
 12.2975            *)
 12.2976  	    if test "$GXX" = yes; then
 12.2977 @@ -5796,10 +6333,10 @@
 12.2978  	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 12.2979  	            ;;
 12.2980  	          ia64*)
 12.2981 -	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 12.2982 +	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 12.2983  	            ;;
 12.2984  	          *)
 12.2985 -	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 12.2986 +	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 12.2987  	            ;;
 12.2988  	        esac
 12.2989  	      fi
 12.2990 @@ -5829,7 +6366,7 @@
 12.2991          case $cc_basename in
 12.2992            CC*)
 12.2993  	    # SGI C++
 12.2994 -	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2995 +	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 12.2996  
 12.2997  	    # Archives containing C++ object files must be created using
 12.2998  	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
 12.2999 @@ -5840,9 +6377,9 @@
 12.3000            *)
 12.3001  	    if test "$GXX" = yes; then
 12.3002  	      if test "$with_gnu_ld" = no; then
 12.3003 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.3004 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.3005  	      else
 12.3006 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
 12.3007 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 12.3008  	      fi
 12.3009  	    fi
 12.3010  	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 12.3011 @@ -5853,7 +6390,7 @@
 12.3012          _LT_TAGVAR(inherit_rpath, $1)=yes
 12.3013          ;;
 12.3014  
 12.3015 -      linux* | k*bsd*-gnu)
 12.3016 +      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 12.3017          case $cc_basename in
 12.3018            KCC*)
 12.3019  	    # Kuck and Associates, Inc. (KAI) C++ Compiler
 12.3020 @@ -5871,7 +6408,7 @@
 12.3021  	    # explicitly linking system object files so we need to strip them
 12.3022  	    # from the output so that they don't get included in the library
 12.3023  	    # dependencies.
 12.3024 -	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 12.3025 +	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 12.3026  
 12.3027  	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 12.3028  	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 12.3029 @@ -5908,26 +6445,26 @@
 12.3030            pgCC* | pgcpp*)
 12.3031              # Portland Group C++ compiler
 12.3032  	    case `$CC -V` in
 12.3033 -	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
 12.3034 +	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 12.3035  	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
 12.3036  		rm -rf $tpldir~
 12.3037  		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
 12.3038 -		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
 12.3039 +		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 12.3040  	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
 12.3041  		rm -rf $tpldir~
 12.3042  		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
 12.3043 -		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
 12.3044 +		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
 12.3045  		$RANLIB $oldlib'
 12.3046  	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
 12.3047  		rm -rf $tpldir~
 12.3048  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
 12.3049 -		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 12.3050 +		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 12.3051  	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
 12.3052  		rm -rf $tpldir~
 12.3053  		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
 12.3054 -		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 12.3055 +		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 12.3056  	      ;;
 12.3057 -	    *) # Version 6 will use weak symbols
 12.3058 +	    *) # Version 6 and above use weak symbols
 12.3059  	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 12.3060  	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 12.3061  	      ;;
 12.3062 @@ -5935,7 +6472,7 @@
 12.3063  
 12.3064  	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 12.3065  	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 12.3066 -	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 12.3067 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 12.3068              ;;
 12.3069  	  cxx*)
 12.3070  	    # Compaq C++
 12.3071 @@ -5954,9 +6491,9 @@
 12.3072  	    # explicitly linking system object files so we need to strip them
 12.3073  	    # from the output so that they don't get included in the library
 12.3074  	    # dependencies.
 12.3075 -	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 12.3076 +	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 12.3077  	    ;;
 12.3078 -	  xl*)
 12.3079 +	  xl* | mpixl* | bgxl*)
 12.3080  	    # IBM XL 8.0 on PPC, with GNU ld
 12.3081  	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 12.3082  	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 12.3083 @@ -5976,13 +6513,13 @@
 12.3084  	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 12.3085  	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 12.3086  	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 12.3087 -	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 12.3088 +	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 12.3089  	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 12.3090  
 12.3091  	      # Not sure whether something based on
 12.3092  	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 12.3093  	      # would be better.
 12.3094 -	      output_verbose_link_cmd='echo'
 12.3095 +	      output_verbose_link_cmd='func_echo_all'
 12.3096  
 12.3097  	      # Archives containing C++ object files must be created using
 12.3098  	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
 12.3099 @@ -6051,7 +6588,7 @@
 12.3100  	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 12.3101  	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 12.3102  	  fi
 12.3103 -	  output_verbose_link_cmd=echo
 12.3104 +	  output_verbose_link_cmd=func_echo_all
 12.3105  	else
 12.3106  	  _LT_TAGVAR(ld_shlibs, $1)=no
 12.3107  	fi
 12.3108 @@ -6086,15 +6623,15 @@
 12.3109  	    case $host in
 12.3110  	      osf3*)
 12.3111  	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 12.3112 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 12.3113 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 12.3114  	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 12.3115  		;;
 12.3116  	      *)
 12.3117  	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 12.3118 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 12.3119 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 12.3120  	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 12.3121  	          echo "-hidden">> $lib.exp~
 12.3122 -	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
 12.3123 +	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
 12.3124  	          $RM $lib.exp'
 12.3125  	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 12.3126  		;;
 12.3127 @@ -6110,17 +6647,17 @@
 12.3128  	    # explicitly linking system object files so we need to strip them
 12.3129  	    # from the output so that they don't get included in the library
 12.3130  	    # dependencies.
 12.3131 -	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
 12.3132 +	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 12.3133  	    ;;
 12.3134  	  *)
 12.3135  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 12.3136  	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 12.3137  	      case $host in
 12.3138  	        osf3*)
 12.3139 -	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.3140 +	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.3141  		  ;;
 12.3142  	        *)
 12.3143 -	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.3144 +	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 12.3145  		  ;;
 12.3146  	      esac
 12.3147  
 12.3148 @@ -6130,7 +6667,7 @@
 12.3149  	      # Commands to make compiler produce verbose output that lists
 12.3150  	      # what "hidden" libraries, object files and flags are used when
 12.3151  	      # linking a shared library.
 12.3152 -	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 12.3153 +	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 12.3154  
 12.3155  	    else
 12.3156  	      # FIXME: insert proper C++ library support
 12.3157 @@ -6166,7 +6703,7 @@
 12.3158  
 12.3159        solaris*)
 12.3160          case $cc_basename in
 12.3161 -          CC*)
 12.3162 +          CC* | sunCC*)
 12.3163  	    # Sun C++ 4.2, 5.x and Centerline C++
 12.3164              _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 12.3165  	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 12.3166 @@ -6187,7 +6724,7 @@
 12.3167  	    esac
 12.3168  	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 12.3169  
 12.3170 -	    output_verbose_link_cmd='echo'
 12.3171 +	    output_verbose_link_cmd='func_echo_all'
 12.3172  
 12.3173  	    # Archives containing C++ object files must be created using
 12.3174  	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
 12.3175 @@ -6207,14 +6744,14 @@
 12.3176  	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 12.3177  	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 12.3178  	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
 12.3179 -	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 12.3180 +	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 12.3181  	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
 12.3182 -		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 12.3183 +		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 12.3184  
 12.3185  	        # Commands to make compiler produce verbose output that lists
 12.3186  	        # what "hidden" libraries, object files and flags are used when
 12.3187  	        # linking a shared library.
 12.3188 -	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 12.3189 +	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 12.3190  	      else
 12.3191  	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 12.3192  	        # platform.
 12.3193 @@ -6225,7 +6762,7 @@
 12.3194  	        # Commands to make compiler produce verbose output that lists
 12.3195  	        # what "hidden" libraries, object files and flags are used when
 12.3196  	        # linking a shared library.
 12.3197 -	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
 12.3198 +	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 12.3199  	      fi
 12.3200  
 12.3201  	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
 12.3202 @@ -6279,6 +6816,10 @@
 12.3203            CC*)
 12.3204  	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 12.3205  	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 12.3206 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
 12.3207 +	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
 12.3208 +	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
 12.3209 +	      '"$_LT_TAGVAR(reload_cmds, $1)"
 12.3210  	    ;;
 12.3211  	  *)
 12.3212  	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 12.3213 @@ -6334,6 +6875,7 @@
 12.3214    fi # test -n "$compiler"
 12.3215  
 12.3216    CC=$lt_save_CC
 12.3217 +  CFLAGS=$lt_save_CFLAGS
 12.3218    LDCXX=$LD
 12.3219    LD=$lt_save_LD
 12.3220    GCC=$lt_save_GCC
 12.3221 @@ -6348,6 +6890,29 @@
 12.3222  ])# _LT_LANG_CXX_CONFIG
 12.3223  
 12.3224  
 12.3225 +# _LT_FUNC_STRIPNAME_CNF
 12.3226 +# ----------------------
 12.3227 +# func_stripname_cnf prefix suffix name
 12.3228 +# strip PREFIX and SUFFIX off of NAME.
 12.3229 +# PREFIX and SUFFIX must not contain globbing or regex special
 12.3230 +# characters, hashes, percent signs, but SUFFIX may contain a leading
 12.3231 +# dot (in which case that matches only a dot).
 12.3232 +#
 12.3233 +# This function is identical to the (non-XSI) version of func_stripname,
 12.3234 +# except this one can be used by m4 code that may be executed by configure,
 12.3235 +# rather than the libtool script.
 12.3236 +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
 12.3237 +AC_REQUIRE([_LT_DECL_SED])
 12.3238 +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
 12.3239 +func_stripname_cnf ()
 12.3240 +{
 12.3241 +  case ${2} in
 12.3242 +  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
 12.3243 +  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
 12.3244 +  esac
 12.3245 +} # func_stripname_cnf
 12.3246 +])# _LT_FUNC_STRIPNAME_CNF
 12.3247 +
 12.3248  # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 12.3249  # ---------------------------------
 12.3250  # Figure out "hidden" library dependencies from verbose
 12.3251 @@ -6356,6 +6921,7 @@
 12.3252  # objects, libraries and library flags.
 12.3253  m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 12.3254  [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 12.3255 +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 12.3256  # Dependencies to place before and after the object being linked:
 12.3257  _LT_TAGVAR(predep_objects, $1)=
 12.3258  _LT_TAGVAR(postdep_objects, $1)=
 12.3259 @@ -6405,7 +6971,20 @@
 12.3260    }
 12.3261  };
 12.3262  _LT_EOF
 12.3263 +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
 12.3264 +package foo
 12.3265 +func foo() {
 12.3266 +}
 12.3267 +_LT_EOF
 12.3268  ])
 12.3269 +
 12.3270 +_lt_libdeps_save_CFLAGS=$CFLAGS
 12.3271 +case "$CC $CFLAGS " in #(
 12.3272 +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 12.3273 +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
 12.3274 +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 12.3275 +esac
 12.3276 +
 12.3277  dnl Parse the compiler output and extract the necessary
 12.3278  dnl objects, libraries and library flags.
 12.3279  if AC_TRY_EVAL(ac_compile); then
 12.3280 @@ -6417,7 +6996,7 @@
 12.3281    pre_test_object_deps_done=no
 12.3282  
 12.3283    for p in `eval "$output_verbose_link_cmd"`; do
 12.3284 -    case $p in
 12.3285 +    case ${prev}${p} in
 12.3286  
 12.3287      -L* | -R* | -l*)
 12.3288         # Some compilers place space between "-{L,R}" and the path.
 12.3289 @@ -6426,13 +7005,22 @@
 12.3290            test $p = "-R"; then
 12.3291  	 prev=$p
 12.3292  	 continue
 12.3293 -       else
 12.3294 -	 prev=
 12.3295         fi
 12.3296  
 12.3297 +       # Expand the sysroot to ease extracting the directories later.
 12.3298 +       if test -z "$prev"; then
 12.3299 +         case $p in
 12.3300 +         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
 12.3301 +         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
 12.3302 +         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
 12.3303 +         esac
 12.3304 +       fi
 12.3305 +       case $p in
 12.3306 +       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
 12.3307 +       esac
 12.3308         if test "$pre_test_object_deps_done" = no; then
 12.3309 -	 case $p in
 12.3310 -	 -L* | -R*)
 12.3311 +	 case ${prev} in
 12.3312 +	 -L | -R)
 12.3313  	   # Internal compiler library paths should come after those
 12.3314  	   # provided the user.  The postdeps already come after the
 12.3315  	   # user supplied libs so there is no need to process them.
 12.3316 @@ -6452,8 +7040,10 @@
 12.3317  	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 12.3318  	 fi
 12.3319         fi
 12.3320 +       prev=
 12.3321         ;;
 12.3322  
 12.3323 +    *.lto.$objext) ;; # Ignore GCC LTO objects
 12.3324      *.$objext)
 12.3325         # This assumes that the test object file only shows up
 12.3326         # once in the compiler output.
 12.3327 @@ -6489,6 +7079,7 @@
 12.3328  fi
 12.3329  
 12.3330  $RM -f confest.$objext
 12.3331 +CFLAGS=$_lt_libdeps_save_CFLAGS
 12.3332  
 12.3333  # PORTME: override above test on systems where it is broken
 12.3334  m4_if([$1], [CXX],
 12.3335 @@ -6525,7 +7116,7 @@
 12.3336  
 12.3337  solaris*)
 12.3338    case $cc_basename in
 12.3339 -  CC*)
 12.3340 +  CC* | sunCC*)
 12.3341      # The more standards-conforming stlport4 library is
 12.3342      # incompatible with the Cstd library. Avoid specifying
 12.3343      # it if it's in CXXFLAGS. Ignore libCrun as
 12.3344 @@ -6569,32 +7160,16 @@
 12.3345  ])# _LT_SYS_HIDDEN_LIBDEPS
 12.3346  
 12.3347  
 12.3348 -# _LT_PROG_F77
 12.3349 -# ------------
 12.3350 -# Since AC_PROG_F77 is broken, in that it returns the empty string
 12.3351 -# if there is no fortran compiler, we have our own version here.
 12.3352 -m4_defun([_LT_PROG_F77],
 12.3353 -[
 12.3354 -pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
 12.3355 -AC_PROG_F77
 12.3356 -if test -z "$F77" || test "X$F77" = "Xno"; then
 12.3357 -  _lt_disable_F77=yes
 12.3358 -fi
 12.3359 -popdef([AC_MSG_ERROR])
 12.3360 -])# _LT_PROG_F77
 12.3361 -
 12.3362 -dnl aclocal-1.4 backwards compatibility:
 12.3363 -dnl AC_DEFUN([_LT_PROG_F77], [])
 12.3364 -
 12.3365 -
 12.3366  # _LT_LANG_F77_CONFIG([TAG])
 12.3367  # --------------------------
 12.3368  # Ensure that the configuration variables for a Fortran 77 compiler are
 12.3369  # suitably defined.  These variables are subsequently used by _LT_CONFIG
 12.3370  # to write the compiler configuration to `libtool'.
 12.3371  m4_defun([_LT_LANG_F77_CONFIG],
 12.3372 -[AC_REQUIRE([_LT_PROG_F77])dnl
 12.3373 -AC_LANG_PUSH(Fortran 77)
 12.3374 +[AC_LANG_PUSH(Fortran 77)
 12.3375 +if test -z "$F77" || test "X$F77" = "Xno"; then
 12.3376 +  _lt_disable_F77=yes
 12.3377 +fi
 12.3378  
 12.3379  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 12.3380  _LT_TAGVAR(allow_undefined_flag, $1)=
 12.3381 @@ -6604,7 +7179,6 @@
 12.3382  _LT_TAGVAR(hardcode_direct, $1)=no
 12.3383  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 12.3384  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 12.3385 -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 12.3386  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 12.3387  _LT_TAGVAR(hardcode_minus_L, $1)=no
 12.3388  _LT_TAGVAR(hardcode_automatic, $1)=no
 12.3389 @@ -6613,6 +7187,8 @@
 12.3390  _LT_TAGVAR(module_expsym_cmds, $1)=
 12.3391  _LT_TAGVAR(link_all_deplibs, $1)=unknown
 12.3392  _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 12.3393 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 12.3394 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 12.3395  _LT_TAGVAR(no_undefined_flag, $1)=
 12.3396  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 12.3397  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 12.3398 @@ -6652,7 +7228,9 @@
 12.3399    # Allow CC to be a program name with arguments.
 12.3400    lt_save_CC="$CC"
 12.3401    lt_save_GCC=$GCC
 12.3402 +  lt_save_CFLAGS=$CFLAGS
 12.3403    CC=${F77-"f77"}
 12.3404 +  CFLAGS=$FFLAGS
 12.3405    compiler=$CC
 12.3406    _LT_TAGVAR(compiler, $1)=$CC
 12.3407    _LT_CC_BASENAME([$compiler])
 12.3408 @@ -6706,38 +7284,24 @@
 12.3409  
 12.3410    GCC=$lt_save_GCC
 12.3411    CC="$lt_save_CC"
 12.3412 +  CFLAGS="$lt_save_CFLAGS"
 12.3413  fi # test "$_lt_disable_F77" != yes
 12.3414  
 12.3415  AC_LANG_POP
 12.3416  ])# _LT_LANG_F77_CONFIG
 12.3417  
 12.3418  
 12.3419 -# _LT_PROG_FC
 12.3420 -# -----------
 12.3421 -# Since AC_PROG_FC is broken, in that it returns the empty string
 12.3422 -# if there is no fortran compiler, we have our own version here.
 12.3423 -m4_defun([_LT_PROG_FC],
 12.3424 -[
 12.3425 -pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
 12.3426 -AC_PROG_FC
 12.3427 -if test -z "$FC" || test "X$FC" = "Xno"; then
 12.3428 -  _lt_disable_FC=yes
 12.3429 -fi
 12.3430 -popdef([AC_MSG_ERROR])
 12.3431 -])# _LT_PROG_FC
 12.3432 -
 12.3433 -dnl aclocal-1.4 backwards compatibility:
 12.3434 -dnl AC_DEFUN([_LT_PROG_FC], [])
 12.3435 -
 12.3436 -
 12.3437  # _LT_LANG_FC_CONFIG([TAG])
 12.3438  # -------------------------
 12.3439  # Ensure that the configuration variables for a Fortran compiler are
 12.3440  # suitably defined.  These variables are subsequently used by _LT_CONFIG
 12.3441  # to write the compiler configuration to `libtool'.
 12.3442  m4_defun([_LT_LANG_FC_CONFIG],
 12.3443 -[AC_REQUIRE([_LT_PROG_FC])dnl
 12.3444 -AC_LANG_PUSH(Fortran)
 12.3445 +[AC_LANG_PUSH(Fortran)
 12.3446 +
 12.3447 +if test -z "$FC" || test "X$FC" = "Xno"; then
 12.3448 +  _lt_disable_FC=yes
 12.3449 +fi
 12.3450  
 12.3451  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 12.3452  _LT_TAGVAR(allow_undefined_flag, $1)=
 12.3453 @@ -6747,7 +7311,6 @@
 12.3454  _LT_TAGVAR(hardcode_direct, $1)=no
 12.3455  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 12.3456  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 12.3457 -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 12.3458  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 12.3459  _LT_TAGVAR(hardcode_minus_L, $1)=no
 12.3460  _LT_TAGVAR(hardcode_automatic, $1)=no
 12.3461 @@ -6756,6 +7319,8 @@
 12.3462  _LT_TAGVAR(module_expsym_cmds, $1)=
 12.3463  _LT_TAGVAR(link_all_deplibs, $1)=unknown
 12.3464  _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 12.3465 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 12.3466 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 12.3467  _LT_TAGVAR(no_undefined_flag, $1)=
 12.3468  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 12.3469  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 12.3470 @@ -6795,7 +7360,9 @@
 12.3471    # Allow CC to be a program name with arguments.
 12.3472    lt_save_CC="$CC"
 12.3473    lt_save_GCC=$GCC
 12.3474 +  lt_save_CFLAGS=$CFLAGS
 12.3475    CC=${FC-"f95"}
 12.3476 +  CFLAGS=$FCFLAGS
 12.3477    compiler=$CC
 12.3478    GCC=$ac_cv_fc_compiler_gnu
 12.3479  
 12.3480 @@ -6851,7 +7418,8 @@
 12.3481    fi # test -n "$compiler"
 12.3482  
 12.3483    GCC=$lt_save_GCC
 12.3484 -  CC="$lt_save_CC"
 12.3485 +  CC=$lt_save_CC
 12.3486 +  CFLAGS=$lt_save_CFLAGS
 12.3487  fi # test "$_lt_disable_FC" != yes
 12.3488  
 12.3489  AC_LANG_POP
 12.3490 @@ -6888,10 +7456,12 @@
 12.3491  _LT_LINKER_BOILERPLATE
 12.3492  
 12.3493  # Allow CC to be a program name with arguments.
 12.3494 -lt_save_CC="$CC"
 12.3495 +lt_save_CC=$CC
 12.3496 +lt_save_CFLAGS=$CFLAGS
 12.3497  lt_save_GCC=$GCC
 12.3498  GCC=yes
 12.3499  CC=${GCJ-"gcj"}
 12.3500 +CFLAGS=$GCJFLAGS
 12.3501  compiler=$CC
 12.3502  _LT_TAGVAR(compiler, $1)=$CC
 12.3503  _LT_TAGVAR(LD, $1)="$LD"
 12.3504 @@ -6901,6 +7471,8 @@
 12.3505  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 12.3506  
 12.3507  _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 12.3508 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 12.3509 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 12.3510  
 12.3511  ## CAVEAT EMPTOR:
 12.3512  ## There is no encapsulation within the following macros, do not change
 12.3513 @@ -6920,10 +7492,82 @@
 12.3514  AC_LANG_RESTORE
 12.3515  
 12.3516  GCC=$lt_save_GCC
 12.3517 -CC="$lt_save_CC"
 12.3518 +CC=$lt_save_CC
 12.3519 +CFLAGS=$lt_save_CFLAGS
 12.3520  ])# _LT_LANG_GCJ_CONFIG
 12.3521  
 12.3522  
 12.3523 +# _LT_LANG_GO_CONFIG([TAG])
 12.3524 +# --------------------------
 12.3525 +# Ensure that the configuration variables for the GNU Go compiler
 12.3526 +# are suitably defined.  These variables are subsequently used by _LT_CONFIG
 12.3527 +# to write the compiler configuration to `libtool'.
 12.3528 +m4_defun([_LT_LANG_GO_CONFIG],
 12.3529 +[AC_REQUIRE([LT_PROG_GO])dnl
 12.3530 +AC_LANG_SAVE
 12.3531 +
 12.3532 +# Source file extension for Go test sources.
 12.3533 +ac_ext=go
 12.3534 +
 12.3535 +# Object file extension for compiled Go test sources.
 12.3536 +objext=o
 12.3537 +_LT_TAGVAR(objext, $1)=$objext
 12.3538 +
 12.3539 +# Code to be used in simple compile tests
 12.3540 +lt_simple_compile_test_code="package main; func main() { }"
 12.3541 +
 12.3542 +# Code to be used in simple link tests
 12.3543 +lt_simple_link_test_code='package main; func main() { }'
 12.3544 +
 12.3545 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 12.3546 +_LT_TAG_COMPILER
 12.3547 +
 12.3548 +# save warnings/boilerplate of simple test code
 12.3549 +_LT_COMPILER_BOILERPLATE
 12.3550 +_LT_LINKER_BOILERPLATE
 12.3551 +
 12.3552 +# Allow CC to be a program name with arguments.
 12.3553 +lt_save_CC=$CC
 12.3554 +lt_save_CFLAGS=$CFLAGS
 12.3555 +lt_save_GCC=$GCC
 12.3556 +GCC=yes
 12.3557 +CC=${GOC-"gccgo"}
 12.3558 +CFLAGS=$GOFLAGS
 12.3559 +compiler=$CC
 12.3560 +_LT_TAGVAR(compiler, $1)=$CC
 12.3561 +_LT_TAGVAR(LD, $1)="$LD"
 12.3562 +_LT_CC_BASENAME([$compiler])
 12.3563 +
 12.3564 +# Go did not exist at the time GCC didn't implicitly link libc in.
 12.3565 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 12.3566 +
 12.3567 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 12.3568 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 12.3569 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 12.3570 +
 12.3571 +## CAVEAT EMPTOR:
 12.3572 +## There is no encapsulation within the following macros, do not change
 12.3573 +## the running order or otherwise move them around unless you know exactly
 12.3574 +## what you are doing...
 12.3575 +if test -n "$compiler"; then
 12.3576 +  _LT_COMPILER_NO_RTTI($1)
 12.3577 +  _LT_COMPILER_PIC($1)
 12.3578 +  _LT_COMPILER_C_O($1)
 12.3579 +  _LT_COMPILER_FILE_LOCKS($1)
 12.3580 +  _LT_LINKER_SHLIBS($1)
 12.3581 +  _LT_LINKER_HARDCODE_LIBPATH($1)
 12.3582 +
 12.3583 +  _LT_CONFIG($1)
 12.3584 +fi
 12.3585 +
 12.3586 +AC_LANG_RESTORE
 12.3587 +
 12.3588 +GCC=$lt_save_GCC
 12.3589 +CC=$lt_save_CC
 12.3590 +CFLAGS=$lt_save_CFLAGS
 12.3591 +])# _LT_LANG_GO_CONFIG
 12.3592 +
 12.3593 +
 12.3594  # _LT_LANG_RC_CONFIG([TAG])
 12.3595  # -------------------------
 12.3596  # Ensure that the configuration variables for the Windows resource compiler
 12.3597 @@ -6955,9 +7599,11 @@
 12.3598  
 12.3599  # Allow CC to be a program name with arguments.
 12.3600  lt_save_CC="$CC"
 12.3601 +lt_save_CFLAGS=$CFLAGS
 12.3602  lt_save_GCC=$GCC
 12.3603  GCC=
 12.3604  CC=${RC-"windres"}
 12.3605 +CFLAGS=
 12.3606  compiler=$CC
 12.3607  _LT_TAGVAR(compiler, $1)=$CC
 12.3608  _LT_CC_BASENAME([$compiler])
 12.3609 @@ -6970,7 +7616,8 @@
 12.3610  
 12.3611  GCC=$lt_save_GCC
 12.3612  AC_LANG_RESTORE
 12.3613 -CC="$lt_save_CC"
 12.3614 +CC=$lt_save_CC
 12.3615 +CFLAGS=$lt_save_CFLAGS
 12.3616  ])# _LT_LANG_RC_CONFIG
 12.3617  
 12.3618  
 12.3619 @@ -6990,6 +7637,13 @@
 12.3620  dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 12.3621  
 12.3622  
 12.3623 +# LT_PROG_GO
 12.3624 +# ----------
 12.3625 +AC_DEFUN([LT_PROG_GO],
 12.3626 +[AC_CHECK_TOOL(GOC, gccgo,)
 12.3627 +])
 12.3628 +
 12.3629 +
 12.3630  # LT_PROG_RC
 12.3631  # ----------
 12.3632  AC_DEFUN([LT_PROG_RC],
 12.3633 @@ -7029,6 +7683,15 @@
 12.3634  AC_SUBST([OBJDUMP])
 12.3635  ])
 12.3636  
 12.3637 +# _LT_DECL_DLLTOOL
 12.3638 +# ----------------
 12.3639 +# Ensure DLLTOOL variable is set.
 12.3640 +m4_defun([_LT_DECL_DLLTOOL],
 12.3641 +[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 12.3642 +test -z "$DLLTOOL" && DLLTOOL=dlltool
 12.3643 +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
 12.3644 +AC_SUBST([DLLTOOL])
 12.3645 +])
 12.3646  
 12.3647  # _LT_DECL_SED
 12.3648  # ------------
 12.3649 @@ -7122,8 +7785,8 @@
 12.3650  # Try some XSI features
 12.3651  xsi_shell=no
 12.3652  ( _lt_dummy="a/b/c"
 12.3653 -  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
 12.3654 -      = c,a/b,, \
 12.3655 +  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
 12.3656 +      = c,a/b,b/c, \
 12.3657      && eval 'test $(( 1 + 1 )) -eq 2 \
 12.3658      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
 12.3659    && xsi_shell=yes
 12.3660 @@ -7162,209 +7825,162 @@
 12.3661  ])# _LT_CHECK_SHELL_FEATURES
 12.3662  
 12.3663  
 12.3664 -# _LT_PROG_XSI_SHELLFNS
 12.3665 -# ---------------------
 12.3666 -# Bourne and XSI compatible variants of some useful shell functions.
 12.3667 -m4_defun([_LT_PROG_XSI_SHELLFNS],
 12.3668 -[case $xsi_shell in
 12.3669 -  yes)
 12.3670 -    cat << \_LT_EOF >> "$cfgfile"
 12.3671 -
 12.3672 -# func_dirname file append nondir_replacement
 12.3673 -# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
 12.3674 -# otherwise set result to NONDIR_REPLACEMENT.
 12.3675 -func_dirname ()
 12.3676 -{
 12.3677 -  case ${1} in
 12.3678 -    */*) func_dirname_result="${1%/*}${2}" ;;
 12.3679 -    *  ) func_dirname_result="${3}" ;;
 12.3680 -  esac
 12.3681 -}
 12.3682 -
 12.3683 -# func_basename file
 12.3684 -func_basename ()
 12.3685 -{
 12.3686 -  func_basename_result="${1##*/}"
 12.3687 -}
 12.3688 -
 12.3689 -# func_dirname_and_basename file append nondir_replacement
 12.3690 -# perform func_basename and func_dirname in a single function
 12.3691 -# call:
 12.3692 -#   dirname:  Compute the dirname of FILE.  If nonempty,
 12.3693 -#             add APPEND to the result, otherwise set result
 12.3694 -#             to NONDIR_REPLACEMENT.
 12.3695 -#             value returned in "$func_dirname_result"
 12.3696 -#   basename: Compute filename of FILE.
 12.3697 -#             value retuned in "$func_basename_result"
 12.3698 -# Implementation must be kept synchronized with func_dirname
 12.3699 -# and func_basename. For efficiency, we do not delegate to
 12.3700 -# those functions but instead duplicate the functionality here.
 12.3701 -func_dirname_and_basename ()
 12.3702 -{
 12.3703 -  case ${1} in
 12.3704 -    */*) func_dirname_result="${1%/*}${2}" ;;
 12.3705 -    *  ) func_dirname_result="${3}" ;;
 12.3706 -  esac
 12.3707 -  func_basename_result="${1##*/}"
 12.3708 -}
 12.3709 -
 12.3710 -# func_stripname prefix suffix name
 12.3711 -# strip PREFIX and SUFFIX off of NAME.
 12.3712 -# PREFIX and SUFFIX must not contain globbing or regex special
 12.3713 -# characters, hashes, percent signs, but SUFFIX may contain a leading
 12.3714 -# dot (in which case that matches only a dot).
 12.3715 -func_stripname ()
 12.3716 -{
 12.3717 -  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
 12.3718 -  # positional parameters, so assign one to ordinary parameter first.
 12.3719 -  func_stripname_result=${3}
 12.3720 -  func_stripname_result=${func_stripname_result#"${1}"}
 12.3721 -  func_stripname_result=${func_stripname_result%"${2}"}
 12.3722 -}
 12.3723 -
 12.3724 -# func_opt_split
 12.3725 -func_opt_split ()
 12.3726 -{
 12.3727 -  func_opt_split_opt=${1%%=*}
 12.3728 -  func_opt_split_arg=${1#*=}
 12.3729 -}
 12.3730 -
 12.3731 -# func_lo2o object
 12.3732 -func_lo2o ()
 12.3733 -{
 12.3734 -  case ${1} in
 12.3735 -    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
 12.3736 -    *)    func_lo2o_result=${1} ;;
 12.3737 -  esac
 12.3738 -}
 12.3739 -
 12.3740 -# func_xform libobj-or-source
 12.3741 -func_xform ()
 12.3742 -{
 12.3743 -  func_xform_result=${1%.*}.lo
 12.3744 -}
 12.3745 -
 12.3746 -# func_arith arithmetic-term...
 12.3747 -func_arith ()
 12.3748 -{
 12.3749 -  func_arith_result=$(( $[*] ))
 12.3750 -}
 12.3751 -
 12.3752 -# func_len string
 12.3753 -# STRING may not start with a hyphen.
 12.3754 -func_len ()
 12.3755 -{
 12.3756 -  func_len_result=${#1}
 12.3757 -}
 12.3758 -
 12.3759 -_LT_EOF
 12.3760 +# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
 12.3761 +# ------------------------------------------------------
 12.3762 +# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
 12.3763 +# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
 12.3764 +m4_defun([_LT_PROG_FUNCTION_REPLACE],
 12.3765 +[dnl {
 12.3766 +sed -e '/^$1 ()$/,/^} # $1 /c\
 12.3767 +$1 ()\
 12.3768 +{\
 12.3769 +m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
 12.3770 +} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
 12.3771 +  && mv -f "$cfgfile.tmp" "$cfgfile" \
 12.3772 +    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
 12.3773 +test 0 -eq $? || _lt_function_replace_fail=:
 12.3774 +])
 12.3775 +
 12.3776 +
 12.3777 +# _LT_PROG_REPLACE_SHELLFNS
 12.3778 +# -------------------------
 12.3779 +# Replace existing portable implementations of several shell functions with
 12.3780 +# equivalent extended shell implementations where those features are available..
 12.3781 +m4_defun([_LT_PROG_REPLACE_SHELLFNS],
 12.3782 +[if test x"$xsi_shell" = xyes; then
 12.3783 +  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
 12.3784 +    case ${1} in
 12.3785 +      */*) func_dirname_result="${1%/*}${2}" ;;
 12.3786 +      *  ) func_dirname_result="${3}" ;;
 12.3787 +    esac])
 12.3788 +
 12.3789 +  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
 12.3790 +    func_basename_result="${1##*/}"])
 12.3791 +
 12.3792 +  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
 12.3793 +    case ${1} in
 12.3794 +      */*) func_dirname_result="${1%/*}${2}" ;;
 12.3795 +      *  ) func_dirname_result="${3}" ;;
 12.3796 +    esac
 12.3797 +    func_basename_result="${1##*/}"])
 12.3798 +
 12.3799 +  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
 12.3800 +    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
 12.3801 +    # positional parameters, so assign one to ordinary parameter first.
 12.3802 +    func_stripname_result=${3}
 12.3803 +    func_stripname_result=${func_stripname_result#"${1}"}
 12.3804 +    func_stripname_result=${func_stripname_result%"${2}"}])
 12.3805 +
 12.3806 +  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
 12.3807 +    func_split_long_opt_name=${1%%=*}
 12.3808 +    func_split_long_opt_arg=${1#*=}])
 12.3809 +
 12.3810 +  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
 12.3811 +    func_split_short_opt_arg=${1#??}
 12.3812 +    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
 12.3813 +
 12.3814 +  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
 12.3815 +    case ${1} in
 12.3816 +      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
 12.3817 +      *)    func_lo2o_result=${1} ;;
 12.3818 +    esac])
 12.3819 +
 12.3820 +  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 12.3821 +
 12.3822 +  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 12.3823 +
 12.3824 +  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
 12.3825 +fi
 12.3826 +
 12.3827 +if test x"$lt_shell_append" = xyes; then
 12.3828 +  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 12.3829 +
 12.3830 +  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
 12.3831 +    func_quote_for_eval "${2}"
 12.3832 +dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
 12.3833 +    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
 12.3834 +
 12.3835 +  # Save a `func_append' function call where possible by direct use of '+='
 12.3836 +  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
 12.3837 +    && mv -f "$cfgfile.tmp" "$cfgfile" \
 12.3838 +      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
 12.3839 +  test 0 -eq $? || _lt_function_replace_fail=:
 12.3840 +else
 12.3841 +  # Save a `func_append' function call even when '+=' is not available
 12.3842 +  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
 12.3843 +    && mv -f "$cfgfile.tmp" "$cfgfile" \
 12.3844 +      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
 12.3845 +  test 0 -eq $? || _lt_function_replace_fail=:
 12.3846 +fi
 12.3847 +
 12.3848 +if test x"$_lt_function_replace_fail" = x":"; then
 12.3849 +  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
 12.3850 +fi
 12.3851 +])
 12.3852 +
 12.3853 +# _LT_PATH_CONVERSION_FUNCTIONS
 12.3854 +# -----------------------------
 12.3855 +# Determine which file name conversion functions should be used by
 12.3856 +# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
 12.3857 +# for certain cross-compile configurations and native mingw.
 12.3858 +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
 12.3859 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 12.3860 +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 12.3861 +AC_MSG_CHECKING([how to convert $build file names to $host format])
 12.3862 +AC_CACHE_VAL(lt_cv_to_host_file_cmd,
 12.3863 +[case $host in
 12.3864 +  *-*-mingw* )
 12.3865 +    case $build in
 12.3866 +      *-*-mingw* ) # actually msys
 12.3867 +        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
 12.3868 +        ;;
 12.3869 +      *-*-cygwin* )
 12.3870 +        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
 12.3871 +        ;;
 12.3872 +      * ) # otherwise, assume *nix
 12.3873 +        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
 12.3874 +        ;;
 12.3875 +    esac
 12.3876      ;;
 12.3877 -  *) # Bourne compatible functions.
 12.3878 -    cat << \_LT_EOF >> "$cfgfile"
 12.3879 -
 12.3880 -# func_dirname file append nondir_replacement
 12.3881 -# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
 12.3882 -# otherwise set result to NONDIR_REPLACEMENT.
 12.3883 -func_dirname ()
 12.3884 -{
 12.3885 -  # Extract subdirectory from the argument.
 12.3886 -  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
 12.3887 -  if test "X$func_dirname_result" = "X${1}"; then
 12.3888 -    func_dirname_result="${3}"
 12.3889 -  else
 12.3890 -    func_dirname_result="$func_dirname_result${2}"
 12.3891 -  fi
 12.3892 -}
 12.3893 -
 12.3894 -# func_basename file
 12.3895 -func_basename ()
 12.3896 -{
 12.3897 -  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
 12.3898 -}
 12.3899 -
 12.3900 -dnl func_dirname_and_basename
 12.3901 -dnl A portable version of this function is already defined in general.m4sh
 12.3902 -dnl so there is no need for it here.
 12.3903 -
 12.3904 -# func_stripname prefix suffix name
 12.3905 -# strip PREFIX and SUFFIX off of NAME.
 12.3906 -# PREFIX and SUFFIX must not contain globbing or regex special
 12.3907 -# characters, hashes, percent signs, but SUFFIX may contain a leading
 12.3908 -# dot (in which case that matches only a dot).
 12.3909 -# func_strip_suffix prefix name
 12.3910 -func_stripname ()
 12.3911 -{
 12.3912 -  case ${2} in
 12.3913 -    .*) func_stripname_result=`$ECHO "X${3}" \
 12.3914 -           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
 12.3915 -    *)  func_stripname_result=`$ECHO "X${3}" \
 12.3916 -           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
 12.3917 -  esac
 12.3918 -}
 12.3919 -
 12.3920 -# sed scripts:
 12.3921 -my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
 12.3922 -my_sed_long_arg='1s/^-[[^=]]*=//'
 12.3923 -
 12.3924 -# func_opt_split
 12.3925 -func_opt_split ()
 12.3926 -{
 12.3927 -  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
 12.3928 -  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
 12.3929 -}
 12.3930 -
 12.3931 -# func_lo2o object
 12.3932 -func_lo2o ()
 12.3933 -{
 12.3934 -  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
 12.3935 -}
 12.3936 -
 12.3937 -# func_xform libobj-or-source
 12.3938 -func_xform ()
 12.3939 -{
 12.3940 -  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
 12.3941 -}
 12.3942 -
 12.3943 -# func_arith arithmetic-term...
 12.3944 -func_arith ()
 12.3945 -{
 12.3946 -  func_arith_result=`expr "$[@]"`
 12.3947 -}
 12.3948 -
 12.3949 -# func_len string
 12.3950 -# STRING may not start with a hyphen.
 12.3951 -func_len ()
 12.3952 -{
 12.3953 -  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
 12.3954 -}
 12.3955 -
 12.3956 -_LT_EOF
 12.3957 +  *-*-cygwin* )
 12.3958 +    case $build in
 12.3959 +      *-*-mingw* ) # actually msys
 12.3960 +        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
 12.3961 +        ;;
 12.3962 +      *-*-cygwin* )
 12.3963 +        lt_cv_to_host_file_cmd=func_convert_file_noop
 12.3964 +        ;;
 12.3965 +      * ) # otherwise, assume *nix
 12.3966 +        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
 12.3967 +        ;;
 12.3968 +    esac
 12.3969 +    ;;
 12.3970 +  * ) # unhandled hosts (and "normal" native builds)
 12.3971 +    lt_cv_to_host_file_cmd=func_convert_file_noop
 12.3972 +    ;;
 12.3973  esac
 12.3974 -
 12.3975 -case $lt_shell_append in
 12.3976 -  yes)
 12.3977 -    cat << \_LT_EOF >> "$cfgfile"
 12.3978 -
 12.3979 -# func_append var value
 12.3980 -# Append VALUE to the end of shell variable VAR.
 12.3981 -func_append ()
 12.3982 -{
 12.3983 -  eval "$[1]+=\$[2]"
 12.3984 -}
 12.3985 -_LT_EOF
 12.3986 +])
 12.3987 +to_host_file_cmd=$lt_cv_to_host_file_cmd
 12.3988 +AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
 12.3989 +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
 12.3990 +         [0], [convert $build file names to $host format])dnl
 12.3991 +
 12.3992 +AC_MSG_CHECKING([how to convert $build file names to toolchain format])
 12.3993 +AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
 12.3994 +[#assume ordinary cross tools, or native build.
 12.3995 +lt_cv_to_tool_file_cmd=func_convert_file_noop
 12.3996 +case $host in
 12.3997 +  *-*-mingw* )
 12.3998 +    case $build in
 12.3999 +      *-*-mingw* ) # actually msys
 12.4000 +        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
 12.4001 +        ;;
 12.4002 +    esac
 12.4003      ;;
 12.4004 -  *)
 12.4005 -    cat << \_LT_EOF >> "$cfgfile"
 12.4006 -
 12.4007 -# func_append var value
 12.4008 -# Append VALUE to the end of shell variable VAR.
 12.4009 -func_append ()
 12.4010 -{
 12.4011 -  eval "$[1]=\$$[1]\$[2]"
 12.4012 -}
 12.4013 -
 12.4014 -_LT_EOF
 12.4015 -    ;;
 12.4016 -  esac
 12.4017 +esac
 12.4018  ])
 12.4019 -
 12.4020 +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 12.4021 +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
 12.4022 +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
 12.4023 +         [0], [convert $build files to toolchain format])dnl
 12.4024 +])# _LT_PATH_CONVERSION_FUNCTIONS
    13.1 --- a/acinclude/ltdl.m4	Sat Sep 01 09:17:34 2012 -0400
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,806 +0,0 @@
    13.4 -##############################################################################
    13.5 -# ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
    13.6 -#
    13.7 -#   Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc.
    13.8 -#   Written by Thomas Tanner, 1999
    13.9 -#
   13.10 -# This file is free software; the Free Software Foundation gives
   13.11 -# unlimited permission to copy and/or distribute it, with or without
   13.12 -# modifications, as long as this notice is preserved.
   13.13 -
   13.14 -# serial 17 LTDL_INIT
   13.15 -
   13.16 -# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
   13.17 -# ------------------------------------------
   13.18 -# DIRECTORY contains the libltdl sources.  It is okay to call this
   13.19 -# function multiple times, as long as the same DIRECTORY is always given.
   13.20 -AC_DEFUN([LT_CONFIG_LTDL_DIR],
   13.21 -[AC_BEFORE([$0], [LTDL_INIT])
   13.22 -_$0($*)
   13.23 -])# LT_CONFIG_LTDL_DIR
   13.24 -
   13.25 -# We break this out into a separate macro, so that we can call it safely
   13.26 -# internally without being caught accidentally by the sed scan in libtoolize.
   13.27 -m4_defun([_LT_CONFIG_LTDL_DIR],
   13.28 -[dnl remove trailing slashes
   13.29 -m4_pushdef([_ARG_DIR], m4_bpatsubst([$1], [/*$]))
   13.30 -m4_case(_LTDL_DIR,
   13.31 -	[], [dnl only set lt_ltdl_dir if _ARG_DIR is not simply `.'
   13.32 -	     m4_if(_ARG_DIR, [.],
   13.33 -	             [],
   13.34 -		 [m4_define([_LTDL_DIR], _ARG_DIR)
   13.35 -	          _LT_SHELL_INIT([lt_ltdl_dir=']_ARG_DIR['])])],
   13.36 -    [m4_if(_ARG_DIR, _LTDL_DIR,
   13.37 -	    [],
   13.38 -	[m4_fatal([multiple libltdl directories: `]_LTDL_DIR[', `]_ARG_DIR['])])])
   13.39 -m4_popdef([_ARG_DIR])
   13.40 -])# _LT_CONFIG_LTDL_DIR
   13.41 -
   13.42 -# Initialise:
   13.43 -m4_define([_LTDL_DIR], [])
   13.44 -
   13.45 -
   13.46 -# _LT_BUILD_PREFIX
   13.47 -# ----------------
   13.48 -# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise
   13.49 -# to `${top_builddir}/'.
   13.50 -m4_define([_LT_BUILD_PREFIX],
   13.51 -[m4_ifdef([AC_AUTOCONF_VERSION],
   13.52 -   [m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]),
   13.53 -	  [-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX],
   13.54 -			  [${top_build_prefix}],
   13.55 -			  [${top_builddir}/])],
   13.56 -	  [${top_build_prefix}])],
   13.57 -   [${top_builddir}/])[]dnl
   13.58 -])
   13.59 -
   13.60 -
   13.61 -# LTDL_CONVENIENCE
   13.62 -# ----------------
   13.63 -# sets LIBLTDL to the link flags for the libltdl convenience library and
   13.64 -# LTDLINCL to the include flags for the libltdl header and adds
   13.65 -# --enable-ltdl-convenience to the configure arguments.  Note that
   13.66 -# AC_CONFIG_SUBDIRS is not called here.  LIBLTDL will be prefixed with
   13.67 -# '${top_build_prefix}' if available, otherwise with '${top_builddir}/',
   13.68 -# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
   13.69 -# quotes!).  If your package is not flat and you're not using automake,
   13.70 -# define top_build_prefix, top_builddir, and top_srcdir appropriately
   13.71 -# in your Makefiles.
   13.72 -AC_DEFUN([LTDL_CONVENIENCE],
   13.73 -[AC_BEFORE([$0], [LTDL_INIT])dnl
   13.74 -dnl Although the argument is deprecated and no longer documented,
   13.75 -dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one
   13.76 -dnl here make sure it is the same as any other declaration of libltdl's
   13.77 -dnl location!  This also ensures lt_ltdl_dir is set when configure.ac is
   13.78 -dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
   13.79 -m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
   13.80 -_$0()
   13.81 -])# LTDL_CONVENIENCE
   13.82 -
   13.83 -# AC_LIBLTDL_CONVENIENCE accepted a directory argument in older libtools,
   13.84 -# now we have LT_CONFIG_LTDL_DIR:
   13.85 -AU_DEFUN([AC_LIBLTDL_CONVENIENCE],
   13.86 -[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
   13.87 -_LTDL_CONVENIENCE])
   13.88 -
   13.89 -dnl aclocal-1.4 backwards compatibility:
   13.90 -dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [])
   13.91 -
   13.92 -
   13.93 -# _LTDL_CONVENIENCE
   13.94 -# -----------------
   13.95 -# Code shared by LTDL_CONVENIENCE and LTDL_INIT([convenience]).
   13.96 -m4_defun([_LTDL_CONVENIENCE],
   13.97 -[case $enable_ltdl_convenience in
   13.98 -  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
   13.99 -  "") enable_ltdl_convenience=yes
  13.100 -      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
  13.101 -esac
  13.102 -LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
  13.103 -LTDLDEPS=$LIBLTDL
  13.104 -LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
  13.105 -
  13.106 -AC_SUBST([LIBLTDL])
  13.107 -AC_SUBST([LTDLDEPS])
  13.108 -AC_SUBST([LTDLINCL])
  13.109 -
  13.110 -# For backwards non-gettext consistent compatibility...
  13.111 -INCLTDL="$LTDLINCL"
  13.112 -AC_SUBST([INCLTDL])
  13.113 -])# _LTDL_CONVENIENCE
  13.114 -
  13.115 -
  13.116 -# LTDL_INSTALLABLE
  13.117 -# ----------------
  13.118 -# sets LIBLTDL to the link flags for the libltdl installable library
  13.119 -# and LTDLINCL to the include flags for the libltdl header and adds
  13.120 -# --enable-ltdl-install to the configure arguments.  Note that
  13.121 -# AC_CONFIG_SUBDIRS is not called from here.  If an installed libltdl
  13.122 -# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if
  13.123 -# available, otherwise with '${top_builddir}/', and LTDLINCL will be
  13.124 -# prefixed with '${top_srcdir}/' (note the single quotes!).  If your
  13.125 -# package is not flat and you're not using automake, define top_build_prefix,
  13.126 -# top_builddir, and top_srcdir appropriately in your Makefiles.
  13.127 -# In the future, this macro may have to be called after LT_INIT.
  13.128 -AC_DEFUN([LTDL_INSTALLABLE],
  13.129 -[AC_BEFORE([$0], [LTDL_INIT])dnl
  13.130 -dnl Although the argument is deprecated and no longer documented,
  13.131 -dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one
  13.132 -dnl here make sure it is the same as any other declaration of libltdl's
  13.133 -dnl location!  This also ensures lt_ltdl_dir is set when configure.ac is
  13.134 -dnl not yet using an explicit LT_CONFIG_LTDL_DIR.
  13.135 -m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl
  13.136 -_$0()
  13.137 -])# LTDL_INSTALLABLE
  13.138 -
  13.139 -# AC_LIBLTDL_INSTALLABLE accepted a directory argument in older libtools,
  13.140 -# now we have LT_CONFIG_LTDL_DIR:
  13.141 -AU_DEFUN([AC_LIBLTDL_INSTALLABLE],
  13.142 -[_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])])
  13.143 -_LTDL_INSTALLABLE])
  13.144 -
  13.145 -dnl aclocal-1.4 backwards compatibility:
  13.146 -dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [])
  13.147 -
  13.148 -
  13.149 -# _LTDL_INSTALLABLE
  13.150 -# -----------------
  13.151 -# Code shared by LTDL_INSTALLABLE and LTDL_INIT([installable]).
  13.152 -m4_defun([_LTDL_INSTALLABLE],
  13.153 -[if test -f $prefix/lib/libltdl.la; then
  13.154 -  lt_save_LDFLAGS="$LDFLAGS"
  13.155 -  LDFLAGS="-L$prefix/lib $LDFLAGS"
  13.156 -  AC_CHECK_LIB([ltdl], [lt_dlinit], [lt_lib_ltdl=yes])
  13.157 -  LDFLAGS="$lt_save_LDFLAGS"
  13.158 -  if test x"${lt_lib_ltdl-no}" = xyes; then
  13.159 -    if test x"$enable_ltdl_install" != xyes; then
  13.160 -      # Don't overwrite $prefix/lib/libltdl.la without --enable-ltdl-install
  13.161 -      AC_MSG_WARN([not overwriting libltdl at $prefix, force with `--enable-ltdl-install'])
  13.162 -      enable_ltdl_install=no
  13.163 -    fi
  13.164 -  elif test x"$enable_ltdl_install" = xno; then
  13.165 -    AC_MSG_WARN([libltdl not installed, but installation disabled])
  13.166 -  fi
  13.167 -fi
  13.168 -
  13.169 -# If configure.ac declared an installable ltdl, and the user didn't override
  13.170 -# with --disable-ltdl-install, we will install the shipped libltdl.
  13.171 -case $enable_ltdl_install in
  13.172 -  no) ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
  13.173 -      LIBLTDL="-lltdl"
  13.174 -      LTDLDEPS=
  13.175 -      LTDLINCL=
  13.176 -      ;;
  13.177 -  *)  enable_ltdl_install=yes
  13.178 -      ac_configure_args="$ac_configure_args --enable-ltdl-install"
  13.179 -      LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la"
  13.180 -      LTDLDEPS=$LIBLTDL
  13.181 -      LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
  13.182 -      ;;
  13.183 -esac
  13.184 -
  13.185 -AC_SUBST([LIBLTDL])
  13.186 -AC_SUBST([LTDLDEPS])
  13.187 -AC_SUBST([LTDLINCL])
  13.188 -
  13.189 -# For backwards non-gettext consistent compatibility...
  13.190 -INCLTDL="$LTDLINCL"
  13.191 -AC_SUBST([INCLTDL])
  13.192 -])# LTDL_INSTALLABLE
  13.193 -
  13.194 -
  13.195 -# _LTDL_MODE_DISPATCH
  13.196 -# -------------------
  13.197 -m4_define([_LTDL_MODE_DISPATCH],
  13.198 -[dnl If _LTDL_DIR is `.', then we are configuring libltdl itself:
  13.199 -m4_if(_LTDL_DIR, [],
  13.200 -	[],
  13.201 -    dnl if _LTDL_MODE was not set already, the default value is `subproject':
  13.202 -    [m4_case(m4_default(_LTDL_MODE, [subproject]),
  13.203 -	  [subproject], [AC_CONFIG_SUBDIRS(_LTDL_DIR)
  13.204 -			  _LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"])],
  13.205 -	  [nonrecursive], [_LT_SHELL_INIT([lt_dlopen_dir="$lt_ltdl_dir"; lt_libobj_prefix="$lt_ltdl_dir/"])],
  13.206 -	  [recursive], [],
  13.207 -	[m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])dnl
  13.208 -dnl Be careful not to expand twice:
  13.209 -m4_define([$0], [])
  13.210 -])# _LTDL_MODE_DISPATCH
  13.211 -
  13.212 -
  13.213 -# _LT_LIBOBJ(MODULE_NAME)
  13.214 -# -----------------------
  13.215 -# Like AC_LIBOBJ, except that MODULE_NAME goes into _LT_LIBOBJS instead
  13.216 -# of into LIBOBJS.
  13.217 -AC_DEFUN([_LT_LIBOBJ], [
  13.218 -  m4_pattern_allow([^_LT_LIBOBJS$])
  13.219 -  _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext"
  13.220 -])# _LT_LIBOBJS
  13.221 -
  13.222 -
  13.223 -# LTDL_INIT([OPTIONS])
  13.224 -# --------------------
  13.225 -# Clients of libltdl can use this macro to allow the installer to
  13.226 -# choose between a shipped copy of the ltdl sources or a preinstalled
  13.227 -# version of the library.  If the shipped ltdl sources are not in a
  13.228 -# subdirectory named libltdl, the directory name must be given by
  13.229 -# LT_CONFIG_LTDL_DIR.
  13.230 -AC_DEFUN([LTDL_INIT],
  13.231 -[dnl Parse OPTIONS
  13.232 -_LT_SET_OPTIONS([$0], [$1])
  13.233 -
  13.234 -dnl We need to keep our own list of libobjs separate from our parent project,
  13.235 -dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while
  13.236 -dnl we look for our own LIBOBJs.
  13.237 -m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ]))
  13.238 -m4_pushdef([AC_LIBSOURCES])
  13.239 -
  13.240 -dnl If not otherwise defined, default to the 1.5.x compatible subproject mode:
  13.241 -m4_if(_LTDL_MODE, [],
  13.242 -        [m4_define([_LTDL_MODE], m4_default([$2], [subproject]))
  13.243 -        m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])],
  13.244 -                [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])])
  13.245 -
  13.246 -AC_ARG_WITH([included_ltdl],
  13.247 -    [AS_HELP_STRING([--with-included-ltdl],
  13.248 -                    [use the GNU ltdl sources included here])])
  13.249 -
  13.250 -if test "x$with_included_ltdl" != xyes; then
  13.251 -  # We are not being forced to use the included libltdl sources, so
  13.252 -  # decide whether there is a useful installed version we can use.
  13.253 -  AC_CHECK_HEADER([ltdl.h],
  13.254 -      [AC_CHECK_DECL([lt_dlinterface_register],
  13.255 -	   [AC_CHECK_LIB([ltdl], [lt_dladvise_preload],
  13.256 -	       [with_included_ltdl=no],
  13.257 -	       [with_included_ltdl=yes])],
  13.258 -	   [with_included_ltdl=yes],
  13.259 -	   [AC_INCLUDES_DEFAULT
  13.260 -	    #include <ltdl.h>])],
  13.261 -      [with_included_ltdl=yes],
  13.262 -      [AC_INCLUDES_DEFAULT]
  13.263 -  )
  13.264 -fi
  13.265 -
  13.266 -dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE
  13.267 -dnl was called yet, then for old times' sake, we assume libltdl is in an
  13.268 -dnl eponymous directory:
  13.269 -AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])])
  13.270 -
  13.271 -AC_ARG_WITH([ltdl_include],
  13.272 -    [AS_HELP_STRING([--with-ltdl-include=DIR],
  13.273 -                    [use the ltdl headers installed in DIR])])
  13.274 -
  13.275 -if test -n "$with_ltdl_include"; then
  13.276 -  if test -f "$with_ltdl_include/ltdl.h"; then :
  13.277 -  else
  13.278 -    AC_MSG_ERROR([invalid ltdl include directory: `$with_ltdl_include'])
  13.279 -  fi
  13.280 -else
  13.281 -  with_ltdl_include=no
  13.282 -fi
  13.283 -
  13.284 -AC_ARG_WITH([ltdl_lib],
  13.285 -    [AS_HELP_STRING([--with-ltdl-lib=DIR],
  13.286 -                    [use the libltdl.la installed in DIR])])
  13.287 -
  13.288 -if test -n "$with_ltdl_lib"; then
  13.289 -  if test -f "$with_ltdl_lib/libltdl.la"; then :
  13.290 -  else
  13.291 -    AC_MSG_ERROR([invalid ltdl library directory: `$with_ltdl_lib'])
  13.292 -  fi
  13.293 -else
  13.294 -  with_ltdl_lib=no
  13.295 -fi
  13.296 -
  13.297 -case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in
  13.298 -  ,yes,no,no,)
  13.299 -	m4_case(m4_default(_LTDL_TYPE, [convenience]),
  13.300 -	    [convenience], [_LTDL_CONVENIENCE],
  13.301 -	    [installable], [_LTDL_INSTALLABLE],
  13.302 -	  [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)])
  13.303 -	;;
  13.304 -  ,no,no,no,)
  13.305 -	# If the included ltdl is not to be used, then use the
  13.306 -	# preinstalled libltdl we found.
  13.307 -	AC_DEFINE([HAVE_LTDL], [1],
  13.308 -	  [Define this if a modern libltdl is already installed])
  13.309 -	LIBLTDL=-lltdl
  13.310 -	LTDLDEPS=
  13.311 -	LTDLINCL=
  13.312 -	;;
  13.313 -  ,no*,no,*)
  13.314 -	AC_MSG_ERROR([`--with-ltdl-include' and `--with-ltdl-lib' options must be used together])
  13.315 -	;;
  13.316 -  *)	with_included_ltdl=no
  13.317 -	LIBLTDL="-L$with_ltdl_lib -lltdl"
  13.318 -	LTDLDEPS=
  13.319 -	LTDLINCL="-I$with_ltdl_include"
  13.320 -	;;
  13.321 -esac
  13.322 -INCLTDL="$LTDLINCL"
  13.323 -
  13.324 -# Report our decision...
  13.325 -AC_MSG_CHECKING([where to find libltdl headers])
  13.326 -AC_MSG_RESULT([$LTDLINCL])
  13.327 -AC_MSG_CHECKING([where to find libltdl library])
  13.328 -AC_MSG_RESULT([$LIBLTDL])
  13.329 -
  13.330 -_LTDL_SETUP
  13.331 -
  13.332 -dnl restore autoconf definition.
  13.333 -m4_popdef([AC_LIBOBJ])
  13.334 -m4_popdef([AC_LIBSOURCES])
  13.335 -
  13.336 -AC_CONFIG_COMMANDS_PRE([
  13.337 -    _ltdl_libobjs=
  13.338 -    _ltdl_ltlibobjs=
  13.339 -    if test -n "$_LT_LIBOBJS"; then
  13.340 -      # Remove the extension.
  13.341 -      _lt_sed_drop_objext='s/\.o$//;s/\.obj$//'
  13.342 -      for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do
  13.343 -        _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext"
  13.344 -        _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo"
  13.345 -      done
  13.346 -    fi
  13.347 -    AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs])
  13.348 -    AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs])
  13.349 -])
  13.350 -
  13.351 -# Only expand once:
  13.352 -m4_define([LTDL_INIT])
  13.353 -])# LTDL_INIT
  13.354 -
  13.355 -# Old names:
  13.356 -AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)])
  13.357 -AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)])
  13.358 -AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)])
  13.359 -dnl aclocal-1.4 backwards compatibility:
  13.360 -dnl AC_DEFUN([AC_LIB_LTDL], [])
  13.361 -dnl AC_DEFUN([AC_WITH_LTDL], [])
  13.362 -dnl AC_DEFUN([LT_WITH_LTDL], [])
  13.363 -
  13.364 -
  13.365 -# _LTDL_SETUP
  13.366 -# -----------
  13.367 -# Perform all the checks necessary for compilation of the ltdl objects
  13.368 -#  -- including compiler checks and header checks.  This is a public
  13.369 -# interface  mainly for the benefit of libltdl's own configure.ac, most
  13.370 -# other users should call LTDL_INIT instead.
  13.371 -AC_DEFUN([_LTDL_SETUP],
  13.372 -[AC_REQUIRE([AC_PROG_CC])dnl
  13.373 -AC_REQUIRE([LT_SYS_MODULE_EXT])dnl
  13.374 -AC_REQUIRE([LT_SYS_MODULE_PATH])dnl
  13.375 -AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl
  13.376 -AC_REQUIRE([LT_LIB_DLLOAD])dnl
  13.377 -AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
  13.378 -AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl
  13.379 -AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl
  13.380 -AC_REQUIRE([gl_FUNC_ARGZ])dnl
  13.381 -
  13.382 -m4_require([_LT_CHECK_OBJDIR])dnl
  13.383 -m4_require([_LT_HEADER_DLFCN])dnl
  13.384 -m4_require([_LT_CHECK_DLPREOPEN])dnl
  13.385 -m4_require([_LT_DECL_SED])dnl
  13.386 -
  13.387 -dnl Don't require this, or it will be expanded earlier than the code
  13.388 -dnl that sets the variables it relies on:
  13.389 -_LT_ENABLE_INSTALL
  13.390 -
  13.391 -dnl _LTDL_MODE specific code must be called at least once:
  13.392 -_LTDL_MODE_DISPATCH
  13.393 -
  13.394 -# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS
  13.395 -# the user used.  This is so that ltdl.h can pick up the parent projects
  13.396 -# config.h file, The first file in AC_CONFIG_HEADERS must contain the
  13.397 -# definitions required by ltdl.c.
  13.398 -# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility).
  13.399 -AC_CONFIG_COMMANDS_PRE([dnl
  13.400 -m4_pattern_allow([^LT_CONFIG_H$])dnl
  13.401 -m4_ifset([AH_HEADER],
  13.402 -    [LT_CONFIG_H=AH_HEADER],
  13.403 -    [m4_ifset([AC_LIST_HEADERS],
  13.404 -	    [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's,^[[      ]]*,,;s,[[ :]].*$,,'`],
  13.405 -	[])])])
  13.406 -AC_SUBST([LT_CONFIG_H])
  13.407 -
  13.408 -AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
  13.409 -	[], [], [AC_INCLUDES_DEFAULT])
  13.410 -
  13.411 -AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
  13.412 -AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
  13.413 -
  13.414 -AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
  13.415 -
  13.416 -name=ltdl
  13.417 -LTDLOPEN=`eval "\\$ECHO \"$libname_spec\""`
  13.418 -AC_SUBST([LTDLOPEN])
  13.419 -])# _LTDL_SETUP
  13.420 -
  13.421 -
  13.422 -# _LT_ENABLE_INSTALL
  13.423 -# ------------------
  13.424 -m4_define([_LT_ENABLE_INSTALL],
  13.425 -[AC_ARG_ENABLE([ltdl-install],
  13.426 -    [AS_HELP_STRING([--enable-ltdl-install], [install libltdl])])
  13.427 -
  13.428 -case ,${enable_ltdl_install},${enable_ltdl_convenience} in
  13.429 -  *yes*) ;;
  13.430 -  *) enable_ltdl_convenience=yes ;;
  13.431 -esac
  13.432 -
  13.433 -m4_ifdef([AM_CONDITIONAL],
  13.434 -[AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
  13.435 - AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)])
  13.436 -])# _LT_ENABLE_INSTALL
  13.437 -
  13.438 -
  13.439 -# LT_SYS_DLOPEN_DEPLIBS
  13.440 -# ---------------------
  13.441 -AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS],
  13.442 -[AC_REQUIRE([AC_CANONICAL_HOST])dnl
  13.443 -AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
  13.444 -  [lt_cv_sys_dlopen_deplibs],
  13.445 -  [# PORTME does your system automatically load deplibs for dlopen?
  13.446 -  # or its logical equivalent (e.g. shl_load for HP-UX < 11)
  13.447 -  # For now, we just catch OSes we know something about -- in the
  13.448 -  # future, we'll try test this programmatically.
  13.449 -  lt_cv_sys_dlopen_deplibs=unknown
  13.450 -  case $host_os in
  13.451 -  aix3*|aix4.1.*|aix4.2.*)
  13.452 -    # Unknown whether this is true for these versions of AIX, but
  13.453 -    # we want this `case' here to explicitly catch those versions.
  13.454 -    lt_cv_sys_dlopen_deplibs=unknown
  13.455 -    ;;
  13.456 -  aix[[4-9]]*)
  13.457 -    lt_cv_sys_dlopen_deplibs=yes
  13.458 -    ;;
  13.459 -  amigaos*)
  13.460 -    case $host_cpu in
  13.461 -    powerpc)
  13.462 -      lt_cv_sys_dlopen_deplibs=no
  13.463 -      ;;
  13.464 -    esac
  13.465 -    ;;
  13.466 -  darwin*)
  13.467 -    # Assuming the user has installed a libdl from somewhere, this is true
  13.468 -    # If you are looking for one http://www.opendarwin.org/projects/dlcompat
  13.469 -    lt_cv_sys_dlopen_deplibs=yes
  13.470 -    ;;
  13.471 -  freebsd* | dragonfly*)
  13.472 -    lt_cv_sys_dlopen_deplibs=yes
  13.473 -    ;;
  13.474 -  gnu* | linux* | k*bsd*-gnu)
  13.475 -    # GNU and its variants, using gnu ld.so (Glibc)
  13.476 -    lt_cv_sys_dlopen_deplibs=yes
  13.477 -    ;;
  13.478 -  hpux10*|hpux11*)
  13.479 -    lt_cv_sys_dlopen_deplibs=yes
  13.480 -    ;;
  13.481 -  interix*)
  13.482 -    lt_cv_sys_dlopen_deplibs=yes
  13.483 -    ;;
  13.484 -  irix[[12345]]*|irix6.[[01]]*)
  13.485 -    # Catch all versions of IRIX before 6.2, and indicate that we don't
  13.486 -    # know how it worked for any of those versions.
  13.487 -    lt_cv_sys_dlopen_deplibs=unknown
  13.488 -    ;;
  13.489 -  irix*)
  13.490 -    # The case above catches anything before 6.2, and it's known that
  13.491 -    # at 6.2 and later dlopen does load deplibs.
  13.492 -    lt_cv_sys_dlopen_deplibs=yes
  13.493 -    ;;
  13.494 -  netbsd*)
  13.495 -    lt_cv_sys_dlopen_deplibs=yes
  13.496 -    ;;
  13.497 -  openbsd*)
  13.498 -    lt_cv_sys_dlopen_deplibs=yes
  13.499 -    ;;
  13.500 -  osf[[1234]]*)
  13.501 -    # dlopen did load deplibs (at least at 4.x), but until the 5.x series,
  13.502 -    # it did *not* use an RPATH in a shared library to find objects the
  13.503 -    # library depends on, so we explicitly say `no'.
  13.504 -    lt_cv_sys_dlopen_deplibs=no
  13.505 -    ;;
  13.506 -  osf5.0|osf5.0a|osf5.1)
  13.507 -    # dlopen *does* load deplibs and with the right loader patch applied
  13.508 -    # it even uses RPATH in a shared library to search for shared objects
  13.509 -    # that the library depends on, but there's no easy way to know if that
  13.510 -    # patch is installed.  Since this is the case, all we can really
  13.511 -    # say is unknown -- it depends on the patch being installed.  If
  13.512 -    # it is, this changes to `yes'.  Without it, it would be `no'.
  13.513 -    lt_cv_sys_dlopen_deplibs=unknown
  13.514 -    ;;
  13.515 -  osf*)
  13.516 -    # the two cases above should catch all versions of osf <= 5.1.  Read
  13.517 -    # the comments above for what we know about them.
  13.518 -    # At > 5.1, deplibs are loaded *and* any RPATH in a shared library
  13.519 -    # is used to find them so we can finally say `yes'.
  13.520 -    lt_cv_sys_dlopen_deplibs=yes
  13.521 -    ;;
  13.522 -  qnx*)
  13.523 -    lt_cv_sys_dlopen_deplibs=yes
  13.524 -    ;;
  13.525 -  solaris*)
  13.526 -    lt_cv_sys_dlopen_deplibs=yes
  13.527 -    ;;
  13.528 -  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
  13.529 -    libltdl_cv_sys_dlopen_deplibs=yes
  13.530 -    ;;
  13.531 -  esac
  13.532 -  ])
  13.533 -if test "$lt_cv_sys_dlopen_deplibs" != yes; then
  13.534 - AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
  13.535 -    [Define if the OS needs help to load dependent libraries for dlopen().])
  13.536 -fi
  13.537 -])# LT_SYS_DLOPEN_DEPLIBS
  13.538 -
  13.539 -# Old name:
  13.540 -AU_ALIAS([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS])
  13.541 -dnl aclocal-1.4 backwards compatibility:
  13.542 -dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [])
  13.543 -
  13.544 -
  13.545 -# LT_SYS_MODULE_EXT
  13.546 -# -----------------
  13.547 -AC_DEFUN([LT_SYS_MODULE_EXT],
  13.548 -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
  13.549 -AC_CACHE_CHECK([which extension is used for runtime loadable modules],
  13.550 -  [libltdl_cv_shlibext],
  13.551 -[
  13.552 -module=yes
  13.553 -eval libltdl_cv_shlibext=$shrext_cmds
  13.554 -  ])
  13.555 -if test -n "$libltdl_cv_shlibext"; then
  13.556 -  m4_pattern_allow([LT_MODULE_EXT])dnl
  13.557 -  AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"],
  13.558 -    [Define to the extension used for runtime loadable modules, say, ".so".])
  13.559 -fi
  13.560 -])# LT_SYS_MODULE_EXT
  13.561 -
  13.562 -# Old name:
  13.563 -AU_ALIAS([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT])
  13.564 -dnl aclocal-1.4 backwards compatibility:
  13.565 -dnl AC_DEFUN([AC_LTDL_SHLIBEXT], [])
  13.566 -
  13.567 -
  13.568 -# LT_SYS_MODULE_PATH
  13.569 -# ------------------
  13.570 -AC_DEFUN([LT_SYS_MODULE_PATH],
  13.571 -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
  13.572 -AC_CACHE_CHECK([which variable specifies run-time module search path],
  13.573 -  [lt_cv_module_path_var], [lt_cv_module_path_var="$shlibpath_var"])
  13.574 -if test -n "$lt_cv_module_path_var"; then
  13.575 -  m4_pattern_allow([LT_MODULE_PATH_VAR])dnl
  13.576 -  AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"],
  13.577 -    [Define to the name of the environment variable that determines the run-time module search path.])
  13.578 -fi
  13.579 -])# LT_SYS_MODULE_PATH
  13.580 -
  13.581 -# Old name:
  13.582 -AU_ALIAS([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH])
  13.583 -dnl aclocal-1.4 backwards compatibility:
  13.584 -dnl AC_DEFUN([AC_LTDL_SHLIBPATH], [])
  13.585 -
  13.586 -
  13.587 -# LT_SYS_DLSEARCH_PATH
  13.588 -# --------------------
  13.589 -AC_DEFUN([LT_SYS_DLSEARCH_PATH],
  13.590 -[m4_require([_LT_SYS_DYNAMIC_LINKER])dnl
  13.591 -AC_CACHE_CHECK([for the default library search path],
  13.592 -  [lt_cv_sys_dlsearch_path],
  13.593 -  [lt_cv_sys_dlsearch_path="$sys_lib_dlsearch_path_spec"])
  13.594 -if test -n "$lt_cv_sys_dlsearch_path"; then
  13.595 -  sys_dlsearch_path=
  13.596 -  for dir in $lt_cv_sys_dlsearch_path; do
  13.597 -    if test -z "$sys_dlsearch_path"; then
  13.598 -      sys_dlsearch_path="$dir"
  13.599 -    else
  13.600 -      sys_dlsearch_path="$sys_dlsearch_path$PATH_SEPARATOR$dir"
  13.601 -    fi
  13.602 -  done
  13.603 -  m4_pattern_allow([LT_DLSEARCH_PATH])dnl
  13.604 -  AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"],
  13.605 -    [Define to the system default library search path.])
  13.606 -fi
  13.607 -])# LT_SYS_DLSEARCH_PATH
  13.608 -
  13.609 -# Old name:
  13.610 -AU_ALIAS([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH])
  13.611 -dnl aclocal-1.4 backwards compatibility:
  13.612 -dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [])
  13.613 -
  13.614 -
  13.615 -# _LT_CHECK_DLPREOPEN
  13.616 -# -------------------
  13.617 -m4_defun([_LT_CHECK_DLPREOPEN],
  13.618 -[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
  13.619 -AC_CACHE_CHECK([whether libtool supports -dlopen/-dlpreopen],
  13.620 -  [libltdl_cv_preloaded_symbols],
  13.621 -  [if test -n "$lt_cv_sys_global_symbol_pipe"; then
  13.622 -    libltdl_cv_preloaded_symbols=yes
  13.623 -  else
  13.624 -    libltdl_cv_preloaded_symbols=no
  13.625 -  fi
  13.626 -  ])
  13.627 -if test x"$libltdl_cv_preloaded_symbols" = xyes; then
  13.628 -  AC_DEFINE([HAVE_PRELOADED_SYMBOLS], [1],
  13.629 -    [Define if libtool can extract symbol lists from object files.])
  13.630 -fi
  13.631 -])# _LT_CHECK_DLPREOPEN
  13.632 -
  13.633 -
  13.634 -# LT_LIB_DLLOAD
  13.635 -# -------------
  13.636 -AC_DEFUN([LT_LIB_DLLOAD],
  13.637 -[m4_pattern_allow([^LT_DLLOADERS$])
  13.638 -LT_DLLOADERS=
  13.639 -AC_SUBST([LT_DLLOADERS])
  13.640 -
  13.641 -AC_LANG_PUSH([C])
  13.642 -
  13.643 -LIBADD_DLOPEN=
  13.644 -AC_SEARCH_LIBS([dlopen], [dl],
  13.645 -	[AC_DEFINE([HAVE_LIBDL], [1],
  13.646 -		   [Define if you have the libdl library or equivalent.])
  13.647 -	if test "$ac_cv_search_dlopen" != "none required" ; then
  13.648 -	  LIBADD_DLOPEN="-ldl"
  13.649 -	fi
  13.650 -	libltdl_cv_lib_dl_dlopen="yes"
  13.651 -	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
  13.652 -    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H
  13.653 -#  include <dlfcn.h>
  13.654 -#endif
  13.655 -    ]], [[dlopen(0, 0);]])],
  13.656 -	    [AC_DEFINE([HAVE_LIBDL], [1],
  13.657 -		       [Define if you have the libdl library or equivalent.])
  13.658 -	    libltdl_cv_func_dlopen="yes"
  13.659 -	    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"],
  13.660 -	[AC_CHECK_LIB([svld], [dlopen],
  13.661 -		[AC_DEFINE([HAVE_LIBDL], [1],
  13.662 -			 [Define if you have the libdl library or equivalent.])
  13.663 -	        LIBADD_DLOPEN="-lsvld" libltdl_cv_func_dlopen="yes"
  13.664 -		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])])
  13.665 -if test x"$libltdl_cv_func_dlopen" = xyes || test x"$libltdl_cv_lib_dl_dlopen" = xyes
  13.666 -then
  13.667 -  lt_save_LIBS="$LIBS"
  13.668 -  LIBS="$LIBS $LIBADD_DLOPEN"
  13.669 -  AC_CHECK_FUNCS([dlerror])
  13.670 -  LIBS="$lt_save_LIBS"
  13.671 -fi
  13.672 -AC_SUBST([LIBADD_DLOPEN])
  13.673 -
  13.674 -LIBADD_SHL_LOAD=
  13.675 -AC_CHECK_FUNC([shl_load],
  13.676 -	[AC_DEFINE([HAVE_SHL_LOAD], [1],
  13.677 -		   [Define if you have the shl_load function.])
  13.678 -	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"],
  13.679 -    [AC_CHECK_LIB([dld], [shl_load],
  13.680 -	    [AC_DEFINE([HAVE_SHL_LOAD], [1],
  13.681 -		       [Define if you have the shl_load function.])
  13.682 -	    LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"
  13.683 -	    LIBADD_SHL_LOAD="-ldld"])])
  13.684 -AC_SUBST([LIBADD_SHL_LOAD])
  13.685 -
  13.686 -case $host_os in
  13.687 -darwin[[1567]].*)
  13.688 -# We only want this for pre-Mac OS X 10.4.
  13.689 -  AC_CHECK_FUNC([_dyld_func_lookup],
  13.690 -	[AC_DEFINE([HAVE_DYLD], [1],
  13.691 -		   [Define if you have the _dyld_func_lookup function.])
  13.692 -	LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"])
  13.693 -  ;;
  13.694 -beos*)
  13.695 -  LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la"
  13.696 -  ;;
  13.697 -cygwin* | mingw* | os2* | pw32*)
  13.698 -  AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]])
  13.699 -  LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la"
  13.700 -  ;;
  13.701 -esac
  13.702 -
  13.703 -AC_CHECK_LIB([dld], [dld_link],
  13.704 -	[AC_DEFINE([HAVE_DLD], [1],
  13.705 -		   [Define if you have the GNU dld library.])
  13.706 -		LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"])
  13.707 -AC_SUBST([LIBADD_DLD_LINK])
  13.708 -
  13.709 -m4_pattern_allow([^LT_DLPREOPEN$])
  13.710 -LT_DLPREOPEN=
  13.711 -if test -n "$LT_DLLOADERS"
  13.712 -then
  13.713 -  for lt_loader in $LT_DLLOADERS; do
  13.714 -    LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader "
  13.715 -  done
  13.716 -  AC_DEFINE([HAVE_LIBDLLOADER], [1],
  13.717 -            [Define if libdlloader will be built on this platform])
  13.718 -fi
  13.719 -AC_SUBST([LT_DLPREOPEN])
  13.720 -
  13.721 -dnl This isn't used anymore, but set it for backwards compatibility
  13.722 -LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD"
  13.723 -AC_SUBST([LIBADD_DL])
  13.724 -
  13.725 -AC_LANG_POP
  13.726 -])# LT_LIB_DLLOAD
  13.727 -
  13.728 -# Old name:
  13.729 -AU_ALIAS([AC_LTDL_DLLIB], [LT_LIB_DLLOAD])
  13.730 -dnl aclocal-1.4 backwards compatibility:
  13.731 -dnl AC_DEFUN([AC_LTDL_DLLIB], [])
  13.732 -
  13.733 -
  13.734 -# LT_SYS_SYMBOL_USCORE
  13.735 -# --------------------
  13.736 -# does the compiler prefix global symbols with an underscore?
  13.737 -AC_DEFUN([LT_SYS_SYMBOL_USCORE],
  13.738 -[m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
  13.739 -AC_CACHE_CHECK([for _ prefix in compiled symbols],
  13.740 -  [lt_cv_sys_symbol_underscore],
  13.741 -  [lt_cv_sys_symbol_underscore=no
  13.742 -  cat > conftest.$ac_ext <<_LT_EOF
  13.743 -void nm_test_func(){}
  13.744 -int main(){nm_test_func;return 0;}
  13.745 -_LT_EOF
  13.746 -  if AC_TRY_EVAL(ac_compile); then
  13.747 -    # Now try to grab the symbols.
  13.748 -    ac_nlist=conftest.nm
  13.749 -    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
  13.750 -      # See whether the symbols have a leading underscore.
  13.751 -      if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
  13.752 -        lt_cv_sys_symbol_underscore=yes
  13.753 -      else
  13.754 -        if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
  13.755 -	  :
  13.756 -        else
  13.757 -	  echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD
  13.758 -        fi
  13.759 -      fi
  13.760 -    else
  13.761 -      echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
  13.762 -    fi
  13.763 -  else
  13.764 -    echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD
  13.765 -    cat conftest.c >&AS_MESSAGE_LOG_FD
  13.766 -  fi
  13.767 -  rm -rf conftest*
  13.768 -  ])
  13.769 -  sys_symbol_underscore=$lt_cv_sys_symbol_underscore
  13.770 -  AC_SUBST([sys_symbol_underscore])
  13.771 -])# LT_SYS_SYMBOL_USCORE
  13.772 -
  13.773 -# Old name:
  13.774 -AU_ALIAS([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE])
  13.775 -dnl aclocal-1.4 backwards compatibility:
  13.776 -dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [])
  13.777 -
  13.778 -
  13.779 -# LT_FUNC_DLSYM_USCORE
  13.780 -# --------------------
  13.781 -AC_DEFUN([LT_FUNC_DLSYM_USCORE],
  13.782 -[AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl
  13.783 -if test x"$lt_cv_sys_symbol_underscore" = xyes; then
  13.784 -  if test x"$libltdl_cv_func_dlopen" = xyes ||
  13.785 -     test x"$libltdl_cv_lib_dl_dlopen" = xyes ; then
  13.786 -	AC_CACHE_CHECK([whether we have to add an underscore for dlsym],
  13.787 -	  [libltdl_cv_need_uscore],
  13.788 -	  [libltdl_cv_need_uscore=unknown
  13.789 -          save_LIBS="$LIBS"
  13.790 -          LIBS="$LIBS $LIBADD_DLOPEN"
  13.791 -	  _LT_TRY_DLOPEN_SELF(
  13.792 -	    [libltdl_cv_need_uscore=no], [libltdl_cv_need_uscore=yes],
  13.793 -	    [],				 [libltdl_cv_need_uscore=cross])
  13.794 -	  LIBS="$save_LIBS"
  13.795 -	])
  13.796 -  fi
  13.797 -fi
  13.798 -
  13.799 -if test x"$libltdl_cv_need_uscore" = xyes; then
  13.800 -  AC_DEFINE([NEED_USCORE], [1],
  13.801 -    [Define if dlsym() requires a leading underscore in symbol names.])
  13.802 -fi
  13.803 -])# LT_FUNC_DLSYM_USCORE
  13.804 -
  13.805 -# Old name:
  13.806 -AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE])
  13.807 -dnl aclocal-1.4 backwards compatibility:
  13.808 -dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])
  13.809 -
    14.1 --- a/acinclude/ltoptions.m4	Sat Sep 01 09:17:34 2012 -0400
    14.2 +++ b/acinclude/ltoptions.m4	Mon Oct 15 21:14:13 2012 -0400
    14.3 @@ -1,14 +1,14 @@
    14.4 -##############################################################################
    14.5  # Helper functions for option handling.                    -*- Autoconf -*-
    14.6  #
    14.7 -#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
    14.8 +#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
    14.9 +#   Inc.
   14.10  #   Written by Gary V. Vaughan, 2004
   14.11  #
   14.12  # This file is free software; the Free Software Foundation gives
   14.13  # unlimited permission to copy and/or distribute it, with or without
   14.14  # modifications, as long as this notice is preserved.
   14.15  
   14.16 -# serial 6 ltoptions.m4
   14.17 +# serial 7 ltoptions.m4
   14.18  
   14.19  # This is to help aclocal find these macros, as it can't see m4_define.
   14.20  AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
   14.21 @@ -126,7 +126,7 @@
   14.22  [enable_win32_dll=yes
   14.23  
   14.24  case $host in
   14.25 -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
   14.26 +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   14.27    AC_CHECK_TOOL(AS, as, false)
   14.28    AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   14.29    AC_CHECK_TOOL(OBJDUMP, objdump, false)
   14.30 @@ -134,13 +134,13 @@
   14.31  esac
   14.32  
   14.33  test -z "$AS" && AS=as
   14.34 -_LT_DECL([], [AS],      [0], [Assembler program])dnl
   14.35 +_LT_DECL([], [AS],      [1], [Assembler program])dnl
   14.36  
   14.37  test -z "$DLLTOOL" && DLLTOOL=dlltool
   14.38 -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
   14.39 +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
   14.40  
   14.41  test -z "$OBJDUMP" && OBJDUMP=objdump
   14.42 -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
   14.43 +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
   14.44  ])# win32-dll
   14.45  
   14.46  AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
   14.47 @@ -326,9 +326,24 @@
   14.48  # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
   14.49  m4_define([_LT_WITH_PIC],
   14.50  [AC_ARG_WITH([pic],
   14.51 -    [AS_HELP_STRING([--with-pic],
   14.52 +    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
   14.53  	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
   14.54 -    [pic_mode="$withval"],
   14.55 +    [lt_p=${PACKAGE-default}
   14.56 +    case $withval in
   14.57 +    yes|no) pic_mode=$withval ;;
   14.58 +    *)
   14.59 +      pic_mode=default
   14.60 +      # Look at the argument we got.  We use all the common list separators.
   14.61 +      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
   14.62 +      for lt_pkg in $withval; do
   14.63 +	IFS="$lt_save_ifs"
   14.64 +	if test "X$lt_pkg" = "X$lt_p"; then
   14.65 +	  pic_mode=yes
   14.66 +	fi
   14.67 +      done
   14.68 +      IFS="$lt_save_ifs"
   14.69 +      ;;
   14.70 +    esac],
   14.71      [pic_mode=default])
   14.72  
   14.73  test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
   14.74 @@ -367,4 +382,3 @@
   14.75  		 [m4_define([_LTDL_TYPE], [installable])])
   14.76  LT_OPTION_DEFINE([LTDL_INIT], [convenience],
   14.77  		 [m4_define([_LTDL_TYPE], [convenience])])
   14.78 -
    15.1 --- a/acinclude/ltsugar.m4	Sat Sep 01 09:17:34 2012 -0400
    15.2 +++ b/acinclude/ltsugar.m4	Mon Oct 15 21:14:13 2012 -0400
    15.3 @@ -1,4 +1,3 @@
    15.4 -##############################################################################
    15.5  # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
    15.6  #
    15.7  # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
    15.8 @@ -122,4 +121,3 @@
    15.9             lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
   15.10  		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
   15.11  ])
   15.12 -
    16.1 --- a/acinclude/ltversion.m4	Sat Sep 01 09:17:34 2012 -0400
    16.2 +++ b/acinclude/ltversion.m4	Mon Oct 15 21:14:13 2012 -0400
    16.3 @@ -1,4 +1,3 @@
    16.4 -##############################################################################
    16.5  # ltversion.m4 -- version numbers			-*- Autoconf -*-
    16.6  #
    16.7  #   Copyright (C) 2004 Free Software Foundation, Inc.
    16.8 @@ -8,18 +7,17 @@
    16.9  # unlimited permission to copy and/or distribute it, with or without
   16.10  # modifications, as long as this notice is preserved.
   16.11  
   16.12 -# Generated from ltversion.in.
   16.13 +# @configure_input@
   16.14  
   16.15 -# serial 3012 ltversion.m4
   16.16 +# serial 3337 ltversion.m4
   16.17  # This file is part of GNU Libtool
   16.18  
   16.19 -m4_define([LT_PACKAGE_VERSION], [2.2.6])
   16.20 -m4_define([LT_PACKAGE_REVISION], [1.3012])
   16.21 +m4_define([LT_PACKAGE_VERSION], [2.4.2])
   16.22 +m4_define([LT_PACKAGE_REVISION], [1.3337])
   16.23  
   16.24  AC_DEFUN([LTVERSION_VERSION],
   16.25 -[macro_version='2.2.6'
   16.26 -macro_revision='1.3012'
   16.27 +[macro_version='2.4.2'
   16.28 +macro_revision='1.3337'
   16.29  _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
   16.30  _LT_DECL(, macro_revision, 0)
   16.31  ])
   16.32 -
    17.1 --- a/acinclude/lt~obsolete.m4	Sat Sep 01 09:17:34 2012 -0400
    17.2 +++ b/acinclude/lt~obsolete.m4	Mon Oct 15 21:14:13 2012 -0400
    17.3 @@ -1,14 +1,13 @@
    17.4 -##############################################################################
    17.5  # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
    17.6  #
    17.7 -#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
    17.8 +#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
    17.9  #   Written by Scott James Remnant, 2004.
   17.10  #
   17.11  # This file is free software; the Free Software Foundation gives
   17.12  # unlimited permission to copy and/or distribute it, with or without
   17.13  # modifications, as long as this notice is preserved.
   17.14  
   17.15 -# serial 4 lt~obsolete.m4
   17.16 +# serial 5 lt~obsolete.m4
   17.17  
   17.18  # These exist entirely to fool aclocal when bootstrapping libtool.
   17.19  #
   17.20 @@ -78,7 +77,6 @@
   17.21  m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
   17.22  m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
   17.23  m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
   17.24 -m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
   17.25  m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
   17.26  m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
   17.27  m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
   17.28 @@ -91,3 +89,10 @@
   17.29  m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
   17.30  m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
   17.31  m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
   17.32 +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
   17.33 +m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
   17.34 +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
   17.35 +m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
   17.36 +m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
   17.37 +m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
   17.38 +m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
    18.1 --- a/aclocal.m4	Sat Sep 01 09:17:34 2012 -0400
    18.2 +++ b/aclocal.m4	Mon Oct 15 21:14:13 2012 -0400
    18.3 @@ -1,4 +1,4 @@
    18.4 -define(AC_CHECK_DEFINE,[dnl
    18.5 +AC_DEFUN([AC_CHECK_DEFINE],[dnl
    18.6    AC_CACHE_CHECK(for $1 in $2, ac_cv_define_$1,
    18.7      AC_EGREP_CPP([YES_IS_DEFINED], [
    18.8  #include <$2>
    18.9 @@ -696,11 +696,12 @@
   18.10    rm -f conf.esdtest
   18.11  ])
   18.12  ##############################################################################
   18.13 -# Based on libtool-2.2.6a
   18.14 +# Based on libtool-2.4.2
   18.15  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
   18.16  #
   18.17  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
   18.18 -#                 2006, 2007, 2008 Free Software Foundation, Inc.
   18.19 +#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
   18.20 +#                 Foundation, Inc.
   18.21  #   Written by Gordon Matzigkeit, 1996
   18.22  #
   18.23  # This file is free software; the Free Software Foundation gives
   18.24 @@ -709,7 +710,8 @@
   18.25  
   18.26  m4_define([_LT_COPYING], [dnl
   18.27  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
   18.28 -#                 2006, 2007, 2008 Free Software Foundation, Inc.
   18.29 +#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
   18.30 +#                 Foundation, Inc.
   18.31  #   Written by Gordon Matzigkeit, 1996
   18.32  #
   18.33  #   This file is part of GNU Libtool.
   18.34 @@ -736,7 +738,7 @@
   18.35  # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   18.36  ])
   18.37  
   18.38 -# serial 56 LT_INIT
   18.39 +# serial 57 LT_INIT
   18.40  
   18.41  
   18.42  # LT_PREREQ(VERSION)
   18.43 @@ -765,6 +767,7 @@
   18.44  # ------------------
   18.45  AC_DEFUN([LT_INIT],
   18.46  [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
   18.47 +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
   18.48  AC_BEFORE([$0], [LT_LANG])dnl
   18.49  AC_BEFORE([$0], [LT_OUTPUT])dnl
   18.50  AC_BEFORE([$0], [LTDL_INIT])dnl
   18.51 @@ -781,6 +784,8 @@
   18.52  AC_REQUIRE([LTOBSOLETE_VERSION])dnl
   18.53  m4_require([_LT_PROG_LTMAIN])dnl
   18.54  
   18.55 +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
   18.56 +
   18.57  dnl Parse OPTIONS
   18.58  _LT_SET_OPTIONS([$0], [$1])
   18.59  
   18.60 @@ -817,7 +822,7 @@
   18.61      *) break;;
   18.62    esac
   18.63  done
   18.64 -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
   18.65 +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
   18.66  ])
   18.67  
   18.68  
   18.69 @@ -837,6 +842,11 @@
   18.70  m4_defun([_LT_SETUP],
   18.71  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
   18.72  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
   18.73 +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
   18.74 +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
   18.75 +
   18.76 +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
   18.77 +dnl
   18.78  _LT_DECL([], [host_alias], [0], [The host system])dnl
   18.79  _LT_DECL([], [host], [0])dnl
   18.80  _LT_DECL([], [host_os], [0])dnl
   18.81 @@ -859,10 +869,13 @@
   18.82  dnl
   18.83  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
   18.84  m4_require([_LT_CHECK_SHELL_FEATURES])dnl
   18.85 +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
   18.86  m4_require([_LT_CMD_RELOAD])dnl
   18.87  m4_require([_LT_CHECK_MAGIC_METHOD])dnl
   18.88 +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
   18.89  m4_require([_LT_CMD_OLD_ARCHIVE])dnl
   18.90  m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
   18.91 +m4_require([_LT_WITH_SYSROOT])dnl
   18.92  
   18.93  _LT_CONFIG_LIBTOOL_INIT([
   18.94  # See if we are running on zsh, and set the options which allow our
   18.95 @@ -878,7 +891,6 @@
   18.96  _LT_CHECK_OBJDIR
   18.97  
   18.98  m4_require([_LT_TAG_COMPILER])dnl
   18.99 -_LT_PROG_ECHO_BACKSLASH
  18.100  
  18.101  case $host_os in
  18.102  aix3*)
  18.103 @@ -892,23 +904,6 @@
  18.104    ;;
  18.105  esac
  18.106  
  18.107 -# Sed substitution that helps us do robust quoting.  It backslashifies
  18.108 -# metacharacters that are still active within double-quoted strings.
  18.109 -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
  18.110 -
  18.111 -# Same as above, but do not quote variable references.
  18.112 -double_quote_subst='s/\([["`\\]]\)/\\\1/g'
  18.113 -
  18.114 -# Sed substitution to delay expansion of an escaped shell variable in a
  18.115 -# double_quote_subst'ed string.
  18.116 -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  18.117 -
  18.118 -# Sed substitution to delay expansion of an escaped single quote.
  18.119 -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  18.120 -
  18.121 -# Sed substitution to avoid accidental globbing in evaled expressions
  18.122 -no_glob_subst='s/\*/\\\*/g'
  18.123 -
  18.124  # Global variables:
  18.125  ofile=libtool
  18.126  can_build_shared=yes
  18.127 @@ -949,6 +944,28 @@
  18.128  ])# _LT_SETUP
  18.129  
  18.130  
  18.131 +# _LT_PREPARE_SED_QUOTE_VARS
  18.132 +# --------------------------
  18.133 +# Define a few sed substitution that help us do robust quoting.
  18.134 +m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
  18.135 +[# Backslashify metacharacters that are still active within
  18.136 +# double-quoted strings.
  18.137 +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
  18.138 +
  18.139 +# Same as above, but do not quote variable references.
  18.140 +double_quote_subst='s/\([["`\\]]\)/\\\1/g'
  18.141 +
  18.142 +# Sed substitution to delay expansion of an escaped shell variable in a
  18.143 +# double_quote_subst'ed string.
  18.144 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  18.145 +
  18.146 +# Sed substitution to delay expansion of an escaped single quote.
  18.147 +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  18.148 +
  18.149 +# Sed substitution to avoid accidental globbing in evaled expressions
  18.150 +no_glob_subst='s/\*/\\\*/g'
  18.151 +])
  18.152 +
  18.153  # _LT_PROG_LTMAIN
  18.154  # ---------------
  18.155  # Note that this code is called both from `configure', and `config.status'
  18.156 @@ -1107,7 +1124,7 @@
  18.157  # declaration there will have the same value as in `configure'.  VARNAME
  18.158  # must have a single quote delimited value for this to work.
  18.159  m4_define([_LT_CONFIG_STATUS_DECLARE],
  18.160 -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
  18.161 +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
  18.162  
  18.163  
  18.164  # _LT_CONFIG_STATUS_DECLARATIONS
  18.165 @@ -1117,7 +1134,7 @@
  18.166  # embedded single quotes properly.  In configure, this macro expands
  18.167  # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
  18.168  #
  18.169 -#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
  18.170 +#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
  18.171  m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
  18.172  [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
  18.173      [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
  18.174 @@ -1216,12 +1233,20 @@
  18.175  LTCFLAGS='$LTCFLAGS'
  18.176  compiler='$compiler_DEFAULT'
  18.177  
  18.178 +# A function that is used when there is no print builtin or printf.
  18.179 +func_fallback_echo ()
  18.180 +{
  18.181 +  eval 'cat <<_LTECHO_EOF
  18.182 +\$[]1
  18.183 +_LTECHO_EOF'
  18.184 +}
  18.185 +
  18.186  # Quote evaled strings.
  18.187  for var in lt_decl_all_varnames([[ \
  18.188  ]], lt_decl_quote_varnames); do
  18.189 -    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
  18.190 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  18.191      *[[\\\\\\\`\\"\\\$]]*)
  18.192 -      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
  18.193 +      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
  18.194        ;;
  18.195      *)
  18.196        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
  18.197 @@ -1232,9 +1257,9 @@
  18.198  # Double-quote double-evaled strings.
  18.199  for var in lt_decl_all_varnames([[ \
  18.200  ]], lt_decl_dquote_varnames); do
  18.201 -    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
  18.202 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
  18.203      *[[\\\\\\\`\\"\\\$]]*)
  18.204 -      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  18.205 +      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
  18.206        ;;
  18.207      *)
  18.208        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
  18.209 @@ -1242,16 +1267,38 @@
  18.210      esac
  18.211  done
  18.212  
  18.213 -# Fix-up fallback echo if it was mangled by the above quoting rules.
  18.214 -case \$lt_ECHO in
  18.215 -*'\\\[$]0 --fallback-echo"')dnl "
  18.216 -  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
  18.217 -  ;;
  18.218 -esac
  18.219 -
  18.220  _LT_OUTPUT_LIBTOOL_INIT
  18.221  ])
  18.222  
  18.223 +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
  18.224 +# ------------------------------------
  18.225 +# Generate a child script FILE with all initialization necessary to
  18.226 +# reuse the environment learned by the parent script, and make the
  18.227 +# file executable.  If COMMENT is supplied, it is inserted after the
  18.228 +# `#!' sequence but before initialization text begins.  After this
  18.229 +# macro, additional text can be appended to FILE to form the body of
  18.230 +# the child script.  The macro ends with non-zero status if the
  18.231 +# file could not be fully written (such as if the disk is full).
  18.232 +m4_ifdef([AS_INIT_GENERATED],
  18.233 +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
  18.234 +[m4_defun([_LT_GENERATED_FILE_INIT],
  18.235 +[m4_require([AS_PREPARE])]dnl
  18.236 +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
  18.237 +[lt_write_fail=0
  18.238 +cat >$1 <<_ASEOF || lt_write_fail=1
  18.239 +#! $SHELL
  18.240 +# Generated by $as_me.
  18.241 +$2
  18.242 +SHELL=\${CONFIG_SHELL-$SHELL}
  18.243 +export SHELL
  18.244 +_ASEOF
  18.245 +cat >>$1 <<\_ASEOF || lt_write_fail=1
  18.246 +AS_SHELL_SANITIZE
  18.247 +_AS_PREPARE
  18.248 +exec AS_MESSAGE_FD>&1
  18.249 +_ASEOF
  18.250 +test $lt_write_fail = 0 && chmod +x $1[]dnl
  18.251 +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
  18.252  
  18.253  # LT_OUTPUT
  18.254  # ---------
  18.255 @@ -1261,20 +1308,11 @@
  18.256  AC_DEFUN([LT_OUTPUT],
  18.257  [: ${CONFIG_LT=./config.lt}
  18.258  AC_MSG_NOTICE([creating $CONFIG_LT])
  18.259 -cat >"$CONFIG_LT" <<_LTEOF
  18.260 -#! $SHELL
  18.261 -# Generated by $as_me.
  18.262 -# Run this file to recreate a libtool stub with the current configuration.
  18.263 -
  18.264 -lt_cl_silent=false
  18.265 -SHELL=\${CONFIG_SHELL-$SHELL}
  18.266 -_LTEOF
  18.267 +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
  18.268 +[# Run this file to recreate a libtool stub with the current configuration.])
  18.269  
  18.270  cat >>"$CONFIG_LT" <<\_LTEOF
  18.271 -AS_SHELL_SANITIZE
  18.272 -_AS_PREPARE
  18.273 -
  18.274 -exec AS_MESSAGE_FD>&1
  18.275 +lt_cl_silent=false
  18.276  exec AS_MESSAGE_LOG_FD>>config.log
  18.277  {
  18.278    echo
  18.279 @@ -1300,7 +1338,7 @@
  18.280  m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
  18.281  configured by $[0], generated by m4_PACKAGE_STRING.
  18.282  
  18.283 -Copyright (C) 2008 Free Software Foundation, Inc.
  18.284 +Copyright (C) 2011 Free Software Foundation, Inc.
  18.285  This config.lt script is free software; the Free Software Foundation
  18.286  gives unlimited permision to copy, distribute and modify it."
  18.287  
  18.288 @@ -1345,15 +1383,13 @@
  18.289  # appending to config.log, which fails on DOS, as config.log is still kept
  18.290  # open by configure.  Here we exec the FD to /dev/null, effectively closing
  18.291  # config.log, so it can be properly (re)opened and appended to by config.lt.
  18.292 -if test "$no_create" != yes; then
  18.293 -  lt_cl_success=:
  18.294 -  test "$silent" = yes &&
  18.295 -    lt_config_lt_args="$lt_config_lt_args --quiet"
  18.296 -  exec AS_MESSAGE_LOG_FD>/dev/null
  18.297 -  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
  18.298 -  exec AS_MESSAGE_LOG_FD>>config.log
  18.299 -  $lt_cl_success || AS_EXIT(1)
  18.300 -fi
  18.301 +lt_cl_success=:
  18.302 +test "$silent" = yes &&
  18.303 +  lt_config_lt_args="$lt_config_lt_args --quiet"
  18.304 +exec AS_MESSAGE_LOG_FD>/dev/null
  18.305 +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
  18.306 +exec AS_MESSAGE_LOG_FD>>config.log
  18.307 +$lt_cl_success || AS_EXIT(1)
  18.308  ])# LT_OUTPUT
  18.309  
  18.310  
  18.311 @@ -1416,15 +1452,12 @@
  18.312    # if finds mixed CR/LF and LF-only lines.  Since sed operates in
  18.313    # text mode, it properly converts lines to CR/LF.  This bash problem
  18.314    # is reportedly fixed, but why not run on old versions too?
  18.315 -  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
  18.316 -    || (rm -f "$cfgfile"; exit 1)
  18.317 -
  18.318 -  _LT_PROG_XSI_SHELLFNS
  18.319 -
  18.320 -  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
  18.321 -    || (rm -f "$cfgfile"; exit 1)
  18.322 -
  18.323 -  mv -f "$cfgfile" "$ofile" ||
  18.324 +  sed '$q' "$ltmain" >> "$cfgfile" \
  18.325 +     || (rm -f "$cfgfile"; exit 1)
  18.326 +
  18.327 +  _LT_PROG_REPLACE_SHELLFNS
  18.328 +
  18.329 +   mv -f "$cfgfile" "$ofile" ||
  18.330      (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
  18.331    chmod +x "$ofile"
  18.332  ],
  18.333 @@ -1469,6 +1502,7 @@
  18.334  m4_case([$1],
  18.335    [C],			[_LT_LANG(C)],
  18.336    [C++],		[_LT_LANG(CXX)],
  18.337 +  [Go],			[_LT_LANG(GO)],
  18.338    [Java],		[_LT_LANG(GCJ)],
  18.339    [Fortran 77],		[_LT_LANG(F77)],
  18.340    [Fortran],		[_LT_LANG(FC)],
  18.341 @@ -1490,6 +1524,31 @@
  18.342  ])# _LT_LANG
  18.343  
  18.344  
  18.345 +m4_ifndef([AC_PROG_GO], [
  18.346 +############################################################
  18.347 +# NOTE: This macro has been submitted for inclusion into   #
  18.348 +#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
  18.349 +#  a released version of Autoconf we should remove this    #
  18.350 +#  macro and use it instead.                               #
  18.351 +############################################################
  18.352 +m4_defun([AC_PROG_GO],
  18.353 +[AC_LANG_PUSH(Go)dnl
  18.354 +AC_ARG_VAR([GOC],     [Go compiler command])dnl
  18.355 +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
  18.356 +_AC_ARG_VAR_LDFLAGS()dnl
  18.357 +AC_CHECK_TOOL(GOC, gccgo)
  18.358 +if test -z "$GOC"; then
  18.359 +  if test -n "$ac_tool_prefix"; then
  18.360 +    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
  18.361 +  fi
  18.362 +fi
  18.363 +if test -z "$GOC"; then
  18.364 +  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
  18.365 +fi
  18.366 +])#m4_defun
  18.367 +])#m4_ifndef
  18.368 +
  18.369 +
  18.370  # _LT_LANG_DEFAULT_CONFIG
  18.371  # -----------------------
  18.372  m4_defun([_LT_LANG_DEFAULT_CONFIG],
  18.373 @@ -1520,6 +1579,10 @@
  18.374         m4_ifdef([LT_PROG_GCJ],
  18.375  	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
  18.376  
  18.377 +AC_PROVIDE_IFELSE([AC_PROG_GO],
  18.378 +  [LT_LANG(GO)],
  18.379 +  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
  18.380 +
  18.381  AC_PROVIDE_IFELSE([LT_PROG_RC],
  18.382    [LT_LANG(RC)],
  18.383    [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
  18.384 @@ -1530,11 +1593,13 @@
  18.385  AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
  18.386  AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
  18.387  AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
  18.388 +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
  18.389  dnl aclocal-1.4 backwards compatibility:
  18.390  dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
  18.391  dnl AC_DEFUN([AC_LIBTOOL_F77], [])
  18.392  dnl AC_DEFUN([AC_LIBTOOL_FC], [])
  18.393  dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
  18.394 +dnl AC_DEFUN([AC_LIBTOOL_RC], [])
  18.395  
  18.396  
  18.397  # _LT_TAG_COMPILER
  18.398 @@ -1620,7 +1685,13 @@
  18.399  	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
  18.400  	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
  18.401          _lt_result=$?
  18.402 -	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
  18.403 +	# If there is a non-empty error log, and "single_module"
  18.404 +	# appears in it, assume the flag caused a linker warning
  18.405 +        if test -s conftest.err && $GREP single_module conftest.err; then
  18.406 +	  cat conftest.err >&AS_MESSAGE_LOG_FD
  18.407 +	# Otherwise, if the output was created with a 0 exit code from
  18.408 +	# the compiler, it worked.
  18.409 +	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
  18.410  	  lt_cv_apple_cc_single_mod=yes
  18.411  	else
  18.412  	  cat conftest.err >&AS_MESSAGE_LOG_FD
  18.413 @@ -1628,6 +1699,7 @@
  18.414  	rm -rf libconftest.dylib*
  18.415  	rm -f conftest.*
  18.416        fi])
  18.417 +
  18.418      AC_CACHE_CHECK([for -exported_symbols_list linker flag],
  18.419        [lt_cv_ld_exported_symbols_list],
  18.420        [lt_cv_ld_exported_symbols_list=no
  18.421 @@ -1639,6 +1711,34 @@
  18.422  	[lt_cv_ld_exported_symbols_list=no])
  18.423  	LDFLAGS="$save_LDFLAGS"
  18.424      ])
  18.425 +
  18.426 +    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
  18.427 +      [lt_cv_ld_force_load=no
  18.428 +      cat > conftest.c << _LT_EOF
  18.429 +int forced_loaded() { return 2;}
  18.430 +_LT_EOF
  18.431 +      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
  18.432 +      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
  18.433 +      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
  18.434 +      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
  18.435 +      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
  18.436 +      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
  18.437 +      cat > conftest.c << _LT_EOF
  18.438 +int main() { return 0;}
  18.439 +_LT_EOF
  18.440 +      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
  18.441 +      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
  18.442 +      _lt_result=$?
  18.443 +      if test -s conftest.err && $GREP force_load conftest.err; then
  18.444 +	cat conftest.err >&AS_MESSAGE_LOG_FD
  18.445 +      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
  18.446 +	lt_cv_ld_force_load=yes
  18.447 +      else
  18.448 +	cat conftest.err >&AS_MESSAGE_LOG_FD
  18.449 +      fi
  18.450 +        rm -f conftest.err libconftest.a conftest conftest.c
  18.451 +        rm -rf conftest.dSYM
  18.452 +    ])
  18.453      case $host_os in
  18.454      rhapsody* | darwin1.[[012]])
  18.455        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
  18.456 @@ -1666,7 +1766,7 @@
  18.457      else
  18.458        _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
  18.459      fi
  18.460 -    if test "$DSYMUTIL" != ":"; then
  18.461 +    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
  18.462        _lt_dsymutil='~$DSYMUTIL $lib || :'
  18.463      else
  18.464        _lt_dsymutil=
  18.465 @@ -1676,8 +1776,8 @@
  18.466  ])
  18.467  
  18.468  
  18.469 -# _LT_DARWIN_LINKER_FEATURES
  18.470 -# --------------------------
  18.471 +# _LT_DARWIN_LINKER_FEATURES([TAG])
  18.472 +# ---------------------------------
  18.473  # Checks for linker and compiler features on darwin
  18.474  m4_defun([_LT_DARWIN_LINKER_FEATURES],
  18.475  [
  18.476 @@ -1686,7 +1786,13 @@
  18.477    _LT_TAGVAR(hardcode_direct, $1)=no
  18.478    _LT_TAGVAR(hardcode_automatic, $1)=yes
  18.479    _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
  18.480 -  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
  18.481 +  if test "$lt_cv_ld_force_load" = "yes"; then
  18.482 +    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
  18.483 +    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
  18.484 +                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
  18.485 +  else
  18.486 +    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
  18.487 +  fi
  18.488    _LT_TAGVAR(link_all_deplibs, $1)=yes
  18.489    _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
  18.490    case $cc_basename in
  18.491 @@ -1694,7 +1800,7 @@
  18.492       *) _lt_dar_can_shared=$GCC ;;
  18.493    esac
  18.494    if test "$_lt_dar_can_shared" = "yes"; then
  18.495 -    output_verbose_link_cmd=echo
  18.496 +    output_verbose_link_cmd=func_echo_all
  18.497      _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
  18.498      _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
  18.499      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
  18.500 @@ -1710,203 +1816,142 @@
  18.501    fi
  18.502  ])
  18.503  
  18.504 -# _LT_SYS_MODULE_PATH_AIX
  18.505 -# -----------------------
  18.506 +# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
  18.507 +# ----------------------------------
  18.508  # Links a minimal program and checks the executable
  18.509  # for the system default hardcoded library path. In most cases,
  18.510  # this is /usr/lib:/lib, but when the MPI compilers are used
  18.511  # the location of the communication and MPI libs are included too.
  18.512  # If we don't find anything, use the default library path according
  18.513  # to the aix ld manual.
  18.514 +# Store the results from the different compilers for each TAGNAME.
  18.515 +# Allow to override them for all tags through lt_cv_aix_libpath.
  18.516  m4_defun([_LT_SYS_MODULE_PATH_AIX],
  18.517  [m4_require([_LT_DECL_SED])dnl
  18.518 -AC_LINK_IFELSE(AC_LANG_PROGRAM,[
  18.519 -lt_aix_libpath_sed='
  18.520 -    /Import File Strings/,/^$/ {
  18.521 -	/^0/ {
  18.522 -	    s/^0  *\(.*\)$/\1/
  18.523 -	    p
  18.524 -	}
  18.525 -    }'
  18.526 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18.527 -# Check for a 64-bit object if we didn't find anything.
  18.528 -if test -z "$aix_libpath"; then
  18.529 -  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18.530 -fi],[])
  18.531 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  18.532 +if test "${lt_cv_aix_libpath+set}" = set; then
  18.533 +  aix_libpath=$lt_cv_aix_libpath
  18.534 +else
  18.535 +  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
  18.536 +  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
  18.537 +  lt_aix_libpath_sed='[
  18.538 +      /Import File Strings/,/^$/ {
  18.539 +	  /^0/ {
  18.540 +	      s/^0  *\([^ ]*\) *$/\1/
  18.541 +	      p
  18.542 +	  }
  18.543 +      }]'
  18.544 +  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18.545 +  # Check for a 64-bit object if we didn't find anything.
  18.546 +  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  18.547 +    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  18.548 +  fi],[])
  18.549 +  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
  18.550 +    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
  18.551 +  fi
  18.552 +  ])
  18.553 +  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
  18.554 +fi
  18.555  ])# _LT_SYS_MODULE_PATH_AIX
  18.556  
  18.557  
  18.558  # _LT_SHELL_INIT(ARG)
  18.559  # -------------------
  18.560  m4_define([_LT_SHELL_INIT],
  18.561 -[ifdef([AC_DIVERSION_NOTICE],
  18.562 -	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
  18.563 -	 [AC_DIVERT_PUSH(NOTICE)])
  18.564 -$1
  18.565 -AC_DIVERT_POP
  18.566 -])# _LT_SHELL_INIT
  18.567 +[m4_divert_text([M4SH-INIT], [$1
  18.568 +])])# _LT_SHELL_INIT
  18.569 +
  18.570  
  18.571  
  18.572  # _LT_PROG_ECHO_BACKSLASH
  18.573  # -----------------------
  18.574 -# Add some code to the start of the generated configure script which
  18.575 -# will find an echo command which doesn't interpret backslashes.
  18.576 +# Find how we can fake an echo command that does not interpret backslash.
  18.577 +# In particular, with Autoconf 2.60 or later we add some code to the start
  18.578 +# of the generated configure script which will find a shell with a builtin
  18.579 +# printf (which we can use as an echo command).
  18.580  m4_defun([_LT_PROG_ECHO_BACKSLASH],
  18.581 -[_LT_SHELL_INIT([
  18.582 -# Check that we are running under the correct shell.
  18.583 -SHELL=${CONFIG_SHELL-/bin/sh}
  18.584 -
  18.585 -case X$lt_ECHO in
  18.586 -X*--fallback-echo)
  18.587 -  # Remove one level of quotation (which was required for Make).
  18.588 -  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
  18.589 -  ;;
  18.590 -esac
  18.591 -
  18.592 -ECHO=${lt_ECHO-echo}
  18.593 -if test "X[$]1" = X--no-reexec; then
  18.594 -  # Discard the --no-reexec flag, and continue.
  18.595 -  shift
  18.596 -elif test "X[$]1" = X--fallback-echo; then
  18.597 -  # Avoid inline document here, it may be left over
  18.598 -  :
  18.599 -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
  18.600 -  # Yippee, $ECHO works!
  18.601 -  :
  18.602 +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  18.603 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
  18.604 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  18.605 +
  18.606 +AC_MSG_CHECKING([how to print strings])
  18.607 +# Test print first, because it will be a builtin if present.
  18.608 +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
  18.609 +   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
  18.610 +  ECHO='print -r --'
  18.611 +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
  18.612 +  ECHO='printf %s\n'
  18.613  else
  18.614 -  # Restart under the correct shell.
  18.615 -  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
  18.616 -fi
  18.617 -
  18.618 -if test "X[$]1" = X--fallback-echo; then
  18.619 -  # used as fallback echo
  18.620 -  shift
  18.621 -  cat <<_LT_EOF
  18.622 -[$]*
  18.623 -_LT_EOF
  18.624 -  exit 0
  18.625 +  # Use this function as a fallback that always works.
  18.626 +  func_fallback_echo ()
  18.627 +  {
  18.628 +    eval 'cat <<_LTECHO_EOF
  18.629 +$[]1
  18.630 +_LTECHO_EOF'
  18.631 +  }
  18.632 +  ECHO='func_fallback_echo'
  18.633  fi
  18.634  
  18.635 -# The HP-UX ksh and POSIX shell print the target directory to stdout
  18.636 -# if CDPATH is set.
  18.637 -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  18.638 -
  18.639 -if test -z "$lt_ECHO"; then
  18.640 -  if test "X${echo_test_string+set}" != Xset; then
  18.641 -    # find a string as large as possible, as long as the shell can cope with it
  18.642 -    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
  18.643 -      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
  18.644 -      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
  18.645 -	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
  18.646 -      then
  18.647 -        break
  18.648 -      fi
  18.649 -    done
  18.650 -  fi
  18.651 -
  18.652 -  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
  18.653 -     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
  18.654 -     test "X$echo_testing_string" = "X$echo_test_string"; then
  18.655 -    :
  18.656 -  else
  18.657 -    # The Solaris, AIX, and Digital Unix default echo programs unquote
  18.658 -    # backslashes.  This makes it impossible to quote backslashes using
  18.659 -    #   echo "$something" | sed 's/\\/\\\\/g'
  18.660 -    #
  18.661 -    # So, first we look for a working echo in the user's PATH.
  18.662 -
  18.663 -    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
  18.664 -    for dir in $PATH /usr/ucb; do
  18.665 -      IFS="$lt_save_ifs"
  18.666 -      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
  18.667 -         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
  18.668 -         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
  18.669 -         test "X$echo_testing_string" = "X$echo_test_string"; then
  18.670 -        ECHO="$dir/echo"
  18.671 -        break
  18.672 -      fi
  18.673 -    done
  18.674 -    IFS="$lt_save_ifs"
  18.675 -
  18.676 -    if test "X$ECHO" = Xecho; then
  18.677 -      # We didn't find a better echo, so look for alternatives.
  18.678 -      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
  18.679 -         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
  18.680 -         test "X$echo_testing_string" = "X$echo_test_string"; then
  18.681 -        # This shell has a builtin print -r that does the trick.
  18.682 -        ECHO='print -r'
  18.683 -      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
  18.684 -	   test "X$CONFIG_SHELL" != X/bin/ksh; then
  18.685 -        # If we have ksh, try running configure again with it.
  18.686 -        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
  18.687 -        export ORIGINAL_CONFIG_SHELL
  18.688 -        CONFIG_SHELL=/bin/ksh
  18.689 -        export CONFIG_SHELL
  18.690 -        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
  18.691 -      else
  18.692 -        # Try using printf.
  18.693 -        ECHO='printf %s\n'
  18.694 -        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
  18.695 -	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
  18.696 -	   test "X$echo_testing_string" = "X$echo_test_string"; then
  18.697 -	  # Cool, printf works
  18.698 -	  :
  18.699 -        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
  18.700 -	     test "X$echo_testing_string" = 'X\t' &&
  18.701 -	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
  18.702 -	     test "X$echo_testing_string" = "X$echo_test_string"; then
  18.703 -	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
  18.704 -	  export CONFIG_SHELL
  18.705 -	  SHELL="$CONFIG_SHELL"
  18.706 -	  export SHELL
  18.707 -	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
  18.708 -        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
  18.709 -	     test "X$echo_testing_string" = 'X\t' &&
  18.710 -	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
  18.711 -	     test "X$echo_testing_string" = "X$echo_test_string"; then
  18.712 -	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
  18.713 -        else
  18.714 -	  # maybe with a smaller string...
  18.715 -	  prev=:
  18.716 -
  18.717 -	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
  18.718 -	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
  18.719 -	    then
  18.720 -	      break
  18.721 -	    fi
  18.722 -	    prev="$cmd"
  18.723 -	  done
  18.724 -
  18.725 -	  if test "$prev" != 'sed 50q "[$]0"'; then
  18.726 -	    echo_test_string=`eval $prev`
  18.727 -	    export echo_test_string
  18.728 -	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
  18.729 -	  else
  18.730 -	    # Oops.  We lost completely, so just stick with echo.
  18.731 -	    ECHO=echo
  18.732 -	  fi
  18.733 -        fi
  18.734 -      fi
  18.735 -    fi
  18.736 -  fi
  18.737 -fi
  18.738 -
  18.739 -# Copy echo and quote the copy suitably for passing to libtool from
  18.740 -# the Makefile, instead of quoting the original, which is used later.
  18.741 -lt_ECHO=$ECHO
  18.742 -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
  18.743 -   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
  18.744 -fi
  18.745 -
  18.746 -AC_SUBST(lt_ECHO)
  18.747 -])
  18.748 +# func_echo_all arg...
  18.749 +# Invoke $ECHO with all args, space-separated.
  18.750 +func_echo_all ()
  18.751 +{
  18.752 +    $ECHO "$*" 
  18.753 +}
  18.754 +
  18.755 +case "$ECHO" in
  18.756 +  printf*) AC_MSG_RESULT([printf]) ;;
  18.757 +  print*) AC_MSG_RESULT([print -r]) ;;
  18.758 +  *) AC_MSG_RESULT([cat]) ;;
  18.759 +esac
  18.760 +
  18.761 +m4_ifdef([_AS_DETECT_SUGGESTED],
  18.762 +[_AS_DETECT_SUGGESTED([
  18.763 +  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
  18.764 +    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  18.765 +    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
  18.766 +    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
  18.767 +    PATH=/empty FPATH=/empty; export PATH FPATH
  18.768 +    test "X`printf %s $ECHO`" = "X$ECHO" \
  18.769 +      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
  18.770 +
  18.771  _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
  18.772 -_LT_DECL([], [ECHO], [1],
  18.773 -    [An echo program that does not interpret backslashes])
  18.774 +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
  18.775  ])# _LT_PROG_ECHO_BACKSLASH
  18.776  
  18.777  
  18.778 +# _LT_WITH_SYSROOT
  18.779 +# ----------------
  18.780 +AC_DEFUN([_LT_WITH_SYSROOT],
  18.781 +[AC_MSG_CHECKING([for sysroot])
  18.782 +AC_ARG_WITH([sysroot],
  18.783 +[  --with-sysroot[=DIR] Search for dependent libraries within DIR
  18.784 +                        (or the compiler's sysroot if not specified).],
  18.785 +[], [with_sysroot=no])
  18.786 +
  18.787 +dnl lt_sysroot will always be passed unquoted.  We quote it here
  18.788 +dnl in case the user passed a directory name.
  18.789 +lt_sysroot=
  18.790 +case ${with_sysroot} in #(
  18.791 + yes)
  18.792 +   if test "$GCC" = yes; then
  18.793 +     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
  18.794 +   fi
  18.795 +   ;; #(
  18.796 + /*)
  18.797 +   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
  18.798 +   ;; #(
  18.799 + no|'')
  18.800 +   ;; #(
  18.801 + *)
  18.802 +   AC_MSG_RESULT([${with_sysroot}])
  18.803 +   AC_MSG_ERROR([The sysroot must be an absolute path.])
  18.804 +   ;;
  18.805 +esac
  18.806 +
  18.807 + AC_MSG_RESULT([${lt_sysroot:-no}])
  18.808 +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
  18.809 +[dependent libraries, and in which our libraries should be installed.])])
  18.810 +
  18.811  # _LT_ENABLE_LOCK
  18.812  # ---------------
  18.813  m4_defun([_LT_ENABLE_LOCK],
  18.814 @@ -1935,7 +1980,7 @@
  18.815    ;;
  18.816  *-*-irix6*)
  18.817    # Find out which ABI we are using.
  18.818 -  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
  18.819 +  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
  18.820    if AC_TRY_EVAL(ac_compile); then
  18.821      if test "$lt_cv_prog_gnu_ld" = yes; then
  18.822        case `/usr/bin/file conftest.$ac_objext` in
  18.823 @@ -2028,14 +2073,27 @@
  18.824      CFLAGS="$SAVE_CFLAGS"
  18.825    fi
  18.826    ;;
  18.827 -sparc*-*solaris*)
  18.828 +*-*solaris*)
  18.829    # Find out which ABI we are using.
  18.830    echo 'int i;' > conftest.$ac_ext
  18.831    if AC_TRY_EVAL(ac_compile); then
  18.832      case `/usr/bin/file conftest.o` in
  18.833      *64-bit*)
  18.834        case $lt_cv_prog_gnu_ld in
  18.835 -      yes*) LD="${LD-ld} -m elf64_sparc" ;;
  18.836 +      yes*)
  18.837 +        case $host in
  18.838 +        i?86-*-solaris*)
  18.839 +          LD="${LD-ld} -m elf_x86_64"
  18.840 +          ;;
  18.841 +        sparc*-*-solaris*)
  18.842 +          LD="${LD-ld} -m elf64_sparc"
  18.843 +          ;;
  18.844 +        esac
  18.845 +        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
  18.846 +        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
  18.847 +          LD="${LD-ld}_sol2"
  18.848 +        fi
  18.849 +        ;;
  18.850        *)
  18.851  	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
  18.852  	  LD="${LD-ld} -64"
  18.853 @@ -2053,14 +2111,47 @@
  18.854  ])# _LT_ENABLE_LOCK
  18.855  
  18.856  
  18.857 +# _LT_PROG_AR
  18.858 +# -----------
  18.859 +m4_defun([_LT_PROG_AR],
  18.860 +[AC_CHECK_TOOLS(AR, [ar], false)
  18.861 +: ${AR=ar}
  18.862 +: ${AR_FLAGS=cru}
  18.863 +_LT_DECL([], [AR], [1], [The archiver])
  18.864 +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
  18.865 +
  18.866 +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
  18.867 +  [lt_cv_ar_at_file=no
  18.868 +   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
  18.869 +     [echo conftest.$ac_objext > conftest.lst
  18.870 +      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
  18.871 +      AC_TRY_EVAL([lt_ar_try])
  18.872 +      if test "$ac_status" -eq 0; then
  18.873 +	# Ensure the archiver fails upon bogus file names.
  18.874 +	rm -f conftest.$ac_objext libconftest.a
  18.875 +	AC_TRY_EVAL([lt_ar_try])
  18.876 +	if test "$ac_status" -ne 0; then
  18.877 +          lt_cv_ar_at_file=@
  18.878 +        fi
  18.879 +      fi
  18.880 +      rm -f conftest.* libconftest.a
  18.881 +     ])
  18.882 +  ])
  18.883 +
  18.884 +if test "x$lt_cv_ar_at_file" = xno; then
  18.885 +  archiver_list_spec=
  18.886 +else
  18.887 +  archiver_list_spec=$lt_cv_ar_at_file
  18.888 +fi
  18.889 +_LT_DECL([], [archiver_list_spec], [1],
  18.890 +  [How to feed a file listing to the archiver])
  18.891 +])# _LT_PROG_AR
  18.892 +
  18.893 +
  18.894  # _LT_CMD_OLD_ARCHIVE
  18.895  # -------------------
  18.896  m4_defun([_LT_CMD_OLD_ARCHIVE],
  18.897 -[AC_CHECK_TOOL(AR, ar, false)
  18.898 -test -z "$AR" && AR=ar
  18.899 -test -z "$AR_FLAGS" && AR_FLAGS=cru
  18.900 -_LT_DECL([], [AR], [1], [The archiver])
  18.901 -_LT_DECL([], [AR_FLAGS], [1])
  18.902 +[_LT_PROG_AR
  18.903  
  18.904  AC_CHECK_TOOL(STRIP, strip, :)
  18.905  test -z "$STRIP" && STRIP=:
  18.906 @@ -2079,18 +2170,27 @@
  18.907  if test -n "$RANLIB"; then
  18.908    case $host_os in
  18.909    openbsd*)
  18.910 -    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
  18.911 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
  18.912      ;;
  18.913    *)
  18.914 -    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
  18.915 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
  18.916      ;;
  18.917    esac
  18.918 -  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  18.919 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
  18.920  fi
  18.921 +
  18.922 +case $host_os in
  18.923 +  darwin*)
  18.924 +    lock_old_archive_extraction=yes ;;
  18.925 +  *)
  18.926 +    lock_old_archive_extraction=no ;;
  18.927 +esac
  18.928  _LT_DECL([], [old_postinstall_cmds], [2])
  18.929  _LT_DECL([], [old_postuninstall_cmds], [2])
  18.930  _LT_TAGDECL([], [old_archive_cmds], [2],
  18.931      [Commands used to build an old-style archive])
  18.932 +_LT_DECL([], [lock_old_archive_extraction], [0],
  18.933 +    [Whether to use a lock for old archive extraction])
  18.934  ])# _LT_CMD_OLD_ARCHIVE
  18.935  
  18.936  
  18.937 @@ -2115,15 +2215,15 @@
  18.938     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  18.939     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
  18.940     -e 's:$: $lt_compiler_flag:'`
  18.941 -   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
  18.942 +   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
  18.943     (eval "$lt_compile" 2>conftest.err)
  18.944     ac_status=$?
  18.945     cat conftest.err >&AS_MESSAGE_LOG_FD
  18.946 -   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
  18.947 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
  18.948     if (exit $ac_status) && test -s "$ac_outfile"; then
  18.949       # The compiler can only warn and ignore the option if not recognized
  18.950       # So say no if there are warnings other than the usual output.
  18.951 -     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
  18.952 +     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
  18.953       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
  18.954       if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
  18.955         $2=yes
  18.956 @@ -2163,7 +2263,7 @@
  18.957       if test -s conftest.err; then
  18.958         # Append any errors to the config.log.
  18.959         cat conftest.err 1>&AS_MESSAGE_LOG_FD
  18.960 -       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
  18.961 +       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
  18.962         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
  18.963         if diff conftest.exp conftest.er2 >/dev/null; then
  18.964           $2=yes
  18.965 @@ -2226,9 +2326,8 @@
  18.966      lt_cv_sys_max_cmd_len=8192;
  18.967      ;;
  18.968  
  18.969 -  beos*)
  18.970 -    # On BeOS, this test takes a really really long time.
  18.971 -    # So we just punt and use a minimum line length of 8192.
  18.972 +  mint*)
  18.973 +    # On MiNT this can take a long time and run out of memory.
  18.974      lt_cv_sys_max_cmd_len=8192;
  18.975      ;;
  18.976  
  18.977 @@ -2257,6 +2356,11 @@
  18.978      lt_cv_sys_max_cmd_len=196608
  18.979      ;;
  18.980  
  18.981 +  os2*)
  18.982 +    # The test takes a long time on OS/2.
  18.983 +    lt_cv_sys_max_cmd_len=8192
  18.984 +    ;;
  18.985 +
  18.986    osf*)
  18.987      # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
  18.988      # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
  18.989 @@ -2296,8 +2400,8 @@
  18.990        # If test is not a shell built-in, we'll probably end up computing a
  18.991        # maximum length that is only half of the actual maximum length, but
  18.992        # we can't tell.
  18.993 -      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
  18.994 -	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
  18.995 +      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
  18.996 +	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
  18.997  	      test $i != 17 # 1/2 MB should be enough
  18.998        do
  18.999          i=`expr $i + 1`
 18.1000 @@ -2348,7 +2452,7 @@
 18.1001    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 18.1002    lt_status=$lt_dlunknown
 18.1003    cat > conftest.$ac_ext <<_LT_EOF
 18.1004 -[#line __oline__ "configure"
 18.1005 +[#line $LINENO "configure"
 18.1006  #include "confdefs.h"
 18.1007  
 18.1008  #if HAVE_DLFCN_H
 18.1009 @@ -2389,7 +2493,13 @@
 18.1010  #  endif
 18.1011  #endif
 18.1012  
 18.1013 -void fnord() { int i=42;}
 18.1014 +/* When -fvisbility=hidden is used, assume the code has been annotated
 18.1015 +   correspondingly for the symbols needed.  */
 18.1016 +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 18.1017 +int fnord () __attribute__((visibility("default")));
 18.1018 +#endif
 18.1019 +
 18.1020 +int fnord () { return 42; }
 18.1021  int main ()
 18.1022  {
 18.1023    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 18.1024 @@ -2398,7 +2508,11 @@
 18.1025    if (self)
 18.1026      {
 18.1027        if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 18.1028 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 18.1029 +      else
 18.1030 +        {
 18.1031 +	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
 18.1032 +          else puts (dlerror ());
 18.1033 +	}
 18.1034        /* dlclose (self); */
 18.1035      }
 18.1036    else
 18.1037 @@ -2574,16 +2688,16 @@
 18.1038     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 18.1039     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 18.1040     -e 's:$: $lt_compiler_flag:'`
 18.1041 -   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 18.1042 +   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 18.1043     (eval "$lt_compile" 2>out/conftest.err)
 18.1044     ac_status=$?
 18.1045     cat out/conftest.err >&AS_MESSAGE_LOG_FD
 18.1046 -   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 18.1047 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 18.1048     if (exit $ac_status) && test -s out/conftest2.$ac_objext
 18.1049     then
 18.1050       # The compiler can only warn and ignore the option if not recognized
 18.1051       # So say no if there are warnings
 18.1052 -     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 18.1053 +     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
 18.1054       $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 18.1055       if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 18.1056         _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 18.1057 @@ -2742,6 +2856,7 @@
 18.1058  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 18.1059  m4_require([_LT_DECL_OBJDUMP])dnl
 18.1060  m4_require([_LT_DECL_SED])dnl
 18.1061 +m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 18.1062  AC_MSG_CHECKING([dynamic linker characteristics])
 18.1063  m4_if([$1],
 18.1064  	[], [
 18.1065 @@ -2750,16 +2865,23 @@
 18.1066      darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
 18.1067      *) lt_awk_arg="/^libraries:/" ;;
 18.1068    esac
 18.1069 -  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 18.1070 -  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
 18.1071 +  case $host_os in
 18.1072 +    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
 18.1073 +    *) lt_sed_strip_eq="s,=/,/,g" ;;
 18.1074 +  esac
 18.1075 +  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
 18.1076 +  case $lt_search_path_spec in
 18.1077 +  *\;*)
 18.1078      # if the path contains ";" then we assume it to be the separator
 18.1079      # otherwise default to the standard path separator (i.e. ":") - it is
 18.1080      # assumed that no part of a normal pathname contains ";" but that should
 18.1081      # okay in the real world where ";" in dirpaths is itself problematic.
 18.1082 -    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
 18.1083 -  else
 18.1084 -    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 18.1085 -  fi
 18.1086 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
 18.1087 +    ;;
 18.1088 +  *)
 18.1089 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
 18.1090 +    ;;
 18.1091 +  esac
 18.1092    # Ok, now we have the path, separated by spaces, we can step through it
 18.1093    # and add multilib dir if necessary.
 18.1094    lt_tmp_lt_search_path_spec=
 18.1095 @@ -2772,7 +2894,7 @@
 18.1096  	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
 18.1097      fi
 18.1098    done
 18.1099 -  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
 18.1100 +  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 18.1101  BEGIN {RS=" "; FS="/|\n";} {
 18.1102    lt_foo="";
 18.1103    lt_count=0;
 18.1104 @@ -2792,7 +2914,13 @@
 18.1105    if (lt_foo != "") { lt_freq[[lt_foo]]++; }
 18.1106    if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 18.1107  }'`
 18.1108 -  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
 18.1109 +  # AWK program above erroneously prepends '/' to C:/dos/paths
 18.1110 +  # for these hosts.
 18.1111 +  case $host_os in
 18.1112 +    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
 18.1113 +      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
 18.1114 +  esac
 18.1115 +  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 18.1116  else
 18.1117    sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 18.1118  fi])
 18.1119 @@ -2818,7 +2946,7 @@
 18.1120  
 18.1121  case $host_os in
 18.1122  aix3*)
 18.1123 -  version_type=linux
 18.1124 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1125    library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 18.1126    shlibpath_var=LIBPATH
 18.1127  
 18.1128 @@ -2827,7 +2955,7 @@
 18.1129    ;;
 18.1130  
 18.1131  aix[[4-9]]*)
 18.1132 -  version_type=linux
 18.1133 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1134    need_lib_prefix=no
 18.1135    need_version=no
 18.1136    hardcode_into_libs=yes
 18.1137 @@ -2880,7 +3008,7 @@
 18.1138    m68k)
 18.1139      library_names_spec='$libname.ixlibrary $libname.a'
 18.1140      # Create ${libname}_ixlibrary.a entries in /sys/libs.
 18.1141 -    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 18.1142 +    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 18.1143      ;;
 18.1144    esac
 18.1145    ;;
 18.1146 @@ -2892,7 +3020,7 @@
 18.1147    ;;
 18.1148  
 18.1149  bsdi[[45]]*)
 18.1150 -  version_type=linux
 18.1151 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1152    need_version=no
 18.1153    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 18.1154    soname_spec='${libname}${release}${shared_ext}$major'
 18.1155 @@ -2911,8 +3039,9 @@
 18.1156    need_version=no
 18.1157    need_lib_prefix=no
 18.1158  
 18.1159 -  case $GCC,$host_os in
 18.1160 -  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
 18.1161 +  case $GCC,$cc_basename in
 18.1162 +  yes,*)
 18.1163 +    # gcc
 18.1164      library_names_spec='$libname.dll.a'
 18.1165      # DLL is installed to $(libdir)/../bin by postinstall_cmds
 18.1166      postinstall_cmds='base_file=`basename \${file}`~
 18.1167 @@ -2932,39 +3061,84 @@
 18.1168      case $host_os in
 18.1169      cygwin*)
 18.1170        # Cygwin DLLs use 'cyg' prefix rather than 'lib'
 18.1171 -      #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 18.1172 -      soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}'
 18.1173 -      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
 18.1174 +      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 18.1175 +m4_if([$1], [],[
 18.1176 +      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
 18.1177        ;;
 18.1178      mingw* | cegcc*)
 18.1179        # MinGW DLLs use traditional 'lib' prefix
 18.1180 -      #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 18.1181 -      soname_spec='`echo ${libname} | $SED -e 's/^lib//'`${shared_ext}'
 18.1182 -      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 18.1183 -      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 18.1184 -        # It is most probably a Windows format PATH printed by
 18.1185 -        # mingw gcc, but we are running on Cygwin. Gcc prints its search
 18.1186 -        # path with ; separators, and with drive letters. We can handle the
 18.1187 -        # drive letters (cygwin fileutils understands them), so leave them,
 18.1188 -        # especially as we might pass files found there to a mingw objdump,
 18.1189 -        # which wouldn't understand a cygwinified path. Ahh.
 18.1190 -        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 18.1191 -      else
 18.1192 -        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 18.1193 -      fi
 18.1194 +      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 18.1195        ;;
 18.1196      pw32*)
 18.1197        # pw32 DLLs use 'pw' prefix rather than 'lib'
 18.1198        library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 18.1199        ;;
 18.1200      esac
 18.1201 +    dynamic_linker='Win32 ld.exe'
 18.1202 +    ;;
 18.1203 +
 18.1204 +  *,cl*)
 18.1205 +    # Native MSVC
 18.1206 +    libname_spec='$name'
 18.1207 +    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 18.1208 +    library_names_spec='${libname}.dll.lib'
 18.1209 +
 18.1210 +    case $build_os in
 18.1211 +    mingw*)
 18.1212 +      sys_lib_search_path_spec=
 18.1213 +      lt_save_ifs=$IFS
 18.1214 +      IFS=';'
 18.1215 +      for lt_path in $LIB
 18.1216 +      do
 18.1217 +        IFS=$lt_save_ifs
 18.1218 +        # Let DOS variable expansion print the short 8.3 style file name.
 18.1219 +        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
 18.1220 +        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
 18.1221 +      done
 18.1222 +      IFS=$lt_save_ifs
 18.1223 +      # Convert to MSYS style.
 18.1224 +      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
 18.1225 +      ;;
 18.1226 +    cygwin*)
 18.1227 +      # Convert to unix form, then to dos form, then back to unix form
 18.1228 +      # but this time dos style (no spaces!) so that the unix form looks
 18.1229 +      # like /cygdrive/c/PROGRA~1:/cygdr...
 18.1230 +      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
 18.1231 +      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
 18.1232 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 18.1233 +      ;;
 18.1234 +    *)
 18.1235 +      sys_lib_search_path_spec="$LIB"
 18.1236 +      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 18.1237 +        # It is most probably a Windows format PATH.
 18.1238 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 18.1239 +      else
 18.1240 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 18.1241 +      fi
 18.1242 +      # FIXME: find the short name or the path components, as spaces are
 18.1243 +      # common. (e.g. "Program Files" -> "PROGRA~1")
 18.1244 +      ;;
 18.1245 +    esac
 18.1246 +
 18.1247 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
 18.1248 +    postinstall_cmds='base_file=`basename \${file}`~
 18.1249 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
 18.1250 +      dldir=$destdir/`dirname \$dlpath`~
 18.1251 +      test -d \$dldir || mkdir -p \$dldir~
 18.1252 +      $install_prog $dir/$dlname \$dldir/$dlname'
 18.1253 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 18.1254 +      dlpath=$dir/\$dldll~
 18.1255 +       $RM \$dlpath'
 18.1256 +    shlibpath_overrides_runpath=yes
 18.1257 +    dynamic_linker='Win32 link.exe'
 18.1258      ;;
 18.1259  
 18.1260    *)
 18.1261 +    # Assume MSVC wrapper
 18.1262      library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
 18.1263 +    dynamic_linker='Win32 ld.exe'
 18.1264      ;;
 18.1265    esac
 18.1266 -  dynamic_linker='Win32 ld.exe'
 18.1267    # FIXME: first we should search . and the directory the executable is in
 18.1268    shlibpath_var=PATH
 18.1269    ;;
 18.1270 @@ -2985,7 +3159,7 @@
 18.1271    ;;
 18.1272  
 18.1273  dgux*)
 18.1274 -  version_type=linux
 18.1275 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1276    need_lib_prefix=no
 18.1277    need_version=no
 18.1278    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
 18.1279 @@ -2993,10 +3167,6 @@
 18.1280    shlibpath_var=LD_LIBRARY_PATH
 18.1281    ;;
 18.1282  
 18.1283 -freebsd1*)
 18.1284 -  dynamic_linker=no
 18.1285 -  ;;
 18.1286 -
 18.1287  freebsd* | dragonfly*)
 18.1288    # DragonFly does not have aout.  When/if they implement a new
 18.1289    # versioning mechanism, adjust this.
 18.1290 @@ -3004,7 +3174,7 @@
 18.1291      objformat=`/usr/bin/objformat`
 18.1292    else
 18.1293      case $host_os in
 18.1294 -    freebsd[[123]]*) objformat=aout ;;
 18.1295 +    freebsd[[23]].*) objformat=aout ;;
 18.1296      *) objformat=elf ;;
 18.1297      esac
 18.1298    fi
 18.1299 @@ -3022,7 +3192,7 @@
 18.1300    esac
 18.1301    shlibpath_var=LD_LIBRARY_PATH
 18.1302    case $host_os in
 18.1303 -  freebsd2*)
 18.1304 +  freebsd2.*)
 18.1305      shlibpath_overrides_runpath=yes
 18.1306      ;;
 18.1307    freebsd3.[[01]]* | freebsdelf3.[[01]]*)
 18.1308 @@ -3042,12 +3212,26 @@
 18.1309    ;;
 18.1310  
 18.1311  gnu*)
 18.1312 -  version_type=linux
 18.1313 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1314    need_lib_prefix=no
 18.1315    need_version=no
 18.1316    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 18.1317    soname_spec='${libname}${release}${shared_ext}$major'
 18.1318    shlibpath_var=LD_LIBRARY_PATH
 18.1319 +  shlibpath_overrides_runpath=no
 18.1320 +  hardcode_into_libs=yes
 18.1321 +  ;;
 18.1322 +
 18.1323 +haiku*)
 18.1324 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1325 +  need_lib_prefix=no
 18.1326 +  need_version=no
 18.1327 +  dynamic_linker="$host_os runtime_loader"
 18.1328 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 18.1329 +  soname_spec='${libname}${release}${shared_ext}$major'
 18.1330 +  shlibpath_var=LIBRARY_PATH
 18.1331 +  shlibpath_overrides_runpath=yes
 18.1332 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 18.1333    hardcode_into_libs=yes
 18.1334    ;;
 18.1335  
 18.1336 @@ -3093,12 +3277,14 @@
 18.1337      soname_spec='${libname}${release}${shared_ext}$major'
 18.1338      ;;
 18.1339    esac
 18.1340 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 18.1341 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
 18.1342    postinstall_cmds='chmod 555 $lib'
 18.1343 +  # or fails outright, so override atomically:
 18.1344 +  install_override_mode=555
 18.1345    ;;
 18.1346  
 18.1347  interix[[3-9]]*)
 18.1348 -  version_type=linux
 18.1349 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1350    need_lib_prefix=no
 18.1351    need_version=no
 18.1352    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 18.1353 @@ -3114,7 +3300,7 @@
 18.1354      nonstopux*) version_type=nonstopux ;;
 18.1355      *)
 18.1356  	if test "$lt_cv_prog_gnu_ld" = yes; then
 18.1357 -		version_type=linux
 18.1358 +		version_type=linux # correct to gnu/linux during the next big refactor
 18.1359  	else
 18.1360  		version_type=irix
 18.1361  	fi ;;
 18.1362 @@ -3151,9 +3337,9 @@
 18.1363    dynamic_linker=no
 18.1364    ;;
 18.1365  
 18.1366 -# This must be Linux ELF.
 18.1367 -linux* | k*bsd*-gnu)
 18.1368 -  version_type=linux
 18.1369 +# This must be glibc/ELF.
 18.1370 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
 18.1371 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1372    need_lib_prefix=no
 18.1373    need_version=no
 18.1374    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 18.1375 @@ -3161,16 +3347,21 @@
 18.1376    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 18.1377    shlibpath_var=LD_LIBRARY_PATH
 18.1378    shlibpath_overrides_runpath=no
 18.1379 +
 18.1380    # Some binutils ld are patched to set DT_RUNPATH
 18.1381 -  save_LDFLAGS=$LDFLAGS
 18.1382 -  save_libdir=$libdir
 18.1383 -  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
 18.1384 -       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
 18.1385 -  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 18.1386 -    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
 18.1387 -       [shlibpath_overrides_runpath=yes])])
 18.1388 -  LDFLAGS=$save_LDFLAGS
 18.1389 -  libdir=$save_libdir
 18.1390 +  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
 18.1391 +    [lt_cv_shlibpath_overrides_runpath=no
 18.1392 +    save_LDFLAGS=$LDFLAGS
 18.1393 +    save_libdir=$libdir
 18.1394 +    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
 18.1395 +	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
 18.1396 +    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 18.1397 +      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
 18.1398 +	 [lt_cv_shlibpath_overrides_runpath=yes])])
 18.1399 +    LDFLAGS=$save_LDFLAGS
 18.1400 +    libdir=$save_libdir
 18.1401 +    ])
 18.1402 +  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 18.1403  
 18.1404    # This implies no fast_install, which is unacceptable.
 18.1405    # Some rework will be needed to allow for fast_install
 18.1406 @@ -3179,7 +3370,7 @@
 18.1407  
 18.1408    # Append ld.so.conf contents to the search path
 18.1409    if test -f /etc/ld.so.conf; then
 18.1410 -    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 18.1411 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 18.1412      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 18.1413    fi
 18.1414  
 18.1415 @@ -3211,7 +3402,7 @@
 18.1416    ;;
 18.1417  
 18.1418  newsos6)
 18.1419 -  version_type=linux
 18.1420 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1421    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 18.1422    shlibpath_var=LD_LIBRARY_PATH
 18.1423    shlibpath_overrides_runpath=yes
 18.1424 @@ -3280,7 +3471,7 @@
 18.1425    ;;
 18.1426  
 18.1427  solaris*)
 18.1428 -  version_type=linux
 18.1429 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1430    need_lib_prefix=no
 18.1431    need_version=no
 18.1432    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 18.1433 @@ -3305,7 +3496,7 @@
 18.1434    ;;
 18.1435  
 18.1436  sysv4 | sysv4.3*)
 18.1437 -  version_type=linux
 18.1438 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1439    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 18.1440    soname_spec='${libname}${release}${shared_ext}$major'
 18.1441    shlibpath_var=LD_LIBRARY_PATH
 18.1442 @@ -3329,7 +3520,7 @@
 18.1443  
 18.1444  sysv4*MP*)
 18.1445    if test -d /usr/nec ;then
 18.1446 -    version_type=linux
 18.1447 +    version_type=linux # correct to gnu/linux during the next big refactor
 18.1448      library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
 18.1449      soname_spec='$libname${shared_ext}.$major'
 18.1450      shlibpath_var=LD_LIBRARY_PATH
 18.1451 @@ -3360,7 +3551,7 @@
 18.1452  
 18.1453  tpf*)
 18.1454    # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
 18.1455 -  version_type=linux
 18.1456 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1457    need_lib_prefix=no
 18.1458    need_version=no
 18.1459    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 18.1460 @@ -3370,7 +3561,7 @@
 18.1461    ;;
 18.1462  
 18.1463  uts4*)
 18.1464 -  version_type=linux
 18.1465 +  version_type=linux # correct to gnu/linux during the next big refactor
 18.1466    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 18.1467    soname_spec='${libname}${release}${shared_ext}$major'
 18.1468    shlibpath_var=LD_LIBRARY_PATH
 18.1469 @@ -3412,6 +3603,8 @@
 18.1470      The last name is the one that the linker finds with -lNAME]])
 18.1471  _LT_DECL([], [soname_spec], [1],
 18.1472      [[The coded name of the library, if different from the real name]])
 18.1473 +_LT_DECL([], [install_override_mode], [1],
 18.1474 +    [Permission mode override for installation of shared libraries])
 18.1475  _LT_DECL([], [postinstall_cmds], [2],
 18.1476      [Command to use after installation of a shared archive])
 18.1477  _LT_DECL([], [postuninstall_cmds], [2],
 18.1478 @@ -3524,6 +3717,7 @@
 18.1479  AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 18.1480  m4_require([_LT_DECL_SED])dnl
 18.1481  m4_require([_LT_DECL_EGREP])dnl
 18.1482 +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 18.1483  
 18.1484  AC_ARG_WITH([gnu-ld],
 18.1485      [AS_HELP_STRING([--with-gnu-ld],
 18.1486 @@ -3645,6 +3839,11 @@
 18.1487  esac
 18.1488  reload_cmds='$LD$reload_flag -o $output$reload_objs'
 18.1489  case $host_os in
 18.1490 +  cygwin* | mingw* | pw32* | cegcc*)
 18.1491 +    if test "$GCC" != yes; then
 18.1492 +      reload_cmds=false
 18.1493 +    fi
 18.1494 +    ;;
 18.1495    darwin*)
 18.1496      if test "$GCC" = yes; then
 18.1497        reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
 18.1498 @@ -3653,8 +3852,8 @@
 18.1499      fi
 18.1500      ;;
 18.1501  esac
 18.1502 -_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 18.1503 -_LT_DECL([], [reload_cmds], [2])dnl
 18.1504 +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 18.1505 +_LT_TAGDECL([], [reload_cmds], [2])dnl
 18.1506  ])# _LT_CMD_RELOAD
 18.1507  
 18.1508  
 18.1509 @@ -3699,25 +3898,27 @@
 18.1510  cygwin*)
 18.1511    # func_win32_libid is a shell function defined in ltmain.sh
 18.1512    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 18.1513 +  lt_cv_file_magic_cmd='func_win32_libid'
 18.1514    lt_cv_deplibs_check_method=pass_all
 18.1515 -  lt_cv_file_magic_cmd='func_win32_libid'
 18.1516    ;;
 18.1517  
 18.1518  mingw* | pw32*)
 18.1519    # Base MSYS/MinGW do not provide the 'file' command needed by
 18.1520    # func_win32_libid shell function, so use a weaker test based on 'objdump',
 18.1521    # unless we find 'file', for example because we are cross-compiling.
 18.1522 -  if ( file / ) >/dev/null 2>&1; then
 18.1523 +  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
 18.1524 +  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
 18.1525      lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 18.1526      lt_cv_file_magic_cmd='func_win32_libid'
 18.1527    else
 18.1528 +    # Keep this pattern in sync with the one in func_win32_libid.
 18.1529      lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
 18.1530      lt_cv_file_magic_cmd='$OBJDUMP -f'
 18.1531    fi
 18.1532    lt_cv_deplibs_check_method=pass_all
 18.1533    ;;
 18.1534  
 18.1535 -cegcc)
 18.1536 +cegcc*)
 18.1537    # use the weaker test based on 'objdump'. See mingw*.
 18.1538    lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
 18.1539    lt_cv_file_magic_cmd='$OBJDUMP -f'
 18.1540 @@ -3747,6 +3948,10 @@
 18.1541    lt_cv_deplibs_check_method=pass_all
 18.1542    ;;
 18.1543  
 18.1544 +haiku*)
 18.1545 +  lt_cv_deplibs_check_method=pass_all
 18.1546 +  ;;
 18.1547 +
 18.1548  hpux10.20* | hpux11*)
 18.1549    lt_cv_file_magic_cmd=/usr/bin/file
 18.1550    case $host_cpu in
 18.1551 @@ -3755,11 +3960,11 @@
 18.1552      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
 18.1553      ;;
 18.1554    hppa*64*)
 18.1555 -    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
 18.1556 +    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
 18.1557      lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
 18.1558      ;;
 18.1559    *)
 18.1560 -    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
 18.1561 +    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
 18.1562      lt_cv_file_magic_test_file=/usr/lib/libc.sl
 18.1563      ;;
 18.1564    esac
 18.1565 @@ -3780,8 +3985,8 @@
 18.1566    lt_cv_deplibs_check_method=pass_all
 18.1567    ;;
 18.1568  
 18.1569 -# This must be Linux ELF.
 18.1570 -linux* | k*bsd*-gnu)
 18.1571 +# This must be glibc/ELF.
 18.1572 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
 18.1573    lt_cv_deplibs_check_method=pass_all
 18.1574    ;;
 18.1575  
 18.1576 @@ -3859,6 +4064,21 @@
 18.1577    ;;
 18.1578  esac
 18.1579  ])
 18.1580 +
 18.1581 +file_magic_glob=
 18.1582 +want_nocaseglob=no
 18.1583 +if test "$build" = "$host"; then
 18.1584 +  case $host_os in
 18.1585 +  mingw* | pw32*)
 18.1586 +    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
 18.1587 +      want_nocaseglob=yes
 18.1588 +    else
 18.1589 +      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
 18.1590 +    fi
 18.1591 +    ;;
 18.1592 +  esac
 18.1593 +fi
 18.1594 +
 18.1595  file_magic_cmd=$lt_cv_file_magic_cmd
 18.1596  deplibs_check_method=$lt_cv_deplibs_check_method
 18.1597  test -z "$deplibs_check_method" && deplibs_check_method=unknown
 18.1598 @@ -3866,7 +4086,11 @@
 18.1599  _LT_DECL([], [deplibs_check_method], [1],
 18.1600      [Method to check whether dependent libraries are shared objects])
 18.1601  _LT_DECL([], [file_magic_cmd], [1],
 18.1602 -    [Command to use when deplibs_check_method == "file_magic"])
 18.1603 +    [Command to use when deplibs_check_method = "file_magic"])
 18.1604 +_LT_DECL([], [file_magic_glob], [1],
 18.1605 +    [How to find potential files when deplibs_check_method = "file_magic"])
 18.1606 +_LT_DECL([], [want_nocaseglob], [1],
 18.1607 +    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 18.1608  ])# _LT_CHECK_MAGIC_METHOD
 18.1609  
 18.1610  
 18.1611 @@ -3923,7 +4147,19 @@
 18.1612    NM="$lt_cv_path_NM"
 18.1613  else
 18.1614    # Didn't find any BSD compatible name lister, look for dumpbin.
 18.1615 -  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
 18.1616 +  if test -n "$DUMPBIN"; then :
 18.1617 +    # Let the user override the test.
 18.1618 +  else
 18.1619 +    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
 18.1620 +    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
 18.1621 +    *COFF*)
 18.1622 +      DUMPBIN="$DUMPBIN -symbols"
 18.1623 +      ;;
 18.1624 +    *)
 18.1625 +      DUMPBIN=:
 18.1626 +      ;;
 18.1627 +    esac
 18.1628 +  fi
 18.1629    AC_SUBST([DUMPBIN])
 18.1630    if test "$DUMPBIN" != ":"; then
 18.1631      NM="$DUMPBIN"
 18.1632 @@ -3936,13 +4172,13 @@
 18.1633  AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
 18.1634    [lt_cv_nm_interface="BSD nm"
 18.1635    echo "int some_variable = 0;" > conftest.$ac_ext
 18.1636 -  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 18.1637 +  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 18.1638    (eval "$ac_compile" 2>conftest.err)
 18.1639    cat conftest.err >&AS_MESSAGE_LOG_FD
 18.1640 -  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 18.1641 +  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 18.1642    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 18.1643    cat conftest.err >&AS_MESSAGE_LOG_FD
 18.1644 -  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
 18.1645 +  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
 18.1646    cat conftest.out >&AS_MESSAGE_LOG_FD
 18.1647    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 18.1648      lt_cv_nm_interface="MS dumpbin"
 18.1649 @@ -3957,6 +4193,67 @@
 18.1650  dnl AC_DEFUN([AM_PROG_NM], [])
 18.1651  dnl AC_DEFUN([AC_PROG_NM], [])
 18.1652  
 18.1653 +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 18.1654 +# --------------------------------
 18.1655 +# how to determine the name of the shared library
 18.1656 +# associated with a specific link library.
 18.1657 +#  -- PORTME fill in with the dynamic library characteristics
 18.1658 +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
 18.1659 +[m4_require([_LT_DECL_EGREP])
 18.1660 +m4_require([_LT_DECL_OBJDUMP])
 18.1661 +m4_require([_LT_DECL_DLLTOOL])
 18.1662 +AC_CACHE_CHECK([how to associate runtime and link libraries],
 18.1663 +lt_cv_sharedlib_from_linklib_cmd,
 18.1664 +[lt_cv_sharedlib_from_linklib_cmd='unknown'
 18.1665 +
 18.1666 +case $host_os in
 18.1667 +cygwin* | mingw* | pw32* | cegcc*)
 18.1668 +  # two different shell functions defined in ltmain.sh
 18.1669 +  # decide which to use based on capabilities of $DLLTOOL
 18.1670 +  case `$DLLTOOL --help 2>&1` in
 18.1671 +  *--identify-strict*)
 18.1672 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
 18.1673 +    ;;
 18.1674 +  *)
 18.1675 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
 18.1676 +    ;;
 18.1677 +  esac
 18.1678 +  ;;
 18.1679 +*)
 18.1680 +  # fallback: assume linklib IS sharedlib
 18.1681 +  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
 18.1682 +  ;;
 18.1683 +esac
 18.1684 +])
 18.1685 +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 18.1686 +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 18.1687 +
 18.1688 +_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
 18.1689 +    [Command to associate shared and link libraries])
 18.1690 +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 18.1691 +
 18.1692 +
 18.1693 +# _LT_PATH_MANIFEST_TOOL
 18.1694 +# ----------------------
 18.1695 +# locate the manifest tool
 18.1696 +m4_defun([_LT_PATH_MANIFEST_TOOL],
 18.1697 +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
 18.1698 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
 18.1699 +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
 18.1700 +  [lt_cv_path_mainfest_tool=no
 18.1701 +  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
 18.1702 +  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
 18.1703 +  cat conftest.err >&AS_MESSAGE_LOG_FD
 18.1704 +  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
 18.1705 +    lt_cv_path_mainfest_tool=yes
 18.1706 +  fi
 18.1707 +  rm -f conftest*])
 18.1708 +if test "x$lt_cv_path_mainfest_tool" != xyes; then
 18.1709 +  MANIFEST_TOOL=:
 18.1710 +fi
 18.1711 +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
 18.1712 +])# _LT_PATH_MANIFEST_TOOL
 18.1713 +
 18.1714  
 18.1715  # LT_LIB_M
 18.1716  # --------
 18.1717 @@ -3965,7 +4262,7 @@
 18.1718  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 18.1719  LIBM=
 18.1720  case $host in
 18.1721 -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
 18.1722 +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
 18.1723    # These system don't have libm, or don't need it
 18.1724    ;;
 18.1725  *-ncr-sysv4.3*)
 18.1726 @@ -3993,7 +4290,12 @@
 18.1727  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 18.1728  
 18.1729  if test "$GCC" = yes; then
 18.1730 -  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 18.1731 +  case $cc_basename in
 18.1732 +  nvcc*)
 18.1733 +    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
 18.1734 +  *)
 18.1735 +    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
 18.1736 +  esac
 18.1737  
 18.1738    _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
 18.1739      lt_cv_prog_compiler_rtti_exceptions,
 18.1740 @@ -4010,6 +4312,7 @@
 18.1741  m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 18.1742  [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 18.1743  AC_REQUIRE([AC_PROG_CC])dnl
 18.1744 +AC_REQUIRE([AC_PROG_AWK])dnl
 18.1745  AC_REQUIRE([LT_PATH_NM])dnl
 18.1746  AC_REQUIRE([LT_PATH_LD])dnl
 18.1747  m4_require([_LT_DECL_SED])dnl
 18.1748 @@ -4077,8 +4380,8 @@
 18.1749  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 18.1750  
 18.1751  # Transform an extracted symbol line into symbol name and symbol address
 18.1752 -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
 18.1753 -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 18.1754 +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
 18.1755 +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 18.1756  
 18.1757  # Handle CRLF in mingw tool chain
 18.1758  opt_cr=
 18.1759 @@ -4102,6 +4405,7 @@
 18.1760      # which start with @ or ?.
 18.1761      lt_cv_sys_global_symbol_pipe="$AWK ['"\
 18.1762  "     {last_section=section; section=\$ 3};"\
 18.1763 +"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 18.1764  "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 18.1765  "     \$ 0!~/External *\|/{next};"\
 18.1766  "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 18.1767 @@ -4114,6 +4418,7 @@
 18.1768    else
 18.1769      lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 18.1770    fi
 18.1771 +  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 18.1772  
 18.1773    # Check to see that the pipe works correctly.
 18.1774    pipe_works=no
 18.1775 @@ -4135,7 +4440,7 @@
 18.1776    if AC_TRY_EVAL(ac_compile); then
 18.1777      # Now try to grab the symbols.
 18.1778      nlist=conftest.nm
 18.1779 -    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
 18.1780 +    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
 18.1781        # Try sorting and uniquifying the output.
 18.1782        if sort "$nlist" | uniq > "$nlist"T; then
 18.1783  	mv -f "$nlist"T "$nlist"
 18.1784 @@ -4147,6 +4452,18 @@
 18.1785        if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 18.1786  	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 18.1787  	  cat <<_LT_EOF > conftest.$ac_ext
 18.1788 +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
 18.1789 +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
 18.1790 +/* DATA imports from DLLs on WIN32 con't be const, because runtime
 18.1791 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 18.1792 +# define LT@&t@_DLSYM_CONST
 18.1793 +#elif defined(__osf__)
 18.1794 +/* This system does not cope well with relocations in const data.  */
 18.1795 +# define LT@&t@_DLSYM_CONST
 18.1796 +#else
 18.1797 +# define LT@&t@_DLSYM_CONST const
 18.1798 +#endif
 18.1799 +
 18.1800  #ifdef __cplusplus
 18.1801  extern "C" {
 18.1802  #endif
 18.1803 @@ -4158,7 +4475,7 @@
 18.1804  	  cat <<_LT_EOF >> conftest.$ac_ext
 18.1805  
 18.1806  /* The mapping between symbol names and symbols.  */
 18.1807 -const struct {
 18.1808 +LT@&t@_DLSYM_CONST struct {
 18.1809    const char *name;
 18.1810    void       *address;
 18.1811  }
 18.1812 @@ -4184,15 +4501,15 @@
 18.1813  _LT_EOF
 18.1814  	  # Now try linking the two files.
 18.1815  	  mv conftest.$ac_objext conftstm.$ac_objext
 18.1816 -	  lt_save_LIBS="$LIBS"
 18.1817 -	  lt_save_CFLAGS="$CFLAGS"
 18.1818 +	  lt_globsym_save_LIBS=$LIBS
 18.1819 +	  lt_globsym_save_CFLAGS=$CFLAGS
 18.1820  	  LIBS="conftstm.$ac_objext"
 18.1821  	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 18.1822  	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 18.1823  	    pipe_works=yes
 18.1824  	  fi
 18.1825 -	  LIBS="$lt_save_LIBS"
 18.1826 -	  CFLAGS="$lt_save_CFLAGS"
 18.1827 +	  LIBS=$lt_globsym_save_LIBS
 18.1828 +	  CFLAGS=$lt_globsym_save_CFLAGS
 18.1829  	else
 18.1830  	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 18.1831  	fi
 18.1832 @@ -4225,6 +4542,13 @@
 18.1833    AC_MSG_RESULT(ok)
 18.1834  fi
 18.1835  
 18.1836 +# Response file support.
 18.1837 +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 18.1838 +  nm_file_list_spec='@'
 18.1839 +elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
 18.1840 +  nm_file_list_spec='@'
 18.1841 +fi
 18.1842 +
 18.1843  _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
 18.1844      [Take the output of nm and produce a listing of raw symbols and C names])
 18.1845  _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
 18.1846 @@ -4235,6 +4559,8 @@
 18.1847  _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
 18.1848      [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
 18.1849      [Transform the output of nm in a C name address pair when lib prefix is needed])
 18.1850 +_LT_DECL([], [nm_file_list_spec], [1],
 18.1851 +    [Specify filename containing input files for $NM])
 18.1852  ]) # _LT_CMD_GLOBAL_SYMBOLS
 18.1853  
 18.1854  
 18.1855 @@ -4246,7 +4572,6 @@
 18.1856  _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 18.1857  _LT_TAGVAR(lt_prog_compiler_static, $1)=
 18.1858  
 18.1859 -AC_MSG_CHECKING([for $compiler option to produce PIC])
 18.1860  m4_if([$1], [CXX], [
 18.1861    # C++ specific cases for pic, static, wl, etc.
 18.1862    if test "$GXX" = yes; then
 18.1863 @@ -4297,6 +4622,11 @@
 18.1864        # DJGPP does not support shared libraries at all
 18.1865        _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 18.1866        ;;
 18.1867 +    haiku*)
 18.1868 +      # PIC is the default for Haiku.
 18.1869 +      # The "-static" flag exists, but is broken.
 18.1870 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=
 18.1871 +      ;;
 18.1872      interix[[3-9]]*)
 18.1873        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 18.1874        # Instead, we relocate shared libraries at runtime.
 18.1875 @@ -4346,6 +4676,12 @@
 18.1876  	  ;;
 18.1877  	esac
 18.1878  	;;
 18.1879 +      mingw* | cygwin* | os2* | pw32* | cegcc*)
 18.1880 +	# This hack is so that the source file can tell whether it is being
 18.1881 +	# built for inclusion in a dll (and should export symbols for example).
 18.1882 +	m4_if([$1], [GCJ], [],
 18.1883 +	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
 18.1884 +	;;
 18.1885        dgux*)
 18.1886  	case $cc_basename in
 18.1887  	  ec++*)
 18.1888 @@ -4402,7 +4738,7 @@
 18.1889  	    ;;
 18.1890  	esac
 18.1891  	;;
 18.1892 -      linux* | k*bsd*-gnu)
 18.1893 +      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 18.1894  	case $cc_basename in
 18.1895  	  KCC*)
 18.1896  	    # KAI C++ Compiler
 18.1897 @@ -4435,8 +4771,8 @@
 18.1898  	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 18.1899  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 18.1900  	    ;;
 18.1901 -	  xlc* | xlC*)
 18.1902 -	    # IBM XL 8.0 on PPC
 18.1903 +	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
 18.1904 +	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 18.1905  	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 18.1906  	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 18.1907  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 18.1908 @@ -4498,7 +4834,7 @@
 18.1909  	;;
 18.1910        solaris*)
 18.1911  	case $cc_basename in
 18.1912 -	  CC*)
 18.1913 +	  CC* | sunCC*)
 18.1914  	    # Sun C++ 4.2, 5.x and Centerline C++
 18.1915  	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 18.1916  	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 18.1917 @@ -4602,6 +4938,12 @@
 18.1918        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 18.1919        ;;
 18.1920  
 18.1921 +    haiku*)
 18.1922 +      # PIC is the default for Haiku.
 18.1923 +      # The "-static" flag exists, but is broken.
 18.1924 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=
 18.1925 +      ;;
 18.1926 +
 18.1927      hpux*)
 18.1928        # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
 18.1929        # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
 18.1930 @@ -4644,6 +4986,15 @@
 18.1931        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 18.1932        ;;
 18.1933      esac
 18.1934 +
 18.1935 +    case $cc_basename in
 18.1936 +    nvcc*) # Cuda Compiler Driver 2.2
 18.1937 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
 18.1938 +      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
 18.1939 +        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
 18.1940 +      fi
 18.1941 +      ;;
 18.1942 +    esac
 18.1943    else
 18.1944      # PORTME Check for flag to pass linker flags through the system compiler.
 18.1945      case $host_os in
 18.1946 @@ -4686,7 +5037,7 @@
 18.1947        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 18.1948        ;;
 18.1949  
 18.1950 -    linux* | k*bsd*-gnu)
 18.1951 +    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 18.1952        case $cc_basename in
 18.1953        # old Intel for x86_64 which still supported -KPIC.
 18.1954        ecc*)
 18.1955 @@ -4707,7 +5058,13 @@
 18.1956  	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 18.1957  	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 18.1958  	;;
 18.1959 -      pgcc* | pgf77* | pgf90* | pgf95*)
 18.1960 +      nagfor*)
 18.1961 +	# NAG Fortran compiler
 18.1962 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
 18.1963 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 18.1964 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 18.1965 +	;;
 18.1966 +      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 18.1967          # Portland Group compilers (*not* the Pentium gcc compiler,
 18.1968  	# which looks to be a dead project)
 18.1969  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 18.1970 @@ -4719,25 +5076,40 @@
 18.1971          # All Alpha code is PIC.
 18.1972          _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 18.1973          ;;
 18.1974 -      xl*)
 18.1975 -	# IBM XL C 8.0/Fortran 10.1 on PPC
 18.1976 +      xl* | bgxl* | bgf* | mpixl*)
 18.1977 +	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 18.1978  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 18.1979  	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 18.1980  	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 18.1981  	;;
 18.1982        *)
 18.1983  	case `$CC -V 2>&1 | sed 5q` in
 18.1984 +	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 18.1985 +	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 18.1986 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 18.1987 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 18.1988 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 18.1989 +	  ;;
 18.1990 +	*Sun\ F* | *Sun*Fortran*)
 18.1991 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 18.1992 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 18.1993 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 18.1994 +	  ;;
 18.1995  	*Sun\ C*)
 18.1996  	  # Sun C 5.9
 18.1997  	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 18.1998  	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 18.1999  	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 18.2000  	  ;;
 18.2001 -	*Sun\ F*)
 18.2002 -	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 18.2003 -	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 18.2004 +        *Intel*\ [[CF]]*Compiler*)
 18.2005 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 18.2006 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 18.2007 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 18.2008 +	  ;;
 18.2009 +	*Portland\ Group*)
 18.2010 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 18.2011 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 18.2012  	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 18.2013 -	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 18.2014  	  ;;
 18.2015  	esac
 18.2016  	;;
 18.2017 @@ -4769,7 +5141,7 @@
 18.2018        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 18.2019        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 18.2020        case $cc_basename in
 18.2021 -      f77* | f90* | f95*)
 18.2022 +      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 18.2023  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
 18.2024        *)
 18.2025  	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
 18.2026 @@ -4826,9 +5198,11 @@
 18.2027      _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
 18.2028      ;;
 18.2029  esac
 18.2030 -AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
 18.2031 -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
 18.2032 -	[How to pass a linker flag through the compiler])
 18.2033 +
 18.2034 +AC_CACHE_CHECK([for $compiler option to produce PIC],
 18.2035 +  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
 18.2036 +  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
 18.2037 +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 18.2038  
 18.2039  #
 18.2040  # Check to make sure the PIC flag actually works.
 18.2041 @@ -4847,6 +5221,8 @@
 18.2042  _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 18.2043  	[Additional compiler flags for building library objects])
 18.2044  
 18.2045 +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
 18.2046 +	[How to pass a linker flag through the compiler])
 18.2047  #
 18.2048  # Check to make sure the static flag actually works.
 18.2049  #
 18.2050 @@ -4867,6 +5243,7 @@
 18.2051  m4_defun([_LT_LINKER_SHLIBS],
 18.2052  [AC_REQUIRE([LT_PATH_LD])dnl
 18.2053  AC_REQUIRE([LT_PATH_NM])dnl
 18.2054 +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 18.2055  m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 18.2056  m4_require([_LT_DECL_EGREP])dnl
 18.2057  m4_require([_LT_DECL_SED])dnl
 18.2058 @@ -4875,27 +5252,37 @@
 18.2059  AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 18.2060  m4_if([$1], [CXX], [
 18.2061    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 18.2062 +  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 18.2063    case $host_os in
 18.2064    aix[[4-9]]*)
 18.2065      # If we're using GNU nm, then we don't want the "-C" option.
 18.2066      # -C means demangle to AIX nm, but means don't demangle with GNU nm
 18.2067 +    # Also, AIX nm treats weak defined symbols like other global defined
 18.2068 +    # symbols, whereas GNU nm marks them as "W".
 18.2069      if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 18.2070 -      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 18.2071 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 18.2072      else
 18.2073        _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 18.2074      fi
 18.2075      ;;
 18.2076    pw32*)
 18.2077      _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
 18.2078 -  ;;
 18.2079 +    ;;
 18.2080    cygwin* | mingw* | cegcc*)
 18.2081 -    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 18.2082 -  ;;
 18.2083 +    case $cc_basename in
 18.2084 +    cl*)
 18.2085 +      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 18.2086 +      ;;
 18.2087 +    *)
 18.2088 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 18.2089 +      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 18.2090 +      ;;
 18.2091 +    esac
 18.2092 +    ;;
 18.2093    *)
 18.2094      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 18.2095 -  ;;
 18.2096 +    ;;
 18.2097    esac
 18.2098 -  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 18.2099  ], [
 18.2100    runpath_var=
 18.2101    _LT_TAGVAR(allow_undefined_flag, $1)=
 18.2102 @@ -4910,7 +5297,6 @@
 18.2103    _LT_TAGVAR(hardcode_direct, $1)=no
 18.2104    _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 18.2105    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 18.2106 -  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 18.2107    _LT_TAGVAR(hardcode_libdir_separator, $1)=
 18.2108    _LT_TAGVAR(hardcode_minus_L, $1)=no
 18.2109    _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 18.2110 @@ -4958,7 +5344,33 @@
 18.2111    esac
 18.2112  
 18.2113    _LT_TAGVAR(ld_shlibs, $1)=yes
 18.2114 +
 18.2115 +  # On some targets, GNU ld is compatible enough with the native linker
 18.2116 +  # that we're better off using the native interface for both.
 18.2117 +  lt_use_gnu_ld_interface=no
 18.2118    if test "$with_gnu_ld" = yes; then
 18.2119 +    case $host_os in
 18.2120</