--- rxvt-unicode/configure 2007/12/23 02:43:54 1.123 +++ rxvt-unicode/configure 2009/09/04 15:40:12 1.129 @@ -696,9 +696,6 @@ PERL_O AFTERIMAGE_CFLAGS AFTERIMAGE_LIBS -include_stdint_h -include_sys_ioctl_h -include_sys_strredir_h LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1298,19 +1295,18 @@ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-everything enable standard non-multichoice features - NOTE: this option is order dependent + NOTE: this option is order dependent --enable-warnings turn on g++ warnings --enable-unicode3 use 21 instead of 16 bits to represent unicode characters --enable-combining enable composition of base and combining characters --enable-xft enable xft support on systems that have it --enable-font-styles enable bold and italic support - --enable-afterimage enable integration with libAfterImage for background images + --enable-afterimage enable integration with libAfterImage for background images --enable-transparency enable transparent backgrounds --enable-fading enable colors fading when off focus --enable-rxvt-scroll enable rxvt style scrollbar --enable-next-scroll enable NeXT style scrollbar --enable-xterm-scroll enable Xterm style scrollbar - --enable-plain-scroll enable plain style scrollbar --enable-perl enable embedded perl interpreter --enable-xim XIM (X Input Method) protocol support --disable-backspace-key disable handling of the backspace key @@ -4371,7 +4367,6 @@ fi - support_frills=yes support_inheritpixmap=yes support_fading=yes @@ -4384,7 +4379,6 @@ support_scroll_rxvt=yes support_scroll_next=yes support_scroll_xterm=yes -support_scroll_plain=yes support_xim=yes support_afterimage=yes support_afterstep=yes @@ -4398,7 +4392,6 @@ codesets=all - # Check whether --enable-everything was given. if test "${enable_everything+set}" = set; then enableval=$enable_everything; @@ -4416,7 +4409,6 @@ support_scroll_rxvt=no support_scroll_next=no support_scroll_xterm=no - support_scroll_plain=no support_utmp=no support_wtmp=no support_xim=no @@ -4445,7 +4437,6 @@ support_scroll_rxvt=yes support_scroll_next=yes support_scroll_xterm=yes - support_scroll_plain=yes support_utmp=yes support_wtmp=yes support_xim=yes @@ -4612,14 +4603,6 @@ fi -# Check whether --enable-plain-scroll was given. -if test "${enable_plain_scroll+set}" = set; then - enableval=$enable_plain_scroll; if test x$enableval = xyes -o x$enableval = xno; then - support_scroll_plain=$enableval - fi -fi - - # Check whether --enable-perl was given. if test "${enable_perl+set}" = set; then enableval=$enable_perl; if test x$enableval = xyes -o x$enableval = xno; then @@ -5342,7 +5325,9 @@ -for ac_header in sys/inotify.h sys/epoll.h sys/event.h sys/queue.h port.h poll.h sys/select.h + + +for ac_header in sys/inotify.h sys/epoll.h sys/event.h sys/queue.h port.h poll.h sys/select.h sys/eventfd.h sys/signalfd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -5488,7 +5473,9 @@ -for ac_func in inotify_init epoll_ctl kqueue port_create poll select + + +for ac_func in inotify_init epoll_ctl kqueue port_create poll select eventfd signalfd do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -5667,7 +5654,63 @@ : else - if test -z "$LIBEV_M4_AVOID_LIBRT"; then + if test $(uname) = Linux; then + { echo "$as_me:$LINENO: checking for clock_gettime syscall" >&5 +echo $ECHO_N "checking for clock_gettime syscall... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include +int +main () +{ +struct timespec ts; int status = syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts) + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_have_clock_syscall=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_CLOCK_SYSCALL 1 +_ACEOF + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + fi + if test -z "$LIBEV_M4_AVOID_LIBRT" && test -z "$ac_have_clock_syscall"; then { echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; } @@ -6171,8 +6214,6 @@ - - # Extract the first word of "tic", so it can be a program name with args. set dummy tic; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -7763,59 +7804,6 @@ done -{ echo "$as_me:$LINENO: checking whether termios.h and sys/ioctl.h may both be included" >&5 -echo $ECHO_N "checking whether termios.h and sys/ioctl.h may both be included... $ECHO_C" >&6; } -if test "${rxvt_cv_header_sysioctl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -int a = ECHO; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - rxvt_cv_header_sysioctl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - rxvt_cv_header_sysioctl=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $rxvt_cv_header_sysioctl" >&5 -echo "${ECHO_T}$rxvt_cv_header_sysioctl" >&6; } - { echo "$as_me:$LINENO: checking for XPointer" >&5 echo $ECHO_N "checking for XPointer... $ECHO_C" >&6; } if test "${rxvt_cv_xpointer+set}" = set; then @@ -8726,13 +8714,7 @@ - - -for ac_header in \ - utmp.h \ - utmpx.h \ - lastlog.h \ - +for ac_header in lastlog.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -8873,18 +8855,23 @@ -if test "${ac_cv_header_utmp_h+set}" = set; then - { echo "$as_me:$LINENO: checking for utmp.h" >&5 -echo $ECHO_N "checking for utmp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_utmp_h+set}" = set; then + +for ac_header in utmp.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_utmp_h" >&5 -echo "${ECHO_T}$ac_cv_header_utmp_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking utmp.h usability" >&5 -echo $ECHO_N "checking utmp.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8892,7 +8879,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -8924,15 +8911,15 @@ echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking utmp.h presence" >&5 -echo $ECHO_N "checking utmp.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -8965,41 +8952,45 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: utmp.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: utmp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: utmp.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: utmp.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: utmp.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: utmp.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: utmp.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: utmp.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: utmp.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: utmp.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: utmp.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: utmp.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: utmp.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: utmp.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: utmp.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: utmp.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for utmp.h" >&5 -echo $ECHO_N "checking for utmp.h... $ECHO_C" >&6; } -if test "${ac_cv_header_utmp_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_utmp_h=$ac_header_preproc + eval "$as_ac_Header=\$ac_header_preproc" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_utmp_h" >&5 -echo "${ECHO_T}$ac_cv_header_utmp_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -if test $ac_cv_header_utmp_h = yes; then - { echo "$as_me:$LINENO: checking for struct utmp" >&5 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + { echo "$as_me:$LINENO: checking for struct utmp" >&5 echo $ECHO_N "checking for struct utmp... $ECHO_C" >&6; } if test "${struct_utmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9176,20 +9167,26 @@ fi +done + -if test "${ac_cv_header_utmpx_h+set}" = set; then - { echo "$as_me:$LINENO: checking for utmpx.h" >&5 -echo $ECHO_N "checking for utmpx.h... $ECHO_C" >&6; } -if test "${ac_cv_header_utmpx_h+set}" = set; then +for ac_header in utmpx.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_utmpx_h" >&5 -echo "${ECHO_T}$ac_cv_header_utmpx_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking utmpx.h usability" >&5 -echo $ECHO_N "checking utmpx.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9197,7 +9194,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -9229,15 +9226,15 @@ echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking utmpx.h presence" >&5 -echo $ECHO_N "checking utmpx.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -9270,41 +9267,45 @@ # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: utmpx.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: utmpx.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: utmpx.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: utmpx.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: utmpx.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: utmpx.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: utmpx.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: utmpx.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: utmpx.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: utmpx.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: utmpx.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: utmpx.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: utmpx.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: utmpx.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: utmpx.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: utmpx.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for utmpx.h" >&5 -echo $ECHO_N "checking for utmpx.h... $ECHO_C" >&6; } -if test "${ac_cv_header_utmpx_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_utmpx_h=$ac_header_preproc + eval "$as_ac_Header=\$ac_header_preproc" fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_utmpx_h" >&5 -echo "${ECHO_T}$ac_cv_header_utmpx_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi -if test $ac_cv_header_utmpx_h = yes; then - { echo "$as_me:$LINENO: checking for struct utmpx" >&5 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + { echo "$as_me:$LINENO: checking for struct utmpx" >&5 echo $ECHO_N "checking for struct utmpx... $ECHO_C" >&6; } if test "${struct_utmpx+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9481,6 +9482,7 @@ fi +done { echo "$as_me:$LINENO: checking for struct lastlog" >&5 echo $ECHO_N "checking for struct lastlog... $ECHO_C" >&6; } @@ -10560,12 +10562,14 @@ + for ac_header in \ pty.h \ util.h \ libutil.h \ sys/ioctl.h \ sys/stropts.h \ + stropts.h \ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -11598,13 +11602,20 @@ fi +scrolltypes=plain + +cat >>confdefs.h <<\_ACEOF +#define PLAIN_SCROLLBAR 1 +_ACEOF + + if test x$support_scroll_rxvt = xyes; then cat >>confdefs.h <<\_ACEOF #define RXVT_SCROLLBAR 1 _ACEOF - scrolltypes="rxvt" + scrolltypes="$scrolltypes rxvt" fi if test x$support_scroll_next = xyes; then @@ -11622,14 +11633,6 @@ scrolltypes="$scrolltypes xterm" fi -if test x$support_scroll_plain = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define PLAIN_SCROLLBAR 1 -_ACEOF - - scrolltypes="$scrolltypes plain" -fi if test x$support_pointer_blank = xyes; then cat >>confdefs.h <<\_ACEOF @@ -11901,26 +11904,7 @@ rm -f conftest.sed - - - -if test "$ac_cv_header_stdint_h" = "yes" -o "$notset" = "dontmatch"; then - include_stdint_h="#include " -else - include_stdint_h="/* #include */" -fi -if test "$rxvt_cv_header_sysioctl" = "yes" -o "$notset" = "dontmatch"; then - include_sys_ioctl_h="#include " -else - include_sys_ioctl_h="/* #include */" -fi -if test "$ac_cv_header_sys_strredir_h" = "yes" -o "$notset" = "dontmatch"; then - include_sys_strredir_h="#include " -else - include_sys_strredir_h="/* #include */" -fi - -ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/rxvtlib.h" +ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -12479,7 +12463,6 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/rxvtlib.h") CONFIG_FILES="$CONFIG_FILES src/rxvtlib.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -12624,14 +12607,11 @@ PERL_O!$PERL_O$ac_delim AFTERIMAGE_CFLAGS!$AFTERIMAGE_CFLAGS$ac_delim AFTERIMAGE_LIBS!$AFTERIMAGE_LIBS$ac_delim -include_stdint_h!$include_stdint_h$ac_delim -include_sys_ioctl_h!$include_sys_ioctl_h$ac_delim -include_sys_strredir_h!$include_sys_strredir_h$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5