--- np2/x11/configure.ac	2012/01/24 18:19:56	1.23
+++ np2/x11/configure.ac	2012/06/18 14:39:34	1.37
@@ -4,9 +4,9 @@ dnl
 
 dnl require autoconf 2.59
 AC_PREREQ(2.59)
-AC_REVISION($Revision: 1.23 $)
+AC_REVISION($Revision: 1.37 $)
 
-AC_INIT(Xnp2,0.83-20120124,nonakap@gmail.com,xnp2)
+AC_INIT(Xnp2,0.83-20120618,nonakap@gmail.com,xnp2)
 AM_INIT_AUTOMAKE([no-define no-dist no-installinfo subdir-objects])
 AC_CONFIG_SRCDIR([../np2ver.h])
 AC_CONFIG_HEADERS(config.h)
@@ -42,6 +42,7 @@ AC_STRUCT_TM
 AC_C_VOLATILE
 AC_CHECK_TYPES([ptrdiff_t])
 AC_SYS_LARGEFILE
+AC_C_CHAR_UNSIGNED
 
 dnl
 dnl Check GCC
@@ -109,25 +110,20 @@ AC_SUBST(GTK_LIBS)
 AC_DEFINE(USE_GTK2,1,[Define to 1 if you have the GTK+-2 library.])
 
 dnl
-dnl Checks for SDL
+dnl Checks for SDL and SDL_mixer
 dnl
-if test x"$enable_sdlmixer" = "xyes"; then
+if test x"$enable_sdl" = "xyes"; then
   AM_PATH_SDL(1.2.0)
   if test x"$no_sdl" != "xyes"; then
     AC_DEFINE(USE_SDLAUDIO,,[Define if you have the SDL library.])
+    if test x"$enable_sdlmixer" = "xyes"; then
+      AC_CHECK_LIB(SDL_mixer,Mix_OpenAudio,
+        AC_DEFINE(USE_SDLMIXER,,[Define if you have the SDL_mixer library.])
+        SDL_LIBS="$SDL_LIBS -lSDL_mixer",,$SDL_LIBS)
+    fi
   fi
 fi
 
-dnl
-dnl Checks for SDL_mixer
-dnl
-if test x"$enable_sdlmixer" = "xyes"; then
-  if test x"$no_sdl" != "xyes"; then
-    AC_CHECK_LIB(SDL_mixer,Mix_OpenAudio,
-      AC_DEFINE(USE_SDLMIXER,,[Define if you have the SDL_mixer library.])
-      SDL_LIBS="$SDL_LIBS -lSDL_mixer",,$SDL_LIBS)
-  fi
-fi
 
 dnl
 dnl Checks for XF86VidMode extension
@@ -139,9 +135,9 @@ if test x"$enable_xf86vidmode" = "xyes";
     XLIB="-lXext $XLIB",,[$X_LIBS $X_PRE_LIBS $XLIB $X_EXTRA_LIBS])
   AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,
     [AC_CHECK_LIB(Xxf86vm,XF86VidModeQueryExtension,
-      X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm"
-      AC_DEFINE(HAVE_XF86VIDMODE,1,[Define to 1 if you have the libXxf86vm library.]),,
-      $X_LIBS $X_PRE_LIBS $XLIB $X_EXTRA_LIBS)],
+      [X_PRE_LIBS="$X_PRE_LIBS -lXxf86vm"
+      AC_DEFINE(HAVE_XF86VIDMODE,1,[Define to 1 if you have the libXxf86vm library.])],,
+      [$X_LIBS $X_PRE_LIBS $XLIB $X_EXTRA_LIBS])],
     ,
     [#include <X11/Xlib.h>])
   CFLAGS=$ac_cv_save_cflags