--- rxvt-unicode/configure 2004/03/01 01:06:45 1.13 +++ rxvt-unicode/configure 2004/03/06 00:05:00 1.18 @@ -467,7 +467,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT MV RM CP LN SED CMP TBL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB RXVTNAME include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS VERSION DATE LSMDATE LIBVERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK LINKER CXXCPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED CMP TBL X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XPM_CPPFLAGS XPM_CFLAGS XPM_LIBS rxvt_int16_typedef rxvt_uint16_typedef rxvt_int32_typedef rxvt_uint32_typedef rxvt_intp_define rxvt_u_intp_define DEBUG DINCLUDE DLIB include_stdint_h include_stdarg_h include_stdlib_h include_unistd_h include_string_h include_fcntl_h include_util_h include_assert_h include_sys_ioctl_h include_sys_select_h include_sys_strredir_h include_sys_time_h include_time_h LIBOBJS LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -1031,7 +1031,8 @@ NOTE: this option is order dependent NOTE: automatically enabled with --enable-shared --enable-unicode3 use 21 instead of 16 bits to represent unicode characters - --enable-xft enable xft support on systems that have it + --enable-combining enable composition of base and combining characters + --enable-xft enable xft support on systems that have it --enable-utmp enable utmp (utmpx) support --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) --enable-lastlog enable lastlog support (requires --enable-utmp) @@ -1049,6 +1050,7 @@ --disable-delete-key disable handling of the delete key --disable-resources disable all resource checking --enable-xgetdefault enable resources via X instead of our small version + --enable-fallback(=CLASS) fall back on CLASS resources in addition to URxvt ones (default: Rxvt) --enable-strings enable some replacement system functions --disable-swapscreen disable swap screen support --enable-frills enable support for rarely used features @@ -1074,8 +1076,11 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-gnu-ld assume the C compiler uses GNU ld default=no --with-pic try to use only PIC/non-PIC objects default=use both - --with-codesets=NAME,... compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all) - --with-term=NAME set the terminal to NAME (default \"rxvt\") + --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,cn,cn_ext,all) + --with-res-name=NAME use this as default resource name (default: urxvt) + --with-res-class=CLASS use this as the resource class (default: URxvt) + --with-name=NAME set the basename for the installed binaries (default: urxvt) + --with-term=NAME set the terminal to NAME (default: rxvt) --with-terminfo=PATH set the path to the terminfo tree to PATH --with-x use the X Window System --with-xpm-includes=DIR use XPM includes in DIR @@ -5032,7 +5037,7 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5035 "configure"' > conftest.$ac_ext + echo '#line 5040 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5583,7 +5588,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -7199,7 +7204,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<_ACEOF +#define RESFALLBACK "$RESFALLBACK" +_ACEOF + +fi + +RESNAME=urxvt + +# Check whether --with-res-name or --without-res-name was given. +if test "${with_res_name+set}" = set; then + withval="$with_res_name" + RESNAME="$withval" +fi; + +cat >>confdefs.h <<_ACEOF +#define RESNAME "$RESNAME" +_ACEOF + + +RESCLASS=URxvt + +# Check whether --with-res-class or --without-res-class was given. +if test "${with_res_class+set}" = set; then + withval="$with_res_class" + RESCLASS="$withval" +fi; + +cat >>confdefs.h <<_ACEOF +#define RESCLASS "$RESCLASS" +_ACEOF + + +RXVTNAME=urxvt + +# Check whether --with-name or --without-name was given. +if test "${with_name+set}" = set; then + withval="$with_name" + RXVTNAME="$withval" +fi; + +RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` + + # Check whether --enable-strings or --disable-strings was given. if test "${enable_strings+set}" = set; then enableval="$enable_strings" @@ -15801,7 +15872,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { @@ -15925,7 +15996,7 @@ /* end confdefs.h. */ #define _GNU_SOURCE #ifdef HAVE_STDLIB_H -# include +# include #endif int main () @@ -16335,8 +16406,15 @@ _ACEOF fi +if test x$support_combining = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define ENCODING_COMPOSE 1 +_ACEOF + +fi if test x$codesets = xall; then - codesets=jp,jp-ext,kr,cn,cn-ext,vn + codesets=jp,jp-ext,kr,cn,cn-ext fi for codeset in `echo $codesets | tr "a-z,\\-" "A-Z _"`; do @@ -16427,9 +16505,6 @@ rm conftest.sed -RXVTNAME=`echo rxvt|sed "$program_transform_name"` - - @@ -16439,14 +16514,14 @@ include_stdint_h="/* #include */" fi if test "$ac_cv_header_stdarg_h" = "yes" -o "$notset" = "dontmatch"; then - include_stdarg_h="#include " + include_stdarg_h="#include " else - include_stdarg_h="/* #include */" + include_stdarg_h="/* #include */" fi if test "$ac_cv_header_stdlib_h" = "yes" -o "$notset" = "dontmatch"; then - include_stdlib_h="#include " + include_stdlib_h="#include " else - include_stdlib_h="/* #include */" + include_stdlib_h="/* #include */" fi if test "$ac_cv_header_unistd_h" = "yes" -o "$notset" = "dontmatch"; then include_unistd_h="#include " @@ -16454,9 +16529,9 @@ include_unistd_h="/* #include */" fi if test "$ac_cv_header_string_h" = "yes" -o "$notset" = "dontmatch"; then - include_string_h="#include " + include_string_h="#include " else - include_string_h="/* #include */" + include_string_h="/* #include */" fi if test "$ac_cv_header_fcntl_h" = "yes" -o "$notset" = "dontmatch"; then include_fcntl_h="#include " @@ -17396,6 +17471,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@LIBTOOL@,$LIBTOOL,;t t s,@INSTALL_LIBRXVT@,$INSTALL_LIBRXVT,;t t +s,@RXVTNAME@,$RXVTNAME,;t t s,@MV@,$MV,;t t s,@RM@,$RM,;t t s,@CP@,$CP,;t t @@ -17419,7 +17495,6 @@ s,@DEBUG@,$DEBUG,;t t s,@DINCLUDE@,$DINCLUDE,;t t s,@DLIB@,$DLIB,;t t -s,@RXVTNAME@,$RXVTNAME,;t t s,@include_stdint_h@,$include_stdint_h,;t t s,@include_stdarg_h@,$include_stdarg_h,;t t s,@include_stdlib_h@,$include_stdlib_h,;t t @@ -17971,13 +18046,17 @@ " fi if test x$term != x; then - echo " set TERM to: $term -" + echo " set TERM to: $term" fi if test x$terminfo != x; then - echo " set TERMINFO to: $terminfo -" + echo " set TERMINFO to: $terminfo" +fi +echo " default resource name: $RESNAME" +echo " resource class: $RESCLASS" +if test x$RESFALLBACK != x; then + echo " resource class fallback: $RESFALLBACK" fi +echo if test x$rxvt_cv_ptys = xUNKNOWN; then echo ".----------------------------------------------------------------." echo ". WARNING: could not determine pty/tty type. Do not build until ."