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

Comparing rxvt-unicode/configure (file contents):
Revision 1.159 by root, Fri Mar 1 12:50:44 2013 UTC vs.
Revision 1.162 by sf-exg, Tue Jun 16 12:06:53 2015 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
6447 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf-2.0" >&5
6448$as_echo_n "checking for gdk-pixbuf-2.0... " >&6; }
6449 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
6450 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
6451 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
6452
6453 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
6454$as_echo "ok" >&6; }
6455
6456 image_lib=gdk-pixbuf
6457
6458$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h
6459
6460
6461 else
6462 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6463$as_echo "no" >&6; }
6464 :
6465 fi
6466
6467fi
6468
6469
6470
6471
6472STARTUP_NOTIFICATION_CFLAGS=
6473STARTUP_NOTIFICATION_LIBS=
6474
6475if test x$support_startup_notification = xyes; then
6476
6393 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification" >&5 6477 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification-1.0" >&5
6394$as_echo_n "checking for libstartup-notification... " >&6; } 6478$as_echo_n "checking for libstartup-notification-1.0... " >&6; }
6395 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then 6479 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
6396 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`" 6480 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
6397 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`" 6481 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
6398 support_startup_notification=yes
6399 fi
6400 6482
6401 if test x$support_startup_notification = xyes; then
6402 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 6483 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
6403$as_echo "ok" >&6; } 6484$as_echo "ok" >&6; }
6404 6485
6486
6405$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h 6487$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h
6488
6406 6489
6407 else 6490 else
6408 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 6491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6409$as_echo "no" >&6; } 6492$as_echo "no" >&6; }
6493 :
6410 fi 6494 fi
6411fi
6412 6495
6496fi
6413 6497
6414 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 xmu --cflags`"
6507 XMU_LIBS="`$PKG_CONFIG xmu --libs`"
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 :
… …
6995 7050
6996 7051
6997 7052
6998 7053
6999save_LIBS=$LIBS 7054save_LIBS=$LIBS
7000save_CFLAGS=$CFLAGS 7055save_CXXFLAGS=$CXXFLAGS
7001CFLAGS="$CFLAGS $X_CFLAGS" 7056CXXFLAGS="$CXXFLAGS $X_CFLAGS"
7002LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 7057LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
7003if test x$support_xim = xyes; then 7058if test x$support_xim = xyes; then
7004 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working Xlocale" >&5 7059 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working Xlocale" >&5
7005$as_echo_n "checking for working Xlocale... " >&6; } 7060$as_echo_n "checking for working Xlocale... " >&6; }
7006if ${rxvt_cv_func_xlocale+:} false; then : 7061if ${rxvt_cv_func_xlocale+:} false; then :
… …
7106 7161
7107$as_echo "#define HAVE_XSETLOCALE 1" >>confdefs.h 7162$as_echo "#define HAVE_XSETLOCALE 1" >>confdefs.h
7108 7163
7109fi 7164fi
7110LIBS=$save_LIBS 7165LIBS=$save_LIBS
7111CFLAGS=$save_CFLAGS 7166CXXFLAGS=$save_CXXFLAGS
7112 7167
7113{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working nl_langinfo" >&5 7168{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working nl_langinfo" >&5
7114$as_echo_n "checking for working nl_langinfo... " >&6; } 7169$as_echo_n "checking for working nl_langinfo... " >&6; }
7115if ${rxvt_cv_func_nl_langinfo+:} false; then : 7170if ${rxvt_cv_func_nl_langinfo+:} false; then :
7116 $as_echo_n "(cached) " >&6 7171 $as_echo_n "(cached) " >&6
… …
7141$as_echo "#define HAVE_NL_LANGINFO 1" >>confdefs.h 7196$as_echo "#define HAVE_NL_LANGINFO 1" >>confdefs.h
7142 7197
7143fi 7198fi
7144 7199
7145 7200
7201
7146case $host in 7202case $host in
7147 *-*-solaris*) 7203 *-*-solaris*)
7204 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7205/* end confdefs.h. */
7148 7206
7207#if __STDC_VERSION__ >= 199901L
7208error
7209#endif
7210
7211int
7212main ()
7213{
7214
7215 ;
7216 return 0;
7217}
7218_ACEOF
7219if ac_fn_cxx_try_compile "$LINENO"; then :
7149$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h 7220 $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
7150 7221
7222else
7223 $as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
7224
7225fi
7226rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7151 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5 7227 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sendmsg" >&5
7152$as_echo_n "checking for library containing sendmsg... " >&6; } 7228$as_echo_n "checking for library containing sendmsg... " >&6; }
7153if ${ac_cv_search_sendmsg+:} false; then : 7229if ${ac_cv_search_sendmsg+:} false; then :
7154 $as_echo_n "(cached) " >&6 7230 $as_echo_n "(cached) " >&6
7155else 7231else
… …
7459if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then 7535if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
7460 support_image=yes 7536 support_image=yes
7461fi 7537fi
7462if test x$support_xft = xyes || test x$support_image = xyes; then 7538if test x$support_xft = xyes || test x$support_image = xyes; then
7463 rxvt_have_xrender=no 7539 rxvt_have_xrender=no
7464 # Extract the first word of "pkg-config", so it can be a program name with args. 7540
7465set dummy pkg-config; ac_word=$2
7466{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7541 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrender" >&5
7467$as_echo_n "checking for $ac_word... " >&6; } 7542$as_echo_n "checking for xrender... " >&6; }
7468if ${ac_cv_path_PKG_CONFIG+:} false; then :
7469 $as_echo_n "(cached) " >&6
7470else
7471 case $PKG_CONFIG in
7472 [\\/]* | ?:[\\/]*)
7473 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7474 ;;
7475 *)
7476 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7477for as_dir in $PATH
7478do
7479 IFS=$as_save_IFS
7480 test -z "$as_dir" && as_dir=.
7481 for ac_exec_ext in '' $ac_executable_extensions; do
7482 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7483 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7484 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7485 break 2
7486 fi
7487done
7488 done
7489IFS=$as_save_IFS
7490
7491 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7492 ;;
7493esac
7494fi
7495PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7496if test -n "$PKG_CONFIG"; then
7497 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7498$as_echo "$PKG_CONFIG" >&6; }
7499else
7500 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7501$as_echo "no" >&6; }
7502fi
7503
7504
7505 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 7543 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
7544 XRENDER_CFLAGS="`$PKG_CONFIG xrender --cflags`"
7506 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 7545 XRENDER_LIBS="`$PKG_CONFIG xrender --libs`"
7507 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" 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"
7508 rxvt_have_xrender=yes 7552 rxvt_have_xrender=yes
7509 7553
7510 save_LIBS="$LIBS" 7554 save_LIBS="$LIBS"
7511 LIBS="$LIBS $X_LIBS" 7555 LIBS="$LIBS $X_LIBS"
7512 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"
… …
7523else 7567else
7524 rxvt_have_xrender=no 7568 rxvt_have_xrender=no
7525fi 7569fi
7526 7570
7527 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 :
7528 fi 7577 fi
7578
7529fi 7579fi
7530 7580
7531if 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
7532 # Extract the first word of "pkg-config", so it can be a program name with args. 7582
7533set dummy pkg-config; ac_word=$2
7534{ $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
7535$as_echo_n "checking for $ac_word... " >&6; } 7584$as_echo_n "checking for fontconfig xft... " >&6; }
7536if ${ac_cv_path_PKG_CONFIG+:} false; then : 7585 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig xft; then
7537 $as_echo_n "(cached) " >&6 7586 XFT_CFLAGS="`$PKG_CONFIG fontconfig xft --cflags`"
7538else 7587 XFT_LIBS="`$PKG_CONFIG fontconfig xft --libs`"
7539 case $PKG_CONFIG in
7540 [\\/]* | ?:[\\/]*)
7541 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7542 ;;
7543 *)
7544 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7545for as_dir in $PATH
7546do
7547 IFS=$as_save_IFS
7548 test -z "$as_dir" && as_dir=.
7549 for ac_exec_ext in '' $ac_executable_extensions; do
7550 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7551 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7552 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7553 break 2
7554 fi
7555done
7556 done
7557IFS=$as_save_IFS
7558 7588
7559 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7560 ;;
7561esac
7562fi
7563PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7564if test -n "$PKG_CONFIG"; then
7565 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 7589 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
7566$as_echo "$PKG_CONFIG" >&6; } 7590$as_echo "ok" >&6; }
7591
7592 X_LIBS="$XFT_LIBS $X_LIBS"
7593 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
7594
7567else 7595 else
7568 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7596 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7569$as_echo "no" >&6; } 7597$as_echo "no" >&6; }
7570fi
7571 7598
7572
7573 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
7574 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
7575 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
7576 else
7577 # 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.
7578set dummy xft-config; ac_word=$2 7600set dummy xft-config; ac_word=$2
7579{ $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
7580$as_echo_n "checking for $ac_word... " >&6; } 7602$as_echo_n "checking for $ac_word... " >&6; }
7581if ${ac_cv_path_XFT_CONFIG+:} false; then : 7603if ${ac_cv_path_XFT_CONFIG+:} false; then :
… …
7617 7639
7618 if test $XFT_CONFIG != no; then 7640 if test $XFT_CONFIG != no; then
7619 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 7641 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
7620 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 7642 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
7621 fi 7643 fi
7622 fi
7623 7644
7624 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
7625 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
7626 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
7627 fi 7645 fi
7646
7628 7647
7629 save_LIBS="$LIBS" 7648 save_LIBS="$LIBS"
7630 LIBS="$LIBS $X_LIBS" 7649 LIBS="$LIBS $X_LIBS"
7631 for ac_header in X11/Xft/Xft.h 7650 for ac_header in X11/Xft/Xft.h fontconfig/fontconfig.h
7632do : 7651do :
7652 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7633 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" 7653ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
7634if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then : 7654if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
7635 cat >>confdefs.h <<_ACEOF 7655 cat >>confdefs.h <<_ACEOF
7636#define HAVE_X11_XFT_XFT_H 1 7656#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7637_ACEOF 7657_ACEOF
7638 7658
7639else 7659else
7640 support_xft=no 7660 support_xft=no
7641fi 7661fi
7642 7662
7643done 7663done
7644 7664
7665 for ac_func in XftDrawString32 FcPatternGet
7666do :
7667 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
7668ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
7669if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
7670 cat >>confdefs.h <<_ACEOF
7671#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
7672_ACEOF
7673
7674else
7675 support_xft=no
7676fi
7677done
7678
7679 LIBS="$save_LIBS"
7680
7681 if test x$support_xft = xyes; then
7682
7683$as_echo "#define XFT 1" >>confdefs.h
7684
7685 fi
7686fi
7687
7688if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
7645 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftDrawString32 in -lXft" >&5 7689 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Render >= 0.11" >&5
7646$as_echo_n "checking for XftDrawString32 in -lXft... " >&6; } 7690$as_echo_n "checking for Render >= 0.11... " >&6; }
7647if ${ac_cv_lib_Xft_XftDrawString32+:} false; then :
7648 $as_echo_n "(cached) " >&6
7649else
7650 ac_check_lib_save_LIBS=$LIBS
7651LIBS="-lXft $LIBS"
7652cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7691 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7653/* end confdefs.h. */ 7692/* end confdefs.h. */
7654 7693
7655/* Override any GCC internal prototype to avoid an error. 7694#include <X11/extensions/Xrender.h>
7656 Use char because int might match the return type of a GCC 7695#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10
7657 builtin and then its argument prototype would still apply. */ 7696error
7658#ifdef __cplusplus
7659extern "C"
7660#endif 7697#endif
7661char XftDrawString32 (); 7698
7662int 7699int
7663main () 7700main ()
7664{ 7701{
7665return XftDrawString32 (); 7702
7666 ; 7703 ;
7667 return 0; 7704 return 0;
7668} 7705}
7669_ACEOF 7706_ACEOF
7670if ac_fn_cxx_try_link "$LINENO"; then : 7707if ac_fn_cxx_try_compile "$LINENO"; then :
7671 ac_cv_lib_Xft_XftDrawString32=yes 7708
7672else 7709else
7673 ac_cv_lib_Xft_XftDrawString32=no 7710 support_image=no
7674fi 7711fi
7675rm -f core conftest.err conftest.$ac_objext \ 7712rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
7676 conftest$ac_exeext conftest.$ac_ext
7677LIBS=$ac_check_lib_save_LIBS
7678fi
7679{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftDrawString32" >&5
7680$as_echo "$ac_cv_lib_Xft_XftDrawString32" >&6; }
7681if test "x$ac_cv_lib_Xft_XftDrawString32" = xyes; then :
7682 :
7683else
7684 support_xft=no
7685fi
7686
7687 for ac_header in fontconfig/fontconfig.h
7688do :
7689 ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
7690if test "x$ac_cv_header_fontconfig_fontconfig_h" = xyes; then :
7691 cat >>confdefs.h <<_ACEOF
7692#define HAVE_FONTCONFIG_FONTCONFIG_H 1
7693_ACEOF
7694
7695else
7696 support_xft=no
7697fi
7698
7699done
7700
7701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternGet in -lfontconfig" >&5
7702$as_echo_n "checking for FcPatternGet in -lfontconfig... " >&6; }
7703if ${ac_cv_lib_fontconfig_FcPatternGet+:} false; then :
7704 $as_echo_n "(cached) " >&6
7705else
7706 ac_check_lib_save_LIBS=$LIBS
7707LIBS="-lfontconfig $LIBS"
7708cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7709/* end confdefs.h. */
7710
7711/* Override any GCC internal prototype to avoid an error.
7712 Use char because int might match the return type of a GCC
7713 builtin and then its argument prototype would still apply. */
7714#ifdef __cplusplus
7715extern "C"
7716#endif
7717char FcPatternGet ();
7718int
7719main ()
7720{
7721return FcPatternGet ();
7722 ;
7723 return 0;
7724}
7725_ACEOF
7726if ac_fn_cxx_try_link "$LINENO"; then :
7727 ac_cv_lib_fontconfig_FcPatternGet=yes
7728else
7729 ac_cv_lib_fontconfig_FcPatternGet=no
7730fi
7731rm -f core conftest.err conftest.$ac_objext \
7732 conftest$ac_exeext conftest.$ac_ext
7733LIBS=$ac_check_lib_save_LIBS
7734fi
7735{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternGet" >&5
7736$as_echo "$ac_cv_lib_fontconfig_FcPatternGet" >&6; }
7737if test "x$ac_cv_lib_fontconfig_FcPatternGet" = xyes; then :
7738 :
7739else
7740 support_xft=no
7741fi
7742
7743 LIBS="$save_LIBS"
7744
7745 if test x$support_xft = xyes; then 7713 if test x$support_image = xyes; then
7746 7714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
7747$as_echo "#define XFT 1" >>confdefs.h 7715$as_echo "ok" >&6; }
7748
7749 fi
7750fi
7751
7752if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then
7753 LIBS="$LIBS -lm" 7716 LIBS="$LIBS -lm"
7754 7717
7755$as_echo "#define XRENDER 1" >>confdefs.h 7718$as_echo "#define XRENDER 1" >>confdefs.h
7756 7719
7757 7720
7758 if test x$support_inheritpixmap = xyes; then 7721 if test x$support_inheritpixmap = xyes; then
7759 7722
7760$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h 7723$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h
7761 7724
7725 fi
7726 else
7727 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7728$as_echo "no" >&6; }
7762 fi 7729 fi
7763fi 7730fi
7764 7731
7765if test x$support_styles = xyes; then 7732if test x$support_styles = xyes; then
7766 7733

Diff Legend

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