--- np2/x11/configure.ac	2011/12/24 03:50:53	1.12
+++ 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.12 $)
+AC_REVISION($Revision: 1.37 $)
 
-AC_INIT(Xnp2,0.83-20111223,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,13 +42,12 @@ AC_STRUCT_TM
 AC_C_VOLATILE
 AC_CHECK_TYPES([ptrdiff_t])
 AC_SYS_LARGEFILE
+AC_C_CHAR_UNSIGNED
 
 dnl
 dnl Check GCC
 dnl
-if test x"$GCC" != "xyes"; then
-    AC_MSG_ERROR(This package required GCC.)
-fi
+AM_CONDITIONAL(HAVE_GCC,test x"$GCC" = "xyes")
 
 dnl
 dnl Checks for library functions.
@@ -83,20 +82,23 @@ dnl
 dnl Xnp2 configure options.
 dnl
 AC_ARG_ENABLE(sdl,
-  AC_HELP_STRING([--enable-sdl],[Use SDL library [[default=yes]]]),,
+  AC_HELP_STRING([--enable-sdl],[Use SDL library [default=yes]]),,
   [enable_sdl="yes"])
 AC_ARG_ENABLE(sdlmixer,
-  AC_HELP_STRING([--enable-sdlmixer],[Use SDL_mixer library [[default=yes]]]),,
+  AC_HELP_STRING([--enable-sdlmixer],[Use SDL_mixer library [default=yes]]),,
   [enable_sdlmixer="yes"])
 AC_ARG_ENABLE(xf86vidmode,
-  AC_HELP_STRING([--enable-xf86vidmode],[Use XF86VidMode extension [[default=yes]]]),,
+  AC_HELP_STRING([--enable-xf86vidmode],[Use XF86VidMode extension [default=yes]]),,
   [enable_xf86vidmode="yes"])
 AC_ARG_ENABLE(ia32,
-  AC_HELP_STRING([--enable-ia32],[Use IA-32 emulation [[default=no]]]),,
+  AC_HELP_STRING([--enable-ia32],[Use IA-32 emulation [default=no]]),,
   [enable_ia32="no"])
 AC_ARG_ENABLE(debug,
-  AC_HELP_STRING([--enable-debug],[Enable debugging [[default=no]]]),,
+  AC_HELP_STRING([--enable-debug],[Enable debugging [default=no]]),,
   [enable_debug="no"])
+AC_ARG_ENABLE(warning,
+  AC_HELP_STRING([--enable-warning],[Enable warning [default=no]]),,
+  [enable_warning="no"])
 
 dnl
 dnl Checks for GTK+
@@ -108,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
@@ -135,18 +132,23 @@ if test x"$enable_xf86vidmode" = "xyes";
   ac_cv_save_cflags=$CFLAGS
   CFLAGS="$CFLAGS $X_CFLAGS"
   AC_CHECK_LIB(Xext,XextCreateExtension,
-    [XLIB="-lXext $XLIB"],,[$X_LIBS $X_PRE_LIBS $XLIB $X_EXTRA_LIBS])
+    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_LIBS $X_PRE_LIBS $XLIB $X_EXTRA_LIBS])],
     ,
     [#include <X11/Xlib.h>])
   CFLAGS=$ac_cv_save_cflags
 fi
 
 dnl
+dnl Checks for nasm
+dnl
+AC_CHECK_PROGS(nasm,[nasm nasmw],no)
+
+dnl
 dnl Checks for IA-32 CPU emulation
 dnl
 AC_MSG_CHECKING([whether to use IA-32 emulation])
@@ -161,17 +163,37 @@ dnl Checks for debug mode
 dnl
 AC_MSG_CHECKING([whether to enable debugging])
 if test x"$enable_debug" = "xyes"; then
-  CFLAGS="$CFLAGS -DDEBUG -g -O0"
-  CFLAGS="$CFLAGS -Wall -Wcast-align"
-  CFLAGS="$CFLAGS -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
-  CFLAGS="$CFLAGS -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
+  CFLAGS="$CFLAGS -g -DDEBUG -DTRACE"
   CFLAGS="$CFLAGS -Wstack-protector -fstack-protector --param ssp-buffer-size=1"
+  enable_warning=yes
 else
   CFLAGS="$CFLAGS -DNDEBUG"
 fi
 AC_MSG_RESULT($enable_debug)
 
 dnl
+dnl Checks for warning
+dnl
+AC_MSG_CHECKING([whether to enable warning])
+if test x"$enable_warning" = "xyes"; then
+  CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith"
+  CFLAGS="$CFLAGS -Wreturn-type -Wswitch -Wshadow"
+  CFLAGS="$CFLAGS -Wcast-qual -Wwrite-strings"
+  CFLAGS="$CFLAGS -Wextra -Wno-unused-parameter"
+  CFLAGS="$CFLAGS -Wformat=2"
+fi
+AC_MSG_RESULT($enable_warning)
+
+dnl
+dnl Checks for Xnp2 version
+dnl
+NP2VER_X11=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="-"} NF==2 {print $2}'`
+if test x"$NP2VER_X11" != "x"; then
+  NP2VER_X11="\"-$NP2VER_X11\""
+  AC_DEFINE_UNQUOTED(NP2VER_X11,$NP2VER_X11,[Define if Xnp2 version is available])
+fi
+
+dnl
 dnl Output Makefiles
 dnl
 AC_CONFIG_FILES([Makefile])