ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/configure
(Generate patch)

Comparing rxvt-unicode/configure (file contents):
Revision 1.161 by root, Sat Dec 13 10:47:15 2014 UTC vs.
Revision 1.163 by root, Sat May 14 08:28:25 2016 UTC

… …
2261$as_echo "$ac_res" >&6; } 2261$as_echo "$ac_res" >&6; }
2262 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2262 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2263 2263
2264} # ac_fn_c_find_uintX_t 2264} # ac_fn_c_find_uintX_t
2265 2265
2266# ac_fn_cxx_check_member LINENO AGGR MEMBER VAR INCLUDES
2267# ------------------------------------------------------
2268# Tries to find if the field MEMBER exists in type AGGR, after including
2269# INCLUDES, setting cache variable VAR accordingly.
2270ac_fn_cxx_check_member ()
2271{
2272 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
2274$as_echo_n "checking for $2.$3... " >&6; }
2275if eval \${$4+:} false; then :
2276 $as_echo_n "(cached) " >&6
2277else
2278 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2279/* end confdefs.h. */
2280$5
2281int
2282main ()
2283{
2284static $2 ac_aggr;
2285if (ac_aggr.$3)
2286return 0;
2287 ;
2288 return 0;
2289}
2290_ACEOF
2291if ac_fn_cxx_try_compile "$LINENO"; then :
2292 eval "$4=yes"
2293else
2294 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2295/* end confdefs.h. */
2296$5
2297int
2298main ()
2299{
2300static $2 ac_aggr;
2301if (sizeof ac_aggr.$3)
2302return 0;
2303 ;
2304 return 0;
2305}
2306_ACEOF
2307if ac_fn_cxx_try_compile "$LINENO"; then :
2308 eval "$4=yes"
2309else
2310 eval "$4=no"
2311fi
2312rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2313fi
2314rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2315fi
2316eval ac_res=\$$4
2317 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2318$as_echo "$ac_res" >&6; }
2319 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
2320
2321} # ac_fn_cxx_check_member
2322
2266# ac_fn_cxx_try_run LINENO 2323# ac_fn_cxx_try_run LINENO
2267# ------------------------ 2324# ------------------------
2268# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes 2325# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
2269# that executables *can* be run. 2326# that executables *can* be run.
2270ac_fn_cxx_try_run () 2327ac_fn_cxx_try_run ()
… …
4949 5006
4950 fi 5007 fi
4951fi 5008fi
4952 5009
4953 5010
5011support_resources=yes
4954# Check whether --enable-resources was given. 5012# Check whether --enable-resources was given.
4955if test "${enable_resources+set}" = set; then : 5013if test "${enable_resources+set}" = set; then :
4956 enableval=$enable_resources; if test x$enableval = xno; then 5014 enableval=$enable_resources; if test x$enableval = xno; then
4957 5015 support_resources=no
4958$as_echo "#define NO_RESOURCES 1" >>confdefs.h
4959
4960 fi 5016 fi
4961fi 5017fi
4962 5018
4963 5019
4964# Check whether --enable-8bitctrls was given. 5020# Check whether --enable-8bitctrls was given.
… …
5136_ACEOF 5192_ACEOF
5137 terminfo="$withval" 5193 terminfo="$withval"
5138 fi 5194 fi
5139fi 5195fi
5140 5196
5197
5198if test x$support_resources = xno; then
5199 if test x$support_frills = xyes || test x$support_perl = xyes; then
5200 as_fn_error $? "--disable-resources requires --disable-frills --disable-perl" "$LINENO" 5
5201 fi
5202
5203
5204$as_echo "#define NO_RESOURCES 1" >>confdefs.h
5205
5206fi
5141 5207
5142 5208
5143LIBEV_M4_AVOID_LIBRT=1 5209LIBEV_M4_AVOID_LIBRT=1
5144 5210
5145ac_ext=cpp 5211ac_ext=cpp
… …
6270 LDFLAGS=$ac_save_LDFLAGS 6336 LDFLAGS=$ac_save_LDFLAGS
6271 6337
6272fi 6338fi
6273 6339
6274 6340
6275image_lib=none 6341if test -n "$ac_tool_prefix"; then
6276
6277PIXBUF_CFLAGS=
6278PIXBUF_LIBS=
6279
6280if test x$support_pixbuf = xyes; then
6281 support_pixbuf=no
6282 # Extract the first word of "pkg-config", so it can be a program name with args. 6342 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
6283set dummy pkg-config; ac_word=$2 6343set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
6284{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6344{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6285$as_echo_n "checking for $ac_word... " >&6; } 6345$as_echo_n "checking for $ac_word... " >&6; }
6286if ${ac_cv_path_PKG_CONFIG+:} false; then : 6346if ${ac_cv_path_PKG_CONFIG+:} false; then :
6287 $as_echo_n "(cached) " >&6 6347 $as_echo_n "(cached) " >&6
6288else 6348else
… …
6304 fi 6364 fi
6305done 6365done
6306 done 6366 done
6307IFS=$as_save_IFS 6367IFS=$as_save_IFS
6308 6368
6309 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
6310 ;; 6369 ;;
6311esac 6370esac
6312fi 6371fi
6313PKG_CONFIG=$ac_cv_path_PKG_CONFIG 6372PKG_CONFIG=$ac_cv_path_PKG_CONFIG
6314if test -n "$PKG_CONFIG"; then 6373if test -n "$PKG_CONFIG"; then
… …
6318 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6377 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6319$as_echo "no" >&6; } 6378$as_echo "no" >&6; }
6320fi 6379fi
6321 6380
6322 6381
6323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5
6324$as_echo_n "checking for gdk-pixbuf... " >&6; }
6325 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
6326 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
6327 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
6328 support_pixbuf=yes
6329 fi
6330
6331 if test x$support_pixbuf = xyes; then
6332 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
6333$as_echo "ok" >&6; }
6334 image_lib=gdk-pixbuf
6335
6336$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h
6337
6338 else
6339 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6340$as_echo "no" >&6; }
6341 fi
6342fi 6382fi
6343 6383if test -z "$ac_cv_path_PKG_CONFIG"; then
6344 6384 ac_pt_PKG_CONFIG=$PKG_CONFIG
6345
6346
6347STARTUP_NOTIFICATION_CFLAGS=
6348STARTUP_NOTIFICATION_LIBS=
6349
6350if test x$support_startup_notification = xyes; then
6351 support_startup_notification=no
6352 # Extract the first word of "pkg-config", so it can be a program name with args. 6385 # Extract the first word of "pkg-config", so it can be a program name with args.
6353set dummy pkg-config; ac_word=$2 6386set dummy pkg-config; ac_word=$2
6354{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6387{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6355$as_echo_n "checking for $ac_word... " >&6; } 6388$as_echo_n "checking for $ac_word... " >&6; }
6356if ${ac_cv_path_PKG_CONFIG+:} false; then : 6389if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
6357 $as_echo_n "(cached) " >&6 6390 $as_echo_n "(cached) " >&6
6358else 6391else
6359 case $PKG_CONFIG in 6392 case $ac_pt_PKG_CONFIG in
6360 [\\/]* | ?:[\\/]*) 6393 [\\/]* | ?:[\\/]*)
6361 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. 6394 ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
6362 ;; 6395 ;;
6363 *) 6396 *)
6364 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 6397 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6365for as_dir in $PATH 6398for as_dir in $PATH
6366do 6399do
6367 IFS=$as_save_IFS 6400 IFS=$as_save_IFS
6368 test -z "$as_dir" && as_dir=. 6401 test -z "$as_dir" && as_dir=.
6369 for ac_exec_ext in '' $ac_executable_extensions; do 6402 for ac_exec_ext in '' $ac_executable_extensions; do
6370 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then 6403 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6371 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" 6404 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
6372 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 6405 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6373 break 2 6406 break 2
6374 fi 6407 fi
6375done 6408done
6376 done 6409 done
6377IFS=$as_save_IFS 6410IFS=$as_save_IFS
6378 6411
6379 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
6380 ;; 6412 ;;
6381esac 6413esac
6382fi 6414fi
6383PKG_CONFIG=$ac_cv_path_PKG_CONFIG 6415ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
6384if test -n "$PKG_CONFIG"; then 6416if test -n "$ac_pt_PKG_CONFIG"; then
6385 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 6417 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
6386$as_echo "$PKG_CONFIG" >&6; } 6418$as_echo "$ac_pt_PKG_CONFIG" >&6; }
6387else 6419else
6388 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6420 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6389$as_echo "no" >&6; } 6421$as_echo "no" >&6; }
6390fi 6422fi
6391 6423
6424 if test "x$ac_pt_PKG_CONFIG" = x; then
6425 PKG_CONFIG="no"
6426 else
6427 case $cross_compiling:$ac_tool_warned in
6428yes:)
6429{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
6430$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
6431ac_tool_warned=yes ;;
6432esac
6433 PKG_CONFIG=$ac_pt_PKG_CONFIG
6434 fi
6435else
6436 PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
6437fi
6392 6438
6439
6440image_lib=none
6441
6442PIXBUF_CFLAGS=
6443PIXBUF_LIBS=
6444
6445if test x$support_pixbuf = xyes; then
6446
6393 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification" >&5 6447 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf-2.0" >&5
6394$as_echo_n "checking for libstartup-notification... " >&6; } 6448$as_echo_n "checking for gdk-pixbuf-2.0... " >&6; }
6395 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then 6449 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
6396 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`" 6450 PIXBUF_CFLAGS="`$PKG_CONFIG --cflags gdk-pixbuf-2.0`"
6397 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`" 6451 PIXBUF_LIBS="`$PKG_CONFIG --libs gdk-pixbuf-2.0`"
6398 support_startup_notification=yes
6399 fi
6400 6452
6401 if test x$support_startup_notification = xyes; then
6402 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 6453 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
6403$as_echo "ok" >&6; } 6454$as_echo "ok" >&6; }
6404 6455
6456 image_lib=gdk-pixbuf
6457
6405$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h 6458$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h
6459
6406 6460
6407 else 6461 else
6408 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6462 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6409$as_echo "no" >&6; } 6463$as_echo "no" >&6; }
6464 :
6410 fi 6465 fi
6411fi
6412 6466
6467fi
6413 6468
6414 6469
6470
6471
6472STARTUP_NOTIFICATION_CFLAGS=
6473STARTUP_NOTIFICATION_LIBS=
6474
6475if test x$support_startup_notification = xyes; then
6476
6477 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification-1.0" >&5
6478$as_echo_n "checking for libstartup-notification-1.0... " >&6; }
6479 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
6480 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG --cflags libstartup-notification-1.0`"
6481 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs libstartup-notification-1.0`"
6482
6483 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
6484$as_echo "ok" >&6; }
6485
6486
6487$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h
6488
6489
6490 else
6491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6492$as_echo "no" >&6; }
6493 :
6494 fi
6495
6496fi
6497
6498
6499
6500
6501if test x$support_frills = xyes; then
6502
6503 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmu" >&5
6504$as_echo_n "checking for xmu... " >&6; }
6505 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xmu; then
6506 XMU_CFLAGS="`$PKG_CONFIG --cflags xmu`"
6507 XMU_LIBS="`$PKG_CONFIG --libs xmu`"
6508
6509 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
6510$as_echo "ok" >&6; }
6511
6512 X_LIBS="$XMU_LIBS $X_LIBS"
6513 CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
6514
6515$as_echo "#define HAVE_XMU 1" >>confdefs.h
6516
6517
6518 else
6519 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6520$as_echo "no" >&6; }
6521 :
6522 fi
6523
6524fi
6415 6525
6416for ac_header in \ 6526for ac_header in \
6417 sys/byteorder.h \ 6527 sys/byteorder.h \
6418 sys/ioctl.h \ 6528 sys/ioctl.h \
6419 sys/sockio.h \ 6529 sys/sockio.h \
… …
6674 ac_fn_cxx_check_header_mongrel "$LINENO" "utmp.h" "ac_cv_header_utmp_h" "$ac_includes_default" 6784 ac_fn_cxx_check_header_mongrel "$LINENO" "utmp.h" "ac_cv_header_utmp_h" "$ac_includes_default"
6675if test "x$ac_cv_header_utmp_h" = xyes; then : 6785if test "x$ac_cv_header_utmp_h" = xyes; then :
6676 cat >>confdefs.h <<_ACEOF 6786 cat >>confdefs.h <<_ACEOF
6677#define HAVE_UTMP_H 1 6787#define HAVE_UTMP_H 1
6678_ACEOF 6788_ACEOF
6789
6679 ac_fn_cxx_check_type "$LINENO" "struct utmp" "ac_cv_type_struct_utmp" " 6790ac_fn_cxx_check_type "$LINENO" "struct utmp" "ac_cv_type_struct_utmp" "
6680#include <sys/types.h> 6791#include <sys/types.h>
6681#include <utmp.h> 6792#include <utmp.h>
6682 6793
6683" 6794"
6684if test "x$ac_cv_type_struct_utmp" = xyes; then : 6795if test "x$ac_cv_type_struct_utmp" = xyes; then :
… …
6689 6800
6690 6801
6691fi 6802fi
6692 6803
6693 6804
6694
6695# ac_fn_cxx_check_member LINENO AGGR MEMBER VAR INCLUDES
6696# ------------------------------------------------------
6697# Tries to find if the field MEMBER exists in type AGGR, after including
6698# INCLUDES, setting cache variable VAR accordingly.
6699ac_fn_cxx_check_member ()
6700{
6701 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
6702 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
6703$as_echo_n "checking for $2.$3... " >&6; }
6704if eval \${$4+:} false; then :
6705 $as_echo_n "(cached) " >&6
6706else
6707 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6708/* end confdefs.h. */
6709$5
6710int
6711main ()
6712{
6713static $2 ac_aggr;
6714if (ac_aggr.$3)
6715return 0;
6716 ;
6717 return 0;
6718}
6719_ACEOF
6720if ac_fn_cxx_try_compile "$LINENO"; then :
6721 eval "$4=yes"
6722else
6723 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6724/* end confdefs.h. */
6725$5
6726int
6727main ()
6728{
6729static $2 ac_aggr;
6730if (sizeof ac_aggr.$3)
6731return 0;
6732 ;
6733 return 0;
6734}
6735_ACEOF
6736if ac_fn_cxx_try_compile "$LINENO"; then :
6737 eval "$4=yes"
6738else
6739 eval "$4=no"
6740fi
6741rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6742fi
6743rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6744fi
6745eval ac_res=\$$4
6746 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
6747$as_echo "$ac_res" >&6; }
6748 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
6749
6750} # ac_fn_cxx_check_member
6751ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_host" "ac_cv_member_struct_utmp_ut_host" " 6805ac_fn_cxx_check_member "$LINENO" "struct utmp" "ut_host" "ac_cv_member_struct_utmp_ut_host" "
6752#include <sys/types.h> 6806#include <sys/types.h>
6753#include <utmp.h> 6807#include <utmp.h>
6754 6808
6755" 6809"
… …
6782 ac_fn_cxx_check_header_mongrel "$LINENO" "utmpx.h" "ac_cv_header_utmpx_h" "$ac_includes_default" 6836 ac_fn_cxx_check_header_mongrel "$LINENO" "utmpx.h" "ac_cv_header_utmpx_h" "$ac_includes_default"
6783if test "x$ac_cv_header_utmpx_h" = xyes; then : 6837if test "x$ac_cv_header_utmpx_h" = xyes; then :
6784 cat >>confdefs.h <<_ACEOF 6838 cat >>confdefs.h <<_ACEOF
6785#define HAVE_UTMPX_H 1 6839#define HAVE_UTMPX_H 1
6786_ACEOF 6840_ACEOF
6841
6787 ac_fn_cxx_check_type "$LINENO" "struct utmpx" "ac_cv_type_struct_utmpx" " 6842ac_fn_cxx_check_type "$LINENO" "struct utmpx" "ac_cv_type_struct_utmpx" "
6788#include <sys/types.h> 6843#include <sys/types.h>
6789#include <utmpx.h> 6844#include <utmpx.h>
6790 6845
6791" 6846"
6792if test "x$ac_cv_type_struct_utmpx" = xyes; then : 6847if test "x$ac_cv_type_struct_utmpx" = xyes; then :
… …
7480if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then 7535if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
7481 support_image=yes 7536 support_image=yes
7482fi 7537fi
7483if test x$support_xft = xyes || test x$support_image = xyes; then 7538if test x$support_xft = xyes || test x$support_image = xyes; then
7484 rxvt_have_xrender=no 7539 rxvt_have_xrender=no
7485 # Extract the first word of "pkg-config", so it can be a program name with args. 7540
7486set dummy pkg-config; ac_word=$2
7487{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7541 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrender" >&5
7488$as_echo_n "checking for $ac_word... " >&6; } 7542$as_echo_n "checking for xrender... " >&6; }
7489if ${ac_cv_path_PKG_CONFIG+:} false; then :
7490 $as_echo_n "(cached) " >&6
7491else
7492 case $PKG_CONFIG in
7493 [\\/]* | ?:[\\/]*)
7494 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7495 ;;
7496 *)
7497 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7498for as_dir in $PATH
7499do
7500 IFS=$as_save_IFS
7501 test -z "$as_dir" && as_dir=.
7502 for ac_exec_ext in '' $ac_executable_extensions; do
7503 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7504 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7505 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7506 break 2
7507 fi
7508done
7509 done
7510IFS=$as_save_IFS
7511
7512 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7513 ;;
7514esac
7515fi
7516PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7517if test -n "$PKG_CONFIG"; then
7518 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7519$as_echo "$PKG_CONFIG" >&6; }
7520else
7521 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7522$as_echo "no" >&6; }
7523fi
7524
7525
7526 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 7543 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
7527 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 7544 XRENDER_CFLAGS="`$PKG_CONFIG --cflags xrender`"
7528 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" 7545 XRENDER_LIBS="`$PKG_CONFIG --libs xrender`"
7546
7547 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
7548$as_echo "ok" >&6; }
7549
7550 X_LIBS="$XRENDER_LIBS $X_LIBS"
7551 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
7529 rxvt_have_xrender=yes 7552 rxvt_have_xrender=yes
7530 7553
7531 save_LIBS="$LIBS" 7554 save_LIBS="$LIBS"
7532 LIBS="$LIBS $X_LIBS" 7555 LIBS="$LIBS $X_LIBS"
7533 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default" 7556 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
… …
7544else 7567else
7545 rxvt_have_xrender=no 7568 rxvt_have_xrender=no
7546fi 7569fi
7547 7570
7548 LIBS="$save_LIBS" 7571 LIBS="$save_LIBS"
7572
7573 else
7574 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7575$as_echo "no" >&6; }
7576 :
7549 fi 7577 fi
7578
7550fi 7579fi
7551 7580
7552if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 7581if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
7553 # Extract the first word of "pkg-config", so it can be a program name with args. 7582
7554set dummy pkg-config; ac_word=$2
7555{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7583 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig xft" >&5
7556$as_echo_n "checking for $ac_word... " >&6; } 7584$as_echo_n "checking for fontconfig xft... " >&6; }
7557if ${ac_cv_path_PKG_CONFIG+:} false; then : 7585 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig xft; then
7558 $as_echo_n "(cached) " >&6 7586 XFT_CFLAGS="`$PKG_CONFIG --cflags fontconfig xft`"
7559else 7587 XFT_LIBS="`$PKG_CONFIG --libs fontconfig xft`"
7560 case $PKG_CONFIG in
7561 [\\/]* | ?:[\\/]*)
7562 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7563 ;;
7564 *)
7565 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7566for as_dir in $PATH
7567do
7568 IFS=$as_save_IFS
7569 test -z "$as_dir" && as_dir=.
7570 for ac_exec_ext in '' $ac_executable_extensions; do
7571 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7572 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7573 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7574 break 2
7575 fi
7576done
7577 done
7578IFS=$as_save_IFS
7579 7588
7580 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7581 ;;
7582esac
7583fi
7584PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7585if test -n "$PKG_CONFIG"; then
7586 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 7589 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
7587$as_echo "$PKG_CONFIG" >&6; } 7590$as_echo "ok" >&6; }
7591
7592 X_LIBS="$XFT_LIBS $X_LIBS"
7593 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
7594
7588else 7595 else
7589 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7596 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7590$as_echo "no" >&6; } 7597$as_echo "no" >&6; }
7591fi
7592 7598
7593
7594 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
7595 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
7596 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
7597 else
7598 # Extract the first word of "xft-config", so it can be a program name with args. 7599 # Extract the first word of "xft-config", so it can be a program name with args.
7599set dummy xft-config; ac_word=$2 7600set dummy xft-config; ac_word=$2
7600{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7601{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7601$as_echo_n "checking for $ac_word... " >&6; } 7602$as_echo_n "checking for $ac_word... " >&6; }
7602if ${ac_cv_path_XFT_CONFIG+:} false; then : 7603if ${ac_cv_path_XFT_CONFIG+:} false; then :
… …
7638 7639
7639 if test $XFT_CONFIG != no; then 7640 if test $XFT_CONFIG != no; then
7640 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 7641 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
7641 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 7642 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
7642 fi 7643 fi
7643 fi
7644 7644
7645 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
7646 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
7647 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
7648 fi 7645 fi
7646
7649 7647
7650 save_LIBS="$LIBS" 7648 save_LIBS="$LIBS"
7651 LIBS="$LIBS $X_LIBS" 7649 LIBS="$LIBS $X_LIBS"
7652 for ac_header in X11/Xft/Xft.h fontconfig/fontconfig.h 7650 for ac_header in X11/Xft/Xft.h fontconfig/fontconfig.h
7653do : 7651do :

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines