--- rxvt-unicode/configure 2004/12/20 16:47:14 1.43 +++ rxvt-unicode/configure 2005/02/13 08:56:27 1.50 @@ -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 RXVTNAME MV RM CP LN SED CMP TBL TIC 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_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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os 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 LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP LIBTOOL INSTALL_LIBRXVT RXVTNAME MV RM CP LN SED CMP TBL TIC 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. @@ -1059,7 +1059,6 @@ --disable-swapscreen disable swap screen support --enable-iso14755 enable support for extended ISO 14755 modes --enable-frills enable support for rarely used features - --enable-linespace enable support for linespace --enable-24bit enable support for using 24bit visuals if available --enable-keepscrolling enable continual scrolling on scrollbar arrow press --enable-selectionscrolling enable scrolling during selections @@ -1568,6 +1567,61 @@ ac_config_headers="$ac_config_headers config.h:autoconf/config.h.in" +# Make sure we can run config.sub. +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 +build=$ac_cv_build +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 +host=$ac_cv_host +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + + + VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` LSMDATE=`sed -n -e 's/^.*[ \t]LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` @@ -3213,6 +3267,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +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 @@ -3284,7 +3346,31 @@ LINKER=$LINKER -CPPFLAGS="-D_GNU_SOURCE -D_XOPEN_SOURCE=2" + +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + + +case $host in + *-*-solaris* ) + +cat >>confdefs.h <<\_ACEOF +#define _XOPEN_SOURCE_EXTENDED 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define _XOPEN_SOURCE 2 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define __EXTENSIONS__ 1 +_ACEOF + + ;; +esac ac_ext=cc @@ -3962,60 +4048,6 @@ else enable_fast_install=yes fi; -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - # Check whether --with-gnu-ld or --without-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then @@ -5240,7 +5272,7 @@ case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 5243 "configure"' > conftest.$ac_ext + echo '#line 5275 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5791,7 +5823,7 @@ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5826: \"$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 @@ -7407,7 +7439,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 @@ -10968,6 +10983,10 @@ + + + + for ac_header in \ assert.h \ fcntl.h \ @@ -10989,6 +11008,10 @@ utmp.h \ utmpx.h \ stdint.h \ + pty.h \ + wchar.h \ + cwchar \ + clocale \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -13454,19 +13477,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 2; then +if test "$ac_cv_sizeof_char" -ge 2; then rxvt_cv_int16_t=" char" else - if test $ac_cv_sizeof_short -ge 2; then + if test "$ac_cv_sizeof_short" -ge 2; then rxvt_cv_int16_t=" short" else - if test $ac_cv_sizeof_int -ge 2; then + if test "$ac_cv_sizeof_int" -ge 2; then rxvt_cv_int16_t=" int" else - if test $ac_cv_sizeof_long -ge 2; then + if test "$ac_cv_sizeof_long" -ge 2; then rxvt_cv_int16_t=" long" else - if test $ac_cv_sizeof_long_long -ge 2; then + if test "$ac_cv_sizeof_long_long" -ge 2; then rxvt_cv_int16_t=" long long" else rxvt_cv_int16_t=" short" # we _must_ have a (possibly wrong) default @@ -13536,19 +13559,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 2; then +if test "$ac_cv_sizeof_char" -ge 2; then rxvt_cv_uint16_t="unsigned char" else - if test $ac_cv_sizeof_short -ge 2; then + if test "$ac_cv_sizeof_short" -ge 2; then rxvt_cv_uint16_t="unsigned short" else - if test $ac_cv_sizeof_int -ge 2; then + if test "$ac_cv_sizeof_int" -ge 2; then rxvt_cv_uint16_t="unsigned int" else - if test $ac_cv_sizeof_long -ge 2; then + if test "$ac_cv_sizeof_long" -ge 2; then rxvt_cv_uint16_t="unsigned long" else - if test $ac_cv_sizeof_long_long -ge 2; then + if test "$ac_cv_sizeof_long_long" -ge 2; then rxvt_cv_uint16_t="unsigned long long" else rxvt_cv_uint16_t="unsigned short" # we _must_ have a (possibly wrong) default @@ -13618,19 +13641,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 4; then +if test "$ac_cv_sizeof_char" -ge 4; then rxvt_cv_int32_t=" char" else - if test $ac_cv_sizeof_short -ge 4; then + if test "$ac_cv_sizeof_short" -ge 4; then rxvt_cv_int32_t=" short" else - if test $ac_cv_sizeof_int -ge 4; then + if test "$ac_cv_sizeof_int" -ge 4; then rxvt_cv_int32_t=" int" else - if test $ac_cv_sizeof_long -ge 4; then + if test "$ac_cv_sizeof_long" -ge 4; then rxvt_cv_int32_t=" long" else - if test $ac_cv_sizeof_long_long -ge 4; then + if test "$ac_cv_sizeof_long_long" -ge 4; then rxvt_cv_int32_t=" long long" else rxvt_cv_int32_t=" int" # we _must_ have a (possibly wrong) default @@ -13700,19 +13723,19 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -if test $ac_cv_sizeof_char -ge 4; then +if test "$ac_cv_sizeof_char" -ge 4; then rxvt_cv_uint32_t="unsigned char" else - if test $ac_cv_sizeof_short -ge 4; then + if test "$ac_cv_sizeof_short" -ge 4; then rxvt_cv_uint32_t="unsigned short" else - if test $ac_cv_sizeof_int -ge 4; then + if test "$ac_cv_sizeof_int" -ge 4; then rxvt_cv_uint32_t="unsigned int" else - if test $ac_cv_sizeof_long -ge 4; then + if test "$ac_cv_sizeof_long" -ge 4; then rxvt_cv_uint32_t="unsigned long" else - if test $ac_cv_sizeof_long_long -ge 4; then + if test "$ac_cv_sizeof_long_long" -ge 4; then rxvt_cv_uint32_t="unsigned long long" else rxvt_cv_uint32_t="unsigned int" # we _must_ have a (possibly wrong) default @@ -13736,15 +13759,15 @@ fi fi -if test $ac_cv_sizeof_int_p -eq 8; then +if test "$ac_cv_sizeof_int_p" -eq 8; then rxvt_intp_define="#define intp_t int64_t" rxvt_u_intp_define="#define u_intp_t u_int64_t" else - if test $ac_cv_sizeof_int_p -eq 4; then + if test "$ac_cv_sizeof_int_p" -eq 4; then rxvt_intp_define="#define intp_t int32_t" rxvt_u_intp_define="#define u_intp_t u_int32_t" else - if test $ac_cv_sizeof_int_p -eq 2; then + if test "$ac_cv_sizeof_int_p" -eq 2; then rxvt_intp_define="#define intp_t int16_t" rxvt_u_intp_define="#define u_intp_t u_int16_t" else @@ -15999,13 +16022,6 @@ _ACEOF fi -if test x$support_linespace = xno; then - -cat >>confdefs.h <<\_ACEOF -#define NO_LINESPACE 1 -_ACEOF - -fi if test x$support_24bit = xyes; then cat >>confdefs.h <<\_ACEOF @@ -16292,7 +16308,7 @@ include_time_h="/* #include */" fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile doc/Makefile src/Makefile src/test/Makefile src/rxvtlib.h W11/Makefile" + ac_config_files="$ac_config_files autoconf/Make.common Makefile doc/Makefile src/Makefile src/rxvtlib.h" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16823,9 +16839,7 @@ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;; "src/rxvtlib.h" ) CONFIG_FILES="$CONFIG_FILES src/rxvtlib.h" ;; - "W11/Makefile" ) CONFIG_FILES="$CONFIG_FILES W11/Makefile" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:autoconf/config.h.in" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -16911,6 +16925,14 @@ s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t s,@VERSION@,$VERSION,;t t s,@DATE@,$DATE,;t t s,@LSMDATE@,$LSMDATE,;t t @@ -16933,14 +16955,6 @@ s,@LINKER@,$LINKER,;t t s,@CXXCPP@,$CXXCPP,;t t s,@EGREP@,$EGREP,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t s,@RANLIB@,$RANLIB,;t t