--- rxvt-unicode/autoconf/configure.in	2004/08/10 22:36:30	1.31
+++ rxvt-unicode/autoconf/configure.in	2005/01/17 00:59:23	1.46
@@ -2,11 +2,15 @@
 dnl#
 dnl# Process this file with autoconf to produce a configure script.
 dnl#
+orig_CXXFLAGS="$CXXFLAGS"
+
 AC_INIT
 AC_CONFIG_SRCDIR([src/feature.h])
 AC_CONFIG_AUX_DIR(autoconf)
 AC_CONFIG_HEADER(config.h:autoconf/config.h.in)
 
+AC_CANONICAL_HOST
+
 dnl RXVT version
 changequote(, )dnl
 VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
@@ -33,6 +37,17 @@
 
 AC_LANG(C)
 
+dnl# --------------------------------------------------------------------------
+dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
+dnl#
+if test -z "$orig_CXXFLAGS"; then
+  CXXFLAGS='-O'
+  if test x$GCC = xyes && test "x$GXX" = xyes; then
+    CXXFLAGS="-g -O3"
+  fi
+  CFLAGS="$CXXFLAGS"
+fi
+
 LINKER="$CXX"
 if test x$GCC = xyes && test x$GXX = xyes; then
    AC_CHECK_LIB(supc++, main, [
@@ -42,7 +57,15 @@
 fi
 AC_SUBST(LINKER,[$LINKER])
 
-CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE"
+AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.)
+
+case $host in
+   *-*-solaris* )
+      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      ;;
+esac
 
 dnl if test x$GXX = xyes; then
 dnl    CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now...
@@ -68,7 +91,6 @@
 MALLOC_TYPE=S
 support_addstrings=no
 support_frills=no
-support_linespace=no
 support_inheritpixmap=no
 support_tinting=no
 support_fading=no
@@ -93,6 +115,8 @@
 support_unicode3=no
 support_combining=no
 support_8bitctrls=no
+support_iso14755=no
+support_styles=no
 codesets=
 
 dnl# --------------------------------------------------------------------------
@@ -112,7 +136,6 @@
   [if test x$enableval = xyes; then
     support_24bit=yes
     support_frills=yes
-    support_linespace=yes
     support_inheritpixmap=yes
     support_tinting=yes
     support_fading=yes
@@ -137,25 +160,33 @@
     support_unicode3=yes
     support_combining=yes
     #support_8bitctrls=yes
+    support_iso14755=yes
+    support_styles=yes
     codesets=all
   fi])
 
 AC_ARG_ENABLE(unicode3,
   [  --enable-unicode3       use 21 instead of 16 bits to represent unicode characters],
   [if test x$enableval = xyes -o x$enableval = xno; then
-    support_unicode3=yes
+    support_unicode3=$enableval
   fi])
 
 AC_ARG_ENABLE(combining,
   [  --enable-combining      enable composition of base and combining characters],
   [if test x$enableval = xyes -o x$enableval = xno; then
-    support_combining=yes
+    support_combining=$enableval
   fi])
 
 AC_ARG_ENABLE(xft,
   [  --enable-xft            enable xft support on systems that have it],
   [if test x$enableval = xyes -o x$enableval = xno; then
-    support_xft=yes
+    support_xft=$enableval
+  fi])
+
+AC_ARG_ENABLE(font-styles,
+  [  --enable-font-styles    enable bold and italic support],
+  [if test x$enableval = xyes -o x$enableval = xno; then
+    support_styles=$enableval
   fi])
 
 AC_ARG_ENABLE(utmp,
@@ -237,7 +268,7 @@
   fi])
 
 AC_ARG_WITH(codesets,
-  [  --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all)],
+  [  --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
   [codesets="$withval"])
 
 AC_ARG_ENABLE(xim,
@@ -279,7 +310,7 @@
 AC_ARG_ENABLE(8bitctrls,
   [  --enable-8bitctrls      enable 8 bit control sequences (not recommended)],
   [if test x$enableval = xyes -o x$enableval = xno; then
-    support_8bitctrls=yes
+    support_8bitctrls=$enableval
   fi])
 
 RESFALLBACK=Rxvt
@@ -311,6 +342,7 @@
 AC_ARG_WITH(name,
   [  --with-name=NAME        set the basename for the installed binaries (default: urxvt)],
   [RXVTNAME="$withval"])
+AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name])
 
 RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"`
 AC_SUBST(RXVTNAME)
@@ -327,16 +359,16 @@
     AC_DEFINE(NO_SECONDARY_SCREEN, 1, Disable the secondary screen. Many programs use the secondary screen as their workplace)
   fi])
 
-AC_ARG_ENABLE(frills,
-  [  --enable-frills         enable support for rarely used features],
+AC_ARG_ENABLE(iso14755,
+  [  --enable-iso14755       enable support for extended ISO 14755 modes],
   [if test x$enableval = xyes -o x$enableval = xno; then
-    support_frills=$enableval
+    support_iso14755=$enableval
   fi])
 
-AC_ARG_ENABLE(linespace,
-  [  --enable-linespace      enable support for linespace],
+AC_ARG_ENABLE(frills,
+  [  --enable-frills         enable support for rarely used features],
   [if test x$enableval = xyes -o x$enableval = xno; then
-    support_linespace=$enableval
+    support_frills=$enableval
   fi])
 
 AC_ARG_ENABLE(24bit,
@@ -394,12 +426,6 @@
     AC_DEFINE(SMART_RESIZE, 1, Define to use "smart" resize behavior)
   fi])
 
-AC_ARG_ENABLE(256-color,
-  [  --enable-256-color      enable 256-color support],
-  [if test x$enableval = xyes; then
-    AC_DEFINE(TTY_256COLOR, 1, Define if you want 256 colour support)
-  fi])
-
 AC_ARG_ENABLE(cursor-blink,
   [  --enable-cursor-blink   enable blinking cursor],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -434,21 +460,6 @@
 
 AC_DEFINE(PROTOTYPES, 1, Define if you need function prototypes)
 
-dnl# --------------------------------------------------------------------------
-dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
-dnl#
-if test -z "$CFLAGS"; then
-    if test -z "$CCOPTS"; then
-	CCOPTS='-O'
-dnl>	if test "x$GCC" = xyes; then
-dnl>	    if test x$system = xLinux; then
-dnl>		CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
-dnl>	    fi
-dnl>	fi
-    fi
-    CFLAGS="$CCOPTS"
-fi
-
 AC_PATH_PROG(MV, mv, mv)
 AC_PATH_PROG(RM, rm, rm)
 AC_PATH_PROG(CP, cp, cp)
@@ -457,6 +468,7 @@
 AC_PATH_PROG(ECHO, echo, echo)
 AC_PATH_PROG(CMP, cmp, cmp)
 AC_PATH_PROG(TBL, tbl)
+AC_PATH_PROG(TIC, tic)
 
 dnl# need a neat way to detect SVR4 or its features
 dnl# in src/command.c we use these functions:
@@ -503,10 +515,12 @@
 	sys/select.h \
 	sys/sockio.h \
 	sys/strredir.h \
+        sys/stropts.h \
 	sys/time.h \
 	utmp.h \
 	utmpx.h \
         stdint.h \
+        pty.h \
 )
 
 AC_HEADER_TIME
@@ -584,11 +598,9 @@
 AC_TYPE_PID_T
 AC_TYPE_UID_T
 
-
-AC_CHECK_SIZEOF(char, 1)
 AC_CHECK_SIZEOF(short, 2)
 AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
+dnl AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 8)
 AC_CHECK_SIZEOF(int *, 4)
 
@@ -1172,6 +1184,24 @@
 dnl# --------------------------------------------------------------------------
 dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
+if test x$support_xft = xyes; then
+  LIBS="$LIBS `pkg-config xft --libs`"
+  CFLAGS="$CFLAGS `pkg-config xft --cflags`"
+  CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
+
+  AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
+  AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
+
+  if test x$support_xft = xyes; then
+    AC_DEFINE(XFT, 1, Define to enable xft support)
+  fi
+fi
+if test x$support_styles = xyes; then
+  AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support)
+fi
+if test x$support_iso14755 = xyes; then
+  AC_DEFINE(ISO_14755, 1, Define if you want ISO 14755 extended support)
+fi
 if test x$support_8bitctrls = xyes; then
   AC_DEFINE(EIGHT_BIT_CONTROLS, 1, Define if you want 8 bit control sequences)
 fi
@@ -1193,11 +1223,8 @@
 if test x$support_menubar = xyes; then
   AC_DEFINE(MENUBAR, 1, Define if you want Menubar support)
 fi
-if test x$support_frills = xno; then
-  AC_DEFINE(NO_FRILLS, 1, Define if you don't want handling for rarely used features)
-fi
-if test x$support_linespace = xno; then
-  AC_DEFINE(NO_LINESPACE, 1, Define if you don't want support linespace)
+if test x$support_frills = xyes; then
+  AC_DEFINE(ENABLE_FRILLS, 1, Define if you want handling for rarely used but handy features)
 fi
 if test x$support_24bit = xyes; then
   AC_DEFINE(PREFER_24BIT, 1, Define to use a 24 bit visual if the screen has 24 bit mode, even if the default is 8 bit)
@@ -1257,17 +1284,17 @@
   AC_DEFINE(ENABLE_COMBINING, 1, Define if you want to automatically compose combining characters)
 fi
 if test x$codesets = xall; then
-  codesets=jp,jp-ext,kr,cn,cn-ext
+  codesets=jp,jp-ext,kr,zh,zh-ext
 fi
+AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
+AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
 for codeset in `echo $codesets | tr "[a-z,\\-]" "[A-Z _]"`; do
-  AC_DEFINE(ENCODING_EU, 1, Define if you want european extended codesets)
-  AC_DEFINE(ENCODING_VN, 1, Define if you want vietnamese codesets)
   case "$codeset" in
     JP     ) AC_DEFINE(ENCODING_JP,     1, Define if you want japanese codesets) ;;
     JP_EXT ) AC_DEFINE(ENCODING_JP_EXT, 1, Define if you want extended japanese codesets) ;;
     KR     ) AC_DEFINE(ENCODING_KR,     1, Define if you want korean codesets) ;;
-    CN     ) AC_DEFINE(ENCODING_CN,     1, Define if you want chinese codesets) ;;
-    CN_EXT ) AC_DEFINE(ENCODING_CN_EXT, 1, Define if you want extended chinese codesets) ;;
+    ZH     ) AC_DEFINE(ENCODING_ZH,     1, Define if you want chinese codesets) ;;
+    ZH_EXT ) AC_DEFINE(ENCODING_ZH_EXT, 1, Define if you want extended chinese codesets) ;;
   esac
 done
 
@@ -1332,19 +1359,6 @@
 RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch)
 RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes)
 
-if test x$support_xft = xyes; then
-  LIBS="$LIBS `pkg-config xft --libs`"
-  CFLAGS="$CFLAGS `pkg-config xft --cflags`"
-  CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
-
-  AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])
-  AC_CHECK_LIB(Xft,XftDrawString32,,[support_xft=no])
-
-  if test x$support_xft = xyes; then
-    AC_DEFINE(XFT, 1, Define to enable xft support)
-  fi
-fi
-
 AC_CONFIG_FILES([autoconf/Make.common \
 Makefile \
 doc/Makefile \