--- np2/x11/configure.ac	2011/12/17 19:55:48	1.3
+++ np2/x11/configure.ac	2011/12/24 02:10:21	1.8
@@ -4,9 +4,9 @@ dnl
 
 dnl require autoconf 2.59
 AC_PREREQ(2.59)
-AC_REVISION($Revision: 1.3 $)
+AC_REVISION($Revision: 1.8 $)
 
-AC_INIT(Xnp2, 0.83, nonakap@gmail.com, xnp2)
+AC_INIT(Xnp2, 0.83-20111223, 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)
@@ -24,6 +24,9 @@ dnl
 dnl Checks for libraries.
 dnl
 AC_PATH_XTRA
+if test x"$no_x" != x"yes"; then
+	X_LIBS="$X_LIBS -lX11"
+fi
 
 dnl
 dnl Checks for header files.
@@ -86,6 +89,9 @@ AC_ARG_ENABLE(sdl,
 AC_ARG_ENABLE(sdlmixer,
 	AC_HELP_STRING([--enable-sdlmixer],[Use SDL_mixer library [[default=yes]]]),,
 	[enable_sdlmixer="yes"])
+AC_ARG_ENABLE(debug,
+	AC_HELP_STRING([--enable-debug],[Enable debugging [[default=no]]]),,
+	[enable_debug="no"])
 
 dnl
 dnl Checks for IA-32 CPU emulation
@@ -100,7 +106,7 @@ if test x"$enable_xf86vidmode" = "xyes";
 		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 -lXext $X_EXTRA_LIBS)
+		$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS)
 fi
 
 dnl
@@ -137,6 +143,21 @@ if test x"$enable_sdlmixer" = "xyes"; th
 fi
 
 dnl
+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 -Wstack-protector -fstack-protector --param ssp-buffer-size=1"
+else
+	CFLAGS="$CFLAGS -DNDEBUG"
+fi
+AC_MSG_RESULT($enable_debug)
+
+dnl
 dnl Output Makefiles
 dnl
 AC_CONFIG_FILES([Makefile])