--- np2/x11/Attic/config.tmpl	2004/05/22 16:37:29	1.4
+++ np2/x11/Attic/config.tmpl	2004/06/17 14:36:33	1.6
@@ -1,4 +1,4 @@
-XCOMM $Id: config.tmpl,v 1.4 2004/05/22 16:37:29 monaka Exp $
+XCOMM $Id: config.tmpl,v 1.6 2004/06/17 14:36:33 monaka Exp $
 
 XCOMM
 XCOMM Sound
@@ -25,66 +25,24 @@ XCOMM ESD_CONFIG= esd-config
 
 
 XCOMM
-XCOMM Misc.
+XCOMM GUI Toolkit
 XCOMM
 
-XCOMM big-endian machine (Apple Macintosh, etc...)
+XCOMM GTK+
 XCOMM
-#undef	BIGENDIAN
+XCOMM GTK_CONFIG= gtk-config		# for GTK+ 1.x
+XCOMM GTK_CONFIG= pkg-config gtk+-2.0	# for GTK+ 2.x
+#undef	USE_GTK2
 
-XCOMM IA-32
-XCOMM
-#define	CPUCORE_IA32
 
+XCOMM
+XCOMM Misc.
+XCOMM
 
+XCOMM big-endian machine (Apple Macintosh, etc...)
 XCOMM
-XCOMM debug
+#undef	BIGENDIAN
+
+XCOMM IA-32 CPU core
 XCOMM
-XCOMM CDEBUGFLAGS=
-CDEBUGFLAGS= -g
-XCOMM CDEBUGFLAGS+= -O0
-CDEBUGFLAGS+= -O
-XCOMM CDEBUGFLAGS+= -Os
-XCOMM CDEBUGFLAGS+= -O2
-XCOMM CDEBUGFLAGS+= -O3
-CDEBUGFLAGS+= -W -Wall
-CDEBUGFLAGS+= -Wpointer-arith
-CDEBUGFLAGS+= -Wuninitialized
-XCOMM CDEBUGFLAGS+= -Werror
-XCOMM CDEBUGFLAGS+= -DTRACE
-XCOMM CDEBUGFLAGS+= -DDEBUG
-XCOMM CDEBUGFLAGS+= -DSUPPORT_VIEWER
-
-XCOMM
-XCOMM Opt.
-XCOMM
-XCOMM CDEBUGFLAGS= -Os
-XCOMM CDEBUGFLAGS= -O2
-XCOMM CDEBUGFLAGS= -O3
-XCOMM CDEBUGFLAGS+= -funroll-loops
-XCOMM CDEBUGFLAGS+= -fomit-frame-pointer
-XCOMM CDEBUGFLAGS+= -fexpensive-optimizations
-
-XCOMM
-XCOMM x86 Opt.
-XCOMM
-CDEBUGFLAGS+= -ffast-math
-CDEBUGFLAGS+= -mcpu=pentiumpro
-XCOMM CDEBUGFLAGS+= -msse -mfpmath=sse
-
-XCOMM
-XCOMM IA-32 flags
-XCOMM
-XCOMM CDEBUGFLAGS+= -DSUPPORT_MEMDBG32
-CDEBUGFLAGS+= -DIA32_USE_ASM_BSWAP
-CDEBUGFLAGS+= -DIA32_USE_GCC_ATTR_REGPARM
-CDEBUGFLAGS+= -DIA32_PAGING_EACHSIZE
-XCOMM CDEBUGFLAGS+= -DIA32_SUPPORT_TLB
-XCOMM CDEBUGFLAGS+= -DIA32_PROFILE_TLB
-XCOMM CDEBUGFLAGS+= -DIA32_SUPPORT_PREFETCH_QUEUE
-XCOMM CDEBUGFLAGS+= -DIA32_SUPPORT_DEBUG_REGISTER
-XCOMM CDEBUGFLAGS+= -DIA32_INSTRUCTION_TRACE
-XCOMM CDEBUGFLAGS+= -DIA32_CROSS_CHECK
-CDEBUGFLAGS+= -DIA32_DONT_USE_SET_EFLAGS_FUNCTION
-XCOMM CDEBUGFLAGS+= -DIA32_REBOOT_ON_PANIC
-XCOMM CDEBUGFLAGS+= -DMORE_DEBUG
+#undef	CPUCORE_IA32