[Pkg-sdl-commits] r100 - in unstable/libsdl1.2/debian: . patches
Samuel Hocevar
sho at costa.debian.org
Fri Sep 29 14:57:48 CEST 2006
Author: sho
Date: 2006-09-29 12:57:27 +0000 (Fri, 29 Sep 2006)
New Revision: 100
Added:
unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff
Modified:
unstable/libsdl1.2/debian/changelog
unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff
unstable/libsdl1.2/debian/patches/100_relibtoolize.diff
unstable/libsdl1.2/debian/patches/series
unstable/libsdl1.2/debian/rules
Log:
libsdl1.2 (1.2.11-4) unstable; urgency=low
* debian/rules:
+ Activate libcaca video driver.
* 020_libcaca_new_api.diff:
+ Patch courtesy of Hanno B?\195?\182ck <mail at hboeck.de> to use SDL with newer
libcaca versions.
-- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 29 Sep 2006 09:05:30 +0200
Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog 2006-09-29 06:54:33 UTC (rev 99)
+++ unstable/libsdl1.2/debian/changelog 2006-09-29 12:57:27 UTC (rev 100)
@@ -1,3 +1,14 @@
+libsdl1.2 (1.2.11-4) unstable; urgency=low
+
+ * debian/rules:
+ + Activate libcaca video driver.
+
+ * 020_libcaca_new_api.diff:
+ + Patch courtesy of Hanno Böck <mail at hboeck.de> to use SDL with newer
+ libcaca versions.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 29 Sep 2006 09:05:30 +0200
+
libsdl1.2 (1.2.11-3) unstable; urgency=low
* debian/rules:
Modified: unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff 2006-09-29 06:54:33 UTC (rev 99)
+++ unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff 2006-09-29 12:57:27 UTC (rev 100)
@@ -1,8 +1,8 @@
-Index: libsdl1.2-1.2.10/autogen.sh
+Index: libsdl1.2-1.2.11/autogen.sh
===================================================================
---- libsdl1.2-1.2.10.orig/autogen.sh 2006-05-15 12:26:06.000000000 +0200
-+++ libsdl1.2-1.2.10/autogen.sh 2006-05-26 10:17:10.000000000 +0200
-@@ -4,15 +4,8 @@
+--- libsdl1.2-1.2.11.orig/autogen.sh 2006-09-29 11:20:56.000000000 +0200
++++ libsdl1.2-1.2.11/autogen.sh 2006-09-29 11:21:00.000000000 +0200
+@@ -4,15 +4,9 @@
echo "This may take a while ..."
# Regenerate configuration files
@@ -17,13 +17,14 @@
-fi
+aclocal-1.9
+autoconf
++autoheader
(cd test; sh autogen.sh)
# Run configure for this platform
-Index: libsdl1.2-1.2.10/test/autogen.sh
+Index: libsdl1.2-1.2.11/test/autogen.sh
===================================================================
---- libsdl1.2-1.2.10.orig/test/autogen.sh 2006-05-26 10:16:41.000000000 +0200
-+++ libsdl1.2-1.2.10/test/autogen.sh 2006-05-26 10:17:21.000000000 +0200
+--- libsdl1.2-1.2.11.orig/test/autogen.sh 2006-09-29 11:20:56.000000000 +0200
++++ libsdl1.2-1.2.11/test/autogen.sh 2006-09-29 11:21:03.000000000 +0200
@@ -1,12 +1,5 @@
#!/bin/sh
#
Added: unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff (rev 0)
+++ unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff 2006-09-29 12:57:27 UTC (rev 100)
@@ -0,0 +1,627 @@
+Index: libsdl1.2-1.2.11/configure.in
+===================================================================
+--- libsdl1.2-1.2.11.orig/configure.in 2006-09-29 11:22:03.000000000 +0200
++++ libsdl1.2-1.2.11/configure.in 2006-09-29 11:22:03.000000000 +0200
+@@ -1335,6 +1335,38 @@
+ fi
+ }
+
++dnl Find the libcaca includes
++CheckCaca()
++{
++ AC_ARG_ENABLE(video-caca,
++AC_HELP_STRING([--enable-video-caca], [use libcaca video driver [[default=no]]]),
++ , enable_video_caca=no)
++ if test x$enable_video = xyes -a x$enable_video_caca = xyes; then
++ video_caca=no
++ AC_PATH_PROG(CACACONFIG, caca-config, no)
++ if test x$CACACONFIG != xno; then
++ AC_MSG_CHECKING(for libcaca support)
++ CACA_CFLAGS=`$CACACONFIG --cflags`
++ CACA_LDFLAGS=`$CACACONFIG --libs`
++ save_CFLAGS="$CFLAGS"
++ AC_TRY_COMPILE([
++ #include <caca.h>
++ ],[
++ ],[
++ video_caca=yes
++ ])
++ CFLAGS="$save_CFLAGS"
++ AC_MSG_RESULT($video_caca)
++ if test x$video_caca = xyes; then
++ AC_DEFINE(SDL_VIDEO_DRIVER_CACA)
++ EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS"
++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS"
++ SOURCES="$SOURCES $srcdir/src/video/caca/*.c"
++ fi
++ fi
++ fi
++}
++
+ dnl Set up the QTopia video driver if enabled
+ CheckQtopia()
+ {
+@@ -2149,6 +2181,7 @@
+ CheckVGL
+ CheckWscons
+ CheckAAlib
++ CheckCaca
+ CheckQtopia
+ CheckPicoGUI
+ CheckOpenGLX11
+Index: libsdl1.2-1.2.11/src/video/caca/SDL_cacaevents.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.11/src/video/caca/SDL_cacaevents.c 2006-09-29 11:22:03.000000000 +0200
+@@ -0,0 +1,101 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Lantinga
++ slouken at libsdl.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++#include <stdio.h>
++
++#include <caca.h>
++#ifdef CACA_API_VERSION_1
++#include <caca0.h>
++#endif
++
++#include "SDL.h"
++#include "../../events/SDL_sysevents.h"
++#include "../../events/SDL_events_c.h"
++#include "SDL_cacavideo.h"
++#include "SDL_cacaevents_c.h"
++
++void Caca_PumpEvents(_THIS)
++{
++ int posted = 0;
++ int event;
++ SDL_keysym keysym;
++
++ if( ! this->screen ) /* Wait till we got the screen initialised */
++ return;
++
++ do {
++ posted = 0;
++
++ /* Get libcaca event */
++ SDL_mutexP(Caca_mutex);
++ event = caca_get_event(CACA_EVENT_ANY);
++ SDL_mutexV(Caca_mutex);
++
++ if ( event & (CACA_EVENT_KEY_PRESS | CACA_EVENT_KEY_RELEASE)) {
++ int key;
++ switch ( event & 0xffffff )
++ {
++ case CACA_KEY_LEFT: key = SDLK_LEFT; break;
++ case CACA_KEY_RIGHT: key = SDLK_RIGHT; break;
++ case CACA_KEY_UP: key = SDLK_UP; break;
++ case CACA_KEY_DOWN: key = SDLK_DOWN; break;
++ default: key = event & 0xff; break;
++ }
++ /* Key pressed */
++/* printf("Key pressed: %d (%c)\n", key, key); */
++ keysym.scancode = key;
++ keysym.sym = key;
++ keysym.mod = KMOD_NONE;
++ keysym.unicode = 0;
++ if ( SDL_TranslateUNICODE ) {
++ keysym.unicode = key;
++ }
++ posted += SDL_PrivateKeyboard((event & CACA_EVENT_KEY_PRESS) ? SDL_PRESSED : SDL_RELEASED, &keysym);
++ }
++ else if ( event & (CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE) ) {
++ /* FIXME: we currently ignore the button type! */
++ int button = event & 0x00ffffff;
++ if ( button > 3 ) {
++ button = 1;
++ }
++ posted += SDL_PrivateMouseButton((event & CACA_EVENT_MOUSE_PRESS) ? SDL_PRESSED : SDL_RELEASED, button, 0, 0);
++ }
++ else if ( event & CACA_EVENT_MOUSE_MOTION ) {
++ int new_x = 0, new_y = 0;
++ new_x = ((event & 0x00fff000) >> 12) * Caca_w / caca_get_width();
++ new_y = ((event & 0x00000fff) >> 0) * Caca_h / caca_get_height();
++ posted += SDL_PrivateMouseMotion(0, 0, new_x, new_y);
++ }
++ } while ( posted );
++}
++
++void Caca_InitOSKeymap(_THIS)
++{
++ return;
++}
++
++
+Index: libsdl1.2-1.2.11/src/video/caca/SDL_cacaevents_c.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.11/src/video/caca/SDL_cacaevents_c.h 2006-09-29 11:22:03.000000000 +0200
+@@ -0,0 +1,35 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Lantinga
++ slouken at libsdl.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++#include "SDL_cacavideo.h"
++
++/* Variables and functions exported by SDL_sysevents.c to other parts.
++ of the native video subsystem (SDL_sysvideo.c)
++*/
++extern void Caca_PumpEvents(_THIS);
++extern void Caca_InitOSKeymap(_THIS);
++
+Index: libsdl1.2-1.2.11/src/video/caca/SDL_cacavideo.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.11/src/video/caca/SDL_cacavideo.c 2006-09-29 11:22:03.000000000 +0200
+@@ -0,0 +1,304 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 2003 Sam Hocevar
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Hocevar
++ sam at zoy.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++/* libcaca based SDL video driver implementation.
++*/
++
++#include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
++#include <sys/stat.h>
++
++
++#include "SDL.h"
++#include "SDL_error.h"
++#include "SDL_video.h"
++#include "SDL_mouse.h"
++#include "../SDL_sysvideo.h"
++#include "../SDL_pixels_c.h"
++#include "../../events/SDL_events_c.h"
++
++#include "SDL_cacavideo.h"
++#include "SDL_cacaevents_c.h"
++
++#include <caca.h>
++#ifdef CACA_API_VERSION_1
++#include <caca0.h>
++#endif
++
++/* Initialization/Query functions */
++static int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat);
++static SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags);
++static SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags);
++static void Caca_VideoQuit(_THIS);
++
++/* Hardware surface functions */
++static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface);
++static int Caca_LockHWSurface(_THIS, SDL_Surface *surface);
++static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface);
++static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface);
++static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface);
++
++/* Cache the VideoDevice struct */
++static struct SDL_VideoDevice *local_this;
++
++/* libcaca driver bootstrap functions */
++
++static int Caca_Available(void)
++{
++ return 1; /* Always available ! */
++}
++
++static void Caca_DeleteDevice(SDL_VideoDevice *device)
++{
++ free(device->hidden);
++ free(device);
++}
++static SDL_VideoDevice *Caca_CreateDevice(int devindex)
++{
++ SDL_VideoDevice *device;
++
++ /* Initialize all variables that we clean on shutdown */
++ device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice));
++ if ( device ) {
++ memset(device, 0, (sizeof *device));
++ device->hidden = (struct SDL_PrivateVideoData *)
++ malloc((sizeof *device->hidden));
++ }
++ if ( (device == NULL) || (device->hidden == NULL) ) {
++ SDL_OutOfMemory();
++ if ( device ) {
++ free(device);
++ }
++ return(0);
++ }
++ memset(device->hidden, 0, (sizeof *device->hidden));
++
++ /* Set the function pointers */
++ device->VideoInit = Caca_VideoInit;
++ device->ListModes = Caca_ListModes;
++ device->SetVideoMode = Caca_SetVideoMode;
++ device->CreateYUVOverlay = NULL;
++ device->SetColors = NULL;
++ device->UpdateRects = NULL;
++ device->VideoQuit = Caca_VideoQuit;
++ device->AllocHWSurface = Caca_AllocHWSurface;
++ device->CheckHWBlit = NULL;
++ device->FillHWRect = NULL;
++ device->SetHWColorKey = NULL;
++ device->SetHWAlpha = NULL;
++ device->LockHWSurface = Caca_LockHWSurface;
++ device->UnlockHWSurface = Caca_UnlockHWSurface;
++ device->FlipHWSurface = NULL;
++ device->FreeHWSurface = Caca_FreeHWSurface;
++ device->SetCaption = NULL;
++ device->SetIcon = NULL;
++ device->IconifyWindow = NULL;
++ device->GrabInput = NULL;
++ device->GetWMInfo = NULL;
++ device->InitOSKeymap = Caca_InitOSKeymap;
++ device->PumpEvents = Caca_PumpEvents;
++
++ device->free = Caca_DeleteDevice;
++
++ return device;
++}
++
++VideoBootStrap CACA_bootstrap = {
++ "caca", "Color ASCII Art Library",
++ Caca_Available, Caca_CreateDevice
++};
++
++int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat)
++{
++ int i;
++
++ /* Initialize all variables that we clean on shutdown */
++ for ( i=0; i<SDL_NUMMODES; ++i ) {
++ SDL_modelist[i] = malloc(sizeof(SDL_Rect));
++ SDL_modelist[i]->x = SDL_modelist[i]->y = 0;
++ }
++ /* Modes sorted largest to smallest */
++ SDL_modelist[0]->w = 1024; SDL_modelist[0]->h = 768;
++ SDL_modelist[1]->w = 800; SDL_modelist[1]->h = 600;
++ SDL_modelist[2]->w = 640; SDL_modelist[2]->h = 480;
++ SDL_modelist[3]->w = 320; SDL_modelist[3]->h = 400;
++ SDL_modelist[4]->w = 320; SDL_modelist[4]->h = 240;
++ SDL_modelist[5]->w = 320; SDL_modelist[5]->h = 200;
++ SDL_modelist[6] = NULL;
++
++ Caca_mutex = SDL_CreateMutex();
++
++ /* Initialize the library */
++ if ( caca_init() != 0 ) {
++ SDL_SetError("Unable to initialize libcaca");
++ return(-1);
++ }
++
++ /* Initialize private variables */
++ Caca_lastkey = 0;
++ Caca_bitmap = NULL;
++ Caca_buffer = NULL;
++
++ local_this = this;
++
++ /* Determine the screen depth (use default 8-bit depth) */
++ vformat->BitsPerPixel = 8;
++ vformat->BytesPerPixel = 1;
++
++ /* We're done! */
++ return(0);
++}
++
++SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
++{
++ if(format->BitsPerPixel != 8)
++ return NULL;
++
++ if ( flags & SDL_FULLSCREEN ) {
++ return SDL_modelist;
++ } else {
++ return (SDL_Rect **) -1;
++ }
++}
++
++/* Various screen update functions available */
++static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects);
++
++SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current,
++ int width, int height, int bpp, Uint32 flags)
++{
++ if ( Caca_buffer ) {
++ free( Caca_buffer );
++ Caca_buffer = NULL;
++ }
++
++ if ( Caca_bitmap ) {
++ caca_free_bitmap( Caca_bitmap );
++ Caca_bitmap = NULL;
++ }
++
++ Caca_buffer = malloc(2 * ((width + 15) & ~15) * height);
++ if ( ! Caca_buffer ) {
++ SDL_SetError("Couldn't allocate buffer for requested mode");
++ return(NULL);
++ }
++
++ memset(Caca_buffer, 0, 2 * ((width + 15) & ~15) * height);
++
++ /* Allocate the new pixel format for the screen */
++ if ( ! SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0) ) {
++ return(NULL);
++ }
++
++ /* Set up the new mode framebuffer */
++ current->flags = SDL_FULLSCREEN;
++ Caca_w = current->w = width;
++ Caca_h = current->h = height;
++ current->pitch = 2 * ((width + 15) & ~15);
++ current->pixels = Caca_buffer;
++
++ /* Create the libcaca bitmap */
++ Caca_bitmap = caca_create_bitmap( 16, width, height, current->pitch, 0xf800, 0x07e0, 0x001f, 0x0000 );
++ if ( ! Caca_bitmap ) {
++ SDL_SetError("Couldn't allocate libcaca bitmap");
++ return(NULL);
++ }
++
++ /* Set the blit function */
++ this->UpdateRects = Caca_DirectUpdate;
++
++ /* We're done */
++ return(current);
++}
++
++/* We don't actually allow hardware surfaces other than the main one */
++static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface)
++{
++ return(-1);
++}
++static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface)
++{
++ return;
++}
++
++/* We need to wait for vertical retrace on page flipped displays */
++static int Caca_LockHWSurface(_THIS, SDL_Surface *surface)
++{
++ /* TODO ? */
++ return(0);
++}
++static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface)
++{
++ return;
++}
++
++/* FIXME: How is this done with libcaca? */
++static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface)
++{
++ SDL_mutexP(Caca_mutex);
++ caca_refresh();
++ SDL_mutexV(Caca_mutex);
++ return(0);
++}
++
++static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects)
++{
++ SDL_mutexP(Caca_mutex);
++ caca_draw_bitmap( 0, 0, caca_get_width() - 1, caca_get_height() - 1,
++ Caca_bitmap, Caca_buffer );
++ caca_refresh();
++ SDL_mutexV(Caca_mutex);
++ return;
++}
++
++/* Note: If we are terminated, this could be called in the middle of
++ another SDL video routine -- notably UpdateRects.
++*/
++void Caca_VideoQuit(_THIS)
++{
++ int i;
++
++ /* Free video mode lists */
++ for ( i=0; i<SDL_NUMMODES; ++i ) {
++ if ( SDL_modelist[i] != NULL ) {
++ free(SDL_modelist[i]);
++ SDL_modelist[i] = NULL;
++ }
++ }
++
++ if ( Caca_bitmap ) {
++ caca_free_bitmap( Caca_bitmap );
++ Caca_bitmap = NULL;
++ }
++
++ caca_end();
++
++ SDL_DestroyMutex(Caca_mutex);
++}
++
+Index: libsdl1.2-1.2.11/src/video/caca/SDL_cacavideo.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.11/src/video/caca/SDL_cacavideo.h 2006-09-29 11:22:03.000000000 +0200
+@@ -0,0 +1,76 @@
++/*
++ SDL - Simple DirectMedia Layer
++ Copyright (C) 2003 Sam Hocevar
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with this library; if not, write to the Free
++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++ Sam Hocevar
++ sam at zoy.org
++*/
++
++#ifdef SAVE_RCSID
++static char rcsid =
++ "@(#) $Id: libsdl-1.2.11-libcaca.patch,v 1.1 2006/09/18 16:06:06 mr_bones_ Exp $";
++#endif
++
++#ifndef _SDL_cacavideo_h
++#define _SDL_cacavideo_h
++
++#include "SDL_mouse.h"
++#include "../SDL_sysvideo.h"
++#include "SDL_mutex.h"
++
++#include <sys/time.h>
++#include <time.h>
++
++#include <caca.h>
++#ifdef CACA_API_VERSION_1
++#include <caca0.h>
++#endif
++
++/* Hidden "this" pointer for the video functions */
++#define _THIS SDL_VideoDevice *this
++
++#define SDL_NUMMODES 6
++
++/* Private display data */
++struct SDL_PrivateVideoData {
++ SDL_Rect *SDL_modelist[SDL_NUMMODES+1];
++ SDL_mutex *mutex;
++
++ struct caca_bitmap *bitmap;
++ void *buffer;
++ int w, h;
++
++ int lastkey;
++ struct timeval lasttime;
++};
++
++/* Old variable names */
++#define SDL_modelist (this->hidden->SDL_modelist)
++#define Caca_palette (this->hidden->palette)
++#define Caca_bitmap (this->hidden->bitmap)
++#define Caca_buffer (this->hidden->buffer)
++
++#define Caca_w (this->hidden->w)
++#define Caca_h (this->hidden->h)
++
++#define Caca_lastkey (this->hidden->lastkey)
++#define Caca_lasttime (this->hidden->lasttime)
++
++#define Caca_mutex (this->hidden->mutex)
++
++#endif /* _SDL_cacavideo_h */
++
+Index: libsdl1.2-1.2.11/src/video/SDL_sysvideo.h
+===================================================================
+--- libsdl1.2-1.2.11.orig/src/video/SDL_sysvideo.h 2006-09-29 11:21:46.000000000 +0200
++++ libsdl1.2-1.2.11/src/video/SDL_sysvideo.h 2006-09-29 11:22:03.000000000 +0200
+@@ -404,6 +404,9 @@
+ #if SDL_VIDEO_DRIVER_AALIB
+ extern VideoBootStrap AALIB_bootstrap;
+ #endif
++#if SDL_VIDEO_DRIVER_CACA
++extern VideoBootStrap CACA_bootstrap;
++#endif
+ #if SDL_VIDEO_DRIVER_DUMMY
+ extern VideoBootStrap DUMMY_bootstrap;
+ #endif
+Index: libsdl1.2-1.2.11/src/video/SDL_video.c
+===================================================================
+--- libsdl1.2-1.2.11.orig/src/video/SDL_video.c 2006-09-29 11:21:46.000000000 +0200
++++ libsdl1.2-1.2.11/src/video/SDL_video.c 2006-09-29 11:22:03.000000000 +0200
+@@ -120,6 +120,9 @@
+ #if SDL_VIDEO_DRIVER_AALIB
+ &AALIB_bootstrap,
+ #endif
++#if SDL_VIDEO_DRIVER_CACA
++ &CACA_bootstrap,
++#endif
+ #if SDL_VIDEO_DRIVER_DUMMY
+ &DUMMY_bootstrap,
+ #endif
+Index: libsdl1.2-1.2.11/include/SDL_config.h.in
+===================================================================
+--- libsdl1.2-1.2.11.orig/include/SDL_config.h.in 2006-09-29 11:29:01.000000000 +0200
++++ libsdl1.2-1.2.11/include/SDL_config.h.in 2006-09-29 11:29:27.000000000 +0200
+@@ -250,6 +250,7 @@
+ /* Enable various video drivers */
+ #undef SDL_VIDEO_DRIVER_AALIB
+ #undef SDL_VIDEO_DRIVER_BWINDOW
++#undef SDL_VIDEO_DRIVER_CACA
+ #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS
+ #undef SDL_VIDEO_DRIVER_DC
+ #undef SDL_VIDEO_DRIVER_DDRAW
Modified: unstable/libsdl1.2/debian/patches/100_relibtoolize.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/100_relibtoolize.diff 2006-09-29 06:54:33 UTC (rev 99)
+++ unstable/libsdl1.2/debian/patches/100_relibtoolize.diff 2006-09-29 12:57:27 UTC (rev 100)
@@ -1,7 +1,7 @@
Index: libsdl1.2-1.2.11/configure
===================================================================
--- libsdl1.2-1.2.11.orig/configure 2006-06-27 06:48:54.000000000 +0200
-+++ libsdl1.2-1.2.11/configure 2006-09-29 08:52:46.000000000 +0200
++++ libsdl1.2-1.2.11/configure 2006-09-29 09:02:57.000000000 +0200
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -677,7 +677,7 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -429,42 +719,180 @@
+@@ -429,42 +719,181 @@
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -831,6 +831,7 @@
+X_EXTRA_LIBS
+DIRECTFBCONFIG
+PKG_CONFIG
++CACACONFIG
+OSMESA_CONFIG
+PTH_CONFIG
+SDL_CFLAGS
@@ -872,7 +873,7 @@
# Initialize some variables set by options.
ac_init_help=
-@@ -491,34 +919,48 @@
+@@ -491,34 +920,48 @@
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
@@ -928,7 +929,7 @@
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -540,12 +982,18 @@
+@@ -540,12 +983,18 @@
--config-cache | -C)
cache_file=config.cache ;;
@@ -950,7 +951,7 @@
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
-@@ -553,7 +1001,17 @@
+@@ -553,7 +1002,17 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -969,7 +970,7 @@
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -562,11 +1020,7 @@
+@@ -562,11 +1021,7 @@
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -982,7 +983,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -593,6 +1047,12 @@
+@@ -593,6 +1048,12 @@
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -995,7 +996,7 @@
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -617,13 +1077,16 @@
+@@ -617,13 +1078,16 @@
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -1016,7 +1017,7 @@
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -688,6 +1151,16 @@
+@@ -688,6 +1152,16 @@
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -1033,7 +1034,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -744,11 +1217,7 @@
+@@ -744,11 +1218,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -1046,7 +1047,7 @@
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -757,7 +1226,7 @@
+@@ -757,7 +1227,7 @@
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -1055,7 +1056,7 @@
--x)
# Obsolete; use --with-x.
-@@ -788,8 +1257,7 @@
+@@ -788,8 +1258,7 @@
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
@@ -1065,7 +1066,7 @@
export $ac_envvar ;;
*)
-@@ -809,27 +1277,19 @@
+@@ -809,27 +1278,19 @@
{ (exit 1); exit 1; }; }
fi
@@ -1103,7 +1104,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -856,94 +1316,76 @@
+@@ -856,94 +1317,76 @@
test "$silent" = yes && exec 6>/dev/null
@@ -1252,7 +1253,7 @@
#
# Report the --help message.
-@@ -972,9 +1414,6 @@
+@@ -972,9 +1415,6 @@
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
@@ -1262,7 +1263,7 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
-@@ -992,15 +1431,22 @@
+@@ -992,15 +1432,22 @@
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
@@ -1288,7 +1289,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -1022,10 +1468,8 @@
+@@ -1022,10 +1469,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -1301,7 +1302,15 @@
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
-@@ -1125,8 +1569,7 @@
+@@ -1093,6 +1538,7 @@
+ --enable-video-vgl use VGL video driver [default=yes]
+ --enable-video-wscons use wscons video driver [default=yes]
+ --enable-video-aalib use AAlib video driver [default=no]
++ --enable-video-caca use libcaca video driver [default=no]
+ --enable-video-qtopia use Qtopia video driver [default=no]
+ --enable-video-picogui use PicoGUI video driver [default=no]
+ --enable-video-xbios use Atari Xbios video driver [default=yes]
+@@ -1125,8 +1571,7 @@
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-pic try to use only PIC/non-PIC objects [default=use
both]
@@ -1311,7 +1320,7 @@
--with-alsa-prefix=PFX Prefix where Alsa library is installed(optional)
--with-alsa-inc-prefix=PFX Prefix where include libraries are (optional)
--with-esd-prefix=PFX Prefix where ESD is installed (optional)
-@@ -1138,131 +1581,100 @@
+@@ -1138,131 +1583,100 @@
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -1494,7 +1503,7 @@
{
cat <<_ASUNAME
## --------- ##
-@@ -1281,7 +1693,7 @@
+@@ -1281,7 +1695,7 @@
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -1503,7 +1512,7 @@
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1295,6 +1707,7 @@
+@@ -1295,6 +1709,7 @@
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
@@ -1511,7 +1520,7 @@
} >&5
-@@ -1316,7 +1729,6 @@
+@@ -1316,7 +1731,6 @@
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -1519,7 +1528,7 @@
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1327,7 +1739,7 @@
+@@ -1327,7 +1741,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -1528,7 +1537,7 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1349,9 +1761,7 @@
+@@ -1349,9 +1763,7 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1539,7 +1548,7 @@
;;
esac
done
-@@ -1362,8 +1772,8 @@
+@@ -1362,8 +1774,8 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
@@ -1550,7 +1559,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1376,20 +1786,34 @@
+@@ -1376,20 +1788,34 @@
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -1595,7 +1604,7 @@
echo
cat <<\_ASBOX
-@@ -1400,22 +1824,28 @@
+@@ -1400,22 +1826,28 @@
echo
for ac_var in $ac_subst_vars
do
@@ -1631,7 +1640,7 @@
done | sort
echo
fi
-@@ -1427,26 +1857,24 @@
+@@ -1427,26 +1859,24 @@
## ----------- ##
_ASBOX
echo
@@ -1663,7 +1672,7 @@
# Predefined preprocessor variables.
-@@ -1477,14 +1905,17 @@
+@@ -1477,14 +1907,17 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -1688,7 +1697,7 @@
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1500,8 +1931,8 @@
+@@ -1500,8 +1933,8 @@
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -1699,7 +1708,7 @@
esac
fi
else
-@@ -1513,12 +1944,11 @@
+@@ -1513,12 +1946,11 @@
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -1715,7 +1724,7 @@
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1543,8 +1973,7 @@
+@@ -1543,8 +1975,7 @@
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -1725,7 +1734,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1561,12 +1990,6 @@
+@@ -1561,12 +1992,6 @@
{ (exit 1); exit 1; }; }
fi
@@ -1738,7 +1747,7 @@
-@@ -1583,9 +2006,14 @@
+@@ -1583,9 +2008,14 @@
@@ -1754,7 +1763,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -1631,15 +2059,15 @@
+@@ -1631,15 +2061,15 @@
ac_aux_dir=
for ac_dir in $srcdir/build-scripts; do
@@ -1773,7 +1782,7 @@
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/shtool install -c"
break
-@@ -1650,62 +2078,97 @@
+@@ -1650,62 +2080,97 @@
echo "$as_me: error: cannot find install-sh or install.sh in $srcdir/build-scripts" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1904,7 +1913,7 @@
ac_ext=c
-@@ -1716,8 +2179,8 @@
+@@ -1716,8 +2181,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -1915,7 +1924,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1730,32 +2193,34 @@
+@@ -1730,32 +2195,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1957,7 +1966,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1768,36 +2233,51 @@
+@@ -1768,36 +2235,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2019,7 +2028,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1810,74 +2290,34 @@
+@@ -1810,74 +2292,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2103,7 +2112,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1891,7 +2331,7 @@
+@@ -1891,7 +2333,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2112,7 +2121,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -1902,6 +2342,7 @@
+@@ -1902,6 +2344,7 @@
fi
done
done
@@ -2120,7 +2129,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -1919,22 +2360,23 @@
+@@ -1919,22 +2362,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2151,7 +2160,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1947,36 +2389,38 @@
+@@ -1947,36 +2391,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2198,7 +2207,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1989,29 +2433,45 @@
+@@ -1989,29 +2435,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -2250,7 +2259,7 @@
fi
fi
-@@ -2024,21 +2484,35 @@
+@@ -2024,21 +2486,35 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -2294,7 +2303,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2063,47 +2537,77 @@
+@@ -2063,47 +2539,77 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2394,7 +2403,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2115,19 +2619,21 @@
+@@ -2115,19 +2621,21 @@
fi
ac_exeext=$ac_cv_exeext
@@ -2423,7 +2432,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2146,22 +2652,27 @@
+@@ -2146,22 +2654,27 @@
fi
fi
fi
@@ -2463,7 +2472,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2172,9 +2683,8 @@
+@@ -2172,9 +2685,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -2474,7 +2483,7 @@
break;;
* ) break;;
esac
-@@ -2188,14 +2698,14 @@
+@@ -2188,14 +2700,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -2493,7 +2502,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2215,14 +2725,20 @@
+@@ -2215,14 +2727,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2518,7 +2527,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2240,12 +2756,12 @@
+@@ -2240,12 +2758,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -2535,7 +2544,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2268,24 +2784,36 @@
+@@ -2268,24 +2786,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -2580,7 +2589,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2294,24 +2822,28 @@
+@@ -2294,24 +2824,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2617,7 +2626,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -2327,24 +2859,147 @@
+@@ -2327,24 +2861,147 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -2773,7 +2782,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2353,12 +3008,20 @@
+@@ -2353,12 +3010,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2798,7 +2807,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -2374,12 +3037,12 @@
+@@ -2374,12 +3039,12 @@
CFLAGS=
fi
fi
@@ -2815,7 +2824,7 @@
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2413,12 +3076,17 @@
+@@ -2413,12 +3078,17 @@
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
@@ -2835,7 +2844,7 @@
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
-@@ -2433,378 +3101,506 @@
+@@ -2433,378 +3103,506 @@
return 0;
}
_ACEOF
@@ -3612,7 +3621,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2812,1357 +3608,1264 @@
+@@ -2812,1357 +3610,1264 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -4737,28 +4746,24 @@
-
-
-
--
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
+if test x$ac_cv_c_bigendian = xyes; then
+ cat >>confdefs.h <<\_ACEOF
+#define SDL_BYTEORDER 4321
+_ACEOF
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
+else
+ cat >>confdefs.h <<\_ACEOF
+#define SDL_BYTEORDER 1234
+_ACEOF
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++fi
+
-# Allow CC to be a program name with arguments.
-compiler=$CC
-+fi
-
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
-- enableval="$enable_libtool_lock"
+INCLUDE="-I$srcdir/include"
+if test x$srcdir != x.; then
+ # Remove SDL_config.h from the source directory, since it's the
@@ -4798,6 +4803,10 @@
+CFLAGS="$CFLAGS $EXTRA_CFLAGS"
+LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+- enableval="$enable_libtool_lock"
+
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
@@ -4859,7 +4868,7 @@
- fi
- rm -rf conftest*
- ;;
-
+-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
@@ -5057,10 +5066,7 @@
- fi
- rm -rf conftest*
- ;;
-+else
-+ enable_fast_install=yes
-+fi
-
+-
-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
@@ -5068,14 +5074,53 @@
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$DLLTOOL"; then
+- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
+-fi
+-DLLTOOL=$ac_cv_prog_DLLTOOL
+-if test -n "$DLLTOOL"; then
+- echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+-echo "${ECHO_T}$DLLTOOL" >&6
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ enable_fast_install=yes
+ fi
+
+-fi
+-if test -z "$ac_cv_prog_DLLTOOL"; then
+- ac_ct_DLLTOOL=$DLLTOOL
+- # Extract the first word of "dlltool", so it can be a program name with args.
+-set dummy dlltool; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+
+{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
+if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test -n "$DLLTOOL"; then
-- ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+- if test -n "$ac_ct_DLLTOOL"; then
+- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
+ # Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
@@ -5086,7 +5131,7 @@
test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
@@ -5129,12 +5174,13 @@
+ done
done
+- test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
+-fi
fi
--fi
--DLLTOOL=$ac_cv_prog_DLLTOOL
--if test -n "$DLLTOOL"; then
-- echo "$as_me:$LINENO: result: $DLLTOOL" >&5
--echo "${ECHO_T}$DLLTOOL" >&6
+-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+-if test -n "$ac_ct_DLLTOOL"; then
+- echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
+
+SED=$lt_cv_path_SED
+{ echo "$as_me:$LINENO: result: $SED" >&5
@@ -5150,6 +5196,7 @@
+ with_gnu_ld=no
fi
+- DLLTOOL=$ac_ct_DLLTOOL
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
@@ -5185,44 +5232,23 @@
+elif test "$with_gnu_ld" = yes; then
+ { echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-+else
+ else
+- DLLTOOL="$ac_cv_prog_DLLTOOL"
+ { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
fi
--if test -z "$ac_cv_prog_DLLTOOL"; then
-- ac_ct_DLLTOOL=$DLLTOOL
-- # Extract the first word of "dlltool", so it can be a program name with args.
--set dummy dlltool; ac_word=$2
+-
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
+-if test "${ac_cv_prog_AS+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test -n "$ac_ct_DLLTOOL"; then
-- ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
-- test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
--fi
--fi
--ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
--if test -n "$ac_ct_DLLTOOL"; then
-- echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
--echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
+- if test -n "$AS"; then
+- ac_cv_prog_AS="$AS" # Let the user override the test.
+ if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
@@ -5245,40 +5271,49 @@
+ done
+ IFS="$lt_save_ifs"
else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_AS="${ac_tool_prefix}as"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-
+-fi
++ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+-AS=$ac_cv_prog_AS
+-if test -n "$AS"; then
+- echo "$as_me:$LINENO: result: $AS" >&5
+-echo "${ECHO_T}$AS" >&6
+-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
fi
-- DLLTOOL=$ac_ct_DLLTOOL
+-fi
+-if test -z "$ac_cv_prog_AS"; then
+- ac_ct_AS=$AS
+- # Extract the first word of "as", so it can be a program name with args.
+-set dummy as; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_AS"; then
+- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
else
-- DLLTOOL="$ac_cv_prog_DLLTOOL"
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
--
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
--set dummy ${ac_tool_prefix}as; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_AS+set}" = set; then
-+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-+ { (exit 1); exit 1; }; }
-+{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test -n "$AS"; then
-- ac_cv_prog_AS="$AS" # Let the user override the test.
--else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
@@ -5286,14 +5321,32 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_AS="${ac_tool_prefix}as"
+- ac_cv_prog_ac_ct_AS="as"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
+- test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
-fi
+-ac_ct_AS=$ac_cv_prog_ac_ct_AS
+-if test -n "$ac_ct_AS"; then
+- echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+-echo "${ECHO_T}$ac_ct_AS" >&6
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++ { (exit 1); exit 1; }; }
++{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
@@ -5304,22 +5357,18 @@
+ ;;
+esac
fi
--AS=$ac_cv_prog_AS
--if test -n "$AS"; then
-- echo "$as_me:$LINENO: result: $AS" >&5
--echo "${ECHO_T}$AS" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+- AS=$ac_ct_AS
+
-+
+{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
+if test "${lt_cv_ld_reload_flag+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+- AS="$ac_cv_prog_AS"
+ lt_cv_ld_reload_flag='-r'
fi
+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
@@ -5340,21 +5389,19 @@
+ ;;
+esac
--fi
--if test -z "$ac_cv_prog_AS"; then
-- ac_ct_AS=$AS
-- # Extract the first word of "as", so it can be a program name with args.
--set dummy as; ac_word=$2
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
+if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test -n "$ac_ct_AS"; then
-- ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+- if test -n "$OBJDUMP"; then
+- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+ if test -n "$NM"; then
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
@@ -5366,7 +5413,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_AS="as"
+- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ lt_nm_to_check="${ac_tool_prefix}nm"
@@ -5376,8 +5423,6 @@
-done
-done
-
-- test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
--fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
@@ -5413,19 +5458,15 @@
+ done
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
--ac_ct_AS=$ac_cv_prog_ac_ct_AS
--if test -n "$ac_ct_AS"; then
-- echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
--echo "${ECHO_T}$ac_ct_AS" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
fi
+-OBJDUMP=$ac_cv_prog_OBJDUMP
+-if test -n "$OBJDUMP"; then
+- echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+-echo "${ECHO_T}$OBJDUMP" >&6
+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
+NM="$lt_cv_path_NM"
-
-- AS=$ac_ct_AS
++
+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+LN_S=$as_ln_s
@@ -5433,24 +5474,27 @@
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
else
-- AS="$ac_cv_prog_AS"
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
fi
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
--set dummy ${ac_tool_prefix}objdump; ac_word=$2
+-fi
+-if test -z "$ac_cv_prog_OBJDUMP"; then
+- ac_ct_OBJDUMP=$OBJDUMP
+- # Extract the first word of "objdump", so it can be a program name with args.
+-set dummy objdump; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_OBJDUMP+set}" = set; then
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-- if test -n "$OBJDUMP"; then
-- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+- if test -n "$ac_ct_OBJDUMP"; then
+- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
@@ -5459,7 +5503,7 @@
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+- ac_cv_prog_ac_ct_OBJDUMP="objdump"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -5525,11 +5569,26 @@
-done
-done
+ ;;
-+
+
+- test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
+-fi
+-fi
+-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+-if test -n "$ac_ct_OBJDUMP"; then
+- echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+-echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-+
+
+- OBJDUMP=$ac_ct_OBJDUMP
+-else
+- OBJDUMP="$ac_cv_prog_OBJDUMP"
+-fi
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
@@ -5547,12 +5606,13 @@
+ ;;
+ esac
+ ;;
-+
+
+interix3*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-+ ;;
-+
+ ;;
+
+-esac
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
@@ -5562,12 +5622,13 @@
+ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-+
+
+-need_locks="$enable_libtool_lock"
+# This must be Linux ELF.
+linux* | k*bsd*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-+
+
+netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
@@ -5576,123 +5637,6 @@
+ fi
+ ;;
--fi
--fi
--OBJDUMP=$ac_cv_prog_OBJDUMP
--if test -n "$OBJDUMP"; then
-- echo "$as_me:$LINENO: result: $OBJDUMP" >&5
--echo "${ECHO_T}$OBJDUMP" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+newos6*)
-+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-+ lt_cv_file_magic_cmd=/usr/bin/file
-+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+ ;;
-
--fi
--if test -z "$ac_cv_prog_OBJDUMP"; then
-- ac_ct_OBJDUMP=$OBJDUMP
-- # Extract the first word of "objdump", so it can be a program name with args.
--set dummy objdump; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_OBJDUMP"; then
-- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_OBJDUMP="objdump"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-+nto-qnx*)
-+ lt_cv_deplibs_check_method=unknown
-+ ;;
-+
-+openbsd*)
-+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-+ else
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
- fi
--done
--done
-+ ;;
-
-- test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
--fi
--fi
--ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
--if test -n "$ac_ct_OBJDUMP"; then
-- echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
--echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+osf3* | osf4* | osf5*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
-- OBJDUMP=$ac_ct_OBJDUMP
--else
-- OBJDUMP="$ac_cv_prog_OBJDUMP"
--fi
-+solaris*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-
-+sysv4 | sysv4.3*)
-+ case $host_vendor in
-+ motorola)
-+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+ ;;
-+ ncr)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ sequent)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+ ;;
-+ sni)
-+ lt_cv_file_magic_cmd='/bin/file'
-+ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-+ lt_cv_file_magic_test_file=/lib/libc.so
-+ ;;
-+ siemens)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ pc)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
-+ esac
- ;;
-
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+ lt_cv_deplibs_check_method=pass_all
-+ ;;
- esac
-
--need_locks="$enable_libtool_lock"
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5744,9 +5688,23 @@
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
++newos6*)
++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++ lt_cv_file_magic_cmd=/usr/bin/file
++ lt_cv_file_magic_test_file=/usr/lib/libnls.so
++ ;;
++
++nto-qnx*)
++ lt_cv_deplibs_check_method=unknown
++ ;;
++
++openbsd*)
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
- ac_cpp_err=
-- fi
++ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ fi
-else
- ac_cpp_err=yes
-fi
@@ -5755,11 +5713,57 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ ;;
++
++osf3* | osf4* | osf5*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++solaris*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++
++sysv4 | sysv4.3*)
++ case $host_vendor in
++ motorola)
++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++ ;;
++ ncr)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ sequent)
++ lt_cv_file_magic_cmd='/bin/file'
++ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++ ;;
++ sni)
++ lt_cv_file_magic_cmd='/bin/file'
++ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++ lt_cv_file_magic_test_file=/lib/libc.so
++ ;;
++ siemens)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++ esac
++ ;;
++
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
++esac
- # Broken: fails on valid input.
-continue
--fi
+ fi
-rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
- # OK, works on sane cases. Now check whether non-existent headers
- # can be detected and how.
@@ -5794,22 +5798,28 @@
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- break
+-fi
+
+- done
+- ac_cv_prog_CPP=$CPP
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
@@ -5817,12 +5827,6 @@
+if test "${enable_libtool_lock+set}" = set; then
+ enableval=$enable_libtool_lock;
fi
-
-- done
-- ac_cv_prog_CPP=$CPP
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
--fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
@@ -5853,6 +5857,9 @@
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
@@ -5861,8 +5868,17 @@
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
@@ -5872,12 +5888,38 @@
+ HPUX_IA64_MODE="64"
+ ;;
+ esac
-+ fi
+ fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- :
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+- # OK, works on sane cases. Now check whether non-existent headers
+- # can be detected and how.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out which ABI we are using.
-+ echo '#line 4767 "configure"' > conftest.$ac_ext
++ echo '#line 4769 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
ac_status=$?
@@ -5922,46 +5964,39 @@
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-- :
+- # Broken: success on invalid input.
+-continue
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- # Broken: fails on valid input.
--continue
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
-fi
-rm -f conftest.err conftest.$ac_ext
+ rm -rf conftest*
+ ;;
-- # OK, works on sane cases. Now check whether non-existent headers
-- # can be detected and how.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <ac_nonexistent.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+- :
+-else
+- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
@@ -5997,30 +6032,11 @@
+ esac
+ ;;
+ esac
- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- # Broken: success on invalid input.
--continue
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.$ac_ext
++ fi
+ rm -rf conftest*
+ ;;
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
-- :
+-ac_ext=c
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
@@ -6029,15 +6045,7 @@
+echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
+if test "${lt_cv_cc_needs_belf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--fi
--
--ac_ext=c
++else
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6064,7 +6072,7 @@
int
main ()
-@@ -4172,236 +4875,397 @@
+@@ -4172,236 +4877,397 @@
return 0;
}
_ACEOF
@@ -6120,8 +6128,18 @@
-ac_cv_header_stdc=no
+ lt_cv_cc_needs_belf=no
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+-if test $ac_cv_header_stdc = yes; then
+- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <string.h>
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
@@ -6129,7 +6147,11 @@
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
+
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "memchr" >/dev/null 2>&1; then
+- :
+fi
+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
@@ -6166,7 +6188,8 @@
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+- ac_cv_header_stdc=no
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
@@ -6194,10 +6217,11 @@
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+-rm -f conftest*
+
-+
-+fi
+
+ fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
@@ -6224,36 +6248,31 @@
+done
+done
+IFS=$as_save_IFS
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--
+
-if test $ac_cv_header_stdc = yes; then
-- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
--#include <string.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "memchr" >/dev/null 2>&1; then
-- :
+-#include <stdlib.h>
+fi
++fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
- else
-- ac_cv_header_stdc=no
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
--rm -f conftest*
++fi
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+- $EGREP "free" >/dev/null 2>&1; then
+- :
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
@@ -6269,19 +6288,12 @@
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
-+else
+ else
+- ac_cv_header_stdc=no
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
fi
+-rm -f conftest*
--if test $ac_cv_header_stdc = yes; then
-- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <stdlib.h>
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -6307,30 +6319,23 @@
+done
+done
+IFS=$as_save_IFS
-
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-- $EGREP "free" >/dev/null 2>&1; then
-- :
++
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ { echo "$as_me:$LINENO: result: $AS" >&5
+echo "${ECHO_T}$AS" >&6; }
- else
-- ac_cv_header_stdc=no
++else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
fi
--rm -f conftest*
--fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
- :
++
+fi
+if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
@@ -6358,7 +6363,24 @@
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
--
++ if test -n "$ac_ct_AS"; then
++ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_AS="as"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
+
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
@@ -6383,33 +6405,8 @@
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- :
-+ if test -n "$ac_ct_AS"; then
-+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
- else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_AS="as"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-
--( exit $ac_status )
--ac_cv_header_stdc=no
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
++fi
++fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
@@ -6417,15 +6414,8 @@
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
--if test $ac_cv_header_stdc = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
--_ACEOF
-
++fi
++
+ if test "x$ac_ct_AS" = x; then
+ AS="false"
+ else
@@ -6443,15 +6433,8 @@
+ fi
+else
+ AS="$ac_cv_prog_AS"
- fi
-
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
++fi
++
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -6462,7 +6445,10 @@
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-+else
+ else
+- echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
@@ -6478,8 +6464,12 @@
+done
+IFS=$as_save_IFS
-+fi
-+fi
+-( exit $ac_status )
+-ac_cv_header_stdc=no
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
@@ -6487,9 +6477,27 @@
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+-if test $ac_cv_header_stdc = yes; then
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
+ fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
@@ -6497,7 +6505,6 @@
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
@@ -6634,7 +6641,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4412,24 +5276,36 @@
+@@ -4412,24 +5278,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -6679,7 +6686,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4438,15 +5314,16 @@
+@@ -4438,15 +5316,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6702,7 +6709,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4455,8 +5332,13 @@
+@@ -4455,8 +5334,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -6718,7 +6725,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4480,9 +5362,10 @@
+@@ -4480,9 +5364,10 @@
ac_header_preproc=no
fi
@@ -6731,7 +6738,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4506,25 +5389,19 @@
+@@ -4506,25 +5391,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -6764,7 +6771,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4536,18 +5413,22 @@
+@@ -4536,18 +5415,22 @@
done
@@ -6792,7 +6799,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4560,36 +5441,38 @@
+@@ -4560,36 +5443,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6839,7 +6846,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4602,55 +5485,85 @@
+@@ -4602,55 +5487,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6943,7 +6950,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4673,24 +5586,36 @@
+@@ -4673,24 +5588,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -6988,7 +6995,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4699,24 +5624,28 @@
+@@ -4699,24 +5626,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7025,7 +7032,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -4732,24 +5661,36 @@
+@@ -4732,24 +5663,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7070,7 +7077,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4758,70 +5699,53 @@
+@@ -4758,70 +5701,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7165,7 +7172,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4830,62 +5754,92 @@
+@@ -4830,62 +5756,92 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7281,7 +7288,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4896,13 +5850,13 @@
+@@ -4896,13 +5852,13 @@
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
@@ -7298,7 +7305,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4932,8 +5886,13 @@
+@@ -4932,8 +5888,13 @@
#endif
Syntax error
_ACEOF
@@ -7314,7 +7321,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4958,9 +5917,10 @@
+@@ -4958,9 +5919,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7326,7 +7333,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4970,8 +5930,13 @@
+@@ -4970,8 +5932,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7342,7 +7349,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4998,6 +5963,7 @@
+@@ -4998,6 +5965,7 @@
ac_preproc_ok=:
break
fi
@@ -7350,7 +7357,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -5015,8 +5981,8 @@
+@@ -5015,8 +5983,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -7361,7 +7368,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -5039,8 +6005,13 @@
+@@ -5039,8 +6007,13 @@
#endif
Syntax error
_ACEOF
@@ -7377,7 +7384,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -5065,9 +6036,10 @@
+@@ -5065,9 +6038,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7389,7 +7396,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5077,8 +6049,13 @@
+@@ -5077,8 +6051,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7405,7 +7412,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -5105,6 +6082,7 @@
+@@ -5105,6 +6084,7 @@
ac_preproc_ok=:
break
fi
@@ -7413,7 +7420,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -5120,7 +6098,7 @@
+@@ -5120,7 +6100,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -7422,7 +7429,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5134,12 +6112,12 @@
+@@ -5134,12 +6114,12 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
@@ -7438,7 +7445,7 @@
if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5152,36 +6130,38 @@
+@@ -5152,36 +6132,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7485,7 +7492,7 @@
if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5194,48 +6174,78 @@
+@@ -5194,48 +6176,78 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7578,7 +7585,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -5245,8 +6255,8 @@
+@@ -5245,8 +6257,8 @@
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -7589,7 +7596,7 @@
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5259,24 +6269,36 @@
+@@ -5259,24 +6271,36 @@
end
_ACEOF
rm -f conftest.$ac_objext
@@ -7634,7 +7641,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5285,20 +6307,21 @@
+@@ -5285,20 +6309,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7662,7 +7669,7 @@
if test "${ac_cv_prog_f77_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5309,24 +6332,36 @@
+@@ -5309,24 +6334,36 @@
end
_ACEOF
rm -f conftest.$ac_objext
@@ -7707,7 +7714,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5335,13 +6370,14 @@
+@@ -5335,13 +6372,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7726,7 +7733,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -5370,8 +6406,8 @@
+@@ -5370,8 +6408,8 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
# find the maximum length of command line arguments
@@ -7737,7 +7744,7 @@
if test "${lt_cv_sys_max_cmd_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5405,12 +6441,6 @@
+@@ -5405,12 +6443,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -7750,7 +7757,7 @@
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5485,19 +6515,19 @@
+@@ -5485,19 +6517,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -7776,7 +7783,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5532,7 +6562,7 @@
+@@ -5532,7 +6564,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
@@ -7785,7 +7792,7 @@
if test "$host_cpu" = ia64; then
symcode='[ABCDGIRSTW]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -5701,15 +6731,15 @@
+@@ -5701,15 +6733,15 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -7807,7 +7814,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5723,8 +6753,8 @@
+@@ -5723,8 +6755,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -7818,7 +7825,7 @@
objdir=$lt_cv_objdir
-@@ -5775,8 +6805,8 @@
+@@ -5775,8 +6807,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -7829,7 +7836,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5789,32 +6819,34 @@
+@@ -5789,32 +6821,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7871,7 +7878,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5827,27 +6859,41 @@
+@@ -5827,27 +6861,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7920,7 +7927,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -5855,8 +6901,8 @@
+@@ -5855,8 +6903,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -7931,7 +7938,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5869,32 +6915,34 @@
+@@ -5869,32 +6917,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7973,7 +7980,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5907,27 +6955,41 @@
+@@ -5907,27 +6957,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8022,7 +8029,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -5935,8 +6997,8 @@
+@@ -5935,8 +6999,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -8033,7 +8040,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5949,32 +7011,34 @@
+@@ -5949,32 +7013,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8075,7 +8082,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5987,27 +7051,41 @@
+@@ -5987,27 +7053,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8124,7 +8131,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -6066,8 +7144,8 @@
+@@ -6066,8 +7146,8 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -8135,7 +8142,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6119,17 +7197,17 @@
+@@ -6119,17 +7199,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -8159,7 +8166,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6181,11 +7259,11 @@
+@@ -6181,11 +7261,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -8175,7 +8182,7 @@
fi
else
-@@ -6200,21 +7278,21 @@
+@@ -6200,21 +7280,21 @@
enable_dlopen=no
enable_win32_dll=yes
@@ -8204,7 +8211,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -6265,10 +7343,6 @@
+@@ -6265,10 +7345,6 @@
$rm conftest*
@@ -8215,7 +8222,7 @@
lt_prog_compiler_no_builtin_flag=
-@@ -6276,8 +7350,8 @@
+@@ -6276,8 +7352,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -8226,21 +8233,21 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6294,11 +7368,11 @@
+@@ -6294,11 +7370,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6297: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7371: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7373: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6301: \$? = $ac_status" >&5
-+ echo "$as_me:7375: \$? = $ac_status" >&5
++ echo "$as_me:7377: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -6311,8 +7385,8 @@
+@@ -6311,8 +7387,8 @@
$rm conftest*
fi
@@ -8251,7 +8258,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -6326,8 +7400,8 @@
+@@ -6326,8 +7402,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -8262,7 +8269,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -6456,7 +7530,7 @@
+@@ -6456,7 +7532,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -8271,7 +8278,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -6536,16 +7610,16 @@
+@@ -6536,16 +7612,16 @@
esac
fi
@@ -8292,21 +8299,21 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6562,11 +7636,11 @@
+@@ -6562,11 +7638,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6565: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7639: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7641: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6569: \$? = $ac_status" >&5
-+ echo "$as_me:7643: \$? = $ac_status" >&5
++ echo "$as_me:7645: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -6579,8 +7653,8 @@
+@@ -6579,8 +7655,8 @@
$rm conftest*
fi
@@ -8317,7 +8324,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -6607,8 +7681,8 @@
+@@ -6607,8 +7683,8 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -8328,7 +8335,7 @@
if test "${lt_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6635,8 +7709,8 @@
+@@ -6635,8 +7711,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -8339,7 +8346,7 @@
if test x"$lt_prog_compiler_static_works" = xyes; then
:
-@@ -6645,8 +7719,8 @@
+@@ -6645,8 +7721,8 @@
fi
@@ -8350,21 +8357,21 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6666,11 +7740,11 @@
+@@ -6666,11 +7742,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6669: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7743: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7745: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6673: \$? = $ac_status" >&5
-+ echo "$as_me:7747: \$? = $ac_status" >&5
++ echo "$as_me:7749: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -6692,23 +7766,23 @@
+@@ -6692,23 +7768,23 @@
$rm conftest*
fi
@@ -8394,7 +8401,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -6718,8 +7792,8 @@
+@@ -6718,8 +7794,8 @@
need_locks=no
fi
@@ -8405,7 +8412,7 @@
runpath_var=
allow_undefined_flag=
-@@ -6895,7 +7969,7 @@
+@@ -6895,7 +7971,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -8414,7 +8421,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6921,12 +7995,13 @@
+@@ -6921,12 +7997,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -8429,7 +8436,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -7134,24 +8209,36 @@
+@@ -7134,24 +8211,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8474,7 +8481,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7165,8 +8252,10 @@
+@@ -7165,8 +8254,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8486,7 +8493,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -7195,24 +8284,36 @@
+@@ -7195,24 +8286,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8531,7 +8538,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7226,8 +8327,10 @@
+@@ -7226,8 +8329,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8543,7 +8550,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -7358,7 +8461,7 @@
+@@ -7358,7 +8463,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8552,7 +8559,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -7460,7 +8563,7 @@
+@@ -7460,7 +8565,7 @@
link_all_deplibs=yes
;;
@@ -8561,7 +8568,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -7676,8 +8779,8 @@
+@@ -7676,8 +8781,8 @@
esac
fi
@@ -8572,7 +8579,7 @@
test "$ld_shlibs" = no && can_build_shared=no
#
-@@ -7697,8 +8800,8 @@
+@@ -7697,8 +8802,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -8583,7 +8590,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -7735,16 +8838,16 @@
+@@ -7735,16 +8840,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -8604,7 +8611,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -7883,14 +8986,12 @@
+@@ -7883,14 +8988,12 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -8621,7 +8628,7 @@
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
-@@ -7952,18 +9053,6 @@
+@@ -7952,18 +9055,6 @@
dynamic_linker=no
;;
@@ -8640,7 +8647,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -8119,7 +9208,7 @@
+@@ -8119,7 +9210,7 @@
;;
# This must be Linux ELF.
@@ -8649,7 +8656,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8148,7 +9237,7 @@
+@@ -8148,7 +9239,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8658,7 +8665,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8157,7 +9246,7 @@
+@@ -8157,7 +9248,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -8667,7 +8674,7 @@
;;
netbsd*)
-@@ -8333,8 +9422,8 @@
+@@ -8333,8 +9424,8 @@
dynamic_linker=no
;;
esac
@@ -8678,7 +8685,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -8342,8 +9431,8 @@
+@@ -8342,8 +9433,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -8689,7 +8696,7 @@
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
-@@ -8367,8 +9456,8 @@
+@@ -8367,8 +9458,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -8700,7 +8707,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -8381,29 +9470,29 @@
+@@ -8381,29 +9472,29 @@
striplib=
old_striplib=
@@ -8740,7 +8747,7 @@
;;
esac
fi
-@@ -8435,8 +9524,8 @@
+@@ -8435,8 +9526,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -8751,7 +8758,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8449,40 +9538,52 @@
+@@ -8449,40 +9540,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -8816,7 +8823,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8491,14 +9592,15 @@
+@@ -8491,14 +9594,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8836,7 +8843,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -8512,8 +9614,8 @@
+@@ -8512,8 +9616,8 @@
;;
*)
@@ -8847,7 +8854,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8540,53 +9642,59 @@
+@@ -8540,53 +9644,59 @@
#undef shl_load
@@ -8926,7 +8933,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8595,18 +9703,19 @@
+@@ -8595,18 +9705,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8952,7 +8959,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8619,40 +9728,52 @@
+@@ -8619,40 +9730,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -9017,7 +9024,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8661,19 +9782,20 @@
+@@ -8661,19 +9784,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9044,7 +9051,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8700,53 +9822,59 @@
+@@ -8700,53 +9824,59 @@
#undef dlopen
@@ -9123,7 +9130,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8755,18 +9883,19 @@
+@@ -8755,18 +9885,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9149,7 +9156,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8779,40 +9908,52 @@
+@@ -8779,40 +9910,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -9214,7 +9221,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8821,19 +9962,20 @@
+@@ -8821,19 +9964,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9241,7 +9248,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8846,40 +9988,52 @@
+@@ -8846,40 +9990,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -9306,7 +9313,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8888,19 +10042,20 @@
+@@ -8888,19 +10044,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9333,7 +9340,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8913,40 +10068,52 @@
+@@ -8913,40 +10070,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -9398,7 +9405,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8955,14 +10122,15 @@
+@@ -8955,14 +10124,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9418,7 +9425,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -9002,8 +10170,8 @@
+@@ -9002,8 +10172,8 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -9429,16 +9436,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9013,7 +10181,7 @@
+@@ -9013,7 +10183,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9016 "configure"
-+#line 10184 "configure"
++#line 10186 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9097,13 +10265,13 @@
+@@ -9097,13 +10267,13 @@
fi
@@ -9456,16 +9463,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9113,7 +10281,7 @@
+@@ -9113,7 +10283,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9116 "configure"
-+#line 10284 "configure"
++#line 10286 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9197,8 +10365,8 @@
+@@ -9197,8 +10367,8 @@
fi
@@ -9476,7 +9483,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -9220,13 +10388,13 @@
+@@ -9220,13 +10390,13 @@
# Report which library types will actually be built
@@ -9496,7 +9503,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -9246,15 +10414,15 @@
+@@ -9246,15 +10416,15 @@
fi
;;
esac
@@ -9518,7 +9525,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -9746,11 +10914,11 @@
+@@ -9746,11 +10916,11 @@
CC="$lt_save_CC"
@@ -9534,7 +9541,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -9804,7 +10972,7 @@
+@@ -9804,7 +10974,7 @@
if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
(test "X$CXX" != "Xg++"))) ; then
@@ -9543,7 +9550,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -9923,18 +11091,18 @@
+@@ -9923,18 +11093,18 @@
# Set up default GNU C++ configuration
@@ -9568,7 +9575,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -9963,11 +11131,11 @@
+@@ -9963,11 +11133,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9584,7 +9591,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10000,17 +11168,17 @@
+@@ -10000,17 +11170,17 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9608,7 +9615,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10024,8 +11192,8 @@
+@@ -10024,8 +11194,8 @@
;;
esac
fi
@@ -9619,7 +9626,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -10075,8 +11243,8 @@
+@@ -10075,8 +11245,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -9630,7 +9637,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -10188,24 +11356,36 @@
+@@ -10188,24 +11358,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9675,7 +9682,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10219,8 +11399,10 @@
+@@ -10219,8 +11401,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9687,7 +9694,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10250,24 +11432,36 @@
+@@ -10250,24 +11434,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9732,7 +9739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10281,8 +11475,10 @@
+@@ -10281,8 +11477,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9744,7 +9751,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10430,7 +11626,7 @@
+@@ -10430,7 +11628,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -9753,7 +9760,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -10589,7 +11785,7 @@
+@@ -10589,7 +11787,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -9762,7 +9769,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -10691,7 +11887,7 @@
+@@ -10691,7 +11889,7 @@
;;
esac
;;
@@ -9771,7 +9778,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -11013,17 +12209,13 @@
+@@ -11013,17 +12211,13 @@
ld_shlibs_CXX=no
;;
esac
@@ -9791,7 +9798,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
-@@ -11157,8 +12349,8 @@
+@@ -11157,8 +12351,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -9802,7 +9809,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -11262,7 +12454,7 @@
+@@ -11262,7 +12456,7 @@
;;
esac
;;
@@ -9811,7 +9818,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -11305,7 +12497,7 @@
+@@ -11305,7 +12499,7 @@
;;
esac
;;
@@ -9820,7 +9827,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -11348,7 +12540,7 @@
+@@ -11348,7 +12542,7 @@
;;
esac
;;
@@ -9829,7 +9836,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -11431,16 +12623,16 @@
+@@ -11431,16 +12625,16 @@
esac
fi
@@ -9850,21 +9857,21 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11457,11 +12649,11 @@
+@@ -11457,11 +12651,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11460: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12652: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11464: \$? = $ac_status" >&5
-+ echo "$as_me:12656: \$? = $ac_status" >&5
++ echo "$as_me:12658: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -11474,8 +12666,8 @@
+@@ -11474,8 +12668,8 @@
$rm conftest*
fi
@@ -9875,7 +9882,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -11502,8 +12694,8 @@
+@@ -11502,8 +12696,8 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -9886,7 +9893,7 @@
if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11530,8 +12722,8 @@
+@@ -11530,8 +12724,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -9897,7 +9904,7 @@
if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
:
-@@ -11540,8 +12732,8 @@
+@@ -11540,8 +12734,8 @@
fi
@@ -9908,21 +9915,21 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11561,11 +12753,11 @@
+@@ -11561,11 +12755,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11564: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:12756: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12758: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11568: \$? = $ac_status" >&5
-+ echo "$as_me:12760: \$? = $ac_status" >&5
++ echo "$as_me:12762: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -11587,23 +12779,23 @@
+@@ -11587,23 +12781,23 @@
$rm conftest*
fi
@@ -9952,7 +9959,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -11613,8 +12805,8 @@
+@@ -11613,8 +12807,8 @@
need_locks=no
fi
@@ -9963,7 +9970,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -11633,13 +12825,16 @@
+@@ -11633,13 +12827,16 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -9982,7 +9989,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
-@@ -11659,8 +12854,8 @@
+@@ -11659,8 +12856,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -9993,7 +10000,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -11697,16 +12892,16 @@
+@@ -11697,16 +12894,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -10014,7 +10021,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -11845,14 +13040,12 @@
+@@ -11845,14 +13042,12 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -10031,7 +10038,7 @@
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
-@@ -11914,18 +13107,6 @@
+@@ -11914,18 +13109,6 @@
dynamic_linker=no
;;
@@ -10050,7 +10057,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -12081,7 +13262,7 @@
+@@ -12081,7 +13264,7 @@
;;
# This must be Linux ELF.
@@ -10059,7 +10066,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12110,7 +13291,7 @@
+@@ -12110,7 +13293,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10068,7 +10075,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12119,7 +13300,7 @@
+@@ -12119,7 +13302,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -10077,7 +10084,7 @@
;;
netbsd*)
-@@ -12295,8 +13476,8 @@
+@@ -12295,8 +13478,8 @@
dynamic_linker=no
;;
esac
@@ -10088,7 +10095,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -12304,8 +13485,8 @@
+@@ -12304,8 +13487,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -10099,7 +10106,7 @@
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
-@@ -12329,8 +13510,8 @@
+@@ -12329,8 +13512,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -10110,7 +10117,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -12855,13 +14036,13 @@
+@@ -12855,13 +14038,13 @@
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
@@ -10130,7 +10137,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -12880,15 +14061,15 @@
+@@ -12880,15 +14063,15 @@
fi
;;
esac
@@ -10152,7 +10159,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -12897,8 +14078,8 @@
+@@ -12897,8 +14080,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -10163,7 +10170,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -13027,7 +14208,7 @@
+@@ -13027,7 +14210,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10172,7 +10179,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -13107,16 +14288,16 @@
+@@ -13107,16 +14290,16 @@
esac
fi
@@ -10193,21 +10200,21 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13133,11 +14314,11 @@
+@@ -13133,11 +14316,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13136: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14317: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14319: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13140: \$? = $ac_status" >&5
-+ echo "$as_me:14321: \$? = $ac_status" >&5
++ echo "$as_me:14323: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -13150,8 +14331,8 @@
+@@ -13150,8 +14333,8 @@
$rm conftest*
fi
@@ -10218,7 +10225,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -13178,8 +14359,8 @@
+@@ -13178,8 +14361,8 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
@@ -10229,7 +10236,7 @@
if test "${lt_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13206,8 +14387,8 @@
+@@ -13206,8 +14389,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10240,7 +10247,7 @@
if test x"$lt_prog_compiler_static_works_F77" = xyes; then
:
-@@ -13216,8 +14397,8 @@
+@@ -13216,8 +14399,8 @@
fi
@@ -10251,21 +10258,21 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13237,11 +14418,11 @@
+@@ -13237,11 +14420,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13240: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14421: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14423: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13244: \$? = $ac_status" >&5
-+ echo "$as_me:14425: \$? = $ac_status" >&5
++ echo "$as_me:14427: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13263,23 +14444,23 @@
+@@ -13263,23 +14446,23 @@
$rm conftest*
fi
@@ -10295,7 +10302,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -13289,8 +14470,8 @@
+@@ -13289,8 +14472,8 @@
need_locks=no
fi
@@ -10306,7 +10313,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -13466,7 +14647,7 @@
+@@ -13466,7 +14649,7 @@
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -10315,7 +10322,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -13492,12 +14673,13 @@
+@@ -13492,12 +14675,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -10330,7 +10337,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -13695,24 +14877,36 @@
+@@ -13695,24 +14879,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10375,7 +10382,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13726,8 +14920,10 @@
+@@ -13726,8 +14922,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10387,7 +10394,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13746,24 +14942,36 @@
+@@ -13746,24 +14944,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10432,7 +10439,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -13777,8 +14985,10 @@
+@@ -13777,8 +14987,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10444,7 +10451,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -13909,7 +15119,7 @@
+@@ -13909,7 +15121,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10453,7 +10460,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -14011,7 +15221,7 @@
+@@ -14011,7 +15223,7 @@
link_all_deplibs_F77=yes
;;
@@ -10462,7 +10469,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -14227,8 +15437,8 @@
+@@ -14227,8 +15439,8 @@
esac
fi
@@ -10473,7 +10480,7 @@
test "$ld_shlibs_F77" = no && can_build_shared=no
#
-@@ -14248,8 +15458,8 @@
+@@ -14248,8 +15460,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -10484,7 +10491,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14286,16 +15496,16 @@
+@@ -14286,16 +15498,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -10505,7 +10512,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -14434,14 +15644,12 @@
+@@ -14434,14 +15646,12 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -10522,16 +10529,10 @@
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
-@@ -14497,22 +15705,10 @@
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--freebsd1*)
-- dynamic_linker=no
-- ;;
--
+@@ -14503,18 +15713,6 @@
+ dynamic_linker=no
+ ;;
+
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
@@ -10542,14 +10543,12 @@
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
-+ ;;
-+
-+freebsd1*)
-+ dynamic_linker=no
- ;;
-
+- ;;
+-
freebsd* | dragonfly*)
-@@ -14670,7 +15866,7 @@
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -14670,7 +15868,7 @@
;;
# This must be Linux ELF.
@@ -10558,7 +10557,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14699,7 +15895,7 @@
+@@ -14699,7 +15897,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10567,7 +10566,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14708,7 +15904,7 @@
+@@ -14708,7 +15906,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -10576,7 +10575,7 @@
;;
netbsd*)
-@@ -14884,8 +16080,8 @@
+@@ -14884,8 +16082,8 @@
dynamic_linker=no
;;
esac
@@ -10587,7 +10586,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -14893,8 +16089,8 @@
+@@ -14893,8 +16091,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -10598,7 +10597,7 @@
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
-@@ -14918,8 +16114,8 @@
+@@ -14918,8 +16116,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -10609,7 +10608,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -15356,7 +16552,6 @@
+@@ -15356,7 +16554,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -10617,7 +10616,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -15417,10 +16612,6 @@
+@@ -15417,10 +16614,6 @@
old_archive_cmds_GCJ=$old_archive_cmds
@@ -10628,7 +10627,7 @@
lt_prog_compiler_no_builtin_flag_GCJ=
-@@ -15428,8 +16619,8 @@
+@@ -15428,8 +16621,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -10639,21 +10638,21 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15446,11 +16637,11 @@
+@@ -15446,11 +16639,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15449: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16640: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16642: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15453: \$? = $ac_status" >&5
-+ echo "$as_me:16644: \$? = $ac_status" >&5
++ echo "$as_me:16646: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -15463,8 +16654,8 @@
+@@ -15463,8 +16656,8 @@
$rm conftest*
fi
@@ -10664,7 +10663,7 @@
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -15478,8 +16669,8 @@
+@@ -15478,8 +16671,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -10675,7 +10674,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -15608,7 +16799,7 @@
+@@ -15608,7 +16801,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -10684,7 +10683,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -15688,16 +16879,16 @@
+@@ -15688,16 +16881,16 @@
esac
fi
@@ -10705,21 +10704,21 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15714,11 +16905,11 @@
+@@ -15714,11 +16907,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15717: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16908: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16910: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15721: \$? = $ac_status" >&5
-+ echo "$as_me:16912: \$? = $ac_status" >&5
++ echo "$as_me:16914: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -15731,8 +16922,8 @@
+@@ -15731,8 +16924,8 @@
$rm conftest*
fi
@@ -10730,7 +10729,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -15759,8 +16950,8 @@
+@@ -15759,8 +16952,8 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
@@ -10741,7 +10740,7 @@
if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15787,8 +16978,8 @@
+@@ -15787,8 +16980,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10752,7 +10751,7 @@
if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
:
-@@ -15797,8 +16988,8 @@
+@@ -15797,8 +16990,8 @@
fi
@@ -10763,21 +10762,21 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15818,11 +17009,11 @@
+@@ -15818,11 +17011,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15821: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17012: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17014: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15825: \$? = $ac_status" >&5
-+ echo "$as_me:17016: \$? = $ac_status" >&5
++ echo "$as_me:17018: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -15844,23 +17035,23 @@
+@@ -15844,23 +17037,23 @@
$rm conftest*
fi
@@ -10807,7 +10806,7 @@
if test "$hard_links" = no; then
{ echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -15870,8 +17061,8 @@
+@@ -15870,8 +17063,8 @@
need_locks=no
fi
@@ -10818,7 +10817,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -16047,7 +17238,7 @@
+@@ -16047,7 +17240,7 @@
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -10827,7 +10826,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16073,12 +17264,13 @@
+@@ -16073,12 +17266,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -10842,7 +10841,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16286,24 +17478,36 @@
+@@ -16286,24 +17480,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10887,7 +10886,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16317,8 +17521,10 @@
+@@ -16317,8 +17523,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10899,7 +10898,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16347,24 +17553,36 @@
+@@ -16347,24 +17555,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10944,7 +10943,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16378,8 +17596,10 @@
+@@ -16378,8 +17598,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10956,7 +10955,7 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16510,7 +17730,7 @@
+@@ -16510,7 +17732,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10965,7 +10964,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -16612,7 +17832,7 @@
+@@ -16612,7 +17834,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -10974,7 +10973,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16828,8 +18048,8 @@
+@@ -16828,8 +18050,8 @@
esac
fi
@@ -10985,7 +10984,7 @@
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
-@@ -16849,8 +18069,8 @@
+@@ -16849,8 +18071,8 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -10996,7 +10995,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -16887,16 +18107,16 @@
+@@ -16887,16 +18109,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -11017,7 +11016,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -17035,14 +18255,12 @@
+@@ -17035,14 +18257,12 @@
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -11034,7 +11033,7 @@
sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
# It is most probably a Windows format PATH printed by
-@@ -17104,18 +18322,6 @@
+@@ -17104,18 +18324,6 @@
dynamic_linker=no
;;
@@ -11053,7 +11052,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17271,7 +18477,7 @@
+@@ -17271,7 +18479,7 @@
;;
# This must be Linux ELF.
@@ -11062,7 +11061,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17300,7 +18506,7 @@
+@@ -17300,7 +18508,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11071,7 +11070,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17309,7 +18515,7 @@
+@@ -17309,7 +18517,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -11080,7 +11079,7 @@
;;
netbsd*)
-@@ -17485,8 +18691,8 @@
+@@ -17485,8 +18693,8 @@
dynamic_linker=no
;;
esac
@@ -11091,7 +11090,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -17494,8 +18700,8 @@
+@@ -17494,8 +18702,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -11102,7 +11101,7 @@
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
-@@ -17519,8 +18725,8 @@
+@@ -17519,8 +18727,8 @@
# directories.
hardcode_action_GCJ=unsupported
fi
@@ -11113,7 +11112,7 @@
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
-@@ -17956,7 +19162,6 @@
+@@ -17956,7 +19164,6 @@
RC)
@@ -11121,7 +11120,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -18495,8 +19700,8 @@
+@@ -18495,8 +19702,8 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -11132,7 +11131,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18509,32 +19714,34 @@
+@@ -18509,32 +19716,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11174,7 +11173,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18547,36 +19754,51 @@
+@@ -18547,36 +19756,51 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11236,7 +11235,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18589,74 +19811,34 @@
+@@ -18589,74 +19813,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11256,16 +11255,12 @@
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
+-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-fi
+-
+-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
@@ -11298,11 +11293,15 @@
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
--else
++ { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
--fi
--
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
+ fi
+
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
@@ -11320,7 +11319,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18670,7 +19852,7 @@
+@@ -18670,7 +19854,7 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11329,7 +11328,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -18681,6 +19863,7 @@
+@@ -18681,6 +19865,7 @@
fi
done
done
@@ -11337,7 +11336,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -18698,22 +19881,23 @@
+@@ -18698,22 +19883,23 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -11368,7 +11367,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18726,36 +19910,38 @@
+@@ -18726,36 +19912,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11415,7 +11414,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18768,29 +19954,45 @@
+@@ -18768,29 +19956,45 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11467,7 +11466,7 @@
fi
fi
-@@ -18803,27 +20005,41 @@
+@@ -18803,31 +20007,178 @@
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -11484,42 +11483,195 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compiler --version >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -v >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compiler -V >&5") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }
++
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_compiler_gnu=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_compiler_gnu=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_g+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_save_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ ac_cv_prog_cc_g=no
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
++ (eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-
+- (exit $ac_status); }
+-
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ (exit $ac_status); }; }; then
++ ac_cv_prog_cc_g=yes
else
-@@ -18846,24 +20062,36 @@
+- cat >conftest.$ac_ext <<_ACEOF
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ CFLAGS=""
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -18837,59 +20188,53 @@
+ int
+ main ()
+ {
+-#ifndef __GNUC__
+- choke me
+-#endif
+
+ ;
+ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -11564,44 +11716,37 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -18872,24 +20100,28 @@
+- ac_compiler_gnu=yes
++ :
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+-
+-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
++ ac_c_werror_flag=$ac_save_c_werror_flag
++ CFLAGS="-g"
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18905,24 +20137,36 @@
+@@ -18905,24 +20250,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -11646,90 +11791,69 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -18931,303 +20175,300 @@
+@@ -18931,12 +20288,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_prog_cc_g=no
--fi
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
-- CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
-- if test "$GCC" = yes; then
-- CFLAGS="-g -O2"
-- else
-- CFLAGS="-g"
-- fi
--else
-- if test "$GCC" = yes; then
-- CFLAGS="-O2"
-- else
-- CFLAGS=
-- fi
--fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -18952,12 +20317,12 @@
+ CFLAGS=
+ fi
+ fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
- ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
++ ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
-- char **p;
-- int i;
--{
-- return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
-- char *s;
-- va_list v;
-- va_start (v,p);
-- s = g (p, va_arg (v,int));
-- va_end (v);
-- return s;
--}
--
--/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-- function prototypes and stuff, but not '\xHH' hex character constants.
-- These don't provoke an error unfortunately, instead are silently treated
+@@ -18991,12 +20356,17 @@
+ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std1 is added to get
-- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-- array size at least. It's necessary to write '\x00'==0 to get something
++ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std1. */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++ that's true only with -std. */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
- int
- main ()
- {
--return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++ inside strings and character constants. */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
- ;
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -19011,223 +20381,96 @@
return 0;
}
_ACEOF
@@ -11741,12 +11865,13 @@
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
-- CC="$ac_save_CC $ac_arg"
-- rm -f conftest.$ac_objext
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11788,29 +11913,45 @@
(exit $ac_status); }; }; then
- ac_cv_prog_cc_stdc=$ac_arg
-break
-+ :
++ ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--fi
++
+ fi
-rm -f conftest.err conftest.$ac_objext
--done
++
++rm -f core conftest.err conftest.$ac_objext
++ test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
-rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
++rm -f conftest.$ac_ext
+ CC=$ac_save_CC
+
+ fi
-
--fi
--
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-- *)
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++ x)
++ { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++ xno)
++ { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
--esac
--
++ CC="$CC $ac_cv_prog_cc_c89"
++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
@@ -11851,74 +11992,48 @@
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
-$ac_declaration
-#include <stdlib.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
-exit (42);
-+
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
- :
-+ ac_cv_prog_cc_g=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -11929,183 +12044,51 @@
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_declaration
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+ CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+ if test "$GCC" = yes; then
-+ CFLAGS="-g -O2"
-+ else
-+ CFLAGS="-g"
-+ fi
-+else
-+ if test "$GCC" = yes; then
-+ CFLAGS="-O2"
-+ else
-+ CFLAGS=
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+ char **p;
-+ int i;
-+{
-+ return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+ char *s;
-+ va_list v;
-+ va_start (v,p);
-+ s = g (p, va_arg (v,int));
-+ va_end (v);
-+ return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
-+ function prototypes and stuff, but not '\xHH' hex character constants.
-+ These don't provoke an error unfortunately, instead are silently treated
-+ as 'x'. The following induces an error, until -std is added to get
-+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
-+ array size at least. It's necessary to write '\x00'==0 to get something
-+ that's true only with -std. */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
- int
- main ()
- {
+-int
+-main ()
+-{
-exit (42);
-+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
- ;
- return 0;
- }
- _ACEOF
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+ CC="$ac_save_CC $ac_arg"
-+ rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
- break
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
+-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
- fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+ *)
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
-
+-fi
+-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
@@ -12142,7 +12125,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19240,36 +20481,38 @@
+@@ -19240,36 +20483,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12189,7 +12172,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19282,55 +20525,85 @@
+@@ -19282,55 +20527,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12293,7 +12276,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19353,24 +20626,36 @@
+@@ -19353,24 +20628,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12338,7 +12321,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19379,24 +20664,28 @@
+@@ -19379,24 +20666,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12375,7 +12358,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19412,24 +20701,36 @@
+@@ -19412,24 +20703,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12420,7 +12403,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19438,70 +20739,53 @@
+@@ -19438,70 +20741,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12515,7 +12498,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19510,61 +20794,91 @@
+@@ -19510,61 +20796,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12629,7 +12612,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -19584,8 +20898,8 @@
+@@ -19584,8 +20900,8 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -12640,7 +12623,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -19607,7 +20921,7 @@
+@@ -19607,7 +20923,7 @@
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12649,7 +12632,7 @@
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
-@@ -19626,21 +20940,22 @@
+@@ -19626,21 +20942,22 @@
;;
esac
done
@@ -12677,7 +12660,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -19650,38 +20965,39 @@
+@@ -19650,38 +20967,39 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -12735,7 +12718,7 @@
if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19699,10 +21015,10 @@
+@@ -19699,10 +21017,10 @@
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -12749,7 +12732,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -19711,16 +21027,17 @@
+@@ -19711,16 +21029,17 @@
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -12771,7 +12754,7 @@
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
-@@ -19739,7 +21056,9 @@
+@@ -19739,7 +21058,9 @@
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -12781,7 +12764,7 @@
#endif
;
-@@ -19747,24 +21066,36 @@
+@@ -19747,24 +21068,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12826,7 +12809,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19773,12 +21104,13 @@
+@@ -19773,12 +21106,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12844,7 +12827,7 @@
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -19787,8 +21119,8 @@
+@@ -19787,8 +21121,8 @@
fi
@@ -12855,7 +12838,7 @@
if test "${ac_cv_c_inline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19808,39 +21140,54 @@
+@@ -19808,39 +21142,54 @@
_ACEOF
rm -f conftest.$ac_objext
@@ -12922,7 +12905,7 @@
case $ac_cv_c_inline in
-@@ -19858,8 +21205,8 @@
+@@ -19858,8 +21207,8 @@
;;
esac
@@ -12933,7 +12916,7 @@
if test "${ac_cv_c_volatile+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19875,30 +21222,43 @@
+@@ -19875,30 +21224,43 @@
{
volatile int x;
@@ -12986,7 +12969,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19907,12 +21267,13 @@
+@@ -19907,12 +21269,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13004,7 +12987,7 @@
if test $ac_cv_c_volatile = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -19922,21 +21283,21 @@
+@@ -19922,21 +21285,21 @@
fi
@@ -13032,7 +13015,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19960,24 +21321,36 @@
+@@ -19960,24 +21323,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -13077,7 +13060,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19986,9 +21359,10 @@
+@@ -19986,9 +21361,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13090,7 +13073,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -20044,6 +21418,7 @@
+@@ -20044,6 +21420,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -13098,7 +13081,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -20063,18 +21438,27 @@
+@@ -20063,18 +21440,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -13132,7 +13115,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20087,12 +21471,14 @@
+@@ -20087,12 +21473,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -13150,7 +13133,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -20119,18 +21505,19 @@
+@@ -20119,18 +21507,19 @@
for ac_header in sys/types.h stdio.h stdlib.h stddef.h stdarg.h malloc.h memory.h string.h strings.h inttypes.h stdint.h ctype.h math.h iconv.h signal.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13178,7 +13161,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20141,24 +21528,36 @@
+@@ -20141,24 +21530,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -13223,7 +13206,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20167,15 +21566,16 @@
+@@ -20167,15 +21568,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13246,7 +13229,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20184,8 +21584,13 @@
+@@ -20184,8 +21586,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -13262,7 +13245,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -20209,9 +21614,10 @@
+@@ -20209,9 +21616,10 @@
ac_header_preproc=no
fi
@@ -13275,7 +13258,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -20235,25 +21641,19 @@
+@@ -20235,25 +21643,19 @@
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -13308,7 +13291,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -20266,8 +21666,8 @@
+@@ -20266,8 +21668,8 @@
done
@@ -13319,7 +13302,7 @@
if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20278,36 +21678,49 @@
+@@ -20278,36 +21680,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -13379,7 +13362,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20316,25 +21729,26 @@
+@@ -20316,25 +21731,26 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13413,7 +13396,7 @@
if test "${ac_cv_type_int64_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20345,36 +21759,49 @@
+@@ -20345,36 +21761,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -13473,7 +13456,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20383,12 +21810,13 @@
+@@ -20383,12 +21812,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13491,7 +13474,7 @@
if test x$ac_cv_type_int64_t = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -20401,8 +21829,8 @@
+@@ -20401,8 +21831,8 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
@@ -13502,7 +13485,7 @@
if test "${ac_cv_working_alloca_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20417,29 +21845,42 @@
+@@ -20417,29 +21847,42 @@
main ()
{
char *p = (char *) alloca (2 * sizeof (int));
@@ -13553,7 +13536,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20448,13 +21889,14 @@
+@@ -20448,13 +21891,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13572,7 +13555,7 @@
if test $ac_cv_working_alloca_h = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -20463,8 +21905,8 @@
+@@ -20463,8 +21907,8 @@
fi
@@ -13583,7 +13566,7 @@
if test "${ac_cv_func_alloca_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20481,7 +21923,7 @@
+@@ -20481,7 +21925,7 @@
# include <malloc.h>
# define alloca _alloca
# else
@@ -13592,7 +13575,7 @@
# include <alloca.h>
# else
# ifdef _AIX
-@@ -20499,29 +21941,42 @@
+@@ -20499,29 +21943,42 @@
main ()
{
char *p = (char *) alloca (1);
@@ -13643,7 +13626,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20530,13 +21985,14 @@
+@@ -20530,13 +21987,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13662,7 +13645,7 @@
if test $ac_cv_func_alloca_works = yes; then
-@@ -20550,15 +22006,15 @@
+@@ -20550,15 +22008,15 @@
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
@@ -13681,7 +13664,7 @@
if test "${ac_cv_os_cray+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20568,7 +22024,7 @@
+@@ -20568,7 +22026,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13690,7 +13673,7 @@
webecray
#else
wenotbecray
-@@ -20584,14 +22040,14 @@
+@@ -20584,14 +22042,14 @@
rm -f conftest*
fi
@@ -13710,7 +13693,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -20617,53 +22073,59 @@
+@@ -20617,53 +22075,59 @@
#undef $ac_func
@@ -13789,7 +13772,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20672,13 +22134,15 @@
+@@ -20672,13 +22136,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13809,7 +13792,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -20691,8 +22155,8 @@
+@@ -20691,8 +22157,8 @@
done
fi
@@ -13820,7 +13803,7 @@
if test "${ac_cv_c_stack_direction+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20705,6 +22169,7 @@
+@@ -20705,6 +22171,7 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13828,7 +13811,7 @@
int
find_stack_direction ()
{
-@@ -20722,17 +22187,26 @@
+@@ -20722,17 +22189,26 @@
int
main ()
{
@@ -13860,7 +13843,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20745,11 +22219,13 @@
+@@ -20745,11 +22221,13 @@
( exit $ac_status )
ac_cv_c_stack_direction=-1
fi
@@ -13877,7 +13860,7 @@
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
-@@ -20758,8 +22234,8 @@
+@@ -20758,8 +22236,8 @@
fi
@@ -13888,7 +13871,7 @@
if test "${ac_cv_func_memcmp_working+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20778,9 +22254,9 @@
+@@ -20778,9 +22256,9 @@
{
/* Some versions of memcmp are not 8-bit clean. */
@@ -13900,7 +13883,7 @@
/* The Next x86 OpenStep bug shows up only when comparing 16 bytes
or more and with at least one buffer not starting on a 4-byte boundary.
-@@ -20796,9 +22272,9 @@
+@@ -20796,9 +22274,9 @@
strcpy (a, "--------01111111");
strcpy (b, "--------10000000");
if (memcmp (a, b, 16) >= 0)
@@ -13912,7 +13895,7 @@
}
;
-@@ -20806,13 +22282,22 @@
+@@ -20806,13 +22284,22 @@
}
_ACEOF
rm -f conftest$ac_exeext
@@ -13939,7 +13922,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20825,17 +22310,17 @@
+@@ -20825,17 +22312,17 @@
( exit $ac_status )
ac_cv_func_memcmp_working=no
fi
@@ -13965,7 +13948,7 @@
esac
-@@ -20845,8 +22330,8 @@
+@@ -20845,8 +22332,8 @@
_ACEOF
fi
@@ -13976,7 +13959,7 @@
if test "${ac_cv_func_strtod+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20860,7 +22345,10 @@
+@@ -20860,7 +22347,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13987,7 +13970,7 @@
int
main()
{
-@@ -20871,7 +22359,7 @@
+@@ -20871,7 +22361,7 @@
double value;
value = strtod (string, &term);
if (value != 69 || term != (string + 4))
@@ -13996,7 +13979,7 @@
}
{
-@@ -20881,20 +22369,29 @@
+@@ -20881,20 +22371,29 @@
char *term;
strtod (string, &term);
if (term != string && *(term - 1) == 0)
@@ -14032,7 +14015,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20907,22 +22404,22 @@
+@@ -20907,22 +22406,22 @@
( exit $ac_status )
ac_cv_func_strtod=no
fi
@@ -14065,7 +14048,7 @@
if test "${ac_cv_func_pow+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20949,53 +22446,59 @@
+@@ -20949,53 +22448,59 @@
#undef pow
@@ -14144,7 +14127,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21004,17 +22507,18 @@
+@@ -21004,17 +22509,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14169,7 +14152,7 @@
if test "${ac_cv_lib_m_pow+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21027,40 +22531,52 @@
+@@ -21027,40 +22533,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14234,7 +14217,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21069,14 +22585,15 @@
+@@ -21069,14 +22587,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14254,7 +14237,7 @@
if test $ac_cv_lib_m_pow = yes; then
POW_LIB=-lm
else
-@@ -21145,9 +22662,9 @@
+@@ -21145,9 +22664,9 @@
for ac_func in malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strlcpy strlcat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp sscanf snprintf vsnprintf iconv sigaction setjmp nanosleep
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14267,7 +14250,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -21173,53 +22690,59 @@
+@@ -21173,53 +22692,59 @@
#undef $ac_func
@@ -14346,7 +14329,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21228,13 +22751,15 @@
+@@ -21228,13 +22753,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14366,7 +14349,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21244,8 +22769,8 @@
+@@ -21244,8 +22771,8 @@
done
@@ -14377,7 +14360,7 @@
if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21258,40 +22783,52 @@
+@@ -21258,40 +22785,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14442,7 +14425,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21300,20 +22837,21 @@
+@@ -21300,20 +22839,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14470,7 +14453,7 @@
if test "${ac_cv_lib_m_pow+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21326,40 +22864,52 @@
+@@ -21326,40 +22866,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14535,7 +14518,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21368,14 +22918,15 @@
+@@ -21368,14 +22920,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14555,7 +14538,7 @@
if test $ac_cv_lib_m_pow = yes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lm"
fi
-@@ -21383,8 +22934,8 @@
+@@ -21383,8 +22936,8 @@
fi
if test x$have_inttypes != xyes; then
@@ -14566,7 +14549,7 @@
if test "${ac_cv_type_char+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21395,36 +22946,49 @@
+@@ -21395,36 +22948,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -14626,7 +14609,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21433,23 +22997,23 @@
+@@ -21433,23 +22999,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14661,7 +14644,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -21459,10 +23023,12 @@
+@@ -21459,10 +23025,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -14675,7 +14658,7 @@
test_array [0] = 0
;
-@@ -21470,24 +23036,36 @@
+@@ -21470,24 +23038,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -14720,7 +14703,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21500,10 +23078,12 @@
+@@ -21500,10 +23080,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -14734,7 +14717,7 @@
test_array [0] = 0
;
-@@ -21511,24 +23091,36 @@
+@@ -21511,24 +23093,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -14779,7 +14762,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21537,30 +23129,33 @@
+@@ -21537,30 +23131,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14822,7 +14805,7 @@
test_array [0] = 0
;
-@@ -21568,24 +23163,36 @@
+@@ -21568,24 +23165,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -14867,7 +14850,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21598,10 +23205,12 @@
+@@ -21598,10 +23207,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -14881,7 +14864,7 @@
test_array [0] = 0
;
-@@ -21609,24 +23218,36 @@
+@@ -21609,24 +23220,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -14926,7 +14909,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21635,24 +23256,27 @@
+@@ -21635,24 +23258,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14964,7 +14947,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -21663,10 +23287,12 @@
+@@ -21663,10 +23289,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -14978,7 +14961,7 @@
test_array [0] = 0
;
-@@ -21674,24 +23300,36 @@
+@@ -21674,24 +23302,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15023,7 +15006,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21700,26 +23338,24 @@
+@@ -21700,26 +23340,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15060,7 +15043,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21727,8 +23363,10 @@
+@@ -21727,8 +23365,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15073,7 +15056,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -21737,35 +23375,44 @@
+@@ -21737,35 +23377,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -15131,7 +15114,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21776,29 +23423,32 @@
+@@ -21776,29 +23425,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -15155,8 +15138,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_char=0
+-fi
fi
--fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
@@ -15176,7 +15159,7 @@
if test "${ac_cv_type_short+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21809,36 +23459,49 @@
+@@ -21809,36 +23461,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15236,7 +15219,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21847,23 +23510,23 @@
+@@ -21847,23 +23512,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15271,7 +15254,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -21873,10 +23536,12 @@
+@@ -21873,10 +23538,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15285,7 +15268,7 @@
test_array [0] = 0
;
-@@ -21884,24 +23549,36 @@
+@@ -21884,24 +23551,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15330,7 +15313,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21914,10 +23591,12 @@
+@@ -21914,10 +23593,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15344,7 +15327,7 @@
test_array [0] = 0
;
-@@ -21925,24 +23604,36 @@
+@@ -21925,24 +23606,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15389,7 +15372,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21951,30 +23642,33 @@
+@@ -21951,30 +23644,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15432,7 +15415,7 @@
test_array [0] = 0
;
-@@ -21982,24 +23676,36 @@
+@@ -21982,24 +23678,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15477,7 +15460,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22012,10 +23718,12 @@
+@@ -22012,10 +23720,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15491,7 +15474,7 @@
test_array [0] = 0
;
-@@ -22023,24 +23731,36 @@
+@@ -22023,24 +23733,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15536,7 +15519,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22049,24 +23769,27 @@
+@@ -22049,24 +23771,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15574,7 +15557,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -22077,10 +23800,12 @@
+@@ -22077,10 +23802,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15588,7 +15571,7 @@
test_array [0] = 0
;
-@@ -22088,24 +23813,36 @@
+@@ -22088,24 +23815,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15633,7 +15616,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22114,26 +23851,24 @@
+@@ -22114,26 +23853,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15670,7 +15653,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22141,8 +23876,10 @@
+@@ -22141,8 +23878,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15683,7 +15666,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -22151,35 +23888,44 @@
+@@ -22151,35 +23890,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -15741,7 +15724,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22190,29 +23936,32 @@
+@@ -22190,29 +23938,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -15765,8 +15748,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_short=0
+-fi
fi
--fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
@@ -15786,7 +15769,7 @@
if test "${ac_cv_type_int+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22223,36 +23972,49 @@
+@@ -22223,36 +23974,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15846,7 +15829,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22261,23 +24023,23 @@
+@@ -22261,23 +24025,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15881,7 +15864,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -22287,10 +24049,12 @@
+@@ -22287,10 +24051,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15895,7 +15878,7 @@
test_array [0] = 0
;
-@@ -22298,24 +24062,36 @@
+@@ -22298,24 +24064,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15940,7 +15923,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22328,10 +24104,12 @@
+@@ -22328,10 +24106,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -15954,7 +15937,7 @@
test_array [0] = 0
;
-@@ -22339,24 +24117,36 @@
+@@ -22339,24 +24119,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15999,7 +15982,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22365,30 +24155,33 @@
+@@ -22365,30 +24157,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16042,7 +16025,7 @@
test_array [0] = 0
;
-@@ -22396,24 +24189,36 @@
+@@ -22396,24 +24191,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16087,7 +16070,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22426,10 +24231,12 @@
+@@ -22426,10 +24233,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16101,7 +16084,7 @@
test_array [0] = 0
;
-@@ -22437,24 +24244,36 @@
+@@ -22437,24 +24246,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16146,7 +16129,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22463,24 +24282,27 @@
+@@ -22463,24 +24284,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16184,7 +16167,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -22491,10 +24313,12 @@
+@@ -22491,10 +24315,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16198,7 +16181,7 @@
test_array [0] = 0
;
-@@ -22502,24 +24326,36 @@
+@@ -22502,24 +24328,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16243,7 +16226,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22528,26 +24364,24 @@
+@@ -22528,26 +24366,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16280,7 +16263,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22555,8 +24389,10 @@
+@@ -22555,8 +24391,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16293,7 +16276,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -22565,35 +24401,44 @@
+@@ -22565,35 +24403,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -16351,7 +16334,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22604,29 +24449,32 @@
+@@ -22604,29 +24451,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -16375,8 +16358,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_int=0
+-fi
fi
--fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
@@ -16396,7 +16379,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22637,36 +24485,49 @@
+@@ -22637,36 +24487,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16456,7 +16439,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22675,23 +24536,23 @@
+@@ -22675,23 +24538,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16491,7 +16474,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -22701,10 +24562,12 @@
+@@ -22701,10 +24564,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16505,7 +16488,7 @@
test_array [0] = 0
;
-@@ -22712,24 +24575,36 @@
+@@ -22712,24 +24577,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16550,7 +16533,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22742,10 +24617,12 @@
+@@ -22742,10 +24619,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16564,7 +16547,7 @@
test_array [0] = 0
;
-@@ -22753,24 +24630,36 @@
+@@ -22753,24 +24632,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16609,7 +16592,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22779,30 +24668,33 @@
+@@ -22779,30 +24670,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16652,7 +16635,7 @@
test_array [0] = 0
;
-@@ -22810,24 +24702,36 @@
+@@ -22810,24 +24704,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16697,7 +16680,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22840,10 +24744,12 @@
+@@ -22840,10 +24746,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16711,7 +16694,7 @@
test_array [0] = 0
;
-@@ -22851,24 +24757,36 @@
+@@ -22851,24 +24759,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16756,7 +16739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22877,24 +24795,27 @@
+@@ -22877,24 +24797,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16794,7 +16777,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -22905,10 +24826,12 @@
+@@ -22905,10 +24828,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16808,7 +16791,7 @@
test_array [0] = 0
;
-@@ -22916,24 +24839,36 @@
+@@ -22916,24 +24841,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -16853,7 +16836,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22942,26 +24877,24 @@
+@@ -22942,26 +24879,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16890,7 +16873,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22969,8 +24902,10 @@
+@@ -22969,8 +24904,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -16903,7 +16886,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -22979,35 +24914,44 @@
+@@ -22979,35 +24916,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -16961,7 +16944,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23018,29 +24962,32 @@
+@@ -23018,29 +24964,32 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -16985,8 +16968,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_long=0
+-fi
fi
--fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
@@ -17006,7 +16989,7 @@
if test "${ac_cv_type_long_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23051,36 +24998,49 @@
+@@ -23051,36 +25000,49 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -17066,7 +17049,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23089,23 +25049,23 @@
+@@ -23089,23 +25051,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17101,7 +17084,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -23115,10 +25075,12 @@
+@@ -23115,10 +25077,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -17115,7 +17098,7 @@
test_array [0] = 0
;
-@@ -23126,24 +25088,36 @@
+@@ -23126,24 +25090,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -17160,7 +17143,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23156,10 +25130,12 @@
+@@ -23156,10 +25132,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -17174,7 +17157,7 @@
test_array [0] = 0
;
-@@ -23167,24 +25143,36 @@
+@@ -23167,24 +25145,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -17219,7 +17202,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23193,30 +25181,33 @@
+@@ -23193,30 +25183,33 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17262,7 +17245,7 @@
test_array [0] = 0
;
-@@ -23224,24 +25215,36 @@
+@@ -23224,24 +25217,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -17307,7 +17290,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23254,10 +25257,12 @@
+@@ -23254,10 +25259,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -17321,7 +17304,7 @@
test_array [0] = 0
;
-@@ -23265,24 +25270,36 @@
+@@ -23265,24 +25272,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -17366,7 +17349,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23291,24 +25308,27 @@
+@@ -23291,24 +25310,27 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17404,7 +17387,7 @@
# Binary search between lo and hi bounds.
while test "x$ac_lo" != "x$ac_hi"; do
ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -23319,10 +25339,12 @@
+@@ -23319,10 +25341,12 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -17418,7 +17401,7 @@
test_array [0] = 0
;
-@@ -23330,24 +25352,36 @@
+@@ -23330,24 +25354,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -17463,7 +17446,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23356,26 +25390,24 @@
+@@ -23356,26 +25392,24 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17500,7 +17483,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23383,8 +25415,10 @@
+@@ -23383,8 +25417,10 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -17513,7 +17496,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -23393,35 +25427,44 @@
+@@ -23393,35 +25429,44 @@
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -17571,7 +17554,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23432,22 +25475,25 @@
+@@ -23432,22 +25477,25 @@
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -17595,8 +17578,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_long_long=0
+-fi
fi
--fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
@@ -17607,7 +17590,7 @@
cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
_ACEOF
-@@ -23558,143 +25604,143 @@
+@@ -23558,143 +25606,143 @@
SOURCES="$SOURCES $srcdir/src/video/*.c"
@@ -17795,7 +17778,7 @@
if test x$enable_assembly = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_ASSEMBLY_ROUTINES 1
-@@ -23704,16 +25750,16 @@
+@@ -23704,16 +25752,16 @@
CheckOSS()
{
@@ -17818,7 +17801,7 @@
have_oss=no
if test x$have_oss != xyes; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -23736,24 +25782,36 @@
+@@ -23736,24 +25784,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -17863,7 +17846,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23764,8 +25822,10 @@
+@@ -23764,8 +25824,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17875,7 +17858,7 @@
fi
if test x$have_oss != xyes; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -23788,24 +25848,36 @@
+@@ -23788,24 +25850,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -17920,7 +17903,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23820,11 +25892,13 @@
+@@ -23820,11 +25894,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17937,7 +17920,7 @@
if test x$have_oss = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_AUDIO_DRIVER_OSS 1
-@@ -23845,13 +25919,13 @@
+@@ -23845,13 +25921,13 @@
CheckALSA()
{
@@ -17955,7 +17938,7 @@
if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
alsa_save_CFLAGS="$CFLAGS"
alsa_save_LDFLAGS="$LDFLAGS"
-@@ -23859,59 +25933,56 @@
+@@ -23859,59 +25935,56 @@
alsa_found=yes
@@ -17969,10 +17952,10 @@
alsa_prefix=""
-fi;
+fi
++
-# Check whether --with-alsa-inc-prefix or --without-alsa-inc-prefix was given.
-+
+# Check whether --with-alsa-inc-prefix was given.
if test "${with_alsa_inc_prefix+set}" = set; then
- withval="$with_alsa_inc_prefix"
@@ -17982,9 +17965,9 @@
alsa_inc_prefix=""
-fi;
+fi
++
-# Check whether --enable-alsatest or --disable-alsatest was given.
-+
+# Check whether --enable-alsatest was given.
if test "${enable_alsatest+set}" = set; then
- enableval="$enable_alsatest"
@@ -17994,10 +17977,10 @@
enable_alsatest=yes
-fi;
+fi
++
-echo "$as_me:$LINENO: checking for ALSA CFLAGS" >&5
-echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6
-+
+{ echo "$as_me:$LINENO: checking for ALSA CFLAGS" >&5
+echo $ECHO_N "checking for ALSA CFLAGS... $ECHO_C" >&6; }
if test "$alsa_inc_prefix" != "" ; then
@@ -18038,7 +18021,7 @@
no_alsa=""
alsa_min_major_version=`echo $min_alsa_version | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-@@ -23921,7 +25992,6 @@
+@@ -23921,7 +25994,6 @@
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
@@ -18046,7 +18029,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23978,40 +26048,53 @@
+@@ -23978,40 +26050,53 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -18113,7 +18096,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -24021,8 +26104,8 @@
+@@ -24021,8 +26106,8 @@
if test "x$enable_alsatest" = "xyes"; then
@@ -18124,7 +18107,7 @@
if test "${ac_cv_lib_asound_snd_ctl_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24035,40 +26118,52 @@
+@@ -24035,40 +26120,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18189,7 +18172,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24077,14 +26172,15 @@
+@@ -24077,14 +26174,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18209,7 +18192,7 @@
if test $ac_cv_lib_asound_snd_ctl_open = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBASOUND 1
-@@ -24100,19 +26196,15 @@
+@@ -24100,19 +26198,15 @@
fi
@@ -18234,7 +18217,7 @@
fi
-@@ -24123,13 +26215,13 @@
+@@ -24123,13 +26217,13 @@
LDFLAGS="$alsa_save_LDFLAGS"
LIBS="$alsa_save_LIBS"
if test x$have_alsa = xyes; then
@@ -18252,7 +18235,7 @@
if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
ALSA_LIBS="-L/lib $ALSA_LIBS"
-@@ -24171,8 +26263,8 @@
+@@ -24171,8 +26265,8 @@
CheckDMEDIA()
{
if test x$enable_audio = xyes; then
@@ -18263,7 +18246,7 @@
have_dmedia=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -24194,24 +26286,36 @@
+@@ -24194,24 +26288,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -18308,7 +18291,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24222,10 +26326,12 @@
+@@ -24222,10 +26328,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18324,7 +18307,7 @@
# Set up files for the audio library
if test x$have_dmedia = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -24249,8 +26355,8 @@
+@@ -24249,8 +26357,8 @@
;;
esac
if test x$enable_audio = xyes; then
@@ -18335,7 +18318,7 @@
MME_CFLAGS="-I/usr/include/mme"
MME_LIBS="-lmme"
have_mme=no
-@@ -24276,24 +26382,36 @@
+@@ -24276,24 +26384,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -18380,7 +18363,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24304,11 +26422,13 @@
+@@ -24304,11 +26424,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18397,7 +18380,7 @@
# Set up files for the audio library
if test x$have_mme = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -24325,37 +26445,37 @@
+@@ -24325,37 +26447,37 @@
CheckESD()
{
@@ -18424,9 +18407,9 @@
esd_prefix=""
-fi;
+fi
-+
-# Check whether --with-esd-exec-prefix or --without-esd-exec-prefix was given.
++
+# Check whether --with-esd-exec-prefix was given.
if test "${with_esd_exec_prefix+set}" = set; then
- withval="$with_esd_exec_prefix"
@@ -18451,7 +18434,7 @@
if test x$esd_exec_prefix != x ; then
esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-@@ -24372,8 +26492,8 @@
+@@ -24372,8 +26494,8 @@
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
@@ -18462,7 +18445,7 @@
if test "${ac_cv_path_ESD_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24388,35 +26508,43 @@
+@@ -24388,35 +26510,43 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18514,7 +18497,7 @@
ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-@@ -24498,13 +26626,22 @@
+@@ -24498,13 +26628,22 @@
_ACEOF
rm -f conftest$ac_exeext
@@ -18541,7 +18524,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24517,19 +26654,27 @@
+@@ -24517,19 +26656,27 @@
( exit $ac_status )
no_esd=yes
fi
@@ -18574,7 +18557,7 @@
if test "$ESD_CONFIG" = "no" ; then
echo "*** The esd-config script installed by ESD could not be found"
echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -24542,6 +26687,13 @@
+@@ -24542,6 +26689,13 @@
echo "*** Could not run ESD test program, checking why..."
CFLAGS="$CFLAGS $ESD_CFLAGS"
LIBS="$LIBS $ESD_LIBS"
@@ -18588,7 +18571,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24561,24 +26713,36 @@
+@@ -24561,24 +26715,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18633,7 +18616,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24595,15 +26759,22 @@
+@@ -24595,15 +26761,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18658,7 +18641,7 @@
fi
fi
ESD_CFLAGS=""
-@@ -24615,13 +26786,13 @@
+@@ -24615,13 +26788,13 @@
rm -f conf.esdtest
if test x$have_esd = xyes; then
@@ -18676,7 +18659,7 @@
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([^ ]*\).*/\1\/libesd.so.*/'`
esd_lib=`ls -- $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $esd_lib_spec -> $esd_lib"
-@@ -24653,18 +26824,18 @@
+@@ -24653,18 +26826,18 @@
CheckARTSC()
{
@@ -18701,7 +18684,7 @@
if test "${ac_cv_path_ARTSCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24679,35 +26850,36 @@
+@@ -24679,35 +26852,36 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18746,7 +18729,7 @@
audio_arts=no
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ARTS_CFLAGS"
-@@ -24731,24 +26903,36 @@
+@@ -24731,24 +26905,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -18791,7 +18774,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24759,19 +26943,21 @@
+@@ -24759,19 +26945,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18820,7 +18803,7 @@
arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
arts_lib=`ls -- $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $arts_lib_spec -> $arts_lib"
-@@ -24804,29 +26990,29 @@
+@@ -24804,29 +26992,29 @@
CheckNAS()
{
@@ -18861,7 +18844,7 @@
if test x$have_nas = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_AUDIO_DRIVER_NAS 1
-@@ -24842,13 +27028,13 @@
+@@ -24842,13 +27030,13 @@
CheckDiskAudio()
{
@@ -18879,7 +18862,7 @@
if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_AUDIO_DRIVER_DISK 1
-@@ -24860,13 +27046,13 @@
+@@ -24860,13 +27048,13 @@
CheckDummyAudio()
{
@@ -18897,7 +18880,7 @@
if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_AUDIO_DRIVER_DUMMY 1
-@@ -24878,27 +27064,27 @@
+@@ -24878,27 +27066,27 @@
CheckAtariAudio()
{
@@ -18935,7 +18918,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24909,24 +27095,36 @@
+@@ -24909,24 +27097,36 @@
#include <mint/falcon.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -18980,7 +18963,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24935,15 +27133,16 @@
+@@ -24935,15 +27135,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19003,7 +18986,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24952,8 +27151,13 @@
+@@ -24952,8 +27153,13 @@
/* end confdefs.h. */
#include <mint/falcon.h>
_ACEOF
@@ -19019,7 +19002,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -24977,9 +27181,10 @@
+@@ -24977,9 +27183,10 @@
ac_header_preproc=no
fi
@@ -19032,7 +19015,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -25003,25 +27208,18 @@
+@@ -25003,25 +27210,18 @@
echo "$as_me: WARNING: mint/falcon.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: mint/falcon.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: mint/falcon.h: in the future, the compiler will take precedence" >&2;}
@@ -19063,7 +19046,7 @@
fi
if test $ac_cv_header_mint_falcon_h = yes; then
-@@ -25053,58 +27251,18 @@
+@@ -25053,58 +27253,18 @@
return
;;
esac
@@ -19128,7 +19111,7 @@
if test "${ac_cv_path_NASM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25119,28 +27277,28 @@
+@@ -25119,28 +27279,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -19164,7 +19147,7 @@
if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
cat >>confdefs.h <<\_ACEOF
#define SDL_HERMES_BLITTERS 1
-@@ -25188,27 +27346,27 @@
+@@ -25188,27 +27348,27 @@
CheckAltivec()
{
@@ -19202,7 +19185,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25219,24 +27377,36 @@
+@@ -25219,24 +27379,36 @@
#include <altivec.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -19247,7 +19230,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25245,15 +27415,16 @@
+@@ -25245,15 +27417,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19270,7 +19253,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -25262,8 +27433,13 @@
+@@ -25262,8 +27435,13 @@
/* end confdefs.h. */
#include <altivec.h>
_ACEOF
@@ -19286,7 +19269,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25287,9 +27463,10 @@
+@@ -25287,9 +27465,10 @@
ac_header_preproc=no
fi
@@ -19299,7 +19282,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -25313,25 +27490,18 @@
+@@ -25313,25 +27492,18 @@
echo "$as_me: WARNING: altivec.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: altivec.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: altivec.h: in the future, the compiler will take precedence" >&2;}
@@ -19330,7 +19313,7 @@
fi
if test $ac_cv_header_altivec_h = yes; then
-@@ -25342,8 +27512,8 @@
+@@ -25342,8 +27514,8 @@
save_CFLAGS="$CFLAGS"
have_gcc_altivec=no
@@ -19341,7 +19324,7 @@
altivec_CFLAGS="-maltivec"
CFLAGS="$save_CFLAGS $altivec_CFLAGS"
-@@ -25370,24 +27540,36 @@
+@@ -25370,24 +27542,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -19386,7 +19369,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25398,10 +27580,12 @@
+@@ -25398,10 +27582,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19402,7 +19385,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25424,24 +27608,36 @@
+@@ -25424,24 +27610,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -19447,7 +19430,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25452,15 +27648,17 @@
+@@ -25452,15 +27650,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19470,7 +19453,7 @@
altivec_CFLAGS="-faltivec"
CFLAGS="$save_CFLAGS $altivec_CFLAGS"
if test x$have_altivec_h_hdr = xyes; then
-@@ -25486,24 +27684,36 @@
+@@ -25486,24 +27686,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -19515,7 +19498,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25514,10 +27724,12 @@
+@@ -25514,10 +27726,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19531,7 +19514,7 @@
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25540,24 +27752,36 @@
+@@ -25540,24 +27754,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -19576,7 +19559,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25568,10 +27792,12 @@
+@@ -25568,10 +27794,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19592,7 +19575,7 @@
fi
fi
CFLAGS="$save_CFLAGS"
-@@ -25594,8 +27820,8 @@
+@@ -25594,8 +27822,8 @@
CheckVisibilityHidden()
{
@@ -19603,7 +19586,7 @@
have_gcc_fvisibility=no
visibility_CFLAGS="-fvisibility=hidden"
-@@ -25622,24 +27848,36 @@
+@@ -25622,24 +27850,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -19648,7 +19631,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25650,10 +27888,12 @@
+@@ -25650,10 +27890,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -19664,7 +19647,7 @@
CFLAGS="$save_CFLAGS"
if test x$have_gcc_fvisibility = xyes; then
-@@ -25664,13 +27904,13 @@
+@@ -25664,13 +27906,13 @@
CheckIPod()
{
@@ -19682,7 +19665,7 @@
if test x$enable_ipod = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
-@@ -25684,44 +27924,44 @@
+@@ -25684,44 +27926,44 @@
CheckNANOX()
{
@@ -19743,7 +19726,7 @@
if test x$enable_nanox_direct_fb = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB"
fi
-@@ -25738,13 +27978,13 @@
+@@ -25738,13 +27980,13 @@
CheckX11()
{
@@ -19761,7 +19744,7 @@
if test x$enable_video = xyes -a x$enable_video_x11 = xyes; then
case "$host" in
*-*-darwin*)
-@@ -25755,44 +27995,49 @@
+@@ -25755,44 +27997,49 @@
fi
;;
esac
@@ -19829,7 +19812,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -25800,7 +28045,7 @@
+@@ -25800,7 +28047,7 @@
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
@@ -19838,7 +19821,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -25809,7 +28054,7 @@
+@@ -25809,7 +28056,7 @@
esac
fi
cd ..
@@ -19847,7 +19830,7 @@
fi
# Standard set of common directories for X headers.
-@@ -25850,7 +28095,7 @@
+@@ -25850,7 +28097,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
@@ -19856,7 +19839,7 @@
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -25858,10 +28103,15 @@
+@@ -25858,10 +28105,15 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19875,7 +19858,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -25885,12 +28135,13 @@
+@@ -25885,12 +28137,13 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
@@ -19890,7 +19873,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -25899,41 +28150,53 @@
+@@ -25899,41 +28152,53 @@
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
@@ -19955,7 +19938,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -25944,49 +28207,54 @@
+@@ -25944,49 +28209,54 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20029,7 +20012,7 @@
fi
if test "$no_x" = yes; then
-@@ -26007,12 +28275,12 @@
+@@ -26007,12 +28277,12 @@
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
@@ -20048,7 +20031,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -26028,43 +28296,48 @@
+@@ -26028,43 +28298,48 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -20116,7 +20099,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -26080,47 +28353,58 @@
+@@ -26080,47 +28355,58 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -20172,10 +20155,6 @@
-ac_R_space=no
+ { echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6; }
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext \
+
@@ -20192,12 +20171,16 @@
- fi
- LIBS=$ac_xsave_LIBS
- esac
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
fi
# Check for system-dependent libraries X programs must link with.
-@@ -26141,40 +28425,52 @@
+@@ -26141,40 +28427,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20262,7 +20245,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26183,8 +28479,8 @@
+@@ -26183,8 +28481,8 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20273,7 +20256,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26197,40 +28493,52 @@
+@@ -26197,40 +28495,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20338,7 +20321,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26239,21 +28547,22 @@
+@@ -26239,21 +28549,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20367,7 +20350,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26266,40 +28575,52 @@
+@@ -26266,40 +28577,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20432,7 +20415,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26308,21 +28629,23 @@
+@@ -26308,21 +28631,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20461,7 +20444,7 @@
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -26334,8 +28657,8 @@
+@@ -26334,8 +28659,8 @@
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -20472,7 +20455,7 @@
if test "${ac_cv_func_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26362,53 +28685,59 @@
+@@ -26362,53 +28687,59 @@
#undef gethostbyname
@@ -20551,7 +20534,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26417,17 +28746,18 @@
+@@ -26417,17 +28748,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20576,7 +20559,7 @@
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26440,40 +28770,52 @@
+@@ -26440,40 +28772,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20641,7 +20624,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26482,21 +28824,22 @@
+@@ -26482,21 +28826,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20670,7 +20653,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26509,40 +28852,52 @@
+@@ -26509,40 +28854,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20735,7 +20718,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26551,14 +28906,15 @@
+@@ -26551,14 +28908,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20755,7 +20738,7 @@
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -26573,8 +28929,8 @@
+@@ -26573,8 +28931,8 @@
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
@@ -20766,7 +20749,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26601,53 +28957,59 @@
+@@ -26601,53 +28959,59 @@
#undef connect
@@ -20782,16 +20765,19 @@
- builtin and then its argument prototype would still apply. */
char connect ();
/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
-#if defined (__stub_connect) || defined (__stub___connect)
-+#if defined __stub_connect || defined __stub___connect
- choke me
+-choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
++ to always fail with ENOSYS. Some functions are actually named
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_connect || defined __stub___connect
++choke me
#endif
int
@@ -20845,7 +20831,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26656,17 +29018,18 @@
+@@ -26656,17 +29020,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20870,7 +20856,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26679,40 +29042,52 @@
+@@ -26679,40 +29044,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20935,7 +20921,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26721,14 +29096,15 @@
+@@ -26721,14 +29098,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -20955,7 +20941,7 @@
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-@@ -26736,8 +29112,8 @@
+@@ -26736,8 +29114,8 @@
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
@@ -20966,7 +20952,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26764,53 +29140,59 @@
+@@ -26764,53 +29142,59 @@
#undef remove
@@ -21045,7 +21031,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26819,17 +29201,18 @@
+@@ -26819,17 +29203,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21070,7 +21056,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26842,40 +29225,52 @@
+@@ -26842,40 +29227,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21135,7 +21121,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26884,14 +29279,15 @@
+@@ -26884,14 +29281,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21155,7 +21141,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -26899,8 +29295,8 @@
+@@ -26899,8 +29297,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -21166,7 +21152,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26927,53 +29323,59 @@
+@@ -26927,53 +29325,59 @@
#undef shmat
@@ -21245,7 +21231,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26982,17 +29384,18 @@
+@@ -26982,17 +29386,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21270,7 +21256,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27005,40 +29408,52 @@
+@@ -27005,40 +29410,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21335,7 +21321,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27047,14 +29462,15 @@
+@@ -27047,14 +29464,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21355,7 +21341,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -27071,8 +29487,8 @@
+@@ -27071,8 +29489,8 @@
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
@@ -21366,7 +21352,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27085,40 +29501,52 @@
+@@ -27085,40 +29503,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21431,7 +21417,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27127,14 +29555,15 @@
+@@ -27127,14 +29557,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21451,7 +21437,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -27149,13 +29578,13 @@
+@@ -27149,13 +29580,13 @@
# with other libraries calling X11 functions.
x11_symbols_private=$have_gcc_fvisibility
@@ -21469,7 +21455,7 @@
case "$host" in
*-*-darwin*) # Latest Mac OS X actually ships with Xrandr/Xrender libs...
-@@ -27252,23 +29681,23 @@
+@@ -27252,23 +29683,23 @@
fi
have_video=yes
@@ -21501,7 +21487,7 @@
if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_DGA 1
-@@ -27276,26 +29705,26 @@
+@@ -27276,26 +29707,26 @@
SOURCES="$SOURCES $srcdir/src/video/dga/*.c"
fi
@@ -21536,7 +21522,7 @@
if test x$enable_video_x11_vm = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
-@@ -27303,13 +29732,13 @@
+@@ -27303,13 +29734,13 @@
SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
fi
@@ -21554,7 +21540,7 @@
if test x$enable_video_x11_xv = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_X11_XV 1
-@@ -27317,13 +29746,13 @@
+@@ -27317,13 +29748,13 @@
SOURCES="$SOURCES $srcdir/src/video/Xext/Xv/*.c"
fi
@@ -21572,7 +21558,7 @@
if test x$enable_video_x11_xinerama = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
-@@ -27331,13 +29760,13 @@
+@@ -27331,13 +29762,13 @@
SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
fi
@@ -21590,7 +21576,7 @@
if test x$enable_video_x11_xme = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_X11_XME 1
-@@ -27345,17 +29774,17 @@
+@@ -27345,17 +29776,17 @@
SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c"
fi
@@ -21614,7 +21600,7 @@
if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27371,24 +29800,36 @@
+@@ -27371,24 +29802,36 @@
#include <X11/extensions/Xrandr.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -21659,7 +21645,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27397,12 +29838,13 @@
+@@ -27397,12 +29840,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21677,7 +21663,7 @@
if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then
have_xrandr_h_hdr=yes
else
-@@ -27424,8 +29866,8 @@
+@@ -27424,8 +29868,8 @@
definitely_enable_video_x11_xrandr=yes
else
@@ -21688,7 +21674,7 @@
if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27438,40 +29880,52 @@
+@@ -27438,40 +29882,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21753,7 +21739,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27480,20 +29934,21 @@
+@@ -27480,20 +29936,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21781,7 +21767,7 @@
if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27506,40 +29961,52 @@
+@@ -27506,40 +29963,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21846,7 +21832,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27548,14 +30015,15 @@
+@@ -27548,14 +30017,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21866,7 +21852,7 @@
if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then
have_xrandr_lib=yes
fi
-@@ -27573,16 +30041,16 @@
+@@ -27573,16 +30043,16 @@
_ACEOF
fi
@@ -21889,7 +21875,7 @@
if test "${ac_cv_header_X11_extensions_dpms_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -27598,24 +30066,36 @@
+@@ -27598,24 +30068,36 @@
#include <X11/extensions/dpms.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -21934,7 +21920,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27624,12 +30104,13 @@
+@@ -27624,12 +30106,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -21952,7 +21938,7 @@
if test $ac_cv_header_X11_extensions_dpms_h = yes; then
have_dpms_h_hdr=yes
else
-@@ -27650,16 +30131,16 @@
+@@ -27650,16 +30133,16 @@
CheckPHOTON()
{
@@ -21975,7 +21961,7 @@
video_photon=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27684,24 +30165,36 @@
+@@ -27684,24 +30167,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22020,7 +22006,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27712,10 +30205,12 @@
+@@ -27712,10 +30207,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22036,7 +22022,7 @@
if test x$video_photon = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_PHOTON 1
-@@ -27744,16 +30239,16 @@
+@@ -27744,16 +30241,16 @@
CheckCARBON()
{
@@ -22059,7 +22045,7 @@
have_carbon=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27774,24 +30269,36 @@
+@@ -27774,24 +30271,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22104,7 +22090,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27802,10 +30309,12 @@
+@@ -27802,10 +30311,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22120,7 +22106,7 @@
if test x$have_carbon = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_TOOLBOX 1
-@@ -27820,18 +30329,18 @@
+@@ -27820,18 +30331,18 @@
CheckCOCOA()
{
@@ -22145,7 +22131,7 @@
have_cocoa=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27852,24 +30361,36 @@
+@@ -27852,24 +30363,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22190,7 +22176,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27880,10 +30401,12 @@
+@@ -27880,10 +30403,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22206,7 +22192,7 @@
CFLAGS="$save_CFLAGS"
if test x$have_cocoa = xyes; then
cat >>confdefs.h <<\_ACEOF
-@@ -27898,16 +30421,16 @@
+@@ -27898,16 +30423,16 @@
CheckFBCON()
{
@@ -22229,7 +22215,7 @@
video_fbcon=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -27930,24 +30453,36 @@
+@@ -27930,24 +30455,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22274,7 +22260,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -27958,10 +30493,12 @@
+@@ -27958,10 +30495,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22290,7 +22276,7 @@
if test x$video_fbcon = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_FBCON 1
-@@ -27975,13 +30512,13 @@
+@@ -27975,13 +30514,13 @@
CheckDirectFB()
{
@@ -22308,7 +22294,7 @@
if test x$enable_video = xyes -a x$enable_video_directfb = xyes; then
video_directfb=no
-@@ -27989,8 +30526,8 @@
+@@ -27989,8 +30528,8 @@
# Extract the first word of "directfb-config", so it can be a program name with args.
set dummy directfb-config; ac_word=$2
@@ -22319,7 +22305,7 @@
if test "${ac_cv_path_DIRECTFBCONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28005,33 +30542,34 @@
+@@ -28005,33 +30544,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22362,7 +22348,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28046,30 +30584,31 @@
+@@ -28046,30 +30586,31 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22402,7 +22388,7 @@
if test x$PKG_CONFIG != xno; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.7 && $PKG_CONFIG --atleast-version $DIRECTFB_REQUIRED_VERSION directfb; then
DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags directfb`
-@@ -28077,11 +30616,11 @@
+@@ -28077,11 +30618,11 @@
video_directfb=yes
fi
fi
@@ -22418,7 +22404,7 @@
set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'`
NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
set -- `directfb-config --version | sed 's/\./ /g'`
-@@ -28091,8 +30630,8 @@
+@@ -28091,8 +30632,8 @@
DIRECTFB_LIBS=`$DIRECTFBCONFIG --libs`
video_directfb=yes
fi
@@ -22429,7 +22415,7 @@
fi
if test x$video_directfb = xyes; then
-@@ -28110,16 +30649,16 @@
+@@ -28110,16 +30651,16 @@
CheckPS2GS()
{
@@ -22452,7 +22438,7 @@
video_ps2gs=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28141,24 +30680,36 @@
+@@ -28141,24 +30682,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22497,7 +22483,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28169,10 +30720,12 @@
+@@ -28169,10 +30722,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22513,7 +22499,7 @@
if test x$video_ps2gs = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_PS2GS 1
-@@ -28186,16 +30739,16 @@
+@@ -28186,16 +30741,16 @@
CheckGGI()
{
@@ -22536,7 +22522,7 @@
video_ggi=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28217,24 +30770,36 @@
+@@ -28217,24 +30772,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22581,7 +22567,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28245,10 +30810,12 @@
+@@ -28245,10 +30812,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22597,7 +22583,7 @@
if test x$video_ggi = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_GGI 1
-@@ -28263,16 +30830,16 @@
+@@ -28263,16 +30832,16 @@
CheckSVGA()
{
@@ -22620,7 +22606,7 @@
video_svga=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28298,24 +30865,36 @@
+@@ -28298,24 +30867,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22665,7 +22651,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28326,10 +30905,12 @@
+@@ -28326,10 +30907,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22681,7 +22667,7 @@
if test x$video_svga = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_SVGALIB 1
-@@ -28344,16 +30925,16 @@
+@@ -28344,16 +30927,16 @@
CheckVGL()
{
@@ -22704,7 +22690,7 @@
video_vgl=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28381,24 +30962,36 @@
+@@ -28381,24 +30964,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22749,7 +22735,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28409,10 +31002,12 @@
+@@ -28409,10 +31004,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22765,7 +22751,7 @@
if test x$video_vgl = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_VGL 1
-@@ -28427,16 +31022,16 @@
+@@ -28427,16 +31024,16 @@
CheckWscons()
{
@@ -22788,7 +22774,116 @@
video_wscons=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28460,24 +31055,36 @@
+@@ -28445,86 +31042,235 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+- #include <sys/time.h>
+- #include <dev/wscons/wsconsio.h>
+- #include <dev/wscons/wsdisplay_usl_io.h>
++ #include <sys/time.h>
++ #include <dev/wscons/wsconsio.h>
++ #include <dev/wscons/wsdisplay_usl_io.h>
++
++int
++main ()
++{
++
++ int wsmode = WSDISPLAYIO_MODE_DUMBFB;
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++
++ video_wscons=yes
++
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { echo "$as_me:$LINENO: result: $video_wscons" >&5
++echo "${ECHO_T}$video_wscons" >&6; }
++ if test x$video_wscons = xyes; then
++ cat >>confdefs.h <<\_ACEOF
++#define SDL_VIDEO_DRIVER_WSCONS 1
++_ACEOF
++
++ SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
++ have_video=yes
++ fi
++ fi
++}
++
++
++CheckAAlib()
++{
++ # Check whether --enable-video-aalib was given.
++if test "${enable_video_aalib+set}" = set; then
++ enableval=$enable_video_aalib;
++else
++ enable_video_aalib=no
++fi
++
++ if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
++ { echo "$as_me:$LINENO: checking for AAlib support" >&5
++echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6; }
++ video_aalib=no
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++ #include <aalib.h>
+
+ int
+ main ()
+ {
+
+- int wsmode = WSDISPLAYIO_MODE_DUMBFB;
+
+ ;
+ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22833,7 +22928,11 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28488,10 +31095,12 @@
+
+- video_wscons=yes
++ video_aalib=yes
+
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22842,37 +22941,108 @@
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $video_wscons" >&5
-echo "${ECHO_T}$video_wscons" >&6
+- if test x$video_wscons = xyes; then
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ { echo "$as_me:$LINENO: result: $video_wscons" >&5
-+echo "${ECHO_T}$video_wscons" >&6; }
- if test x$video_wscons = xyes; then
++ { echo "$as_me:$LINENO: result: $video_aalib" >&5
++echo "${ECHO_T}$video_aalib" >&6; }
++ if test x$video_aalib = xyes; then
cat >>confdefs.h <<\_ACEOF
- #define SDL_VIDEO_DRIVER_WSCONS 1
-@@ -28506,16 +31115,16 @@
+-#define SDL_VIDEO_DRIVER_WSCONS 1
++#define SDL_VIDEO_DRIVER_AALIB 1
+ _ACEOF
- CheckAAlib()
+- SOURCES="$SOURCES $srcdir/src/video/wscons/*.c"
++ SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
+ have_video=yes
+ fi
+ fi
+ }
+
+-
+-CheckAAlib()
++CheckCaca()
{
- # Check whether --enable-video-aalib or --disable-video-aalib was given.
-+ # Check whether --enable-video-aalib was given.
- if test "${enable_video_aalib+set}" = set; then
+-if test "${enable_video_aalib+set}" = set; then
- enableval="$enable_video_aalib"
--
-+ enableval=$enable_video_aalib;
++ # Check whether --enable-video-caca was given.
++if test "${enable_video_caca+set}" = set; then
++ enableval=$enable_video_caca;
++else
++ enable_video_caca=no
++fi
+
++ if test x$enable_video = xyes -a x$enable_video_caca = xyes; then
++ video_caca=no
++ # Extract the first word of "caca-config", so it can be a program name with args.
++set dummy caca-config; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_CACACONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- enable_video_aalib=no
+- enable_video_aalib=no
-fi;
+- if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
+- echo "$as_me:$LINENO: checking for AAlib support" >&5
+-echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
+- video_aalib=no
+- cat >conftest.$ac_ext <<_ACEOF
++ case $CACACONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_CACACONFIG="$CACACONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_CACACONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_path_CACACONFIG" && ac_cv_path_CACACONFIG="no"
++ ;;
++esac
+fi
++CACACONFIG=$ac_cv_path_CACACONFIG
++if test -n "$CACACONFIG"; then
++ { echo "$as_me:$LINENO: result: $CACACONFIG" >&5
++echo "${ECHO_T}$CACACONFIG" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+
- if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
-- echo "$as_me:$LINENO: checking for AAlib support" >&5
--echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for AAlib support" >&5
-+echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6; }
- video_aalib=no
- cat >conftest.$ac_ext <<_ACEOF
++
++ if test x$CACACONFIG != xno; then
++ { echo "$as_me:$LINENO: checking for libcaca support" >&5
++echo $ECHO_N "checking for libcaca support... $ECHO_C" >&6; }
++ CACA_CFLAGS=`$CACACONFIG --cflags`
++ CACA_LDFLAGS=`$CACACONFIG --libs`
++ save_CFLAGS="$CFLAGS"
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28536,24 +31145,36 @@
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+- #include <aalib.h>
++ #include <caca.h>
+
+ int
+ main ()
+@@ -28536,65 +31282,81 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -22917,7 +23087,11 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28564,10 +31185,12 @@
+
+- video_aalib=yes
++ video_caca=yes
+
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -22926,15 +23100,30 @@
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- echo "$as_me:$LINENO: result: $video_aalib" >&5
-echo "${ECHO_T}$video_aalib" >&6
+- if test x$video_aalib = xyes; then
+- cat >>confdefs.h <<\_ACEOF
+-#define SDL_VIDEO_DRIVER_AALIB 1
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ { echo "$as_me:$LINENO: result: $video_aalib" >&5
-+echo "${ECHO_T}$video_aalib" >&6; }
- if test x$video_aalib = xyes; then
- cat >>confdefs.h <<\_ACEOF
- #define SDL_VIDEO_DRIVER_AALIB 1
-@@ -28582,19 +31205,19 @@
++ CFLAGS="$save_CFLAGS"
++ { echo "$as_me:$LINENO: result: $video_caca" >&5
++echo "${ECHO_T}$video_caca" >&6; }
++ if test x$video_caca = xyes; then
++ cat >>confdefs.h <<\_ACEOF
++#define SDL_VIDEO_DRIVER_CACA 1
+ _ACEOF
+- SOURCES="$SOURCES $srcdir/src/video/aalib/*.c"
+- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa"
+- have_video=yes
++ EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS"
++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS"
++ SOURCES="$SOURCES $srcdir/src/video/caca/*.c"
++ fi
+ fi
+ fi
+ }
+
CheckQtopia()
{
- # Check whether --enable-video-qtopia or --disable-video-qtopia was given.
@@ -22960,7 +23149,7 @@
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -28621,24 +31244,36 @@
+@@ -28621,24 +31383,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23005,7 +23194,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28649,11 +31284,13 @@
+@@ -28649,11 +31423,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23022,7 +23211,7 @@
if test x$video_qtopia = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_QTOPIA 1
-@@ -28677,16 +31314,16 @@
+@@ -28677,16 +31453,16 @@
CheckPicoGUI()
{
@@ -23045,7 +23234,7 @@
video_picogui=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -28707,24 +31344,36 @@
+@@ -28707,24 +31483,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23090,7 +23279,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28735,10 +31384,12 @@
+@@ -28735,10 +31523,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23106,7 +23295,7 @@
if test x$video_picogui = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_PICOGUI 1
-@@ -28759,13 +31410,13 @@
+@@ -28759,13 +31549,13 @@
CheckAtariXbiosVideo()
{
@@ -23124,7 +23313,7 @@
video_xbios=no
if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then
video_xbios=yes
-@@ -28780,27 +31431,27 @@
+@@ -28780,27 +31570,27 @@
CheckAtariGemVideo()
{
@@ -23162,7 +23351,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28811,24 +31462,36 @@
+@@ -28811,24 +31601,36 @@
#include <gem.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -23207,7 +23396,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28837,15 +31500,16 @@
+@@ -28837,15 +31639,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23230,7 +23419,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28854,8 +31518,13 @@
+@@ -28854,8 +31657,13 @@
/* end confdefs.h. */
#include <gem.h>
_ACEOF
@@ -23246,7 +23435,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -28879,9 +31548,10 @@
+@@ -28879,9 +31687,10 @@
ac_header_preproc=no
fi
@@ -23259,7 +23448,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -28905,25 +31575,18 @@
+@@ -28905,25 +31714,18 @@
echo "$as_me: WARNING: gem.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gem.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gem.h: in the future, the compiler will take precedence" >&2;}
@@ -23290,7 +23479,7 @@
fi
if test $ac_cv_header_gem_h = yes; then
-@@ -28931,8 +31594,8 @@
+@@ -28931,8 +31733,8 @@
fi
@@ -23301,7 +23490,7 @@
if test "${ac_cv_lib_gem_appl_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -28945,40 +31608,52 @@
+@@ -28945,40 +31747,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23366,7 +23555,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -28987,14 +31662,15 @@
+@@ -28987,14 +31801,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23386,7 +23575,7 @@
if test $ac_cv_lib_gem_appl_init = yes; then
have_gem_lib=yes
fi
-@@ -29014,13 +31690,13 @@
+@@ -29014,13 +31829,13 @@
CheckDummyVideo()
{
@@ -23404,7 +23593,7 @@
if test x$enable_video_dummy = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_DRIVER_DUMMY 1
-@@ -29031,19 +31707,19 @@
+@@ -29031,19 +31846,19 @@
fi
}
@@ -23430,7 +23619,7 @@
video_opengl=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29065,24 +31741,36 @@
+@@ -29065,24 +31880,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23475,7 +23664,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29093,10 +31781,12 @@
+@@ -29093,10 +31920,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23491,7 +23680,7 @@
if test x$video_opengl = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_OPENGL 1
-@@ -29113,8 +31803,8 @@
+@@ -29113,8 +31942,8 @@
CheckOpenGLQNX()
{
if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then
@@ -23502,7 +23691,7 @@
video_opengl=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29135,24 +31825,36 @@
+@@ -29135,24 +31964,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23547,7 +23736,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29163,10 +31865,12 @@
+@@ -29163,10 +32004,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23563,7 +23752,7 @@
if test x$video_opengl = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_VIDEO_OPENGL 1
-@@ -29225,17 +31929,17 @@
+@@ -29225,17 +32068,17 @@
{
if test "x$enable_video" = "xyes" -a "x$enable_video_opengl" = "xyes"; then
if test "${ac_cv_header_GL_osmesa_h+set}" = set; then
@@ -23587,7 +23776,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29246,24 +31950,36 @@
+@@ -29246,24 +32089,36 @@
#include <GL/osmesa.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -23632,7 +23821,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29272,15 +31988,16 @@
+@@ -29272,15 +32127,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23655,7 +23844,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29289,8 +32006,13 @@
+@@ -29289,8 +32145,13 @@
/* end confdefs.h. */
#include <GL/osmesa.h>
_ACEOF
@@ -23671,7 +23860,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -29314,9 +32036,10 @@
+@@ -29314,9 +32175,10 @@
ac_header_preproc=no
fi
@@ -23684,7 +23873,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -29340,25 +32063,18 @@
+@@ -29340,25 +32202,18 @@
echo "$as_me: WARNING: GL/osmesa.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: GL/osmesa.h: in the future, the compiler will take precedence" >&2;}
@@ -23715,7 +23904,7 @@
fi
if test $ac_cv_header_GL_osmesa_h = yes; then
-@@ -29366,8 +32082,8 @@
+@@ -29366,8 +32221,8 @@
fi
@@ -23726,7 +23915,7 @@
if test "${ac_cv_lib_OSMesa_OSMesaCreateContext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29380,40 +32096,52 @@
+@@ -29380,40 +32235,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -23791,7 +23980,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29422,14 +32150,15 @@
+@@ -29422,14 +32289,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23811,7 +24000,7 @@
if test $ac_cv_lib_OSMesa_OSMesaCreateContext = yes; then
have_osmesa_lib=yes
else
-@@ -29440,8 +32169,8 @@
+@@ -29440,8 +32308,8 @@
# Static linking to -lOSMesa
# Extract the first word of "osmesa-config", so it can be a program name with args.
set dummy osmesa-config; ac_word=$2
@@ -23822,7 +24011,7 @@
if test "${ac_cv_path_OSMESA_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29456,28 +32185,29 @@
+@@ -29456,28 +32324,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -23858,7 +24047,7 @@
if test "x$OSMESA_CONFIG" = "xno" -o "x$enable_atari_ldg" = "xno"; then
# -lOSMesa is really the static library
if test "x$have_osmesa_hdr" = "xyes" -a "x$have_osmesa_lib" = "xyes"; then
-@@ -29499,13 +32229,13 @@
+@@ -29499,13 +32368,13 @@
SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS"
SDL_LIBS="$SDL_LIBS $OSMESA_LIBS"
@@ -23876,7 +24065,7 @@
if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then
# Dynamic linking
if test "x$have_osmesa_hdr" = "xyes"; then
-@@ -29520,16 +32250,16 @@
+@@ -29520,16 +32389,16 @@
CheckInputEvents()
{
@@ -23899,7 +24088,7 @@
use_input_events=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29553,24 +32283,36 @@
+@@ -29553,24 +32422,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -23944,7 +24133,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29581,10 +32323,12 @@
+@@ -29581,10 +32462,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -23960,7 +24149,7 @@
if test x$use_input_events = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_INPUT_LINUXEV 1
-@@ -29596,16 +32340,16 @@
+@@ -29596,16 +32479,16 @@
CheckTslib()
{
@@ -23983,7 +24172,7 @@
enable_input_tslib=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29626,24 +32370,36 @@
+@@ -29626,24 +32509,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -24028,7 +24217,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29654,10 +32410,12 @@
+@@ -29654,10 +32549,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24044,7 +24233,7 @@
if test x$enable_input_tslib = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_INPUT_TSLIB 1
-@@ -29670,18 +32428,18 @@
+@@ -29670,18 +32567,18 @@
CheckPTH()
{
@@ -24069,7 +24258,7 @@
if test "${ac_cv_path_PTH_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -29696,37 +32454,38 @@
+@@ -29696,37 +32593,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -24118,7 +24307,7 @@
if test "x$use_pth" = xyes; then
cat >>confdefs.h <<\_ACEOF
#define SDL_THREAD_PTH 1
-@@ -29743,20 +32502,20 @@
+@@ -29743,20 +32641,20 @@
CheckPTHREAD()
{
@@ -24147,7 +24336,7 @@
case "$host" in
*-*-linux*|*-*-uclinux*)
pthread_cflags="-D_REENTRANT"
-@@ -29826,8 +32585,8 @@
+@@ -29826,8 +32724,8 @@
# Add the pthread compiler flags and libraries
CFLAGS="$CFLAGS $pthread_cflags"; LIBS="$LIBS $pthread_lib"
# Check to see if we have pthread support on this system
@@ -24158,7 +24347,7 @@
use_pthreads=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -29850,24 +32609,36 @@
+@@ -29850,24 +32748,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -24203,7 +24392,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29878,11 +32649,13 @@
+@@ -29878,11 +32788,13 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24220,7 +24409,7 @@
# Restore the compiler flags and libraries
CFLAGS="$ac_save_cflags"; LIBS="$ac_save_libs"
-@@ -29903,8 +32676,8 @@
+@@ -29903,8 +32815,8 @@
CFLAGS="$CFLAGS $pthread_cflags"; LIBS="$LIBS $pthread_lib"
# Check to see if recursive mutexes are available
@@ -24231,7 +24420,7 @@
has_recursive_mutexes=no
if test x$has_recursive_mutexes = xno; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -29928,24 +32701,36 @@
+@@ -29928,24 +32840,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -24276,7 +24465,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -29960,8 +32745,10 @@
+@@ -29960,8 +32884,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24288,7 +24477,7 @@
fi
if test x$has_recursive_mutexes = xno; then
cat >conftest.$ac_ext <<_ACEOF
-@@ -29985,24 +32772,36 @@
+@@ -29985,24 +32911,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -24333,7 +24522,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30017,16 +32816,18 @@
+@@ -30017,16 +32955,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24357,7 +24546,7 @@
have_pthread_sem=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30048,24 +32849,36 @@
+@@ -30048,24 +32988,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -24402,7 +24591,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30076,10 +32889,12 @@
+@@ -30076,10 +33028,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24418,7 +24607,7 @@
fi
# Restore the compiler flags and libraries
-@@ -30113,8 +32928,8 @@
+@@ -30113,8 +33067,8 @@
CheckWIN32()
{
@@ -24429,7 +24618,7 @@
have_win32_gcc=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30135,24 +32950,36 @@
+@@ -30135,24 +33089,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -24474,7 +24663,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30163,10 +32990,12 @@
+@@ -30163,10 +33129,12 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24490,7 +24679,7 @@
if test x$have_win32_gcc != xyes; then
{ { echo "$as_me:$LINENO: error:
*** Your compiler ($CC) does not produce Win32 executables!
-@@ -30177,13 +33006,13 @@
+@@ -30177,13 +33145,13 @@
{ (exit 1); exit 1; }; }
fi
@@ -24508,7 +24697,7 @@
if test x$enable_stdio_redirect != xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT"
fi
-@@ -30201,27 +33030,27 @@
+@@ -30201,27 +33169,27 @@
CheckDIRECTX()
{
@@ -24546,7 +24735,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30232,24 +33061,36 @@
+@@ -30232,24 +33200,36 @@
#include <ddraw.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -24591,7 +24780,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30258,15 +33099,16 @@
+@@ -30258,15 +33238,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24614,7 +24803,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30275,8 +33117,13 @@
+@@ -30275,8 +33256,13 @@
/* end confdefs.h. */
#include <ddraw.h>
_ACEOF
@@ -24630,7 +24819,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -30300,9 +33147,10 @@
+@@ -30300,9 +33286,10 @@
ac_header_preproc=no
fi
@@ -24643,7 +24832,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -30326,25 +33174,18 @@
+@@ -30326,25 +33313,18 @@
echo "$as_me: WARNING: ddraw.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: ddraw.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: ddraw.h: in the future, the compiler will take precedence" >&2;}
@@ -24674,7 +24863,7 @@
fi
if test $ac_cv_header_ddraw_h = yes; then
-@@ -30353,17 +33194,17 @@
+@@ -30353,17 +33333,17 @@
if test "${ac_cv_header_dsound_h+set}" = set; then
@@ -24698,7 +24887,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30374,24 +33215,36 @@
+@@ -30374,24 +33354,36 @@
#include <dsound.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -24743,7 +24932,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30400,15 +33253,16 @@
+@@ -30400,15 +33392,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24766,7 +24955,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30417,8 +33271,13 @@
+@@ -30417,8 +33410,13 @@
/* end confdefs.h. */
#include <dsound.h>
_ACEOF
@@ -24782,7 +24971,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -30442,9 +33301,10 @@
+@@ -30442,9 +33440,10 @@
ac_header_preproc=no
fi
@@ -24795,7 +24984,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -30468,25 +33328,18 @@
+@@ -30468,25 +33467,18 @@
echo "$as_me: WARNING: dsound.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: dsound.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: dsound.h: in the future, the compiler will take precedence" >&2;}
@@ -24826,7 +25015,7 @@
fi
if test $ac_cv_header_dsound_h = yes; then
-@@ -30495,17 +33348,17 @@
+@@ -30495,17 +33487,17 @@
if test "${ac_cv_header_dinput_h+set}" = set; then
@@ -24850,7 +25039,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30516,24 +33369,36 @@
+@@ -30516,24 +33508,36 @@
#include <dinput.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -24895,7 +25084,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30542,15 +33407,16 @@
+@@ -30542,15 +33546,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -24918,7 +25107,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -30559,8 +33425,13 @@
+@@ -30559,8 +33564,13 @@
/* end confdefs.h. */
#include <dinput.h>
_ACEOF
@@ -24934,7 +25123,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -30584,9 +33455,10 @@
+@@ -30584,9 +33594,10 @@
ac_header_preproc=no
fi
@@ -24947,7 +25136,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -30610,25 +33482,18 @@
+@@ -30610,25 +33621,18 @@
echo "$as_me: WARNING: dinput.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: dinput.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: dinput.h: in the future, the compiler will take precedence" >&2;}
@@ -24978,7 +25167,7 @@
fi
if test $ac_cv_header_dinput_h = yes; then
-@@ -30652,16 +33517,16 @@
+@@ -30652,16 +33656,16 @@
CheckDLOPEN()
{
@@ -25001,7 +25190,7 @@
have_dlopen=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -30685,24 +33550,36 @@
+@@ -30685,24 +33689,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -25046,7 +25235,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30713,14 +33590,16 @@
+@@ -30713,14 +33729,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25068,7 +25257,7 @@
if test "${ac_cv_lib_c_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30733,40 +33612,52 @@
+@@ -30733,40 +33751,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25133,7 +25322,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30775,19 +33666,20 @@
+@@ -30775,19 +33805,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25160,7 +25349,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30800,40 +33692,52 @@
+@@ -30800,40 +33831,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25225,7 +25414,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30842,19 +33746,20 @@
+@@ -30842,19 +33885,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25252,7 +25441,7 @@
if test "${ac_cv_lib_ltdl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30867,40 +33772,52 @@
+@@ -30867,40 +33911,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25317,7 +25506,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30909,14 +33826,15 @@
+@@ -30909,14 +33965,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25337,7 +25526,7 @@
if test $ac_cv_lib_ltdl_dlopen = yes; then
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"
fi
-@@ -30925,8 +33843,8 @@
+@@ -30925,8 +33982,8 @@
fi
@@ -25348,7 +25537,7 @@
if test "${ac_cv_lib_dl_dlvsym+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -30939,40 +33857,52 @@
+@@ -30939,40 +33996,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25413,7 +25602,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -30981,14 +33911,15 @@
+@@ -30981,14 +34050,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25433,7 +25622,7 @@
if test $ac_cv_lib_dl_dlvsym = yes; then
have_dlvsym=yes
fi
-@@ -31011,26 +33942,26 @@
+@@ -31011,26 +34081,26 @@
CheckAtariLdg()
{
@@ -25470,7 +25659,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31041,24 +33972,36 @@
+@@ -31041,24 +34111,36 @@
#include <ldg.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -25515,7 +25704,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31067,15 +34010,16 @@
+@@ -31067,15 +34149,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25538,7 +25727,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31084,8 +34028,13 @@
+@@ -31084,8 +34167,13 @@
/* end confdefs.h. */
#include <ldg.h>
_ACEOF
@@ -25554,7 +25743,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31109,9 +34058,10 @@
+@@ -31109,9 +34197,10 @@
ac_header_preproc=no
fi
@@ -25567,7 +25756,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -31135,25 +34085,18 @@
+@@ -31135,25 +34224,18 @@
echo "$as_me: WARNING: ldg.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: ldg.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: ldg.h: in the future, the compiler will take precedence" >&2;}
@@ -25598,7 +25787,7 @@
fi
if test $ac_cv_header_ldg_h = yes; then
-@@ -31161,8 +34104,8 @@
+@@ -31161,8 +34243,8 @@
fi
@@ -25609,7 +25798,7 @@
if test "${ac_cv_lib_ldg_ldg_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31175,40 +34118,52 @@
+@@ -31175,40 +34257,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25674,7 +25863,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31217,14 +34172,15 @@
+@@ -31217,14 +34311,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25694,7 +25883,7 @@
if test $ac_cv_lib_ldg_ldg_open = yes; then
have_ldg_lib=yes
else
-@@ -31246,8 +34202,8 @@
+@@ -31246,8 +34341,8 @@
CheckUSBHID()
{
if test x$enable_joystick = xyes; then
@@ -25705,7 +25894,7 @@
if test "${ac_cv_lib_usbhid_hid_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31260,40 +34216,52 @@
+@@ -31260,40 +34355,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -25770,7 +25959,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31302,31 +34270,32 @@
+@@ -31302,31 +34409,32 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25813,7 +26002,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31337,24 +34306,36 @@
+@@ -31337,24 +34445,36 @@
#include <usbhid.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -25858,7 +26047,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31363,15 +34344,16 @@
+@@ -31363,15 +34483,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -25881,7 +26070,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31380,8 +34362,13 @@
+@@ -31380,8 +34501,13 @@
/* end confdefs.h. */
#include <usbhid.h>
_ACEOF
@@ -25897,7 +26086,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31405,9 +34392,10 @@
+@@ -31405,9 +34531,10 @@
ac_header_preproc=no
fi
@@ -25910,7 +26099,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -31431,25 +34419,18 @@
+@@ -31431,25 +34558,18 @@
echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: usbhid.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;}
@@ -25941,7 +26130,7 @@
fi
if test $ac_cv_header_usbhid_h = yes; then
-@@ -31458,17 +34439,17 @@
+@@ -31458,17 +34578,17 @@
if test "${ac_cv_header_libusbhid_h+set}" = set; then
@@ -25965,7 +26154,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31479,24 +34460,36 @@
+@@ -31479,24 +34599,36 @@
#include <libusbhid.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -26010,7 +26199,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31505,15 +34498,16 @@
+@@ -31505,15 +34637,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26033,7 +26222,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31522,8 +34516,13 @@
+@@ -31522,8 +34655,13 @@
/* end confdefs.h. */
#include <libusbhid.h>
_ACEOF
@@ -26049,7 +26238,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31547,9 +34546,10 @@
+@@ -31547,9 +34685,10 @@
ac_header_preproc=no
fi
@@ -26062,7 +26251,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -31573,25 +34573,18 @@
+@@ -31573,25 +34712,18 @@
echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&2;}
@@ -26093,7 +26282,7 @@
fi
if test $ac_cv_header_libusbhid_h = yes; then
-@@ -31602,17 +34595,17 @@
+@@ -31602,17 +34734,17 @@
USB_LIBS="$USB_LIBS -lusbhid"
else
if test "${ac_cv_header_usb_h+set}" = set; then
@@ -26117,7 +26306,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31623,24 +34616,36 @@
+@@ -31623,24 +34755,36 @@
#include <usb.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -26162,7 +26351,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31649,15 +34654,16 @@
+@@ -31649,15 +34793,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26185,7 +26374,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31666,8 +34672,13 @@
+@@ -31666,8 +34811,13 @@
/* end confdefs.h. */
#include <usb.h>
_ACEOF
@@ -26201,7 +26390,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31691,9 +34702,10 @@
+@@ -31691,9 +34841,10 @@
ac_header_preproc=no
fi
@@ -26214,7 +26403,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -31717,25 +34729,18 @@
+@@ -31717,25 +34868,18 @@
echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;}
@@ -26245,7 +26434,7 @@
fi
if test $ac_cv_header_usb_h = yes; then
-@@ -31744,17 +34749,17 @@
+@@ -31744,17 +34888,17 @@
if test "${ac_cv_header_libusb_h+set}" = set; then
@@ -26269,7 +26458,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31765,24 +34770,36 @@
+@@ -31765,24 +34909,36 @@
#include <libusb.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -26314,7 +26503,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31791,15 +34808,16 @@
+@@ -31791,15 +34947,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26337,7 +26526,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -31808,8 +34826,13 @@
+@@ -31808,8 +34965,13 @@
/* end confdefs.h. */
#include <libusb.h>
_ACEOF
@@ -26353,7 +26542,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -31833,9 +34856,10 @@
+@@ -31833,9 +34995,10 @@
ac_header_preproc=no
fi
@@ -26366,7 +26555,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -31859,25 +34883,18 @@
+@@ -31859,25 +35022,18 @@
echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: libusb.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: libusb.h: in the future, the compiler will take precedence" >&2;}
@@ -26397,7 +26586,7 @@
fi
if test $ac_cv_header_libusb_h = yes; then
-@@ -31885,8 +34902,8 @@
+@@ -31885,8 +35041,8 @@
fi
@@ -26408,7 +26597,7 @@
if test "${ac_cv_lib_usb_hid_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -31899,40 +34916,52 @@
+@@ -31899,40 +35055,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26473,7 +26662,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -31941,14 +34970,15 @@
+@@ -31941,14 +35109,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26493,7 +26682,7 @@
if test $ac_cv_lib_usb_hid_init = yes; then
USB_LIBS="$USB_LIBS -lusb"
fi
-@@ -31958,8 +34988,8 @@
+@@ -31958,8 +35127,8 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $USB_CFLAGS"
@@ -26504,7 +26693,7 @@
have_usbhid=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -32000,24 +35030,36 @@
+@@ -32000,24 +35169,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26549,7 +26738,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32028,14 +35070,16 @@
+@@ -32028,14 +35209,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26571,7 +26760,7 @@
have_usbhid_ucr_data=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -32075,24 +35119,36 @@
+@@ -32075,24 +35258,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26616,7 +26805,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32103,16 +35159,18 @@
+@@ -32103,16 +35298,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26640,7 +26829,7 @@
have_usbhid_new=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -32147,24 +35205,36 @@
+@@ -32147,24 +35344,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26685,7 +26874,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32175,16 +35245,18 @@
+@@ -32175,16 +35384,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26709,7 +26898,7 @@
have_machine_joystick=no
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -32206,24 +35278,36 @@
+@@ -32206,24 +35417,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -26754,7 +26943,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32234,16 +35318,18 @@
+@@ -32234,16 +35457,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26776,7 +26965,7 @@
cat >>confdefs.h <<\_ACEOF
#define SDL_JOYSTICK_USBHID 1
-@@ -32260,16 +35346,16 @@
+@@ -32260,16 +35485,16 @@
CheckClockGettime()
{
@@ -26799,7 +26988,7 @@
if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -32282,40 +35368,52 @@
+@@ -32282,40 +35507,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -26864,7 +27053,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32324,14 +35422,15 @@
+@@ -32324,14 +35561,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26884,7 +27073,7 @@
if test $ac_cv_lib_rt_clock_gettime = yes; then
have_clock_gettime=yes
fi
-@@ -32349,17 +35448,17 @@
+@@ -32349,17 +35587,17 @@
CheckLinuxVersion()
{
if test "${ac_cv_header_linux_version_h+set}" = set; then
@@ -26908,7 +27097,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32370,24 +35469,36 @@
+@@ -32370,24 +35608,36 @@
#include <linux/version.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -26953,7 +27142,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -32396,15 +35507,16 @@
+@@ -32396,15 +35646,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -26976,7 +27165,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -32413,8 +35525,13 @@
+@@ -32413,8 +35664,13 @@
/* end confdefs.h. */
#include <linux/version.h>
_ACEOF
@@ -26992,7 +27181,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -32438,9 +35555,10 @@
+@@ -32438,9 +35694,10 @@
ac_header_preproc=no
fi
@@ -27005,7 +27194,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -32464,25 +35582,18 @@
+@@ -32464,25 +35721,18 @@
echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;}
@@ -27036,7 +27225,7 @@
fi
if test $ac_cv_header_linux_version_h = yes; then
-@@ -32497,13 +35608,13 @@
+@@ -32497,13 +35747,13 @@
CheckRPATH()
{
@@ -27054,7 +27243,15 @@
}
case "$host" in
-@@ -33229,8 +36340,10 @@
+@@ -32565,6 +35815,7 @@
+ CheckVGL
+ CheckWscons
+ CheckAAlib
++ CheckCaca
+ CheckQtopia
+ CheckPicoGUI
+ CheckOpenGLX11
+@@ -33229,8 +36480,10 @@
@@ -27067,7 +27264,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -33249,39 +36362,58 @@
+@@ -33249,39 +36502,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -27142,7 +27339,7 @@
fi
fi
rm -f confcache
-@@ -33290,32 +36422,18 @@
+@@ -33290,32 +36562,18 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -27181,7 +27378,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -33353,11 +36471,35 @@
+@@ -33353,11 +36611,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -27219,7 +27416,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -33366,8 +36508,43 @@
+@@ -33366,8 +36648,43 @@
fi
@@ -27264,7 +27461,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -33381,18 +36558,19 @@
+@@ -33381,18 +36698,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -27287,7 +27484,7 @@
as_basename=basename
else
as_basename=false
-@@ -33400,159 +36578,120 @@
+@@ -33400,159 +36718,120 @@
# Name of the executable.
@@ -27518,7 +27715,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -33561,7 +36700,19 @@
+@@ -33561,7 +36840,19 @@
as_mkdir_p=false
fi
@@ -27539,7 +27736,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -33570,31 +36721,14 @@
+@@ -33570,31 +36861,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -27575,7 +27772,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -33602,30 +36736,20 @@
+@@ -33602,30 +36876,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -27614,7 +27811,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -33633,7 +36757,7 @@
+@@ -33633,7 +36897,7 @@
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -27623,7 +27820,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -33652,19 +36776,21 @@
+@@ -33652,19 +36916,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -27651,7 +27848,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -33675,39 +36801,24 @@
+@@ -33675,39 +36941,24 @@
do
case $1 in
--*=*)
@@ -27697,7 +27894,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -33717,18 +36828,24 @@
+@@ -33717,18 +36968,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -27727,7 +27924,7 @@
esac
shift
-@@ -33744,34 +36861,48 @@
+@@ -33744,34 +37001,48 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -27790,7 +27987,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -33783,749 +36914,627 @@
+@@ -33783,749 +37054,628 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -28159,6 +28356,7 @@
+X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+DIRECTFBCONFIG!$DIRECTFBCONFIG$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
++CACACONFIG!$CACACONFIG$ac_delim
+OSMESA_CONFIG!$OSMESA_CONFIG$ac_delim
+PTH_CONFIG!$PTH_CONFIG$ac_delim
+SDL_CFLAGS!$SDL_CFLAGS$ac_delim
@@ -28182,7 +28380,7 @@
+LTLIBOBJS!$LTLIBOBJS$ac_delim
+_ACEOF
+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -29070,7 +29268,7 @@
Index: libsdl1.2-1.2.11/libtool.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libsdl1.2-1.2.11/libtool.m4 2006-09-29 08:51:29.000000000 +0200
++++ libsdl1.2-1.2.11/libtool.m4 2006-09-29 09:02:21.000000000 +0200
@@ -0,0 +1,5767 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
@@ -34842,7 +35040,7 @@
Index: libsdl1.2-1.2.11/ltoptions.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libsdl1.2-1.2.11/ltoptions.m4 2006-09-29 08:51:29.000000000 +0200
++++ libsdl1.2-1.2.11/ltoptions.m4 2006-09-29 09:02:21.000000000 +0200
@@ -0,0 +1,358 @@
+# Helper functions for option handling. -*- Autoconf -*-
+# Written by Gary V. Vaughan <gary at gnu.org>
@@ -35205,7 +35403,7 @@
Index: libsdl1.2-1.2.11/ltsugar.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libsdl1.2-1.2.11/ltsugar.m4 2006-09-29 08:51:29.000000000 +0200
++++ libsdl1.2-1.2.11/ltsugar.m4 2006-09-29 09:02:21.000000000 +0200
@@ -0,0 +1,115 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@@ -35325,7 +35523,7 @@
Index: libsdl1.2-1.2.11/ltversion.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ libsdl1.2-1.2.11/ltversion.m4 2006-09-29 08:51:29.000000000 +0200
++++ libsdl1.2-1.2.11/ltversion.m4 2006-09-29 09:02:21.000000000 +0200
@@ -0,0 +1,15 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+# Generated from ltversion.in; do not edit by hand.
@@ -35345,7 +35543,7 @@
Index: libsdl1.2-1.2.11/test/aclocal.m4
===================================================================
--- libsdl1.2-1.2.11.orig/test/aclocal.m4 2006-06-27 06:48:54.000000000 +0200
-+++ libsdl1.2-1.2.11/test/aclocal.m4 2006-09-29 08:51:29.000000000 +0200
++++ libsdl1.2-1.2.11/test/aclocal.m4 2006-09-29 09:02:21.000000000 +0200
@@ -1,181 +1,14 @@
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
@@ -35543,7 +35741,7 @@
Index: libsdl1.2-1.2.11/test/configure
===================================================================
--- libsdl1.2-1.2.11.orig/test/configure 2006-06-27 06:48:55.000000000 +0200
-+++ libsdl1.2-1.2.11/test/configure 2006-09-29 08:52:51.000000000 +0200
++++ libsdl1.2-1.2.11/test/configure 2006-09-29 09:03:02.000000000 +0200
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
Modified: unstable/libsdl1.2/debian/patches/series
===================================================================
--- unstable/libsdl1.2/debian/patches/series 2006-09-29 06:54:33 UTC (rev 99)
+++ unstable/libsdl1.2/debian/patches/series 2006-09-29 12:57:27 UTC (rev 100)
@@ -4,6 +4,7 @@
011_no_yasm.diff
012_nasm_include.diff
013_builddir_support.diff
+020_libcaca_new_api.diff
040_propagate_pic_to_nasm.diff
100_relibtoolize.diff
205_lock_keys.diff
Modified: unstable/libsdl1.2/debian/rules
===================================================================
--- unstable/libsdl1.2/debian/rules 2006-09-29 06:54:33 UTC (rev 99)
+++ unstable/libsdl1.2/debian/rules 2006-09-29 12:57:27 UTC (rev 100)
@@ -22,13 +22,14 @@
--enable-arts-shared=no --enable-alsa-shared=no \
--enable-esd-shared=no
all_confflags = --disable-video-ggi \
- --enable-video-aalib --enable-video-directfb
+ --enable-video-aalib --enable-video-directfb \
+ --enable-video-caca
udeb_confflags = --enable-video-directfb --disable-video-ggi \
--disable-video-svga --disable-video-x11 \
--disable-video-aalib --disable-dga --disable-video-photon \
--disable-video-fbcon --disable-video-ps2gs \
--disable-video-opengl --disable-video-xbios \
- --disable-video-gem \
+ --disable-video-gem --disable-video-caca \
--disable-audio --disable-audio-arts --disable-audio-esd \
--disable-audio-oss --disable-audio-nas --disable-audio-alsa
More information about the Pkg-sdl-commits
mailing list