--- rxvt-unicode/configure 2010/12/02 11:09:40 1.138 +++ rxvt-unicode/configure 2012/06/19 18:17:56 1.156 @@ -599,12 +599,11 @@ PERLFLAGS PERLLIB PERL -XFT_CONFIG -AFTERIMAGE_LIBS -AFTERIMAGE_CFLAGS -afterimage_config PIXBUF_LIBS PIXBUF_CFLAGS +XFT_CONFIG +STARTUP_NOTIFICATION_LIBS +STARTUP_NOTIFICATION_CFLAGS PKG_CONFIG X_EXTRA_LIBS X_LIBS @@ -617,10 +616,10 @@ LINKER EGREP GREP +CPP INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -CPP ac_ct_CXX CXXFLAGS CXX @@ -690,9 +689,8 @@ enable_combining enable_xft enable_font_styles -enable_afterimage -with_afterimage_config enable_pixbuf +enable_startup_notification enable_transparency enable_fading enable_rxvt_scroll @@ -721,6 +719,7 @@ enable_pointer_blank with_term with_terminfo +enable_xdbe with_x enable_utmp enable_wtmp @@ -1366,8 +1365,8 @@ --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-pixbuf enable integration with gdk-pixbuf for background images + --enable-startup-notification enable freedesktop startup notification support --enable-transparency enable transparent backgrounds --enable-fading enable colors fading when off focus --enable-rxvt-scroll enable rxvt style scrollbar @@ -1390,6 +1389,7 @@ --enable-smart-resize enable smart growth/shrink behaviour --enable-text-blink enable blinking text --enable-pointer-blank enable pointer blanking when typing or inactive + --enable-xdbe enable support for double buffering --enable-utmp enable utmp (utmpx) support --enable-wtmp enable wtmp (wtmpx) support (requires --enable-utmp) --enable-lastlog enable lastlog support (requires --enable-utmp) @@ -1397,7 +1397,6 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-afterimage-config=DIR use libAfterImage config script in DIR --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_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) @@ -2541,7 +2540,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2686,7 +2685,7 @@ $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2719,7 +2718,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2736,8 +2735,8 @@ -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` +VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` echo "" echo "configuring for rxvt $VERSION" @@ -3046,7 +3045,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3161,7 +3160,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3204,7 +3203,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3263,7 +3262,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3315,7 +3314,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3792,6 +3791,101 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done + ;; +esac + + done +IFS=$as_save_IFS + +rm -rf conftest.one conftest.two conftest.dir + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3920,7 +4014,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -3929,101 +4023,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - - done -IFS=$as_save_IFS - -rm -rf conftest.one conftest.two conftest.dir - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } @@ -4410,6 +4409,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +LINKER="$CXX" if test x$GCC = xyes && test x$GXX = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5 $as_echo_n "checking for working libsupc++... " >&6; } @@ -4417,7 +4417,6 @@ save_LIBS="$LIBS" CXX="$CC" LIBS="$LIBS -lsupc++" - LINKER="$CC" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4433,12 +4432,12 @@ if ac_fn_cxx_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } + LINKER="$CC" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5 $as_echo "no, making everything bigger and slower" >&6; } LIBS="$save_LIBS" - LINKER="$save_CXX" fi @@ -4475,14 +4474,6 @@ CFLAGS="$CXXFLAGS" fi -case $host in - *-*-solaris* ) - -$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h - - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing setlocale" >&5 $as_echo_n "checking for library containing setlocale... " >&6; } if test "${ac_cv_search_setlocale+set}" = set; then : @@ -4666,7 +4657,8 @@ support_scroll_next=yes support_scroll_xterm=yes support_xim=yes -support_afterimage=yes +support_pixbuf=yes +support_startup_notification=yes support_xft=yes support_unicode3=no support_combining=yes @@ -4674,6 +4666,7 @@ support_iso14755=yes support_styles=yes support_perl=yes +support_xdbe=yes codesets=all @@ -4682,6 +4675,7 @@ enableval=$enable_everything; if test x$enableval = xno; then support_frills=no + support_xdbe=no support_inheritpixmap=no support_fading=no support_keepscrolling=no @@ -4697,7 +4691,8 @@ support_utmp=no support_wtmp=no support_xim=no - support_afterimage=no + support_pixbuf=no + support_startup_notification=no support_xft=no support_unicode3=no support_combining=no @@ -4705,6 +4700,7 @@ support_iso14755=no support_styles=no support_perl=no + support_xdbe=no codesets= fi if test x$enableval = xyes; then @@ -4724,7 +4720,8 @@ support_utmp=yes support_wtmp=yes support_xim=yes - support_afterimage=yes + support_pixbuf=yes + support_startup_notification=yes support_xft=yes support_unicode3=yes support_combining=yes @@ -4732,38 +4729,39 @@ support_iso14755=yes support_styles=yes support_perl=yes + support_xdbe=yes codesets=all fi fi -ASSERTIONS=no +support_assertions=no # Check whether --enable-assert was given. if test "${enable_assert+set}" = set; then : enableval=$enable_assert; if test x$enableval = xyes; then - ASSERTIONS=yes + support_assertions=yes fi fi -if test x$ASSERTIONS = xno; then +if test x$support_assertions = xno; then $as_echo "#define NDEBUG 1" >>confdefs.h fi -WARNINGS=no +support_warnings=no # Check whether --enable-warnings was given. if test "${enable_warnings+set}" = set; then : enableval=$enable_warnings; if test x$enableval = xyes; then - WARNINGS=yes + support_warnings=yes fi fi if test x$GXX = xyes; then - if test $WARNINGS = yes; then + if test $support_warnings = yes; then save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" + CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -4832,23 +4830,6 @@ fi -# Check whether --enable-afterimage was given. -if test "${enable_afterimage+set}" = set; then : - enableval=$enable_afterimage; if test x$enableval = xyes -o x$enableval = xno; then - support_afterimage=$enableval - fi -fi - - - -# Check whether --with-afterimage_config was given. -if test "${with_afterimage_config+set}" = set; then : - withval=$with_afterimage_config; if test "x$withval" != x; then - afterimage_config=$withval/afterimage-config - fi -fi - - # Check whether --enable-pixbuf was given. if test "${enable_pixbuf+set}" = set; then : enableval=$enable_pixbuf; if test x$enableval = xyes -o x$enableval = xno; then @@ -4857,6 +4838,14 @@ fi +# Check whether --enable-startup-notification was given. +if test "${enable_startup_notification+set}" = set; then : + enableval=$enable_startup_notification; if test x$enableval = xyes -o x$enableval = xno; then + support_startup_notification=$enableval + fi +fi + + # Check whether --enable-transparency was given. if test "${enable_transparency+set}" = set; then : enableval=$enable_transparency; if test x$enableval = xyes -o x$enableval = xno; then @@ -5128,6 +5117,14 @@ fi +# Check whether --enable-xdbe was given. +if test "${enable_xdbe+set}" = set; then : + enableval=$enable_xdbe; if test x$enableval = xyes -o x$enableval = xno; then + support_xdbe=$enableval + fi +fi + + LIBEV_M4_AVOID_LIBRT=1 @@ -5255,7 +5252,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=cpp @@ -5292,8 +5289,13 @@ done -ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +for ac_func in clock_gettime +do : + ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" if test "x$ac_cv_func_clock_gettime" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CLOCK_GETTIME 1 +_ACEOF else @@ -5388,10 +5390,16 @@ fi fi +done -ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" +for ac_func in nanosleep +do : + ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" if test "x$ac_cv_func_nanosleep" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NANOSLEEP 1 +_ACEOF else @@ -5456,15 +5464,18 @@ fi fi +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5 -$as_echo_n "checking for ceil in -lm... " >&6; } -if test "${ac_cv_lib_m_ceil+set}" = set; then : +if test -z "$LIBEV_M4_AVOID_LIBM"; then + LIBM=m +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5 +$as_echo_n "checking for library containing floor... " >&6; } +if test "${ac_cv_search_floor+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" + ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5474,32 +5485,46 @@ #ifdef __cplusplus extern "C" #endif -char ceil (); +char floor (); int main () { -return ceil (); +return floor (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_m_ceil=yes -else - ac_cv_lib_m_ceil=no +for ac_lib in '' $LIBM; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_search_floor=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_floor+set}" = set; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ceil" >&5 -$as_echo "$ac_cv_lib_m_ceil" >&6; } -if test "x$ac_cv_lib_m_ceil" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF +done +if test "${ac_cv_search_floor+set}" = set; then : + +else + ac_cv_search_floor=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5 +$as_echo "$ac_cv_search_floor" >&6; } +ac_res=$ac_cv_search_floor +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - LIBS="-lm $LIBS" +$as_echo "#define HAVE_FLOOR 1" >>confdefs.h fi @@ -5564,7 +5589,7 @@ have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -6233,13 +6258,11 @@ fi -image_lib=none +STARTUP_NOTIFICATION_CFLAGS= +STARTUP_NOTIFICATION_LIBS= -PIXBUF_CFLAGS= -PIXBUF_LIBS= - -if test x$support_pixbuf = xyes; then - support_pixbuf=no +if test x$support_startup_notification = xyes; then + support_startup_notification=no # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -6281,24 +6304,19 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5 -$as_echo_n "checking for gdk-pixbuf... " >&6; } - if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then - PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" - PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" - support_pixbuf=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification" >&5 +$as_echo_n "checking for libstartup-notification... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then + STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`" + STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`" + support_startup_notification=yes fi - if test x$support_pixbuf = xyes; then + if test x$support_startup_notification = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } - image_lib=gdk-pixbuf - support_afterimage=no - -$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h - -$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h +$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -6309,94 +6327,6 @@ -AFTERIMAGE_CFLAGS= -AFTERIMAGE_LIBS= -AFTERIMAGE_VERSION= - -if test x$support_afterimage = xyes; then - support_afterimage=no - - if test "x$afterimage_config" = "x" ; then - # Extract the first word of "afterimage-config", so it can be a program name with args. -set dummy afterimage-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_afterimage_config+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $afterimage_config in - [\\/]* | ?:[\\/]*) - ac_cv_path_afterimage_config="$afterimage_config" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_afterimage_config="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_afterimage_config" && ac_cv_path_afterimage_config="no" - ;; -esac -fi -afterimage_config=$ac_cv_path_afterimage_config -if test -n "$afterimage_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $afterimage_config" >&5 -$as_echo "$afterimage_config" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - if test "x$afterimage_config" != "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libAfterImage version >= 1.15" >&5 -$as_echo_n "checking for libAfterImage version >= 1.15... " >&6; } - xAFTERIMAGE_VERSION=`$afterimage_config --version` - if test -n "$xAFTERIMAGE_VERSION" ; then - xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` - xAFTERIMAGE_LIBS=`$afterimage_config --libs` - if test "x$xAFTERIMAGE_LIBS" != "x"; then - libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` - libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` - if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then - support_afterimage=yes - AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS" - AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS" - AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION" - fi - fi - fi - if test "x$support_afterimage" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AFTERIMAGE_LIBS" >&5 -$as_echo "$AFTERIMAGE_LIBS" >&6; } - image_lib=libafterimage - -$as_echo "#define HAVE_AFTERIMAGE 1" >>confdefs.h - - -$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - fi -fi - - - - for ac_header in \ sys/byteorder.h \ sys/ioctl.h \ @@ -6404,7 +6334,6 @@ sys/strredir.h \ stdint.h \ wchar.h \ - cwchar \ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -6419,37 +6348,6 @@ done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPointer" >&5 -$as_echo_n "checking for XPointer... " >&6; } -if test "${rxvt_cv_xpointer+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -XPointer dummy; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - rxvt_cv_xpointer=yes -else - rxvt_cv_xpointer=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_xpointer" >&5 -$as_echo "$rxvt_cv_xpointer" >&6; } -if test x$rxvt_cv_xpointer = xyes; then - -$as_echo "#define HAVE_XPOINTER 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB_ILLEGAL_ACCESS" >&5 $as_echo_n "checking for XLIB_ILLEGAL_ACCESS... " >&6; } if test "${rxvt_cv_xlib_illegal_access+set}" = set; then : @@ -6676,6 +6574,14 @@ done +case $host in + *-*-solaris*) + +$as_echo "#define __EXTENSIONS__ 1" >>confdefs.h + + ;; +esac + for ac_header in utmp.h do : @@ -6684,103 +6590,102 @@ cat >>confdefs.h <<_ACEOF #define HAVE_UTMP_H 1 _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmp" >&5 -$as_echo_n "checking for struct utmp... " >&6; } -if test "${pt_cv_struct_utmp+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ac_fn_cxx_check_type "$LINENO" "struct utmp" "ac_cv_type_struct_utmp" " #include #include -int -main () -{ -struct utmp ut; - ; - return 0; -} + +" +if test "x$ac_cv_type_struct_utmp" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_UTMP 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmp=yes -else - pt_cv_struct_utmp=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp" >&5 -$as_echo "$pt_cv_struct_utmp" >&6; } -if test x$pt_cv_struct_utmp = xyes; then -$as_echo "#define HAVE_STRUCT_UTMP 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_host in utmp struct" >&5 -$as_echo_n "checking for ut_host in utmp struct... " >&6; } -if test "${pt_cv_struct_utmp_host+set}" = set; then : + +# ac_fn_cxx_check_member LINENO AGGR MEMBER VAR INCLUDES +# ------------------------------------------------------ +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_cxx_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if eval "test \"\${$4+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +$5 int main () { -struct utmp ut; ut.ut_host; +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; ; return 0; } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmp_host=yes -else - pt_cv_struct_utmp_host=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp_host" >&5 -$as_echo "$pt_cv_struct_utmp_host" >&6; } -if test x$pt_cv_struct_utmp_host = xyes; then - -$as_echo "#define HAVE_UTMP_HOST 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ut_pid in utmp struct" >&5 -$as_echo_n "checking for ut_pid in utmp struct... " >&6; } -if test "${pt_cv_struct_utmp_pid+set}" = set; then : - $as_echo_n "(cached) " >&6 + eval "$4=yes" else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +$5 int main () { -struct utmp ut; ut.ut_pid; +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; ; return 0; } _ACEOF if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmp_pid=yes + eval "$4=yes" else - pt_cv_struct_utmp_pid=no + eval "$4=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmp_pid" >&5 -$as_echo "$pt_cv_struct_utmp_pid" >&6; } -if test x$pt_cv_struct_utmp_pid = xyes; then +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_cxx_check_member +ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_host" "ac_cv_member_struct_utmp_ut_host" " +#include +#include + +" +if test "x$ac_cv_member_struct_utmp_ut_host" = x""yes; then : + +$as_echo "#define HAVE_UTMP_HOST 1" >>confdefs.h + +fi + + +ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_pid" "ac_cv_member_struct_utmp_ut_pid" " +#include +#include + +" +if test "x$ac_cv_member_struct_utmp_ut_pid" = x""yes; then : $as_echo "#define HAVE_UTMP_PID 1" >>confdefs.h fi + fi done @@ -6793,483 +6698,213 @@ cat >>confdefs.h <<_ACEOF #define HAVE_UTMPX_H 1 _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utmpx" >&5 -$as_echo_n "checking for struct utmpx... " >&6; } -if test "${pt_cv_struct_utmpx+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + ac_fn_cxx_check_type "$LINENO" "struct utmpx" "ac_cv_type_struct_utmpx" " #include #include -int -main () -{ -struct utmpx ut; - ; - return 0; -} + +" +if test "x$ac_cv_type_struct_utmpx" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_UTMPX 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmpx=yes -else - pt_cv_struct_utmpx=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx" >&5 -$as_echo "$pt_cv_struct_utmpx" >&6; } -if test x$pt_cv_struct_utmpx = xyes; then -$as_echo "#define HAVE_STRUCT_UTMPX 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host in utmpx struct" >&5 -$as_echo_n "checking for host in utmpx struct... " >&6; } -if test "${pt_cv_struct_utmpx_host+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +ac_fn_cxx_check_member "$LINENO" "struct utmpx" "ut_host" "ac_cv_member_struct_utmpx_ut_host" " #include #include -int -main () -{ -struct utmpx utx; utx.ut_host; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmpx_host=yes -else - pt_cv_struct_utmpx_host=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx_host" >&5 -$as_echo "$pt_cv_struct_utmpx_host" >&6; } -if test x$pt_cv_struct_utmpx_host = xyes; then + +" +if test "x$ac_cv_member_struct_utmpx_ut_host" = x""yes; then : $as_echo "#define HAVE_UTMPX_HOST 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for session in utmpx struct" >&5 -$as_echo_n "checking for session in utmpx struct... " >&6; } -if test "${pt_cv_struct_utmpx_session+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -struct utmpx utx; utx.ut_session; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_utmpx_session=yes -else - pt_cv_struct_utmpx_session=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_utmpx_session" >&5 -$as_echo "$pt_cv_struct_utmpx_session" >&6; } -if test x$pt_cv_struct_utmpx_session = xyes; then - -$as_echo "#define HAVE_UTMPX_SESSION 1" >>confdefs.h - -fi fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct lastlog" >&5 -$as_echo_n "checking for struct lastlog... " >&6; } -if test "${pt_cv_struct_lastlog+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +ac_fn_cxx_check_type "$LINENO" "struct lastlog" "ac_cv_type_struct_lastlog" " #include #include #ifdef HAVE_LASTLOG_H #include #endif -int -main () -{ -struct lastlog ll; - ; - return 0; -} +" +if test "x$ac_cv_type_struct_lastlog" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_LASTLOG 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_lastlog=yes -else - pt_cv_struct_lastlog=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_lastlog" >&5 -$as_echo "$pt_cv_struct_lastlog" >&6; } -if test x$pt_cv_struct_lastlog = xyes; then -$as_echo "#define HAVE_STRUCT_LASTLOG 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct lastlogx" >&5 -$as_echo_n "checking for struct lastlogx... " >&6; } -if test "${pt_cv_struct_lastlogx+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + +ac_fn_cxx_check_type "$LINENO" "struct lastlogx" "ac_cv_type_struct_lastlogx" " #include #include #ifdef HAVE_LASTLOG_H #include #endif -int -main () -{ -struct lastlogx ll; - ; - return 0; -} +" +if test "x$ac_cv_type_struct_lastlogx" = x""yes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_LASTLOGX 1 _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - pt_cv_struct_lastlogx=yes -else - pt_cv_struct_lastlogx=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_struct_lastlogx" >&5 -$as_echo "$pt_cv_struct_lastlogx" >&6; } -if test x$pt_cv_struct_lastlogx = xyes; then -$as_echo "#define HAVE_STRUCT_LASTLOGX 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where utmp is located" >&5 -$as_echo_n "checking where utmp is located... " >&6; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of utmp" >&5 +$as_echo_n "checking for a fallback location of utmp... " >&6; } if test "${pt_cv_path_utmp+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define UTMP_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define UTMP_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -#include -main() -{ - char **u, *utmplist[] = { - "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef UTMP_FILE - fprintf(f, "%s\n", UTMP_FILE); - exit(0); -#endif -#ifdef _PATH_UTMP - fprintf(f, "%s\n", _PATH_UTMP); - exit(0); -#endif - for (u = utmplist; *u; u++) { - if ((a = fopen(*u, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *u); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_utmp=`cat conftestval` -else - pt_cv_path_utmp= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/run/utmp" "/var/adm/utmp" "/etc/utmp" "/usr/etc/utmp" "/usr/adm/utmp"; do + if test -f "$file"; then + pt_cv_path_utmp=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_utmp" >&5 $as_echo "$pt_cv_path_utmp" >&6; } if test x$pt_cv_path_utmp != x; then cat >>confdefs.h <<_ACEOF -#define UTMP_FILE "$pt_cv_path_utmp" +#define PT_UTMP_FILE "$pt_cv_path_utmp" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_UTMP_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_UTMP_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where wtmp is located" >&5 -$as_echo_n "checking where wtmp is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of wtmp" >&5 +$as_echo_n "checking for a fallback location of wtmp... " >&6; } if test "${pt_cv_path_wtmp+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMP_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define WTMP_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#ifdef HAVE_UTMP_H -#include -#endif -#include -main() -{ - char **w, *wtmplist[] = { - "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef WTMP_FILE - fprintf(f, "%s\n", WTMP_FILE); - exit(0); -#endif -#ifdef _PATH_WTMP - fprintf(f, "%s\n", _PATH_WTMP); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_wtmp=`cat conftestval` -else - pt_cv_path_wtmp= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/wtmp" "/var/adm/wtmp" "/etc/wtmp" "/usr/etc/wtmp" "/usr/adm/wtmp"; do + if test -f "$file"; then + pt_cv_path_wtmp=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_wtmp" >&5 $as_echo "$pt_cv_path_wtmp" >&6; } if test x$pt_cv_path_wtmp != x; then cat >>confdefs.h <<_ACEOF -#define WTMP_FILE "$pt_cv_path_wtmp" +#define PT_WTMP_FILE "$pt_cv_path_wtmp" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_WTMP_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_WTMP_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where wtmpx is located" >&5 -$as_echo_n "checking where wtmpx is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of wtmpx" >&5 +$as_echo_n "checking for a fallback location of wtmpx... " >&6; } if test "${pt_cv_path_wtmpx+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define WTMPX_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define WTMPX_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#ifdef HAVE_UTMPX_H -#include -#endif -#include -main() -{ - char **w, *wtmplist[] = { - "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef WTMPX_FILE - fprintf(f, "%s\n", WTMPX_FILE); - exit(0); -#endif -#ifdef _PATH_WTMPX - fprintf(f, "%s\n", _PATH_WTMPX); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_wtmpx=`cat conftestval` -else - pt_cv_path_wtmpx= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/wtmpx" "/var/adm/wtmpx"; do + if test -f "$file"; then + pt_cv_path_wtmpx=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_wtmpx" >&5 $as_echo "$pt_cv_path_wtmpx" >&6; } if test x$pt_cv_path_wtmpx != x; then cat >>confdefs.h <<_ACEOF -#define WTMPX_FILE "$pt_cv_path_wtmpx" +#define PT_WTMPX_FILE "$pt_cv_path_wtmpx" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_WTMPX_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_WTMPX_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where lastlog is located" >&5 -$as_echo_n "checking where lastlog is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of lastlog" >&5 +$as_echo_n "checking for a fallback location of lastlog... " >&6; } if test "${pt_cv_path_lastlog+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOG_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define LASTLOG_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#ifdef HAVE_UTMPX_H -#include -#elif defined(HAVE_UTMP_H) -#include -#endif -#ifdef HAVE_LASTLOG_H -#include -#endif -#include -main() -{ - char **w, *lastloglist[] = { "/var/log/lastlog", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef LASTLOG_FILE - fprintf(f, "%s\n", LASTLOG_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOG - fprintf(f, "%s\n", _PATH_LASTLOG); - exit(0); -#endif - for (w = lastloglist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_lastlog=`cat conftestval` -else - pt_cv_path_lastlog= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/lastlog" "/var/adm/lastlog"; do + if test -f "$file"; then + pt_cv_path_lastlog=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_lastlog" >&5 $as_echo "$pt_cv_path_lastlog" >&6; } if test x$pt_cv_path_lastlog != x; then cat >>confdefs.h <<_ACEOF -#define LASTLOG_FILE "$pt_cv_path_lastlog" +#define PT_LASTLOG_FILE "$pt_cv_path_lastlog" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_LASTLOG_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_LASTLOG_FILE in config.h manually" >&2;} fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where lastlogx is located" >&5 -$as_echo_n "checking where lastlogx is located... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback location of lastlogx" >&5 +$as_echo_n "checking for a fallback location of lastlogx... " >&6; } if test "${pt_cv_path_lastlogx+set}" = set; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define LASTLOGX_FILE in config.h manually" >&5 -$as_echo "$as_me: WARNING: Define LASTLOGX_FILE in config.h manually" >&2;} -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#ifdef HAVE_UTMPX_H -#include -#endif -#include -main() -{ - char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; - FILE *a, *f=fopen("conftestval", "w"); - if (!f) exit(1); -#ifdef LASTLOGX_FILE - fprintf(f, "%s\n", LASTLOGX_FILE); - exit(0); -#endif -#ifdef _PATH_LASTLOGX - fprintf(f, "%s\n", _PATH_LASTLOGX); - exit(0); -#endif - for (w = wtmplist; *w; w++) { - if ((a = fopen(*w, "r")) != NULL || errno == EACCES) { - fprintf(f, "%s\n", *w); - exit(0); - } - } - exit(0); -} -_ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - pt_cv_path_lastlogx=`cat conftestval` -else - pt_cv_path_lastlogx= -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi +if test "$cross_compiling" != yes; then + for file in "/var/log/lastlogx" "/var/adm/lastlogx"; do + if test -f "$file"; then + pt_cv_path_lastlogx=$file + break + fi + done +fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pt_cv_path_lastlogx" >&5 $as_echo "$pt_cv_path_lastlogx" >&6; } if test x$pt_cv_path_lastlogx != x; then cat >>confdefs.h <<_ACEOF -#define LASTLOGX_FILE "$pt_cv_path_lastlogx" +#define PT_LASTLOGX_FILE "$pt_cv_path_lastlogx" _ACEOF +elif test "$cross_compiling" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Define PT_LASTLOGX_FILE in config.h manually" >&5 +$as_echo "$as_me: WARNING: Define PT_LASTLOGX_FILE in config.h manually" >&2;} fi @@ -7286,21 +6921,24 @@ $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - : + : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + + #include #include - main() { - char *p; - if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) - exit (XSupportsLocale() ? 0 : 1); - else - exit (1);} + int main() { + char *p; + if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) + exit (XSupportsLocale() ? 0 : 1); + else + exit (1); + } + _ACEOF if ac_fn_cxx_try_run "$LINENO"; then : - rxvt_cv_func_xlocale=yes + rxvt_cv_func_xlocale=yes else rxvt_cv_func_xlocale=no fi @@ -7386,70 +7024,102 @@ LIBS=$save_LIBS CFLAGS=$save_CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working plain setlocale" >&5 -$as_echo_n "checking for working plain setlocale... " >&6; } -if test "${rxvt_cv_func_setlocale+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working nl_langinfo" >&5 +$as_echo_n "checking for working nl_langinfo... " >&6; } +if test "${rxvt_cv_func_nl_langinfo+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include +#include int main () { -setlocale(LC_CTYPE, ""); +nl_langinfo(CODESET); ; return 0; } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - rxvt_cv_func_setlocale=yes + rxvt_cv_func_nl_langinfo=yes else - rxvt_cv_func_setlocale=no + rxvt_cv_func_nl_langinfo=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_func_setlocale" >&5 -$as_echo "$rxvt_cv_func_setlocale" >&6; } -if test x$rxvt_cv_func_setlocale = xyes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_func_nl_langinfo" >&5 +$as_echo "$rxvt_cv_func_nl_langinfo" >&6; } +if test x$rxvt_cv_func_nl_langinfo = xyes; then -$as_echo "#define HAVE_SETLOCALE 1" >>confdefs.h +$as_echo "#define HAVE_NL_LANGINFO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working nl_langinfo" >&5 -$as_echo_n "checking for working nl_langinfo... " >&6; } -if test "${rxvt_cv_func_nl_langinfo+set}" = set; then : + +case $host in + *-*-solaris*) + +$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5 +$as_echo_n "checking for library containing sendmsg... " >&6; } +if test "${ac_cv_search_sendmsg+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sendmsg (); int main () { -nl_langinfo(CODESET); +return sendmsg (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - rxvt_cv_func_nl_langinfo=yes -else - rxvt_cv_func_nl_langinfo=no +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_search_sendmsg=$ac_res fi rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext + if test "${ac_cv_search_sendmsg+set}" = set; then : + break fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_func_nl_langinfo" >&5 -$as_echo "$rxvt_cv_func_nl_langinfo" >&6; } -if test x$rxvt_cv_func_nl_langinfo = xyes; then +done +if test "${ac_cv_search_sendmsg+set}" = set; then : -$as_echo "#define HAVE_NL_LANGINFO 1" >>confdefs.h +else + ac_cv_search_sendmsg=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sendmsg" >&5 +$as_echo "$ac_cv_search_sendmsg" >&6; } +ac_res=$ac_cv_search_sendmsg +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi + ;; +esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unix-compliant filehandle passing ability" >&5 $as_echo_n "checking for unix-compliant filehandle passing ability... " >&6; } @@ -7459,7 +7129,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include // broken bsds (is that redundant?) need this +#include // broken bsds (is that redundant?) need this #include #include #include @@ -7521,7 +7191,6 @@ util.h \ libutil.h \ sys/ioctl.h \ - sys/stropts.h \ stropts.h \ do : @@ -7560,53 +7229,9 @@ done -have_clone=no - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 -$as_echo_n "checking for /dev/ptc... " >&6; } -if test -e /dev/ptc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define CLONE_DEVICE \"/dev/ptc\"" >>confdefs.h - - have_clone=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -case $host in - *-*-cygwin*) - have_clone=yes - -$as_echo "#define CLONE_DEVICE \"/dev/ptmx\"" >>confdefs.h - - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 -$as_echo_n "checking for /dev/ptmx... " >&6; } - if test -e /dev/ptmx; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h - - -$as_echo "#define CLONE_DEVICE \"/dev/ptmx\"" >>confdefs.h - - have_clone=yes - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; -esac - -if test x$ac_cv_func_getpt = xyes -o x$ac_cv_func_posix_openpt = xyes -o x$have_clone = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX98 ptys" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX98 ptys" >&5 $as_echo_n "checking for UNIX98 ptys... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -7622,7 +7247,7 @@ $as_echo "#define UNIX98_PTY 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -7630,7 +7255,6 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -fi if test -z "$unix98_pty"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing openpty" >&5 @@ -7711,7 +7335,7 @@ #include #include -main() +int main() { struct stat st; struct group *gr; @@ -7745,7 +7369,15 @@ fi -if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then +support_image=no +if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then + support_image=yes +fi +if test x$support_xdbe = xyes; then + LIBS="$LIBS -lXext" +fi + +if test x$support_xft = xyes || test x$support_image = xyes; then rxvt_have_xrender=no # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 @@ -8034,6 +7666,100 @@ fi fi + +image_lib=none + +PIXBUF_CFLAGS= +PIXBUF_LIBS= + +if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then + LIBS="$LIBS -lm" + +$as_echo "#define XRENDER 1" >>confdefs.h + + + if test x$support_inheritpixmap = xyes; then + +$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h + + fi + + if test x$support_pixbuf = xyes; then + support_pixbuf=no + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5 +$as_echo_n "checking for gdk-pixbuf... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then + PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" + PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" + support_pixbuf=yes + fi + + if test x$support_pixbuf = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + image_lib=gdk-pixbuf + +$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h + + +$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + fi +fi + + + + +if test x$support_xdbe = xyes; then + +$as_echo "#define ENABLE_XDBE 1" >>confdefs.h + +fi if test x$support_styles = xyes; then $as_echo "#define ENABLE_STYLES 1" >>confdefs.h @@ -8054,17 +7780,6 @@ $as_echo "#define OFF_FOCUS_FADING 1" >>confdefs.h fi -if test x$support_inheritpixmap = xyes; then - if test x$rxvt_have_xrender = xyes; then - LIBS="$LIBS -lm" - -$as_echo "#define XRENDER 1" >>confdefs.h - - fi - -$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h - -fi if test x$support_keepscrolling = xno; then $as_echo "#define NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1" >>confdefs.h @@ -8192,46 +7907,7 @@ done IFS=$as_save_IFS - ;; -esac -fi -PERL=$ac_cv_path_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - # Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_PERL="$PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl" ;; esac fi @@ -9004,7 +8680,7 @@ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -9319,7 +8995,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9347,7 +9023,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -9374,7 +9050,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac