--- rxvt-unicode/configure 2012/11/06 20:58:04 1.158 +++ rxvt-unicode/configure 2019/06/20 23:07:42 1.164 @@ -687,6 +687,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -804,6 +805,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1056,6 +1058,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1193,7 +1204,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1346,6 +1357,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2263,6 +2275,63 @@ } # ac_fn_c_find_uintX_t +# 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 \${$4+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +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; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_member + # ac_fn_cxx_try_run LINENO # ------------------------ # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes @@ -4951,12 +5020,11 @@ fi +support_resources=yes # Check whether --enable-resources was given. if test "${enable_resources+set}" = set; then : enableval=$enable_resources; if test x$enableval = xno; then - -$as_echo "#define NO_RESOURCES 1" >>confdefs.h - + support_resources=no fi fi @@ -5139,6 +5207,16 @@ fi +if test x$support_resources = xno; then + if test x$support_frills = xyes || test x$support_perl = xyes; then + as_fn_error $? "--disable-resources requires --disable-frills --disable-perl" "$LINENO" 5 + fi + + +$as_echo "#define NO_RESOURCES 1" >>confdefs.h + +fi + LIBEV_M4_AVOID_LIBRT=1 @@ -5276,7 +5354,20 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -for ac_header in sys/inotify.h sys/epoll.h sys/event.h port.h poll.h sys/select.h sys/eventfd.h sys/signalfd.h +for ac_header in sys/inotify.h sys/epoll.h sys/event.h port.h poll.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +for ac_header in sys/select.h sys/eventfd.h sys/signalfd.h linux/aio_abi.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -6272,15 +6363,9 @@ fi -image_lib=none - -PIXBUF_CFLAGS= -PIXBUF_LIBS= - -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 +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}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 ${ac_cv_path_PKG_CONFIG+:} false; then : @@ -6306,7 +6391,6 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -6320,45 +6404,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 - 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 - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi fi - - - - -STARTUP_NOTIFICATION_CFLAGS= -STARTUP_NOTIFICATION_LIBS= - -if test x$support_startup_notification = xyes; then - support_startup_notification=no +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG # 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 ${ac_cv_path_PKG_CONFIG+:} false; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $PKG_CONFIG in + case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -6368,7 +6426,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ac_pt_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 @@ -6376,43 +6434,120 @@ 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; } +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + - { $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 +image_lib=none + +PIXBUF_CFLAGS= +PIXBUF_LIBS= + +if test x$support_pixbuf = xyes; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf-2.0" >&5 +$as_echo_n "checking for gdk-pixbuf-2.0... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then + PIXBUF_CFLAGS="`$PKG_CONFIG --cflags gdk-pixbuf-2.0`" + PIXBUF_LIBS="`$PKG_CONFIG --libs gdk-pixbuf-2.0`" + + { $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 + + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : fi - if test x$support_startup_notification = xyes; then +fi + + + + +STARTUP_NOTIFICATION_CFLAGS= +STARTUP_NOTIFICATION_LIBS= + +if test x$support_startup_notification = xyes; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification-1.0" >&5 +$as_echo_n "checking for libstartup-notification-1.0... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then + STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG --cflags libstartup-notification-1.0`" + STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs libstartup-notification-1.0`" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } + $as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h + else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + : fi + fi +if test x$support_frills = xyes; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmu" >&5 +$as_echo_n "checking for xmu... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists xmu; then + XMU_CFLAGS="`$PKG_CONFIG --cflags xmu`" + XMU_LIBS="`$PKG_CONFIG --libs xmu`" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + + X_LIBS="$XMU_LIBS $X_LIBS" + CPPFLAGS="$CPPFLAGS $XMU_CFLAGS" + +$as_echo "#define HAVE_XMU 1" >>confdefs.h + + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : + fi + +fi + for ac_header in \ sys/byteorder.h \ sys/ioctl.h \ @@ -6676,7 +6811,8 @@ cat >>confdefs.h <<_ACEOF #define HAVE_UTMP_H 1 _ACEOF - ac_fn_cxx_check_type "$LINENO" "struct utmp" "ac_cv_type_struct_utmp" " + +ac_fn_cxx_check_type "$LINENO" "struct utmp" "ac_cv_type_struct_utmp" " #include #include @@ -6691,63 +6827,6 @@ fi - -# 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 \${$4+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "$4=yes" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (sizeof ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "$4=yes" -else - eval "$4=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -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; ${as_lineno_stack:+:} 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 @@ -6784,7 +6863,8 @@ cat >>confdefs.h <<_ACEOF #define HAVE_UTMPX_H 1 _ACEOF - ac_fn_cxx_check_type "$LINENO" "struct utmpx" "ac_cv_type_struct_utmpx" " + +ac_fn_cxx_check_type "$LINENO" "struct utmpx" "ac_cv_type_struct_utmpx" " #include #include @@ -6997,8 +7077,8 @@ save_LIBS=$LIBS -save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS $X_CFLAGS" +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS $X_CFLAGS" LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" if test x$support_xim = xyes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working Xlocale" >&5 @@ -7108,7 +7188,7 @@ fi LIBS=$save_LIBS -CFLAGS=$save_CFLAGS +CXXFLAGS=$save_CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working nl_langinfo" >&5 $as_echo_n "checking for working nl_langinfo... " >&6; } @@ -7143,11 +7223,32 @@ fi + case $host in *-*-solaris*) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if __STDC_VERSION__ >= 199901L +error +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h -$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h +else + $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5 $as_echo_n "checking for library containing sendmsg... " >&6; } if ${ac_cv_search_sendmsg+:} false; then : @@ -7461,50 +7562,18 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; 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 as_fn_executable_p "$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 xrender" >&5 +$as_echo_n "checking for xrender... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then + XRENDER_CFLAGS="`$PKG_CONFIG --cflags xrender`" + XRENDER_LIBS="`$PKG_CONFIG --libs xrender`" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } - if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then - X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" + X_LIBS="$XRENDER_LIBS $X_LIBS" + CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS" rxvt_have_xrender=yes save_LIBS="$LIBS" @@ -7525,55 +7594,33 @@ fi LIBS="$save_LIBS" + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : fi + fi if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then - # 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 ${ac_cv_path_PKG_CONFIG+:} false; 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 as_fn_executable_p "$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 fontconfig xft" >&5 +$as_echo_n "checking for fontconfig xft... " >&6; } + if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig xft; then + XFT_CFLAGS="`$PKG_CONFIG --cflags fontconfig xft`" + XFT_LIBS="`$PKG_CONFIG --libs fontconfig xft`" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + + X_LIBS="$XFT_LIBS $X_LIBS" + CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" - if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then - X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + # Extract the first word of "xft-config", so it can be a program name with args. set dummy xft-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -7619,21 +7666,19 @@ X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" fi - fi - if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then - X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`" fi + save_LIBS="$LIBS" LIBS="$LIBS $X_LIBS" - for ac_header in X11/Xft/Xft.h + for ac_header in X11/Xft/Xft.h fontconfig/fontconfig.h do : - ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_X11_XFT_XFT_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else @@ -7642,129 +7687,70 @@ done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftDrawString32 in -lXft" >&5 -$as_echo_n "checking for XftDrawString32 in -lXft... " >&6; } -if ${ac_cv_lib_Xft_XftDrawString32+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXft $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* 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 XftDrawString32 (); -int -main () -{ -return XftDrawString32 (); - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_Xft_XftDrawString32=yes -else - ac_cv_lib_Xft_XftDrawString32=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftDrawString32" >&5 -$as_echo "$ac_cv_lib_Xft_XftDrawString32" >&6; } -if test "x$ac_cv_lib_Xft_XftDrawString32" = xyes; then : - : -else - support_xft=no -fi - - for ac_header in fontconfig/fontconfig.h + for ac_func in XftDrawString32 FcPatternGet do : - ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default" -if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_FONTCONFIG_FONTCONFIG_H 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF else support_xft=no fi - done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternGet in -lfontconfig" >&5 -$as_echo_n "checking for FcPatternGet in -lfontconfig... " >&6; } -if ${ac_cv_lib_fontconfig_FcPatternGet+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lfontconfig $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + LIBS="$save_LIBS" + + if test x$support_xft = xyes; then + +$as_echo "#define XFT 1" >>confdefs.h + + fi +fi + +if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Render >= 0.11" >&5 +$as_echo_n "checking for Render >= 0.11... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* 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" +#include +#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10 +error #endif -char FcPatternGet (); + int main () { -return FcPatternGet (); + ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_fontconfig_FcPatternGet=yes -else - ac_cv_lib_fontconfig_FcPatternGet=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternGet" >&5 -$as_echo "$ac_cv_lib_fontconfig_FcPatternGet" >&6; } -if test "x$ac_cv_lib_fontconfig_FcPatternGet" = xyes; then : - : -else - support_xft=no -fi - - LIBS="$save_LIBS" - - if test x$support_xft = xyes; then - -$as_echo "#define XFT 1" >>confdefs.h +if ac_fn_cxx_try_compile "$LINENO"; then : - fi +else + support_image=no fi - -if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then - LIBS="$LIBS -lm" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test x$support_image = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } + LIBS="$LIBS -lm" $as_echo "#define XRENDER 1" >>confdefs.h - if test x$support_inheritpixmap = xyes; then + if test x$support_inheritpixmap = xyes; then $as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h - fi - - if test x$support_pixbuf = xyes; then - -$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h - + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi fi