[Pkg-sdl-commits] r165 - in unstable/libsdl1.2/debian: . patches

aurel32 at alioth.debian.org aurel32 at alioth.debian.org
Wed Jan 2 02:48:01 UTC 2008


Author: aurel32
Date: 2008-01-02 02:48:00 +0000 (Wed, 02 Jan 2008)
New Revision: 165

Modified:
   unstable/libsdl1.2/debian/changelog
   unstable/libsdl1.2/debian/patches/000_unlibfoolise.diff
   unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff
   unstable/libsdl1.2/debian/patches/011_no_yasm.diff
   unstable/libsdl1.2/debian/patches/012_nasm_include.diff
   unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff
   unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff
   unstable/libsdl1.2/debian/patches/040_propagate_pic_to_nasm.diff
   unstable/libsdl1.2/debian/patches/100_relibtoolize.diff
   unstable/libsdl1.2/debian/patches/205_lock_keys.diff
   unstable/libsdl1.2/debian/patches/205_x11_keysym_fix.diff
   unstable/libsdl1.2/debian/patches/206_gcc4_compilation_fix.diff
   unstable/libsdl1.2/debian/patches/209_alsa_priority.diff
   unstable/libsdl1.2/debian/patches/211_mprotect.diff
   unstable/libsdl1.2/debian/patches/214_missing_mmx_blit.diff
   unstable/libsdl1.2/debian/patches/215_kfreebsd_gnu.diff
   unstable/libsdl1.2/debian/patches/216_page_size.diff
   unstable/libsdl1.2/debian/patches/217_x11_keytounicode.diff
   unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff
   unstable/libsdl1.2/debian/patches/300_dont_propagate_lpthread.diff
Log:
  * debian/patches/*.diff
    + Refresh.



Modified: unstable/libsdl1.2/debian/changelog
===================================================================
--- unstable/libsdl1.2/debian/changelog	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/changelog	2008-01-02 02:48:00 UTC (rev 165)
@@ -3,8 +3,10 @@
   * New upstream release.
   * debian/patches/100_relibtoolize.diff
     + Update.
+  * debian/patches/*.diff
+    + Refresh.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Wed, 02 Jan 2008 02:46:51 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 02 Jan 2008 03:47:13 +0100
 
 libsdl1.2 (1.2.12-3) unstable; urgency=low
 

Modified: unstable/libsdl1.2/debian/patches/000_unlibfoolise.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/000_unlibfoolise.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/000_unlibfoolise.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,6 +1,6 @@
-Index: libsdl1.2-1.2.11/acinclude.m4
+Index: libsdl1.2-1.2.13/acinclude.m4
 ===================================================================
---- libsdl1.2-1.2.11.orig/acinclude.m4	2006-07-19 15:23:33.000000000 +0200
+--- libsdl1.2-1.2.13.orig/acinclude.m4	2007-12-31 05:48:39.000000000 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,6724 +0,0 @@
 -##############################################################################

Modified: unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/001_autogen_autotools_fix.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.11/autogen.sh
+Index: libsdl1.2-1.2.13/autogen.sh
 ===================================================================
---- 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
+--- libsdl1.2-1.2.13.orig/autogen.sh	2007-12-31 05:48:39.000000000 +0100
++++ libsdl1.2-1.2.13/autogen.sh	2008-01-02 03:19:59.000000000 +0100
 @@ -4,15 +4,9 @@
  echo "This may take a while ..."
  
@@ -21,10 +21,10 @@
  (cd test; sh autogen.sh)
  
  # Run configure for this platform
-Index: libsdl1.2-1.2.11/test/autogen.sh
+Index: libsdl1.2-1.2.13/test/autogen.sh
 ===================================================================
---- 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
+--- libsdl1.2-1.2.13.orig/test/autogen.sh	2007-12-31 05:48:35.000000000 +0100
++++ libsdl1.2-1.2.13/test/autogen.sh	2008-01-02 03:19:59.000000000 +0100
 @@ -1,12 +1,5 @@
  #!/bin/sh
  #

Modified: unstable/libsdl1.2/debian/patches/011_no_yasm.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/011_no_yasm.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/011_no_yasm.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.12/configure.in
+Index: libsdl1.2-1.2.13/configure.in
 ===================================================================
---- libsdl1.2-1.2.12.orig/configure.in
-+++ libsdl1.2-1.2.12/configure.in
+--- libsdl1.2-1.2.13.orig/configure.in	2008-01-02 03:19:45.000000000 +0100
++++ libsdl1.2-1.2.13/configure.in	2008-01-02 03:45:17.000000000 +0100
 @@ -703,16 +703,12 @@
              esac
          fi

Modified: unstable/libsdl1.2/debian/patches/012_nasm_include.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/012_nasm_include.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/012_nasm_include.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,8 +1,8 @@
-Index: libsdl1.2-1.2.10/build-scripts/makedep.sh
+Index: libsdl1.2-1.2.13/build-scripts/makedep.sh
 ===================================================================
---- libsdl1.2-1.2.10.orig/build-scripts/makedep.sh	2006-05-26 10:20:17.000000000 +0200
-+++ libsdl1.2-1.2.10/build-scripts/makedep.sh	2006-05-26 10:21:00.000000000 +0200
-@@ -65,7 +65,7 @@
+--- libsdl1.2-1.2.13.orig/build-scripts/makedep.sh	2007-12-31 05:47:51.000000000 +0100
++++ libsdl1.2-1.2.13/build-scripts/makedep.sh	2008-01-02 03:19:59.000000000 +0100
+@@ -69,7 +69,7 @@
          ;;
          asm) cat >>${output}.new <<__EOF__
  

Modified: unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/020_libcaca_new_api.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,6 +1,8 @@
---- libsdl1.2-1.2.12.orig/configure.in
-+++ libsdl1.2-1.2.12/configure.in
-@@ -1432,6 +1432,38 @@
+Index: libsdl1.2-1.2.13/configure.in
+===================================================================
+--- libsdl1.2-1.2.13.orig/configure.in	2008-01-02 03:19:59.000000000 +0100
++++ libsdl1.2-1.2.13/configure.in	2008-01-02 03:45:14.000000000 +0100
+@@ -1428,6 +1428,38 @@
      fi
  }
  
@@ -39,7 +41,7 @@
  dnl Set up the QTopia video driver if enabled
  CheckQtopia()
  {
-@@ -2253,6 +2285,7 @@
+@@ -2249,6 +2281,7 @@
          CheckVGL
          CheckWscons
          CheckAAlib
@@ -47,8 +49,10 @@
          CheckQtopia
          CheckPicoGUI
          CheckOpenGLX11
---- libsdl1.2-1.2.12.orig/src/video/SDL_video.c
-+++ libsdl1.2-1.2.12/src/video/SDL_video.c
+Index: libsdl1.2-1.2.13/src/video/SDL_video.c
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/video/SDL_video.c	2007-12-31 05:48:14.000000000 +0100
++++ libsdl1.2-1.2.13/src/video/SDL_video.c	2008-01-02 03:19:59.000000000 +0100
 @@ -120,6 +120,9 @@
  #if SDL_VIDEO_DRIVER_AALIB
  	&AALIB_bootstrap,
@@ -59,8 +63,10 @@
  #if SDL_VIDEO_DRIVER_DUMMY
  	&DUMMY_bootstrap,
  #endif
---- libsdl1.2-1.2.12.orig/src/video/SDL_sysvideo.h
-+++ libsdl1.2-1.2.12/src/video/SDL_sysvideo.h
+Index: libsdl1.2-1.2.13/src/video/SDL_sysvideo.h
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/video/SDL_sysvideo.h	2007-12-31 05:48:14.000000000 +0100
++++ libsdl1.2-1.2.13/src/video/SDL_sysvideo.h	2008-01-02 03:19:59.000000000 +0100
 @@ -404,6 +404,9 @@
  #if SDL_VIDEO_DRIVER_AALIB
  extern VideoBootStrap AALIB_bootstrap;
@@ -71,8 +77,10 @@
  #if SDL_VIDEO_DRIVER_DUMMY
  extern VideoBootStrap DUMMY_bootstrap;
  #endif
---- libsdl1.2-1.2.12.orig/src/video/caca/SDL_cacaevents_c.h
-+++ libsdl1.2-1.2.12/src/video/caca/SDL_cacaevents_c.h
+Index: libsdl1.2-1.2.13/src/video/caca/SDL_cacaevents_c.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.13/src/video/caca/SDL_cacaevents_c.h	2008-01-02 03:19:59.000000000 +0100
 @@ -0,0 +1,35 @@
 +/*
 +    SDL - Simple DirectMedia Layer
@@ -109,8 +117,10 @@
 +extern void Caca_PumpEvents(_THIS);
 +extern void Caca_InitOSKeymap(_THIS);
 +
---- libsdl1.2-1.2.12.orig/src/video/caca/SDL_cacaevents.c
-+++ libsdl1.2-1.2.12/src/video/caca/SDL_cacaevents.c
+Index: libsdl1.2-1.2.13/src/video/caca/SDL_cacaevents.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.13/src/video/caca/SDL_cacaevents.c	2008-01-02 03:19:59.000000000 +0100
 @@ -0,0 +1,101 @@
 +/*
 +    SDL - Simple DirectMedia Layer
@@ -213,8 +223,10 @@
 +}
 +
 +
---- libsdl1.2-1.2.12.orig/src/video/caca/SDL_cacavideo.h
-+++ libsdl1.2-1.2.12/src/video/caca/SDL_cacavideo.h
+Index: libsdl1.2-1.2.13/src/video/caca/SDL_cacavideo.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.13/src/video/caca/SDL_cacavideo.h	2008-01-02 03:19:59.000000000 +0100
 @@ -0,0 +1,76 @@
 +/*
 +    SDL - Simple DirectMedia Layer
@@ -292,8 +304,10 @@
 +
 +#endif /* _SDL_cacavideo_h */
 +
---- libsdl1.2-1.2.12.orig/src/video/caca/SDL_cacavideo.c
-+++ libsdl1.2-1.2.12/src/video/caca/SDL_cacavideo.c
+Index: libsdl1.2-1.2.13/src/video/caca/SDL_cacavideo.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.13/src/video/caca/SDL_cacavideo.c	2008-01-02 03:19:59.000000000 +0100
 @@ -0,0 +1,304 @@
 +/*
 +    SDL - Simple DirectMedia Layer
@@ -599,8 +613,10 @@
 +	SDL_DestroyMutex(Caca_mutex);
 +}
 +
---- libsdl1.2-1.2.12.orig/include/SDL_config.h.in
-+++ libsdl1.2-1.2.12/include/SDL_config.h.in
+Index: libsdl1.2-1.2.13/include/SDL_config.h.in
+===================================================================
+--- libsdl1.2-1.2.13.orig/include/SDL_config.h.in	2008-01-02 03:19:45.000000000 +0100
++++ libsdl1.2-1.2.13/include/SDL_config.h.in	2008-01-02 03:19:59.000000000 +0100
 @@ -252,6 +252,7 @@
  /* Enable various video drivers */
  #undef SDL_VIDEO_DRIVER_AALIB

Modified: unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/030_pulseaudio_enable.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,5 +1,7 @@
---- libsdl1.2-1.2.12.orig/configure.in	2007-12-17 23:32:30.000000000 +0100
-+++ libsdl1.2-1.2.12/configure.in	2007-12-17 23:33:09.000000000 +0100
+Index: libsdl1.2-1.2.13/configure.in
+===================================================================
+--- libsdl1.2-1.2.13.orig/configure.in	2008-01-02 03:19:59.000000000 +0100
++++ libsdl1.2-1.2.13/configure.in	2008-01-02 03:19:59.000000000 +0100
 @@ -470,8 +470,8 @@
  {
      AC_ARG_ENABLE(pulseaudio,

Modified: unstable/libsdl1.2/debian/patches/040_propagate_pic_to_nasm.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/040_propagate_pic_to_nasm.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/040_propagate_pic_to_nasm.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.11/build-scripts/strip_fPIC.sh
+Index: libsdl1.2-1.2.13/build-scripts/strip_fPIC.sh
 ===================================================================
---- libsdl1.2-1.2.11.orig/build-scripts/strip_fPIC.sh	2006-06-27 06:48:32.000000000 +0200
-+++ libsdl1.2-1.2.11/build-scripts/strip_fPIC.sh	2006-07-19 14:51:41.000000000 +0200
+--- libsdl1.2-1.2.13.orig/build-scripts/strip_fPIC.sh	2007-12-31 05:47:51.000000000 +0100
++++ libsdl1.2-1.2.13/build-scripts/strip_fPIC.sh	2008-01-02 03:19:59.000000000 +0100
 @@ -5,8 +5,8 @@
  command=""
  while [ $# -gt 0 ]; do

Modified: unstable/libsdl1.2/debian/patches/100_relibtoolize.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/100_relibtoolize.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/100_relibtoolize.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,6 +1,7 @@
-diff -Nurd libsdl1.2-1.2.13.orig/aclocal.m4 libsdl1.2-1.2.13/aclocal.m4
---- libsdl1.2-1.2.13.orig/aclocal.m4	1970-01-01 01:00:00.000000000 +0100
-+++ libsdl1.2-1.2.13/aclocal.m4	2008-01-02 03:17:52.000000000 +0100
+Index: libsdl1.2-1.2.13/aclocal.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libsdl1.2-1.2.13/aclocal.m4	2008-01-02 03:19:59.000000000 +0100
 @@ -0,0 +1,6928 @@
 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 +
@@ -6930,9 +6931,10 @@
 +AC_MSG_RESULT([$SED])
 +])
 +
-diff -Nurd libsdl1.2-1.2.13.orig/configure libsdl1.2-1.2.13/configure
---- libsdl1.2-1.2.13.orig/configure	2008-01-02 03:17:17.000000000 +0100
-+++ libsdl1.2-1.2.13/configure	2008-01-02 03:17:57.000000000 +0100
+Index: libsdl1.2-1.2.13/configure
+===================================================================
+--- libsdl1.2-1.2.13.orig/configure	2008-01-02 03:19:45.000000000 +0100
++++ libsdl1.2-1.2.13/configure	2008-01-02 03:20:00.000000000 +0100
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -7119,8 +7121,8 @@
 +  as_have_required=yes
 +else
 +  as_have_required=no
-+fi
-+
+ fi
+ 
 +  if test $as_have_required = yes && 	 (eval ":
 +(as_func_return () {
 +  (exit \$1)
@@ -7137,20 +7139,7 @@
 +as_func_ret_failure () {
 +  return 1
 +}
-+
-+exitcode=0
-+if as_func_success; then
-+  :
-+else
-+  exitcode=1
-+  echo as_func_success failed.
- fi
  
-+if as_func_failure; then
-+  exitcode=1
-+  echo as_func_failure succeeded.
-+fi
- 
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
@@ -7167,11 +7156,12 @@
 -  test -z "$as_dir" && as_dir=.
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
-+if as_func_ret_success; then
++exitcode=0
++if as_func_success; then
 +  :
 +else
 +  exitcode=1
-+  echo as_func_ret_success failed.
++  echo as_func_success failed.
 +fi
  
 -       ;;
@@ -7187,6 +7177,18 @@
 -  fi
 -  case $CONFIG_SHELL in
 -  '')
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
 +if as_func_ret_failure; then
 +  exitcode=1
 +  echo as_func_ret_failure succeeded.
@@ -8077,6 +8079,11 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
+-# Find the source files, if location was not specified.
+-if test -z "$srcdir"; then
+-  ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
 +ac_ls_di=`ls -di .` &&
 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -8087,11 +8094,9 @@
 +   { (exit 1); exit 1; }; }
 +
 +
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
--  # Try the directory containing this script, then its parent.
--  ac_confdir=`(dirname "$0") 2>/dev/null ||
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
 +  # Try the directory containing this script, then the parent directory.
 +  ac_confdir=`$as_dirname -- "$0" ||
  $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -8400,15 +8405,8 @@
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
+-esac
+-
 -    cd $ac_dir
 -    # Check for guested configure; otherwise get Cygnus style configure.
 -    if test -f $ac_srcdir/configure.gnu; then
@@ -8421,6 +8419,15 @@
 -	   test -f $ac_srcdir/configure.in; then
 -      echo
 -      $ac_configure --help
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
 +    cd "$ac_dir" || { ac_status=$?; continue; }
 +    # Check for guested configure.
 +    if test -f "$ac_srcdir/configure.gnu"; then
@@ -9418,15 +9425,16 @@
 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $cross_compiling" >&5
 -echo "${ECHO_T}$cross_compiling" >&6
+-
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
 +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
 +echo "${ECHO_T}$cross_compiling" >&6; }
- 
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
++
 +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
 +if { (ac_try="$ac_link"
@@ -9701,20 +9709,20 @@
  
 -ac_cv_prog_cc_g=no
 +
++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
 +
 +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
-+
-+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
@@ -9757,7 +9765,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2436,214 +3057,702 @@
+@@ -2436,1736 +3057,1660 @@
    return 0;
  }
  _ACEOF
@@ -9854,6 +9862,58 @@
 -cat >conftest.$ac_ext <<_ACEOF
 -#ifndef __cplusplus
 -  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
@@ -9899,12 +9959,9 @@
 +# include <limits.h>
 +#else
 +# include <assert.h>
- #endif
++#endif
 +		     Syntax error
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
++_ACEOF
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9912,7 +9969,7 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
++  ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
    cat conftest.err >&5
@@ -9922,31 +9979,52 @@
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
-+  :
-+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
+ 
 +  # Broken: fails on valid input.
-+continue
-+fi
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f conftest.err conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent 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.  */
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
 +#include <ac_nonexistent.h>
-+_ACEOF
+ _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_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9955,44 +10033,121 @@
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
+   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_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
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  break
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
 +  # Broken: success on invalid input.
 +continue
-+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
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
-+fi
-+
+ fi
+ 
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +rm -f conftest.err conftest.$ac_ext
-+
+ 
 +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
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
 +    done
 +    ac_cv_prog_CPP=$CPP
-+
+ 
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+-if test "${ac_cv_c_bigendian+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +fi
 +  CPP=$ac_cv_prog_CPP
-+else
+ else
+-  # See if sys/param.h defines the BYTE_ORDER macro.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-#include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+- bogus endian macros
+-#endif
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  # It does; now see whether it defined to BIG_ENDIAN or not.
+-cat >conftest.$ac_ext <<_ACEOF
 +  ac_cv_prog_CPP=$CPP
 +fi
 +{ echo "$as_me:$LINENO: result: $CPP" >&5
@@ -10007,18 +10162,33 @@
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat >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.  */
+-#include <sys/types.h>
+-#include <sys/param.h>
+-
+-int
+-main ()
+-{
+-#if BYTE_ORDER != BIG_ENDIAN
+- not big endian
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
-+#endif
+ #endif
+-
+-  ;
+-  return 0;
+-}
 +		     Syntax error
-+_ACEOF
+ _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_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10027,43 +10197,75 @@
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
+   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_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
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
+-  ac_cv_c_bigendian=yes
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
 +  :
-+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
+ 
+-ac_cv_c_bigendian=no
 +  # Broken: fails on valid input.
 +continue
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# It does not; compile a test program.
+-if test "$cross_compiling" = yes; then
+-  # try to guess the endianness by grepping values into an object file
+-  ac_cv_c_bigendian=unknown
 +rm -f conftest.err conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent 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.  */
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+-int
+-main ()
+-{
+- _ascii (); _ebcdic ();
+-  ;
+-  return 0;
+-}
 +#include <ac_nonexistent.h>
-+_ACEOF
+ _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_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10071,28 +10273,115 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   ac_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_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
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+-  ac_cv_c_bigendian=yes
+-fi
+-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+-  if test "$ac_cv_c_bigendian" = unknown; then
+-    ac_cv_c_bigendian=no
+-  else
+-    # finding both strings is unlikely to happen, but who knows?
+-    ac_cv_c_bigendian=unknown
+-  fi
+-fi
 +  (exit $ac_status); } >/dev/null && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then
 +  # Broken: success on invalid input.
 +continue
-+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
+ 
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
-+fi
-+
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-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 ()
+-{
+-  /* Are we little or big endian?  From Harbison&Steele.  */
+-  union
+-  {
+-    long l;
+-    char c[sizeof (long)];
+-  } u;
+-  u.l = 1;
+-  exit (u.c[sizeof (long) - 1] == 1);
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_c_bigendian=no
+-else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-( exit $ac_status )
+-ac_cv_c_bigendian=yes
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+-case $ac_cv_c_bigendian in
+-  yes)
 +rm -f conftest.err conftest.$ac_ext
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define WORDS_BIGENDIAN 1
+-_ACEOF
+- ;;
+-  no)
+-     ;;
+-  *)
+-    { { echo "$as_me:$LINENO: error: unknown endianness
+-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-echo "$as_me: error: unknown endianness
+-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+-   { (exit 1); exit 1; }; } ;;
+-esac
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.err conftest.$ac_ext
@@ -10111,13 +10400,20 @@
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
+ 
+-if test x$ac_cv_c_bigendian = xyes; then
+-    cat >>confdefs.h <<\_ACEOF
+-#define SDL_BYTEORDER 4321
+-_ACEOF
+ 
 +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
 +if test "${ac_cv_path_GREP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-    cat >>confdefs.h <<\_ACEOF
+-#define SDL_BYTEORDER 1234
+-_ACEOF
 +  # Extract the first word of "grep ggrep" to use in msg output
 +if test -z "$GREP"; then
 +set dummy grep ggrep; ac_prog_name=$2
@@ -10128,7 +10424,7 @@
 +# Loop through the user's path and test for each of PROGNAME-LIST
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
- do
++do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_prog in grep ggrep; do
@@ -10171,32 +10467,141 @@
 +done
 +IFS=$as_save_IFS
 +
-+
-+fi
-+
+ 
+ fi
+ 
+-INCLUDE="-I$srcdir/include"
+-if test x$srcdir != x.; then
+-    # Remove SDL_config.h from the source directory, since it's the
+-    # default one, and we want to include the one that we generate.
+-    if test -f $srcdir/include/SDL_config.h; then
+-        rm $srcdir/include/SDL_config.h
+-    fi
+-    INCLUDE="-Iinclude $INCLUDE"
 +GREP="$ac_cv_path_GREP"
 +if test -z "$GREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
+ fi
+-case "$host" in
+-    *-*-cygwin*)
+-        # We build SDL on cygwin without the UNIX emulation layer
+-        BASE_CFLAGS="-I/usr/include/mingw -mno-cygwin"
+-        BASE_LDFLAGS="-mno-cygwin"
+-        ;;
+-    *)
+-        BASE_CFLAGS="-D_GNU_SOURCE=1"
+-        BASE_LDFLAGS=""
+-        ;;
+-esac
+-BUILD_CFLAGS="$CFLAGS $CPPFLAGS"
+-EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS"
+-BUILD_LDFLAGS="$LDFLAGS"
+-EXTRA_LDFLAGS="$BASE_LDFLAGS"
+-## These are common directories to find software packages
+-#for path in /usr/freeware /usr/pkg /usr/X11R6 /usr/local; do
+-#    if test -d $path/include; then
+-#        EXTRA_CFLAGS="$EXTRA_CFLAGS -I$path/include"
+-#    fi
+-#    if test -d $path/lib; then
+-#        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$path/lib"
+-#    fi
+-#done
+-SDL_CFLAGS="$BASE_CFLAGS"
+-SDL_LIBS="-lSDL $BASE_LDFLAGS"
+-CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
+-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
+-LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ 
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
-+
-+
+ 
+ 
+-# Check whether --enable-shared or --disable-shared was given.
+-if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
+-else
+-  enable_shared=yes
+-fi;
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
-+
-+
+ 
+-# Check whether --enable-static or --disable-static was given.
+-if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_static=yes ;;
+-    no) enable_static=no ;;
+-    *)
+-     enable_static=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_static=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
+-else
+-  enable_static=yes
+-fi;
+ 
+-# Check whether --enable-fast-install or --disable-fast-install was given.
+-if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_fast_install=yes ;;
+-    no) enable_fast_install=no ;;
+-    *)
+-      enable_fast_install=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_fast_install=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  enable_fast_install=yes
+-fi;
+-
+-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
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
@@ -10204,15 +10609,53 @@
 +if test -z "$EGREP"; then
 +set dummy egrep; ac_prog_name=$2
 +if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ 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.
 +  ac_path_EGREP_found=false
 +# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for lt_ac_prog in sed gsed; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+-      fi
+-    done
+-  done
+-done
+-lt_ac_max=0
+-lt_ac_count=0
+-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-# along with /bin/sed that truncates output.
+-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+-  test ! -f $lt_ac_sed && continue
+-  cat /dev/null > conftest.in
+-  lt_ac_count=0
+-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+-  # Check for GNU sed and select it if it is found.
+-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+-    lt_cv_path_SED=$lt_ac_sed
+-    break
+-  fi
+-  while true; do
+-    cat conftest.in conftest.in >conftest.tmp
+-    mv conftest.tmp conftest.in
+-    cp conftest.in conftest.nl
+-    echo >>conftest.nl
+-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+-    cmp -s conftest.out conftest.nl || break
+-    # 10000 chars as input seems more than enough
+-    test $lt_ac_count -gt 10 && break
+-    lt_ac_count=`expr $lt_ac_count + 1`
+-    if test $lt_ac_count -gt $lt_ac_max; then
+-      lt_ac_max=$lt_ac_count
+-      lt_cv_path_SED=$lt_ac_sed
 +  for ac_prog in egrep; do
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
@@ -10238,7 +10681,7 @@
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_EGREP="$ac_path_EGREP"
 +      ac_path_EGREP_max=$ac_count
-+    fi
+     fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -10247,29 +10690,90 @@
 +
 +
 +    $ac_path_EGREP_found && break 3
-+  done
+   done
+ done
+ 
 +done
-+
-+done
 +IFS=$as_save_IFS
 +
 +
-+fi
-+
+ fi
+ 
+-SED=$lt_cv_path_SED
+-echo "$as_me:$LINENO: result: $SED" >&5
+-echo "${ECHO_T}$SED" >&6
 +EGREP="$ac_cv_path_EGREP"
 +if test -z "$EGREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
-+
-+else
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
+-    fi
 +  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
+ 
+-
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
+-else
+-  with_gnu_ld=no
+-fi;
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [\\/]* | ?:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the pathname of ld
+-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  echo "$as_me:$LINENO: checking for GNU ld" >&5
+-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+-else
+-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 +   fi
-+fi
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
@@ -10278,32 +10782,49 @@
 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 +if test "${ac_cv_header_stdc+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.  */
--$ac_declaration
- #include <stdlib.h>
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if test -z "$LD"; then
+-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    IFS="$lt_save_ifs"
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some variants of GNU ld only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+-      *GNU* | *'with BFD'*)
+-	test "$with_gnu_ld" != no && break
+-	;;
+-      *)
+-	test "$with_gnu_ld" != yes && break
+-	;;
+-      esac
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
++  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>
 +#include <stdarg.h>
 +#include <string.h>
 +#include <float.h>
 +
- int
- main ()
- {
--exit (42);
++int
++main ()
++{
 +
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10311,64 +10832,74 @@
 +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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
++  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); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  ac_cv_header_stdc=yes
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--continue
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
 +	ac_cv_header_stdc=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ 
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  echo "$as_me:$LINENO: result: $LD" >&5
+-echo "${ECHO_T}$LD" >&6
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +if test $ac_cv_header_stdc = yes; then
 +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_declaration
++  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
 +  :
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  ac_cv_header_stdc=no
-+fi
+ fi
+-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
+-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+-case `$LD -v 2>&1 </dev/null` in
+-*GNU* | *'with BFD'*)
+-  lt_cv_prog_gnu_ld=yes
+-  ;;
+-*)
+-  lt_cv_prog_gnu_ld=no
+-  ;;
+-esac
 +rm -f conftest*
 +
-+fi
-+
+ fi
+-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
+ 
 +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
@@ -10378,23 +10909,52 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <stdlib.h>
-+
+ 
+-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
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "free" >/dev/null 2>&1; then
 +  :
-+else
+ else
+-  lt_cv_ld_reload_flag='-r'
 +  ac_cv_header_stdc=no
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+-reload_flag=$lt_cv_ld_reload_flag
+-case $reload_flag in
+-"" | " "*) ;;
+-*) reload_flag=" $reload_flag" ;;
+-esac
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-case $host_os in
+-  darwin*)
+-    if test "$GCC" = yes; then
+-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+-    else
+-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-    fi
+-    ;;
+-esac
 +rm -f conftest*
-+
+ 
+-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
 +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
 +  :
-+else
+ else
+-  if test -n "$NM"; then
+-  # Let the user override the test.
+-  lt_cv_path_NM="$NM"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -10415,32 +10975,17 @@
 +#endif
 +
 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
- int
- main ()
- {
--exit (42);
--  ;
++int
++main ()
++{
 +  int i;
 +  for (i = 0; i < 256; i++)
 +    if (XOR (islower (i), ISLOWER (i))
 +	|| toupper (i) != TOUPPER (i))
 +      return 2;
-   return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  return 0;
++}
++_ACEOF
 +rm -f conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
@@ -10449,12 +10994,8 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 +  { (case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10462,53 +11003,254 @@
 +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
--  break
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
 +  :
  else
--  echo "$as_me: failed program was:" >&5
+-  lt_nm_to_check="${ac_tool_prefix}nm"
+-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+-    lt_nm_to_check="$lt_nm_to_check nm"
+-  fi
+-  for lt_tmp_nm in $lt_nm_to_check; do
+-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+-      IFS="$lt_save_ifs"
+-      test -z "$ac_dir" && ac_dir=.
+-      tmp_nm="$ac_dir/$lt_tmp_nm"
+-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+-	# Check to see if the nm accepts a BSD-compat flag.
+-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-	#   nm: unknown option "B" ignored
+-	# Tru64's nm complains that /dev/null is an invalid object file
+-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+-	*/dev/null* | *'Invalid file or object type'*)
+-	  lt_cv_path_NM="$tmp_nm -B"
+-	  break
+-	  ;;
+-	*)
+-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+-	  */dev/null*)
+-	    lt_cv_path_NM="$tmp_nm -p"
+-	    break
+-	    ;;
+-	  *)
+-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	    continue # so that we can try to find one that supports BSD flags
+-	    ;;
+-	  esac
+-	  ;;
+-	esac
+-      fi
+-    done
+-    IFS="$lt_save_ifs"
+-  done
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 +  echo "$as_me: program exited with status $ac_status" >&5
 +echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
++sed 's/^/| /' conftest.$ac_ext >&5
++
 +( exit $ac_status )
 +ac_cv_header_stdc=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--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 core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
+-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+-echo "${ECHO_T}$lt_cv_path_NM" >&6
+-NM="$lt_cv_path_NM"
  
+-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
+-if test "$LN_S" = "ln -s"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
 +
 +fi
-+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
-+
+ 
+-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
+-  lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given extended regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
 +cat >>confdefs.h <<\_ACEOF
 +#define STDC_HEADERS 1
 +_ACEOF
-+
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +fi
-+
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
-+
-+
-+
-+
-+
-+
-+
-+
+ 
+-bsdi[45]*)
+-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
+ 
+-cygwin*)
+-  # func_win32_libid is a shell function defined in ltmain.sh
+-  #lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_cmd='func_win32_libid'
+-  ;;
+-
+-mingw* | pw32*)
+-  # Base MSYS/MinGW do not provide the 'file' command needed by
+-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+-  #lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
+-
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-freebsd* | kfreebsd*-gnu | dragonfly*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
+-    esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+-  fi
+-  ;;
+-
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-hpux10.20* | hpux11*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  case $host_cpu in
+-  ia64*)
+-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+-    ;;
+-  hppa*64*)
+-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+-    ;;
+-  *)
+-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-    ;;
+-  esac
+-  ;;
+-
+-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)$'
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $LD in
+-  *-32|*"-32 ") libmagic=32-bit;;
+-  *-n32|*"-n32 ") libmagic=N32;;
+-  *-64|*"-64 ") libmagic=64-bit;;
+-  *) libmagic=never-match;;
+-  esac
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
+-# This must be Linux ELF.
+-linux*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+-  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
+-  ;;
+ 
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
+-  ;;
+ 
+-openbsd*)
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+-  fi
+-  ;;
+ 
+-osf3* | osf4* | osf5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-sysv4 | sysv4.3*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  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
+-  ;;
 +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
@@ -10525,7 +11267,10 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
-+
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
@@ -10533,7 +11278,7 @@
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
-+esac
+ esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
 +  ac_status=$?
@@ -10546,18 +11291,19 @@
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
 +  eval "$as_ac_Header=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
  
 +	eval "$as_ac_Header=no"
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-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
+-
+-
  
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
@@ -10569,34 +11315,58 @@
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
  
--echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
--echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+-# If no C compiler was specified, use CC.
+-LTCC=${LTCC-"$CC"}
 +fi
-+
+ 
+-# If no C compiler flags were specified, use CFLAGS.
+-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +done
-+
-+
+ 
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
 +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
- if test "${ac_cv_c_bigendian+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2660,7 +3769,8 @@
- int
- main ()
- {
--#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++if test "${ac_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
+ 
+-fi;
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++int
++main ()
++{
 +#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
 +	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-  bogus endian macros
- #endif
++ bogus endian macros
++#endif
  
-@@ -2669,27 +3779,22 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-ia64-*-hpux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10605,37 +11375,53 @@
 +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
++  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_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
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  (exit $ac_status); }; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *ELF-32*)
+-      HPUX_IA64_MODE="32"
+-      ;;
+-    *ELF-64*)
+-      HPUX_IA64_MODE="64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '#line 3495 "configure"' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2712,40 +3817,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10644,70 +11430,145 @@
 +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
++  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_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
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  (exit $ac_status); }; then
+-   if test "$lt_cv_prog_gnu_ld" = yes; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -melf32bsmip"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -melf32bmipn32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -melf64bmip"
+-      ;;
+-    esac
+-   else
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-   fi
+-  fi
+-  rm -rf conftest*
+-  ;;
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   ac_cv_c_bigendian=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
--ac_cv_c_bigendian=no
+-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=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-    case `/usr/bin/file conftest.o` in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_i386"
+-          ;;
+-        ppc64-*linux*|powerpc64-*linux*)
+-          LD="${LD-ld} -m elf32ppclinux"
+-          ;;
+-        s390x-*linux*)
+-          LD="${LD-ld} -m elf_s390"
+-          ;;
+-        sparc64-*linux*)
+-          LD="${LD-ld} -m elf32_sparc"
+-          ;;
+-      esac
+-      ;;
+-    *64-bit*)
+-      case $host in
+-        x86_64-*linux*)
+-          LD="${LD-ld} -m elf_x86_64"
+-          ;;
+-        ppc*-*linux*|powerpc*-*linux*)
+-          LD="${LD-ld} -m elf64ppc"
+-          ;;
+-        s390*-*linux*)
+-          LD="${LD-ld} -m elf64_s390"
+-          ;;
+-        sparc*-*linux*)
+-          LD="${LD-ld} -m elf64_sparc"
+-          ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
 +	ac_cv_c_bigendian=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
++fi
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-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
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-  ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
--# It does not; compile a test program.
+-     cat >conftest.$ac_ext <<_ACEOF
 +	# It does not; compile a test program.
- if test "$cross_compiling" = yes; then
-   # try to guess the endianness by grepping values into an object file
-   ac_cv_c_bigendian=unknown
-@@ -2755,11 +3856,11 @@
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
--short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
--short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+-
 +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
--short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
--short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
 +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
 +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -2770,27 +3871,22 @@
+ {
+-
++ _ascii (); _ebcdic ();
+   ;
+   return 0;
  }
  _ACEOF
- 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 conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10728,59 +11589,107 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
+-  lt_cv_cc_needs_belf=yes
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then
-   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-   ac_cv_c_bigendian=yes
- fi
-@@ -2806,8 +3902,10 @@
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-+
+-lt_cv_cc_needs_belf=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-     ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-sparc*-*solaris*)
+-  # 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=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-    case `/usr/bin/file conftest.o` in
+-    *64-bit*)
+-      case $lt_cv_prog_gnu_ld in
+-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
+-      esac
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+ 
+-*-*-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.
+-set dummy ${ac_tool_prefix}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_DLLTOOL+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -2815,27 +3913,41 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
+-  if test -n "$DLLTOOL"; then
+-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
 +$ac_includes_default
- int
- main ()
- {
++int
++main ()
++{
 +
-   /* Are we little or big endian?  From Harbison&Steele.  */
-   union
-   {
--    long l;
--    char c[sizeof (long)];
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
 +    long int l;
 +    char c[sizeof (long int)];
-   } u;
-   u.l = 1;
--  exit (u.c[sizeof (long) - 1] == 1);
++  } u;
++  u.l = 1;
 +  return u.c[sizeof (long int) - 1] == 1;
 +
 +  ;
 +  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
++}
++_ACEOF
++rm -f conftest$ac_exeext
 +if { (ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -10788,794 +11697,436 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
 +  { (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
-@@ -2848,13 +3960,16 @@
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
- case $ac_cv_c_bigendian in
-   yes)
- 
-@@ -2925,10 +4040,9 @@
- 
- 
- 
--# Check whether --enable-shared or --disable-shared was given.
-+# Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
--  enableval="$enable_shared"
--  p=${PACKAGE-default}
-+  enableval=$enable_shared; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_shared=yes ;;
-     no) enable_shared=no ;;
-@@ -2947,12 +4061,12 @@
-     esac
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=no
  else
-   enable_shared=yes
--fi;
-+fi
+-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
++  echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
--# Check whether --enable-static or --disable-static was given.
-+
-+# Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
--  enableval="$enable_static"
--  p=${PACKAGE-default}
-+  enableval=$enable_static; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_static=yes ;;
-     no) enable_static=no ;;
-@@ -2971,12 +4085,12 @@
-     esac
- else
-   enable_static=yes
--fi;
-+fi
- 
--# Check whether --enable-fast-install or --disable-fast-install was given.
-+
-+# Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
--  enableval="$enable_fast_install"
--  p=${PACKAGE-default}
-+  enableval=$enable_fast_install; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_fast_install=yes ;;
-     no) enable_fast_install=no ;;
-@@ -2995,10 +4109,11 @@
-     esac
- else
-   enable_fast_install=yes
--fi;
-+fi
- 
--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
-+
-+{ 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
-@@ -3011,12 +4126,13 @@
-   test -z "$as_dir" && as_dir=.
-   for lt_ac_prog in sed gsed; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
-         lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-       fi
-     done
-   done
- done
-+IFS=$as_save_IFS
- lt_ac_max=0
- lt_ac_count=0
- # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -3051,37 +4167,23 @@
++( exit $ac_status )
++ac_cv_c_bigendian=yes
  fi
- 
- SED=$lt_cv_path_SED
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
--
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
--    fi
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
- 
-+{ echo "$as_me:$LINENO: result: $SED" >&5
-+echo "${ECHO_T}$SED" >&6; }
- 
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+# Check whether --with-gnu-ld was given.
- if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
--fi;
-+fi
-+
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-   case $host in
-   *-*-mingw*)
-     # gcc leaves a trailing carriage return which upsets mingw
-@@ -3110,11 +4212,11 @@
-     ;;
-   esac
- 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
-+  { echo "$as_me:$LINENO: checking for GNU ld" >&5
-+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
- else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
- fi
- if test "${lt_cv_path_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3147,17 +4249,17 @@
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
-+  { echo "$as_me:$LINENO: result: $LD" >&5
-+echo "${ECHO_T}$LD" >&6; }
- 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
- 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
-+{ 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
-@@ -3171,20 +4273,20 @@
-   ;;
- esac
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&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
- 
- 
--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
-+{ 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
-   lt_cv_ld_reload_flag='-r'
- fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
- "" | " "*) ;;
-@@ -3201,8 +4303,8 @@
-     ;;
- esac
- 
--echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-+{ 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
-@@ -3250,23 +4352,23 @@
-   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
- fi
- fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+echo "${ECHO_T}$lt_cv_path_NM" >&6; }
- NM="$lt_cv_path_NM"
- 
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+{ 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
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
--  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
-+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+echo "${ECHO_T}no, using $LN_S" >&6; }
- fi
- 
--echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
- if test "${lt_cv_deplibs_check_method+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3301,24 +4403,28 @@
- 
- cygwin*)
-   # func_win32_libid is a shell function defined in ltmain.sh
--  #lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
--  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-   lt_cv_file_magic_cmd='func_win32_libid'
-   ;;
- 
- mingw* | pw32*)
-   # Base MSYS/MinGW do not provide the 'file' command needed by
--  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
--  #lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--  lt_cv_deplibs_check_method=pass_all
--  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+  # unless we find 'file', for example because we are cross-compiling.
-+  if ( file / ) >/dev/null 2>&1; then
-+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+    lt_cv_file_magic_cmd='func_win32_libid'
-+  else
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  fi
-   ;;
- 
- darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd* | kfreebsd*-gnu | dragonfly*)
-+freebsd* | dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-@@ -3356,7 +4462,7 @@
-   esac
-   ;;
- 
--interix3*)
-+interix[3-9]*)
-   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-   ;;
-@@ -3372,11 +4478,11 @@
-   ;;
- 
- # This must be Linux ELF.
--linux*)
-+linux* | k*bsd*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -3406,6 +4512,10 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+rdos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
- solaris*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
-@@ -3443,8 +4553,8 @@
- esac
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-+{ 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
-@@ -3461,11 +4571,11 @@
- # Allow CC to be a program name with arguments.
- compiler=$CC
- 
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-+# Check whether --enable-libtool-lock was given.
- if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
-+  enableval=$enable_libtool_lock;
-+fi
- 
--fi;
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- # Some flags need to be propagated to the compiler or linker for good
-@@ -3492,7 +4602,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 3495 "configure"' > conftest.$ac_ext
-+  echo '#line 4605 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -3527,7 +4637,8 @@
-   rm -rf conftest*
-   ;;
- 
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -3538,6 +4649,9 @@
-     case `/usr/bin/file conftest.o` in
-     *32-bit*)
-       case $host in
-+        x86_64-*kfreebsd*-gnu)
-+          LD="${LD-ld} -m elf_i386_fbsd"
-+          ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
-@@ -3554,6 +4668,9 @@
-       ;;
-     *64-bit*)
-       case $host in
-+        x86_64-*kfreebsd*-gnu)
-+          LD="${LD-ld} -m elf_x86_64_fbsd"
-+          ;;
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_x86_64"
-           ;;
-@@ -3577,8 +4694,8 @@
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
--  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-+  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+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
-@@ -3604,35 +4721,32 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_link") 2>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'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext &&
-+       $as_test_x conftest$ac_exeext; then
-   lt_cv_cc_needs_belf=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--lt_cv_cc_needs_belf=no
-+	lt_cv_cc_needs_belf=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3641,8 +4755,8 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-+{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-     CFLAGS="$SAVE_CFLAGS"
-@@ -3672,8 +4786,8 @@
-   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.
- set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ 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
-@@ -3686,32 +4800,34 @@
-   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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
- 
- fi
- fi
- DLLTOOL=$ac_cv_prog_DLLTOOL
- if test -n "$DLLTOOL"; then
+-DLLTOOL=$ac_cv_prog_DLLTOOL
+-if test -n "$DLLTOOL"; then
 -  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
 -echo "${ECHO_T}$DLLTOOL" >&6
-+  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-+echo "${ECHO_T}$DLLTOOL" >&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; }
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  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
+-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
-+{ 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 $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3724,27 +4840,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-if test "${ac_cv_prog_ac_ct_DLLTOOL+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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    ac_cv_prog_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
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
- ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
- if test -n "$ac_ct_DLLTOOL"; then
+-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
-+  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-+echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
++{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
++case $ac_cv_c_bigendian in
++  yes)
++
++cat >>confdefs.h <<\_ACEOF
++#define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++if test x$ac_cv_c_bigendian = xyes; then
++    cat >>confdefs.h <<\_ACEOF
++#define SDL_BYTEORDER 4321
++_ACEOF
++
  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; }
++    cat >>confdefs.h <<\_ACEOF
++#define SDL_BYTEORDER 1234
++_ACEOF
++
  fi
  
 -  DLLTOOL=$ac_ct_DLLTOOL
-+  if test "x$ac_ct_DLLTOOL" = x; then
-+    DLLTOOL="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
+-else
+-  DLLTOOL="$ac_cv_prog_DLLTOOL"
++INCLUDE="-I$srcdir/include"
++if test x$srcdir != x.; then
++    # Remove SDL_config.h from the source directory, since it's the
++    # default one, and we want to include the one that we generate.
++    if test -f $srcdir/include/SDL_config.h; then
++        rm $srcdir/include/SDL_config.h
++    fi
++    INCLUDE="-Iinclude $INCLUDE"
+ fi
++case "$host" in
++    *-*-cygwin*)
++        # We build SDL on cygwin without the UNIX emulation layer
++        BASE_CFLAGS="-I/usr/include/mingw -mno-cygwin"
++        BASE_LDFLAGS="-mno-cygwin"
++        ;;
++    *)
++        BASE_CFLAGS="-D_GNU_SOURCE=1"
++        BASE_LDFLAGS=""
++        ;;
 +esac
-+    DLLTOOL=$ac_ct_DLLTOOL
-+  fi
- else
-   DLLTOOL="$ac_cv_prog_DLLTOOL"
- fi
-@@ -3752,8 +4882,8 @@
-   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
++BUILD_CFLAGS="$CFLAGS $CPPFLAGS"
++EXTRA_CFLAGS="$INCLUDE $BASE_CFLAGS"
++BUILD_LDFLAGS="$LDFLAGS"
++EXTRA_LDFLAGS="$BASE_LDFLAGS"
++## These are common directories to find software packages
++#for path in /usr/freeware /usr/pkg /usr/X11R6 /usr/local; do
++#    if test -d $path/include; then
++#        EXTRA_CFLAGS="$EXTRA_CFLAGS -I$path/include"
++#    fi
++#    if test -d $path/lib; then
++#        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -L$path/lib"
++#    fi
++#done
++SDL_CFLAGS="$BASE_CFLAGS"
++SDL_LIBS="-lSDL $BASE_LDFLAGS"
++CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
++CFLAGS="$CFLAGS $EXTRA_CFLAGS"
++LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
+ 
+-  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
-+{ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3766,32 +4896,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-if test "${ac_cv_prog_AS+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
+-  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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+IFS=$as_save_IFS
- 
- fi
- fi
- AS=$ac_cv_prog_AS
- if test -n "$AS"; 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
+-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: $AS" >&5
-+echo "${ECHO_T}$AS" >&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_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
+-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
-+{ 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
-@@ -3804,27 +4936,41 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-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.
+-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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_AS="as"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    ac_cv_prog_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"
- fi
- fi
- ac_ct_AS=$ac_cv_prog_ac_ct_AS
- if test -n "$ac_ct_AS"; then
+-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
-+  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
-+echo "${ECHO_T}$ac_ct_AS" >&6; }
++# Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval=$enable_shared; p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  enable_shared=yes
  fi
  
 -  AS=$ac_ct_AS
-+  if test "x$ac_ct_AS" = x; then
-+    AS="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AS=$ac_ct_AS
-+  fi
++
++# Check whether --enable-static was given.
++if test "${enable_static+set}" = set; then
++  enableval=$enable_static; p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
  else
-   AS="$ac_cv_prog_AS"
+-  AS="$ac_cv_prog_AS"
++  enable_static=yes
  fi
-@@ -3832,8 +4978,8 @@
-   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
+ 
+-  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
-+{ 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3846,32 +4992,34 @@
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
+-if test "${ac_cv_prog_OBJDUMP+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.
+-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
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
- done
-+IFS=$as_save_IFS
+-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
  
- fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
+-fi
+-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: $OBJDUMP" >&5
-+echo "${ECHO_T}$OBJDUMP" >&6; }
++# Check whether --enable-fast-install was given.
++if test "${enable_fast_install+set}" = set; then
++  enableval=$enable_fast_install; p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
  else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
++  enable_fast_install=yes
  fi
  
-+
- 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
+-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
-+{ 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
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+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
-@@ -3884,27 +5032,41 @@
+-  if test -n "$ac_ct_OBJDUMP"; then
+-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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.
+ 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
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
+-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
  done
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && continue
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
  done
-+IFS=$as_save_IFS
  
 -  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
+-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
-+  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+echo "${ECHO_T}$ac_ct_OBJDUMP" >&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
+-
 -  OBJDUMP=$ac_ct_OBJDUMP
-+  if test "x$ac_ct_OBJDUMP" = x; then
-+    OBJDUMP="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    OBJDUMP=$ac_ct_OBJDUMP
-+  fi
- else
-   OBJDUMP="$ac_cv_prog_OBJDUMP"
+-else
+-  OBJDUMP="$ac_cv_prog_OBJDUMP"
  fi
-@@ -3916,495 +5078,23 @@
- need_locks="$enable_libtool_lock"
  
+-  ;;
+-
+-esac
++SED=$lt_cv_path_SED
  
+-need_locks="$enable_libtool_lock"
++{ echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6; }
+ 
+ 
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11590,7 +12141,10 @@
 -if test -z "$CPP"; then
 -  if test "${ac_cv_prog_CPP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
 -      # Double quotes because CPP needs to be expanded
 -    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 -    do
@@ -11627,9 +12181,319 @@
 -  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
++  with_gnu_ld=no
++fi
++
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  { echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
++else
++  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  { echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++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
++  # I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++{ 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
++
++
++{ 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
++  lt_cv_ld_reload_flag='-r'
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++
++{ 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 "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
++	  break
++	  ;;
++	*)
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
++	  ;;
++	esac
++      fi
++    done
++    IFS="$lt_save_ifs"
++  done
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6; }
++NM="$lt_cv_path_NM"
++
++{ 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
++if test "$LN_S" = "ln -s"; then
++  { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6; }
++fi
++
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
++if test "${lt_cv_deplibs_check_method+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[45]*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case $host_cpu in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++interix[3-9]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# 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)$'
+   else
 -    ac_cpp_err=
--  fi
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+   fi
 -else
 -  ac_cpp_err=yes
 -fi
@@ -11638,12 +12502,18 @@
 -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
--
++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
++  ;;
+ 
 -  # OK, works on sane cases.  Now check whether non-existent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -11665,9 +12535,17 @@
 -  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
++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
@@ -11677,28 +12555,91 @@
 -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
--
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
 -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
--
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
 -    done
 -    ac_cv_prog_CPP=$CPP
--
--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
+ 
+ fi
 -  CPP=$ac_cv_prog_CPP
 -else
 -  ac_cv_prog_CPP=$CPP
--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
++
++
++
++
++# 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
++
++# Check whether --enable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval=$enable_libtool_lock;
+ fi
 -echo "$as_me:$LINENO: result: $CPP" >&5
 -echo "${ECHO_T}$CPP" >&6
 -ac_preproc_ok=false
@@ -11725,18 +12666,38 @@
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
++
++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
++ia64-*-hpux*)
++  # 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
+   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=
--  fi
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
+   fi
 -else
 -  ac_cpp_err=yes
 -fi
@@ -11750,7 +12711,45 @@
 -continue
 -fi
 -rm -f conftest.err conftest.$ac_ext
--
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line 4605 "configure"' > 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
++  (exit $ac_status); }; then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
+ 
 -  # OK, works on sane cases.  Now check whether non-existent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -11763,18 +12762,65 @@
 -_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (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
+   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=
--  fi
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.o` in
++    *32-bit*)
++      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
+   fi
 -else
 -  ac_cpp_err=yes
 -fi
@@ -11790,13 +12836,23 @@
 -break
 -fi
 -rm -f conftest.err conftest.$ac_ext
--
++  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
 -  :
--else
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++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
@@ -11805,44 +12861,52 @@
 -fi
 -
 -ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
++  ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
 -
--
 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 -if test "${ac_cv_header_stdc+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.  */
++     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>
 -#include <stdarg.h>
 -#include <string.h>
 -#include <float.h>
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
+ 
+ int
+ main ()
+@@ -4175,236 +4720,381 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
@@ -11858,14 +12922,21 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_header_stdc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  lt_cv_cc_needs_belf=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -ac_cv_header_stdc=no
--fi
++	lt_cv_cc_needs_belf=no
+ 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
@@ -11875,18 +12946,87 @@
 -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
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
 -_ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "memchr" >/dev/null 2>&1; then
 -  :
 -else
 -  ac_cv_header_stdc=no
--fi
+ fi
 -rm -f conftest*
--
--fi
--
++{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++sparc*-*solaris*)
++  # 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=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-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.
++set dummy ${ac_tool_prefix}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_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
++IFS=$as_save_IFS
+ 
+ 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; }
++fi
+ 
 -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
@@ -11896,23 +13036,73 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <stdlib.h>
--
+ 
 -_ACEOF
 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 -  $EGREP "free" >/dev/null 2>&1; then
 -  :
 -else
 -  ac_cv_header_stdc=no
--fi
+ fi
 -rm -f conftest*
--
--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 $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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
+ fi
++fi
++ac_ct_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
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++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
 -  :
--else
++  if test "x$ac_ct_DLLTOOL" = x; then
++    DLLTOOL="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    DLLTOOL=$ac_ct_DLLTOOL
++  fi
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -11930,7 +13120,9 @@
 -		     || ('s' <= (c) && (c) <= 'z'))
 -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 -#endif
--
++  DLLTOOL="$ac_cv_prog_DLLTOOL"
++fi
+ 
 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 -int
 -main ()
@@ -11955,38 +13147,158 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  :
--else
++  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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  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
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AS="${ac_tool_prefix}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
+ 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; }
+ 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
--
+ 
+ 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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_AS="as"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
 -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 -
 -
 -
 -
--
--
--
--
--
++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; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
+ 
++  if test "x$ac_ct_AS" = x; then
++    AS="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    AS=$ac_ct_AS
++  fi
++else
++  AS="$ac_cv_prog_AS"
++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
++{ 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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$OBJDUMP"; then
++  ac_cv_prog_OBJDUMP="$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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
++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
+ 
+ 
 -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
@@ -11994,8 +13306,16 @@
 -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
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++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
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -12029,27 +13349,73 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  eval "$as_ac_Header=yes"
--else
++  if test -n "$ac_ct_OBJDUMP"; then
++  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+ else
 -  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_test_x "$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
++  fi
++done
++done
++IFS=$as_save_IFS
+ 
 -eval "$as_ac_Header=no"
--fi
+ fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
--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
+ 
++  if test "x$ac_ct_OBJDUMP" = x; then
++    OBJDUMP="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf at gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    OBJDUMP=$ac_ct_OBJDUMP
++  fi
++else
++  OBJDUMP="$ac_cv_prog_OBJDUMP"
+ fi
+ 
 -done
--
--
++  ;;
++
++esac
++
++need_locks="$enable_libtool_lock"
  
+ 
+ 
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12673,9 +14039,8 @@
 -  echo '#endif'             >>confdefs.h
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- 
--ac_ext=cc
++fi
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
@@ -12698,7 +14063,9 @@
 +  else
 +    CXXFLAGS=
 +  fi
-+fi
+ fi
+-
+-ac_ext=cc
 +ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -18322,7 +19689,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18550,36 +19429,51 @@
+@@ -18550,79 +19429,56 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18342,16 +19709,42 @@
  if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  CC=$ac_ct_CC
 +  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  CC="$ac_cv_prog_CC"
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
--  CC=$ac_ct_CC
+-if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  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_CC="${ac_tool_prefix}cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
@@ -18366,31 +19759,54 @@
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
-+  fi
+   fi
+-done
+-done
+-
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
  else
-   CC="$ac_cv_prog_CC"
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  CC="$ac_cv_prog_CC"
  fi
  
- if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-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.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test -z "$CC"; then
 +          if test -n "$ac_tool_prefix"; then
 +    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++set dummy ${ac_tool_prefix}cc; ac_word=$2
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18592,74 +19486,34 @@
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -18630,36 +19486,34 @@
    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_CC="cc"
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
++    ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -18400,48 +19816,12 @@
  
  fi
  fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--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.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
 -ac_ct_CC=$ac_cv_prog_ac_ct_CC
 -if test -n "$ac_ct_CC"; then
 -  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 -echo "${ECHO_T}$ac_ct_CC" >&6
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
  else
@@ -18857,20 +20237,20 @@
  
 -ac_cv_prog_cc_g=no
 +
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +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
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 +{ 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
@@ -19602,12 +20982,12 @@
 -  echo '#endif'             >>confdefs.h
 +
 +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
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -21676,18 +23056,11 @@
  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
+-  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'
@@ -21699,8 +23072,18 @@
 -	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 +  (exit $ac_status); } && {
 +	 test -z "$ac_c_werror_flag" ||
@@ -22057,8 +23440,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
@@ -22617,8 +24000,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
@@ -23177,8 +24560,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
@@ -24660,10 +26043,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"
@@ -24673,9 +26056,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"
@@ -24685,10 +26068,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
@@ -27463,6 +28846,10 @@
 -rm -f conftest.err conftest.$ac_objext \
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
 -	if test $ac_R_space = yes; then
 -	  echo "$as_me:$LINENO: result: yes" >&5
@@ -27475,10 +28862,6 @@
 -      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
@@ -33207,10 +34590,11 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -32144,25 +32676,18 @@
+@@ -32143,26 +32675,19 @@
+     { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5
  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;}
+-echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;}
 -    (
 -      cat <<\_ASBOX
 -## ------------------------------------------ ##
@@ -33219,6 +34603,7 @@
 -_ASBOX
 -    ) |
 -      sed "s/^/$as_me: WARNING:     /" >&2
++echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;}
 +
      ;;
  esac
@@ -34630,7 +36015,6 @@
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
--
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
@@ -34645,6 +36029,7 @@
 +	  }
 +	  s/.*/./; q'`
  
+-
 -# PATH needs CR, and LINENO needs CR and PATH.
 -# Avoid depending upon Character Ranges.
 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -34652,9 +36037,7 @@
 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 -as_cr_digits='0123456789'
 -as_cr_alnum=$as_cr_Letters$as_cr_digits
-+# CDPATH.
-+$as_unset CDPATH
- 
+-
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conf$$.sh
@@ -34667,12 +36050,14 @@
 -  fi
 -  rm -f conf$$.sh
 -fi
++# CDPATH.
++$as_unset CDPATH
  
  
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
 -  # Find who we are.  Look in the path if we contain no path at all
 -  # relative or not.
@@ -34685,7 +36070,7 @@
 -  test -z "$as_dir" && as_dir=.
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
--
+ 
 -       ;;
 -  esac
 -  # We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -34709,10 +36094,10 @@
 -	 case $as_dir in
 -	 /*)
 -	   if ("$as_dir/$as_base" -c '
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
 -	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
 -	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
@@ -35303,10 +36688,9 @@
 -s, at EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
 -s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 -CEOF
-+if test -n "$CONFIG_FILES"; then
- 
- _ACEOF
- 
+-
+-_ACEOF
+-
 -  cat >>$CONFIG_STATUS <<\_ACEOF
 -  # Split the substitutions into bite-sized pieces for seds with
 -  # small command number limits, like on Digital OSF/1 and HP-UX.
@@ -35343,8 +36727,12 @@
 -  done
 -  if test -z "$ac_sed_cmds"; then
 -    ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
 +
++_ACEOF
 +
++
++
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
@@ -35458,7 +36846,7 @@
    fi
 -fi # test -n "$CONFIG_FILES"
 +done
- 
++
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
@@ -35481,7 +36869,7 @@
 +rm -f conf$$subs.sed
 +cat >>$CONFIG_STATUS <<_ACEOF
 +CEOF$ac_eof
- _ACEOF
++_ACEOF
 +
 +
 +ac_delim='%!_!# '
@@ -35529,7 +36917,7 @@
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 +  fi
 +done
-+
+ 
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
@@ -35554,7 +36942,7 @@
 +:end
 +s/|#_!!_#|//g
 +CEOF$ac_eof
-+_ACEOF
+ _ACEOF
 +
 +
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -35590,7 +36978,7 @@
 +do
 +  case $ac_tag in
 +  :[FHLC]) ac_mode=$ac_tag; continue;;
-   esac
++  esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
 +  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
@@ -35606,9 +36994,7 @@
 +  shift
 +  ac_file=$1
 +  shift
- 
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++
 +  case $ac_mode in
 +  :L) ac_source=$1;;
 +  :[FH])
@@ -35647,8 +37033,10 @@
 +    *:-:* | *:-) cat >"$tmp/stdin";;
 +    esac
 +    ;;
-+  esac
-+
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
 +  ac_dir=`$as_dirname -- "$ac_file" ||
  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -35856,11 +37244,7 @@
 -  fi
 -  configure_input=$configure_input"Generated from `echo $ac_file_in |
 -				     sed 's,.*/,,'` by configure."
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
- 
+-
 -  # First look for the input files in the build tree, otherwise in the
 -  # src tree.
 -  ac_file_inputs=`IFS=:
@@ -35888,6 +37272,11 @@
 -	 fi;;
 -      esac
 -    done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=; ac_datarootdir_seen=
++
 +case `sed -n '/datarootdir/ {
 +  p
 +  q
@@ -35950,19 +37339,7 @@
 -#
 -# CONFIG_HEADER section.
 -#
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
- 
+-
 -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
 -# NAME is the cpp macro being defined and VALUE is the value it is being given.
 -#
@@ -35976,6 +37353,19 @@
 -ac_uB='$,\1#\2define\3'
 -ac_uC=' '
 -ac_uD=',;t'
++s&@configure_input@&$configure_input&;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++$ac_datarootdir_hack
++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
++
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
 +  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
@@ -36110,19 +37500,10 @@
  # on some systems where configure will not decide to define it.
 -cat >>conftest.undefs <<\_ACEOF
 -s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
 +# (The regexp can be short, since the line contains either #define or #undef.)
 +echo 's/ $//
 +s,^[	 #]*u.*,/* & */,' >>conftest.defines
- 
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo '  :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
++
 +# Break up conftest.defines:
 +ac_max_sed_lines=50
 +
@@ -36135,7 +37516,26 @@
 +ac_nxt='"$tmp/out2"'
 +
 +while :
- do
++do
++  # Write a here document:
++    cat >>$CONFIG_STATUS <<_ACEOF
++    # First, check the format of the line:
++    cat >"\$tmp/defines.sed" <<\\CEOF
++/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
++/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
++b
++:def
+ _ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
 -  # Write a limited-size here document to $tmp/defines.sed.
 -  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
 -  # Speed up: don't consider the non `#define' lines.
@@ -36144,15 +37544,6 @@
 -  echo 't clr' >>$CONFIG_STATUS
 -  echo ': clr' >>$CONFIG_STATUS
 -  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+  # Write a here document:
-+    cat >>$CONFIG_STATUS <<_ACEOF
-+    # First, check the format of the line:
-+    cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-+b
-+:def
-+_ACEOF
 +  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
    echo 'CEOF
 -  sed -f $tmp/defines.sed $tmp/in >$tmp/out
@@ -36402,9 +37793,10 @@
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nurd libsdl1.2-1.2.13.orig/test/aclocal.m4 libsdl1.2-1.2.13/test/aclocal.m4
+Index: libsdl1.2-1.2.13/test/aclocal.m4
+===================================================================
 --- libsdl1.2-1.2.13.orig/test/aclocal.m4	2007-12-31 06:09:39.000000000 +0100
-+++ libsdl1.2-1.2.13/test/aclocal.m4	2008-01-02 03:17:58.000000000 +0100
++++ libsdl1.2-1.2.13/test/aclocal.m4	2008-01-02 03:20:00.000000000 +0100
 @@ -1,181 +1,14 @@
 -# Configure paths for SDL
 -# Sam Lantinga 9/21/99
@@ -36412,7 +37804,8 @@
 -# stolen back from Frank Belew
 -# stolen from Manish Singh
 -# Shamelessly stolen from Owen Taylor
--
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+ 
 -dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
 -dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
 -dnl
@@ -36426,7 +37819,17 @@
 -            sdl_exec_prefix="$withval", sdl_exec_prefix="")
 -AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
 -		    , enable_sdltest=yes)
--
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005  Free Software Foundation, Inc.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
+ 
 -  if test x$sdl_exec_prefix != x ; then
 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
 -    if test x${SDL_CONFIG+set} != xset ; then
@@ -36509,8 +37912,7 @@
 -     printf("%s, bad version string\n", "$min_sdl_version");
 -     exit(1);
 -   }
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
+-
 -   if (($sdl_major_version > major) ||
 -      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
 -      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
@@ -36528,12 +37930,7 @@
 -      return 1;
 -    }
 -}
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
+-
 -],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
 -       CFLAGS="$ac_save_CFLAGS"
 -       CXXFLAGS="$ac_save_CXXFLAGS"
@@ -36561,11 +37958,7 @@
 -          AC_TRY_LINK([
 -#include <stdio.h>
 -#include "SDL.h"
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
- 
+-
 -int main(int argc, char *argv[])
 -{ return 0; }
 -#undef  main
@@ -36598,9 +37991,10 @@
 -  rm -f conf.sdltest
 -])
 +m4_include([acinclude.m4])
-diff -Nurd libsdl1.2-1.2.13.orig/test/configure libsdl1.2-1.2.13/test/configure
---- libsdl1.2-1.2.13.orig/test/configure	2008-01-02 03:17:17.000000000 +0100
-+++ libsdl1.2-1.2.13/test/configure	2008-01-02 03:17:58.000000000 +0100
+Index: libsdl1.2-1.2.13/test/configure
+===================================================================
+--- libsdl1.2-1.2.13.orig/test/configure	2008-01-02 03:19:45.000000000 +0100
++++ libsdl1.2-1.2.13/test/configure	2008-01-02 03:20:00.000000000 +0100
 @@ -1,288 +1,28 @@
  #! /bin/sh
 +
@@ -36847,12 +38241,12 @@
 -# CDPATH.
 -$as_unset CDPATH
 -
--
+ 
 -# Name of the host.
 -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 -# so uname gets run too.
 -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
+-
 -exec 6>&1
 -
 -#
@@ -37349,10 +38743,7 @@
 -  esac
 -done
 +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
- 
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--	      localstatedir libdir includedir oldincludedir infodir mandir
++
 +# File descriptor usage:
 +# 0 standard input
 +# 1 file creation
@@ -37367,7 +38758,10 @@
 +  exec 6>&1
 +fi
 +exec 5>./config.log
-+
+ 
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
 +echo "\
 +This file contains any messages produced by compilers while
 +running configure, to aid debugging if configure makes a mistake.
@@ -37912,8 +39306,9 @@
 -cat >>confdefs.h <<_ACEOF
 -#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 -_ACEOF
++srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+ 
 -
--
 -cat >>confdefs.h <<_ACEOF
 -#define PACKAGE_VERSION "$PACKAGE_VERSION"
 -_ACEOF
@@ -37928,8 +39323,7 @@
 -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 -_ACEOF
 -
-+srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
- 
+-
 -# Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
  if test -z "$CONFIG_SITE"; then
@@ -38040,10 +39434,11 @@
 -
 -
 -
+-
 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 +cross_compiling=$ac_cv_prog_cc_cross
- 
++
 +ac_exeext=
 +ac_objext=o
 +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
@@ -38078,7 +39473,12 @@
 -ac_config_guess="$SHELL $ac_aux_dir/config.guess"
 -ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
--
++  { echo "configure: error: can not find install-sh or install.sh in $srcdir/../build-scripts" 1>&2; exit 1; }
++fi
++ac_config_guess=$ac_aux_dir/config.guess
++ac_config_sub=$ac_aux_dir/config.sub
++ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+ 
 -# Make sure we can run config.sub.
 -$ac_config_sub sun4 >/dev/null 2>&1 ||
 -  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
@@ -38102,19 +39502,15 @@
 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
 -   { (exit 1); exit 1; }; }
 -
-+  { echo "configure: error: can not find install-sh or install.sh in $srcdir/../build-scripts" 1>&2; exit 1; }
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 -echo "${ECHO_T}$ac_cv_build" >&6
 -build=$ac_cv_build
 -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_config_guess=$ac_aux_dir/config.guess
-+ac_config_sub=$ac_aux_dir/config.sub
-+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
- 
- 
+-
+-
 -echo "$as_me:$LINENO: checking host system type" >&5
 -echo $ECHO_N "checking host system type... $ECHO_C" >&6
 -if test "${ac_cv_host+set}" = set; then
@@ -38127,7 +39523,7 @@
 -  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
 -   { (exit 1); exit 1; }; }
--
+ 
 +# Make sure we can run config.sub.
 +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
@@ -38141,7 +39537,7 @@
  
 +echo $ac_n "checking host system type""... $ac_c" 1>&6
 +echo "configure:554: checking host system type" >&5
- 
++
 +host_alias=$host
 +case "$host_alias" in
 +NONE)
@@ -38160,6 +39556,7 @@
 +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 +echo "$ac_t""$host" 1>&6
  
+ 
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -38172,10 +39569,17 @@
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$CC"; then
--  ac_cv_prog_CC="$CC" # Let the user override the test.
--else
++
++# Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:579: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH
 -do
@@ -38189,29 +39593,48 @@
 -  fi
 -done
 -done
- 
--fi
--fi
+-
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="gcc"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
+ fi
+ fi
 -CC=$ac_cv_prog_CC
--if test -n "$CC"; then
++CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
--else
++  echo "$ac_t""$CC" 1>&6
+ else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--fi
++  echo "$ac_t""no" 1>&6
+ fi
  
 -fi
 -if test -z "$ac_cv_prog_CC"; then
 -  ac_ct_CC=$CC
 -  # Extract the first word of "gcc", so it can be a program name with args.
-+# Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
+-set dummy gcc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:609: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
+ else
 -  if test -n "$ac_ct_CC"; then
 -  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 -else
@@ -38253,14 +39676,10 @@
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:579: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
- else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH
 -do
@@ -38275,21 +39694,10 @@
 -done
 -done
 -
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_CC="gcc"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
- fi
- fi
+-fi
+-fi
 -CC=$ac_cv_prog_CC
-+CC="$ac_cv_prog_CC"
- if test -n "$CC"; then
+-if test -n "$CC"; then
 -  echo "$as_me:$LINENO: result: $CC" >&5
 -echo "${ECHO_T}$CC" >&6
 -else
@@ -38336,28 +39744,24 @@
 -fi
 -
 -  CC=$ac_ct_CC
-+  echo "$ac_t""$CC" 1>&6
- else
+-else
 -  CC="$ac_cv_prog_CC"
-+  echo "$ac_t""no" 1>&6
- fi
- 
 -fi
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
+-
+-fi
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
 -echo "$as_me:$LINENO: checking for $ac_word" >&5
 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 -if test "${ac_cv_prog_CC+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:609: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
  else
-   if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
- else
 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
    ac_prog_rejected=no
 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -38531,14 +39935,20 @@
 -done
 -
 -  CC=$ac_ct_CC
--fi
--
 +  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
+-fi
 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 +echo "configure:692: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+ 
 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: no acceptable C compiler found in \$PATH
@@ -38575,7 +39985,8 @@
 -int
 -main ()
 -{
--
++cat > conftest.$ac_ext << EOF
+ 
 -  ;
 -  return 0;
 -}
@@ -38628,12 +40039,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+ac_ext=c
-+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+cross_compiling=$ac_cv_prog_cc_cross
++#line 703 "configure"
++#include "confdefs.h"
  
 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
 -See \`config.log' for more details." >&5
@@ -38641,14 +40048,11 @@
 -See \`config.log' for more details." >&2;}
 -   { (exit 77); exit 77; }; }
 -fi
-+cat > conftest.$ac_ext << EOF
- 
+-
 -ac_exeext=$ac_cv_exeext
 -echo "$as_me:$LINENO: result: $ac_file" >&5
 -echo "${ECHO_T}$ac_file" >&6
-+#line 703 "configure"
-+#include "confdefs.h"
- 
+-
 -# Check the compiler produces executables we can run.  If not, either
 -# the compiler is broken, or we cross compile.
 -echo "$as_me:$LINENO: checking whether the C compiler works" >&5
@@ -38724,10 +40128,23 @@
 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
+-fi
+-
+-rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
+-
+-rm -f conftest.$ac_ext
+-EXEEXT=$ac_cv_exeext
+-ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+-if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  ac_cv_prog_cc_works=no
- fi
++fi
 +rm -fr conftest*
 +ac_ext=c
 +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -38735,10 +40152,7 @@
 +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 +cross_compiling=$ac_cv_prog_cc_cross
- 
--rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
++
 +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 +if test $ac_cv_prog_cc_works = no; then
 +  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
@@ -38747,18 +40161,19 @@
 +echo "configure:734: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 +cross_compiling=$ac_cv_prog_cc_cross
- 
--rm -f conftest.$ac_ext
--EXEEXT=$ac_cv_exeext
--ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
--if test "${ac_cv_objext+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++
 +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
 +echo "configure:739: checking whether we are using GNU C" >&5
 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.c <<EOF
++#ifdef __GNUC__
++  yes;
++#endif
++EOF
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  ac_cv_prog_gcc=yes
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -38770,7 +40185,10 @@
 -int
 -main ()
 -{
--
++  ac_cv_prog_gcc=no
++fi
++fi
+ 
 -  ;
 -  return 0;
 -}
@@ -38788,27 +40206,20 @@
 -       break;;
 -  esac
 -done
-+  cat > conftest.c <<EOF
-+#ifdef __GNUC__
-+  yes;
-+#endif
-+EOF
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+  ac_cv_prog_gcc=yes
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+ 
 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 -See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+  ac_cv_prog_gcc=no
- fi
+-fi
 -
 -rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 -echo "${ECHO_T}$ac_cv_objext" >&6
 -OBJEXT=$ac_cv_objext
@@ -38817,22 +40228,23 @@
 -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
++if test $ac_cv_prog_gcc = yes; then
++  GCC=yes
+ 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
-+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
- 
+-
 -  ;
 -  return 0;
 -}
@@ -38860,9 +40272,7 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_compiler_gnu=yes
-+if test $ac_cv_prog_gcc = yes; then
-+  GCC=yes
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
@@ -38991,7 +40401,7 @@
 -  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
@@ -39000,7 +40410,7 @@
 -   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];
- 
+-
 -int test (int i, double x);
 -struct s1 {int (*f) (int a);};
 -struct s2 {int (*f) (double a);};
@@ -39058,17 +40468,8 @@
 -done
 -rm -f conftest.$ac_ext conftest.$ac_objext
 -CC=$ac_save_CC
-+echo $ac_n "checking for working const""... $ac_c" 1>&6
-+echo "configure:801: checking for working const" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 806 "configure"
-+#include "confdefs.h"
  
 -fi
-+int main() {
  
 -case "x$ac_cv_prog_cc_stdc" in
 -  x|xno)
@@ -39079,6 +40480,17 @@
 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
 -    CC="$CC $ac_cv_prog_cc_stdc" ;;
 -esac
++echo $ac_n "checking for working const""... $ac_c" 1>&6
++echo "configure:801: checking for working const" >&5
++if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 806 "configure"
++#include "confdefs.h"
++
++int main() {
++
 +/* Ultrix mips cc rejects this.  */
 +typedef int charset[2]; const charset x;
 +/* SunOS 4.1.1 cc rejects this.  */
@@ -39325,6 +40737,11 @@
 +  typedef const int *iptr;
 +  iptr p = 0;
 +  ++p;
++}
++{ /* AIX XL C 1.02.0.0 rejects this saying
++     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++  struct s { int j; const int *ap[3]; };
++  struct s *b; b->j = 5;
  }
 -_ACEOF
 -rm -f conftest.$ac_objext
@@ -39349,11 +40766,6 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+{ /* AIX XL C 1.02.0.0 rejects this saying
-+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+  struct s { int j; const int *ap[3]; };
-+  struct s *b; b->j = 5;
-+}
 +{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
 +  const int foo = 10;
 +}
@@ -40770,34 +42182,20 @@
 -PS1='$ '
 -PS2='> '
 -PS4='+ '
-+# configure, is in ./config.log if it exists.
- 
+-
 -# NLS nuisances.
 -for as_var in \
 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
 -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
 -  LC_TELEPHONE LC_TIME
-+ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-+for ac_option
- do
+-do
 -  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 -    eval $as_var=C; export $as_var
 -  else
 -    $as_unset $as_var
 -  fi
-+  case "\$ac_option" in
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-+    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-+  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-+    exit 0 ;;
-+  -help | --help | --hel | --he | --h)
-+    echo "\$ac_cs_usage"; exit 0 ;;
-+  *) echo "\$ac_cs_usage"; exit 1 ;;
-+  esac
- done
- 
+-done
+-
 -# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1; then
 -  as_expr=expr
@@ -40810,12 +42208,8 @@
 -else
 -  as_basename=false
 -fi
-+ac_given_srcdir=$srcdir
- 
-+trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+EOF
-+cat >> $CONFIG_STATUS <<EOF
- 
+-
+-
 -# Name of the executable.
 -as_me=`$as_basename "$0" ||
 -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
@@ -40827,49 +42221,8 @@
 -  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
-+# Protect against being on the right side of a sed subst in config.status.
-+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-+$ac_vpsub
-+$extrasub
-+s%@SHELL@%$SHELL%g
-+s%@CFLAGS@%$CFLAGS%g
-+s%@CPPFLAGS@%$CPPFLAGS%g
-+s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
-+s%@DEFS@%$DEFS%g
-+s%@LDFLAGS@%$LDFLAGS%g
-+s%@LIBS@%$LIBS%g
-+s%@exec_prefix@%$exec_prefix%g
-+s%@prefix@%$prefix%g
-+s%@program_transform_name@%$program_transform_name%g
-+s%@bindir@%$bindir%g
-+s%@sbindir@%$sbindir%g
-+s%@libexecdir@%$libexecdir%g
-+s%@datadir@%$datadir%g
-+s%@sysconfdir@%$sysconfdir%g
-+s%@sharedstatedir@%$sharedstatedir%g
-+s%@localstatedir@%$localstatedir%g
-+s%@libdir@%$libdir%g
-+s%@includedir@%$includedir%g
-+s%@oldincludedir@%$oldincludedir%g
-+s%@infodir@%$infodir%g
-+s%@mandir@%$mandir%g
-+s%@host@%$host%g
-+s%@host_alias@%$host_alias%g
-+s%@host_cpu@%$host_cpu%g
-+s%@host_vendor@%$host_vendor%g
-+s%@host_os@%$host_os%g
-+s%@CC@%$CC%g
-+s%@OSMESA_CONFIG@%$OSMESA_CONFIG%g
-+s%@EXE@%$EXE%g
-+s%@MATHLIB@%$MATHLIB%g
-+s%@CPP@%$CPP%g
-+s%@GLLIB@%$GLLIB%g
- 
-+CEOF
-+EOF
- 
+-
+-
 -# PATH needs CR, and LINENO needs CR and PATH.
 -# Avoid depending upon Character Ranges.
 -as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -40877,8 +42230,7 @@
 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 -as_cr_digits='0123456789'
 -as_cr_alnum=$as_cr_Letters$as_cr_digits
-+cat >> $CONFIG_STATUS <<\EOF
- 
+-
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conf$$.sh
@@ -40886,18 +42238,7 @@
 -  chmod +x conf$$.sh
 -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 -    PATH_SEPARATOR=';'
-+# Split the substitutions into bite-sized pieces for seds with
-+# small command number limits, like on Digital OSF/1 and HP-UX.
-+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-+ac_file=1 # Number of current file.
-+ac_beg=1 # First line for current file.
-+ac_end=$ac_max_sed_cmds # Line after last line for current file.
-+ac_more_lines=:
-+ac_sed_cmds=""
-+while $ac_more_lines; do
-+  if test $ac_beg -gt 1; then
-+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-   else
+-  else
 -    PATH_SEPARATOR=:
 -  fi
 -  rm -f conf$$.sh
@@ -40932,8 +42273,7 @@
 -    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
 -   { (exit 1); exit 1; }; }
-+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-   fi
+-  fi
 -  case $CONFIG_SHELL in
 -  '')
 -    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -41015,20 +42355,9 @@
 -  if test -f conf$$.exe; then
 -    # Don't use ln at all; we don't have any links
 -    as_ln_s='cp -p'
-+  if test ! -s conftest.s$ac_file; then
-+    ac_more_lines=false
-+    rm -f conftest.s$ac_file
-   else
+-  else
 -    as_ln_s='ln -s'
-+    if test -z "$ac_sed_cmds"; then
-+      ac_sed_cmds="sed -f conftest.s$ac_file"
-+    else
-+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-+    fi
-+    ac_file=`expr $ac_file + 1`
-+    ac_beg=$ac_end
-+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-   fi
+-  fi
 -elif ln conf$$.file conf$$ 2>/dev/null; then
 -  as_ln_s=ln
 -else
@@ -41057,7 +42386,8 @@
 -as_nl='
 -'
 -IFS=" 	$as_nl"
--
++# configure, is in ./config.log if it exists.
+ 
 -# CDPATH.
 -$as_unset CDPATH
 -
@@ -41145,7 +42475,9 @@
 -# value.  By we need to know if files were specified by the user.
 -ac_need_defaults=:
 -while test $# != 0
--do
++ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
++for ac_option
+ do
 -  case $1 in
 -  --*=*)
 -    ac_option=`expr "x$1" : 'x\([^=]*\)='`
@@ -41167,7 +42499,8 @@
 -  # Handling of the options.
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
--  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++  case "\$ac_option" in
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 -    ac_cs_recheck=: ;;
 -  --version | --vers* | -V )
 -    echo "$ac_cs_version"; exit 0 ;;
@@ -41205,7 +42538,7 @@
 -
 -  esac
 -  shift
- done
+-done
 -
 -ac_configure_extra_args=
 -
@@ -41236,20 +42569,25 @@
 -  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 -   { (exit 1); exit 1; }; };;
--  esac
--done
--
++    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
++    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
++  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
++    echo "$CONFIG_STATUS generated by autoconf version 2.13"
++    exit 0 ;;
++  -help | --help | --hel | --he | --h)
++    echo "\$ac_cs_usage"; exit 0 ;;
++  *) echo "\$ac_cs_usage"; exit 1 ;;
+   esac
+ done
+ 
 -# 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
 -# bizarre bug on SunOS 4.1.3.
 -if $ac_need_defaults; then
 -  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+if test -z "$ac_sed_cmds"; then
-+  ac_sed_cmds=cat
- fi
-+EOF
- 
+-fi
+-
 -# Have a temporary directory for convenience.  Make it in the build tree
 -# simply because there is no reason to put it here, and in addition,
 -# creating and moving files from /tmp can sometimes cause problems.
@@ -41278,11 +42616,55 @@
 -_ACEOF
 -
 -cat >>$CONFIG_STATUS <<_ACEOF
--
++ac_given_srcdir=$srcdir
+ 
 -#
 -# CONFIG_FILES section.
 -#
--
++trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++EOF
++cat >> $CONFIG_STATUS <<EOF
++
++# Protect against being on the right side of a sed subst in config.status.
++sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
++ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
++$ac_vpsub
++$extrasub
++s%@SHELL@%$SHELL%g
++s%@CFLAGS@%$CFLAGS%g
++s%@CPPFLAGS@%$CPPFLAGS%g
++s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
++s%@DEFS@%$DEFS%g
++s%@LDFLAGS@%$LDFLAGS%g
++s%@LIBS@%$LIBS%g
++s%@exec_prefix@%$exec_prefix%g
++s%@prefix@%$prefix%g
++s%@program_transform_name@%$program_transform_name%g
++s%@bindir@%$bindir%g
++s%@sbindir@%$sbindir%g
++s%@libexecdir@%$libexecdir%g
++s%@datadir@%$datadir%g
++s%@sysconfdir@%$sysconfdir%g
++s%@sharedstatedir@%$sharedstatedir%g
++s%@localstatedir@%$localstatedir%g
++s%@libdir@%$libdir%g
++s%@includedir@%$includedir%g
++s%@oldincludedir@%$oldincludedir%g
++s%@infodir@%$infodir%g
++s%@mandir@%$mandir%g
++s%@host@%$host%g
++s%@host_alias@%$host_alias%g
++s%@host_cpu@%$host_cpu%g
++s%@host_vendor@%$host_vendor%g
++s%@host_os@%$host_os%g
++s%@CC@%$CC%g
++s%@OSMESA_CONFIG@%$OSMESA_CONFIG%g
++s%@EXE@%$EXE%g
++s%@MATHLIB@%$MATHLIB%g
++s%@CPP@%$CPP%g
++s%@GLLIB@%$GLLIB%g
+ 
 -# No need to generate the scripts if there are no CONFIG_FILES.
 -# This happens for instance when ./config.status config.h
 -if test -n "\$CONFIG_FILES"; then
@@ -41344,10 +42726,12 @@
 -s, at GLLIB@,$GLLIB,;t t
 -s, at LIBOBJS@,$LIBOBJS,;t t
 -s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
+ CEOF
++EOF
+ 
 -_ACEOF
--
++cat >> $CONFIG_STATUS <<\EOF
+ 
 -  cat >>$CONFIG_STATUS <<\_ACEOF
 -  # Split the substitutions into bite-sized pieces for seds with
 -  # small command number limits, like on Digital OSF/1 and HP-UX.
@@ -41365,7 +42749,27 @@
 -    fi
 -    if test ! -s $tmp/subs.frag; then
 -      ac_more_lines=false
--    else
++# Split the substitutions into bite-sized pieces for seds with
++# small command number limits, like on Digital OSF/1 and HP-UX.
++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
++ac_file=1 # Number of current file.
++ac_beg=1 # First line for current file.
++ac_end=$ac_max_sed_cmds # Line after last line for current file.
++ac_more_lines=:
++ac_sed_cmds=""
++while $ac_more_lines; do
++  if test $ac_beg -gt 1; then
++    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
++  else
++    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
++  fi
++  if test ! -s conftest.s$ac_file; then
++    ac_more_lines=false
++    rm -f conftest.s$ac_file
++  else
++    if test -z "$ac_sed_cmds"; then
++      ac_sed_cmds="sed -f conftest.s$ac_file"
+     else
 -      # The purpose of the label and of the branching condition is to
 -      # speed up the sed processing (if there are no `@' at all, there
 -      # is no need to browse any of the substitutions).
@@ -41380,12 +42784,22 @@
 -      ac_sed_frag=`expr $ac_sed_frag + 1`
 -      ac_beg=$ac_end
 -      ac_end=`expr $ac_end + $ac_max_sed_lines`
--    fi
++      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+     fi
 -  done
 -  if test -z "$ac_sed_cmds"; then
 -    ac_sed_cmds=cat
--  fi
++    ac_file=`expr $ac_file + 1`
++    ac_beg=$ac_end
++    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+   fi
 -fi # test -n "$CONFIG_FILES"
++done
++if test -z "$ac_sed_cmds"; then
++  ac_sed_cmds=cat
++fi
++EOF
++
 +cat >> $CONFIG_STATUS <<EOF
  
 -_ACEOF
@@ -41449,8 +42863,7 @@
 -   { (exit 1); exit 1; }; }; }
 -
 -  ac_builddir=.
-+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
- 
+-
 -if test "$ac_dir" != .; then
 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
 -  # A "../" for each directory in $ac_dir_suffix.
@@ -41458,17 +42871,7 @@
 -else
 -  ac_dir_suffix= ac_top_builddir=
 -fi
-+  # Remove last slash and all that follows it.  Not all systems have dirname.
-+  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-+  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-+    # The file is in a subdirectory.
-+    test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-+    # A "../" for each directory in $ac_dir_suffix.
-+    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-+  else
-+    ac_dir_suffix= ac_dots=
-+  fi
++  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
  
 -case $srcdir in
 -  .)  # No --srcdir option.  We are building in place.
@@ -41481,6 +42884,18 @@
 -  [\\/]* | ?:[\\/]* )  # Absolute path.
 -    ac_srcdir=$srcdir$ac_dir_suffix;
 -    ac_top_srcdir=$srcdir ;;
++  # Remove last slash and all that follows it.  Not all systems have dirname.
++  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
++  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
++    # The file is in a subdirectory.
++    test ! -d "$ac_dir" && mkdir "$ac_dir"
++    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
++    # A "../" for each directory in $ac_dir_suffix.
++    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
++  else
++    ac_dir_suffix= ac_dots=
++  fi
++
 +  case "$ac_given_srcdir" in
 +  .)  srcdir=.
 +      if test -z "$ac_dots"; then top_srcdir=.

Modified: unstable/libsdl1.2/debian/patches/205_lock_keys.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/205_lock_keys.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/205_lock_keys.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.10/src/events/SDL_keyboard.c
+Index: libsdl1.2-1.2.13/src/events/SDL_keyboard.c
 ===================================================================
---- libsdl1.2-1.2.10.orig/src/events/SDL_keyboard.c	2006-05-04 07:06:02.000000000 +0200
-+++ libsdl1.2-1.2.10/src/events/SDL_keyboard.c	2006-05-18 18:46:34.000000000 +0200
+--- libsdl1.2-1.2.13.orig/src/events/SDL_keyboard.c	2007-12-31 05:47:59.000000000 +0100
++++ libsdl1.2-1.2.13/src/events/SDL_keyboard.c	2008-01-02 03:20:00.000000000 +0100
 @@ -32,6 +32,7 @@
  /* Global keystate information */
  static Uint8  SDL_KeyState[SDLK_LAST];

Modified: unstable/libsdl1.2/debian/patches/205_x11_keysym_fix.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/205_x11_keysym_fix.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/205_x11_keysym_fix.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,8 +1,8 @@
-Index: libsdl1.2-1.2.10/src/video/x11/SDL_x11events.c
+Index: libsdl1.2-1.2.13/src/video/x11/SDL_x11events.c
 ===================================================================
---- libsdl1.2-1.2.10.orig/src/video/x11/SDL_x11events.c	2006-05-12 05:02:31.000000000 +0200
-+++ libsdl1.2-1.2.10/src/video/x11/SDL_x11events.c	2006-05-18 18:47:30.000000000 +0200
-@@ -826,7 +826,13 @@
+--- libsdl1.2-1.2.13.orig/src/video/x11/SDL_x11events.c	2008-01-02 03:19:45.000000000 +0100
++++ libsdl1.2-1.2.13/src/video/x11/SDL_x11events.c	2008-01-02 03:44:38.000000000 +0100
+@@ -1096,7 +1096,13 @@
  	KeySym xsym;
  	SDLKey key;
  

Modified: unstable/libsdl1.2/debian/patches/206_gcc4_compilation_fix.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/206_gcc4_compilation_fix.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/206_gcc4_compilation_fix.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.10/include/SDL_events.h
+Index: libsdl1.2-1.2.13/include/SDL_events.h
 ===================================================================
---- libsdl1.2-1.2.10.orig/include/SDL_events.h	2006-05-01 10:02:59.000000000 +0200
-+++ libsdl1.2-1.2.10/include/SDL_events.h	2006-05-18 18:48:59.000000000 +0200
+--- libsdl1.2-1.2.13.orig/include/SDL_events.h	2007-12-31 05:48:36.000000000 +0100
++++ libsdl1.2-1.2.13/include/SDL_events.h	2008-01-02 03:20:00.000000000 +0100
 @@ -44,7 +44,7 @@
  #define SDL_PRESSED	1
  

Modified: unstable/libsdl1.2/debian/patches/209_alsa_priority.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/209_alsa_priority.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/209_alsa_priority.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,5 +1,7 @@
---- libsdl1.2-1.2.12.orig/src/audio/SDL_audio.c
-+++ libsdl1.2-1.2.12/src/audio/SDL_audio.c
+Index: libsdl1.2-1.2.13/src/audio/SDL_audio.c
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/audio/SDL_audio.c	2007-12-31 05:47:59.000000000 +0100
++++ libsdl1.2-1.2.13/src/audio/SDL_audio.c	2008-01-02 03:20:00.000000000 +0100
 @@ -39,13 +39,13 @@
  #if SDL_AUDIO_DRIVER_BSD
  	&BSD_AUDIO_bootstrap,
@@ -17,8 +19,10 @@
  #if SDL_AUDIO_DRIVER_PULSE
  	&PULSE_bootstrap,
  #endif
---- libsdl1.2-1.2.12.orig/src/audio/SDL_sysaudio.h
-+++ libsdl1.2-1.2.12/src/audio/SDL_sysaudio.h
+Index: libsdl1.2-1.2.13/src/audio/SDL_sysaudio.h
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/audio/SDL_sysaudio.h	2007-12-31 05:47:59.000000000 +0100
++++ libsdl1.2-1.2.13/src/audio/SDL_sysaudio.h	2008-01-02 03:20:00.000000000 +0100
 @@ -106,13 +106,13 @@
  #if SDL_AUDIO_DRIVER_PULSE
  extern AudioBootStrap PULSE_bootstrap;

Modified: unstable/libsdl1.2/debian/patches/211_mprotect.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/211_mprotect.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/211_mprotect.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.10/src/video/SDL_stretch.c
+Index: libsdl1.2-1.2.13/src/video/SDL_stretch.c
 ===================================================================
---- libsdl1.2-1.2.10.orig/src/video/SDL_stretch.c	2006-05-01 10:02:48.000000000 +0200
-+++ libsdl1.2-1.2.10/src/video/SDL_stretch.c	2006-05-31 01:05:09.000000000 +0200
+--- libsdl1.2-1.2.13.orig/src/video/SDL_stretch.c	2008-01-02 03:19:45.000000000 +0100
++++ libsdl1.2-1.2.13/src/video/SDL_stretch.c	2008-01-02 03:20:00.000000000 +0100
 @@ -38,10 +38,23 @@
       defined(__WATCOMC__) || \
       (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES

Modified: unstable/libsdl1.2/debian/patches/214_missing_mmx_blit.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/214_missing_mmx_blit.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/214_missing_mmx_blit.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.11/src/video/SDL_blit_N.c
+Index: libsdl1.2-1.2.13/src/video/SDL_blit_N.c
 ===================================================================
---- libsdl1.2-1.2.11.orig/src/video/SDL_blit_N.c	2006-05-09 17:09:30.000000000 +0200
-+++ libsdl1.2-1.2.11/src/video/SDL_blit_N.c	2006-07-19 14:52:12.000000000 +0200
+--- libsdl1.2-1.2.13.orig/src/video/SDL_blit_N.c	2007-12-31 05:48:14.000000000 +0100
++++ libsdl1.2-1.2.13/src/video/SDL_blit_N.c	2008-01-02 03:20:00.000000000 +0100
 @@ -2333,6 +2333,8 @@
      { 0x00FF0000,0x0000FF00,0x000000FF, 2, 0x0000001F,0x000003E0,0x00007C00,
        0, ConvertX86p32_16BGR555, ConvertX86, NO_ALPHA },

Modified: unstable/libsdl1.2/debian/patches/215_kfreebsd_gnu.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/215_kfreebsd_gnu.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/215_kfreebsd_gnu.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,5 +1,7 @@
---- libsdl1.2-1.2.10.orig/src/joystick/bsd/SDL_sysjoystick.c
-+++ libsdl1.2-1.2.10/src/joystick/bsd/SDL_sysjoystick.c
+Index: libsdl1.2-1.2.13/src/joystick/bsd/SDL_sysjoystick.c
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/joystick/bsd/SDL_sysjoystick.c	2007-12-31 05:47:55.000000000 +0100
++++ libsdl1.2-1.2.13/src/joystick/bsd/SDL_sysjoystick.c	2008-01-02 03:20:00.000000000 +0100
 @@ -55,7 +55,7 @@
  #include <libusbhid.h>
  #endif
@@ -9,7 +11,7 @@
  #ifndef __DragonFly__
  #include <osreldate.h>
  #endif
-@@ -294,7 +294,7 @@
+@@ -306,7 +306,7 @@
  		goto usberr;
  	}
  
@@ -18,16 +20,16 @@
  	hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
  #else
  	hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
-@@ -378,7 +378,7 @@
+@@ -390,7 +390,7 @@
  	int nbutton, naxe = -1;
  	Sint32 v;
  
 -#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
 +#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__)
  	struct joystick gameport;
- 	static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
   
-@@ -427,14 +427,14 @@
+ 	if (joy->hwdata->type == BSDJOY_JOY) {
+@@ -438,14 +438,14 @@
  		}
  		return;
  	}
@@ -44,7 +46,7 @@
  	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
  #else
  	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
-@@ -530,8 +530,8 @@
+@@ -541,8 +541,8 @@
  #ifdef __DragonFly__
  	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
  #elif __FREEBSD__

Modified: unstable/libsdl1.2/debian/patches/216_page_size.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/216_page_size.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/216_page_size.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,6 +1,7 @@
-diff -Naru libsdl1.2-1.2.11/src/video/ps2gs/SDL_gsyuv.c libsdl1.2-patched/src/video/ps2gs/SDL_gsyuv.c
---- libsdl1.2-1.2.11/src/video/ps2gs/SDL_gsyuv.c	2006-05-17 00:16:07.000000000 -0300
-+++ libsdl1.2-patched/src/video/ps2gs/SDL_gsyuv.c	2006-08-02 20:35:18.992336121 -0300
+Index: libsdl1.2-1.2.13/src/video/ps2gs/SDL_gsyuv.c
+===================================================================
+--- libsdl1.2-1.2.13.orig/src/video/ps2gs/SDL_gsyuv.c	2007-12-31 05:48:11.000000000 +0100
++++ libsdl1.2-1.2.13/src/video/ps2gs/SDL_gsyuv.c	2008-01-02 03:20:00.000000000 +0100
 @@ -180,7 +180,7 @@
  
  	/* Allocate a DMA area for pixel conversion */

Modified: unstable/libsdl1.2/debian/patches/217_x11_keytounicode.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/217_x11_keytounicode.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/217_x11_keytounicode.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,8 +1,8 @@
-Index: libsdl1.2-1.2.11/src/video/x11/SDL_x11events.c
+Index: libsdl1.2-1.2.13/src/video/x11/SDL_x11events.c
 ===================================================================
---- libsdl1.2-1.2.11.orig/src/video/x11/SDL_x11events.c	2006-08-13 12:03:13.000000000 +0200
-+++ libsdl1.2-1.2.11/src/video/x11/SDL_x11events.c	2006-08-13 12:07:09.000000000 +0200
-@@ -957,8 +957,11 @@
+--- libsdl1.2-1.2.13.orig/src/video/x11/SDL_x11events.c	2008-01-02 03:20:00.000000000 +0100
++++ libsdl1.2-1.2.13/src/video/x11/SDL_x11events.c	2008-01-02 03:20:00.000000000 +0100
+@@ -1227,8 +1227,11 @@
   * sequences (dead accents, compose key sequences) will not work since the
   * state has been irrevocably lost.
   */
@@ -14,7 +14,7 @@
  	struct SDL_VideoDevice *this = current_video;
  	char keybuf[32];
  	int i;
-@@ -966,6 +969,12 @@
+@@ -1236,6 +1239,12 @@
  	XKeyEvent xkey;
  	Uint16 unicode;
  

Modified: unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/218_joystick_memmove.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.12/src/joystick/SDL_joystick.c
+Index: libsdl1.2-1.2.13/src/joystick/SDL_joystick.c
 ===================================================================
---- libsdl1.2-1.2.12.orig/src/joystick/SDL_joystick.c	2007-10-08 19:01:12.000000000 +0000
-+++ libsdl1.2-1.2.12/src/joystick/SDL_joystick.c	2007-10-08 19:01:20.000000000 +0000
+--- libsdl1.2-1.2.13.orig/src/joystick/SDL_joystick.c	2007-12-31 05:47:55.000000000 +0100
++++ libsdl1.2-1.2.13/src/joystick/SDL_joystick.c	2008-01-02 03:20:00.000000000 +0100
 @@ -373,7 +373,7 @@
  	/* Remove joystick from list */
  	for ( i=0; SDL_joysticks[i]; ++i ) {

Modified: unstable/libsdl1.2/debian/patches/300_dont_propagate_lpthread.diff
===================================================================
--- unstable/libsdl1.2/debian/patches/300_dont_propagate_lpthread.diff	2008-01-02 02:20:57 UTC (rev 164)
+++ unstable/libsdl1.2/debian/patches/300_dont_propagate_lpthread.diff	2008-01-02 02:48:00 UTC (rev 165)
@@ -1,7 +1,7 @@
-Index: libsdl1.2-1.2.11/sdl.pc.in
+Index: libsdl1.2-1.2.13/sdl.pc.in
 ===================================================================
---- libsdl1.2-1.2.11.orig/sdl.pc.in	2006-07-20 14:14:40.000000000 +0200
-+++ libsdl1.2-1.2.11/sdl.pc.in	2006-07-20 14:14:47.000000000 +0200
+--- libsdl1.2-1.2.13.orig/sdl.pc.in	2007-12-31 05:48:39.000000000 +0100
++++ libsdl1.2-1.2.13/sdl.pc.in	2008-01-02 03:20:00.000000000 +0100
 @@ -10,5 +10,5 @@
  Version: @SDL_VERSION@
  Requires:
@@ -9,11 +9,11 @@
 -Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
 +Libs: -L${libdir} @SDL_RLD_FLAGS@ -lSDL
  Cflags: -I${includedir}/SDL @SDL_CFLAGS@
-Index: libsdl1.2-1.2.11/sdl-config.in
+Index: libsdl1.2-1.2.13/sdl-config.in
 ===================================================================
---- libsdl1.2-1.2.11.orig/sdl-config.in	2006-07-20 14:16:00.000000000 +0200
-+++ libsdl1.2-1.2.11/sdl-config.in	2006-07-20 14:16:20.000000000 +0200
-@@ -44,7 +44,7 @@
+--- libsdl1.2-1.2.13.orig/sdl-config.in	2007-12-31 05:48:39.000000000 +0100
++++ libsdl1.2-1.2.13/sdl-config.in	2008-01-02 03:20:00.000000000 +0100
+@@ -45,7 +45,7 @@
        echo -I at includedir@/SDL @SDL_CFLAGS@
        ;;
  @ENABLE_SHARED_TRUE@    --libs)




More information about the pkg-sdl-commits mailing list