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

Comparing rxvt-unicode/configure (file contents):
Revision 1.137 by root, Sat Nov 13 00:48:11 2010 UTC vs.
Revision 1.144 by sf-exg, Sun Mar 27 00:15:40 2011 UTC

… …
4664support_pointer_blank=yes 4664support_pointer_blank=yes
4665support_scroll_rxvt=yes 4665support_scroll_rxvt=yes
4666support_scroll_next=yes 4666support_scroll_next=yes
4667support_scroll_xterm=yes 4667support_scroll_xterm=yes
4668support_xim=yes 4668support_xim=yes
4669support_pixbuf=yes
4669support_afterimage=yes 4670support_afterimage=yes
4670support_xft=yes 4671support_xft=yes
4671support_unicode3=no 4672support_unicode3=no
4672support_combining=yes 4673support_combining=yes
4673support_8bitctrls=no 4674support_8bitctrls=no
… …
4695 support_scroll_next=no 4696 support_scroll_next=no
4696 support_scroll_xterm=no 4697 support_scroll_xterm=no
4697 support_utmp=no 4698 support_utmp=no
4698 support_wtmp=no 4699 support_wtmp=no
4699 support_xim=no 4700 support_xim=no
4701 support_pixbuf=no
4700 support_afterimage=no 4702 support_afterimage=no
4701 support_xft=no 4703 support_xft=no
4702 support_unicode3=no 4704 support_unicode3=no
4703 support_combining=no 4705 support_combining=no
4704 support_8bitctrls=no 4706 support_8bitctrls=no
… …
4722 support_scroll_next=yes 4724 support_scroll_next=yes
4723 support_scroll_xterm=yes 4725 support_scroll_xterm=yes
4724 support_utmp=yes 4726 support_utmp=yes
4725 support_wtmp=yes 4727 support_wtmp=yes
4726 support_xim=yes 4728 support_xim=yes
4729 support_pixbuf=yes
4727 support_afterimage=yes 4730 support_afterimage=yes
4728 support_xft=yes 4731 support_xft=yes
4729 support_unicode3=yes 4732 support_unicode3=yes
4730 support_combining=yes 4733 support_combining=yes
4731 #support_8bitctrls=yes 4734 #support_8bitctrls=yes
… …
5290 5293
5291fi 5294fi
5292done 5295done
5293 5296
5294 5297
5298for ac_func in clock_gettime
5299do :
5295ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" 5300 ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
5296if test "x$ac_cv_func_clock_gettime" = x""yes; then : 5301if test "x$ac_cv_func_clock_gettime" = x""yes; then :
5302 cat >>confdefs.h <<_ACEOF
5303#define HAVE_CLOCK_GETTIME 1
5304_ACEOF
5297 5305
5298else 5306else
5299 5307
5300 if test $(uname) = Linux; then 5308 if test $(uname) = Linux; then
5301 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime syscall" >&5 5309 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime syscall" >&5
… …
5386done 5394done
5387 5395
5388 fi 5396 fi
5389 5397
5390fi 5398fi
5399done
5391 5400
5392 5401
5402for ac_func in nanosleep
5403do :
5393ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" 5404 ac_fn_cxx_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
5394if test "x$ac_cv_func_nanosleep" = x""yes; then : 5405if test "x$ac_cv_func_nanosleep" = x""yes; then :
5406 cat >>confdefs.h <<_ACEOF
5407#define HAVE_NANOSLEEP 1
5408_ACEOF
5395 5409
5396else 5410else
5397 5411
5398 if test -z "$LIBEV_M4_AVOID_LIBRT"; then 5412 if test -z "$LIBEV_M4_AVOID_LIBRT"; then
5399 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 5413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
… …
5454done 5468done
5455 5469
5456 fi 5470 fi
5457 5471
5458fi 5472fi
5473done
5459 5474
5460 5475
5476if test -z "$LIBEV_M4_AVOID_LIBM"; then
5477 LIBM=m
5478fi
5461{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5 5479{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing floor" >&5
5462$as_echo_n "checking for ceil in -lm... " >&6; } 5480$as_echo_n "checking for library containing floor... " >&6; }
5463if test "${ac_cv_lib_m_ceil+set}" = set; then : 5481if test "${ac_cv_search_floor+set}" = set; then :
5464 $as_echo_n "(cached) " >&6 5482 $as_echo_n "(cached) " >&6
5465else 5483else
5466 ac_check_lib_save_LIBS=$LIBS 5484 ac_func_search_save_LIBS=$LIBS
5467LIBS="-lm $LIBS"
5468cat confdefs.h - <<_ACEOF >conftest.$ac_ext 5485cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5469/* end confdefs.h. */ 5486/* end confdefs.h. */
5470 5487
5471/* Override any GCC internal prototype to avoid an error. 5488/* Override any GCC internal prototype to avoid an error.
5472 Use char because int might match the return type of a GCC 5489 Use char because int might match the return type of a GCC
5473 builtin and then its argument prototype would still apply. */ 5490 builtin and then its argument prototype would still apply. */
5474#ifdef __cplusplus 5491#ifdef __cplusplus
5475extern "C" 5492extern "C"
5476#endif 5493#endif
5477char ceil (); 5494char floor ();
5478int 5495int
5479main () 5496main ()
5480{ 5497{
5481return ceil (); 5498return floor ();
5482 ; 5499 ;
5483 return 0; 5500 return 0;
5484} 5501}
5485_ACEOF 5502_ACEOF
5503for ac_lib in '' $LIBM; do
5504 if test -z "$ac_lib"; then
5505 ac_res="none required"
5506 else
5507 ac_res=-l$ac_lib
5508 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
5509 fi
5486if ac_fn_cxx_try_link "$LINENO"; then : 5510 if ac_fn_cxx_try_link "$LINENO"; then :
5487 ac_cv_lib_m_ceil=yes 5511 ac_cv_search_floor=$ac_res
5488else
5489 ac_cv_lib_m_ceil=no
5490fi 5512fi
5491rm -f core conftest.err conftest.$ac_objext \ 5513rm -f core conftest.err conftest.$ac_objext \
5492 conftest$ac_exeext conftest.$ac_ext 5514 conftest$ac_exeext
5493LIBS=$ac_check_lib_save_LIBS 5515 if test "${ac_cv_search_floor+set}" = set; then :
5516 break
5494fi 5517fi
5518done
5519if test "${ac_cv_search_floor+set}" = set; then :
5520
5521else
5522 ac_cv_search_floor=no
5523fi
5524rm conftest.$ac_ext
5525LIBS=$ac_func_search_save_LIBS
5526fi
5495{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_ceil" >&5 5527{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_floor" >&5
5496$as_echo "$ac_cv_lib_m_ceil" >&6; } 5528$as_echo "$ac_cv_search_floor" >&6; }
5497if test "x$ac_cv_lib_m_ceil" = x""yes; then : 5529ac_res=$ac_cv_search_floor
5498 cat >>confdefs.h <<_ACEOF 5530if test "$ac_res" != no; then :
5499#define HAVE_LIBM 1 5531 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
5500_ACEOF
5501 5532
5502 LIBS="-lm $LIBS" 5533$as_echo "#define HAVE_FLOOR 1" >>confdefs.h
5503 5534
5504fi 5535fi
5505 5536
5506 5537
5507 5538
… …
6281fi 6312fi
6282 6313
6283 6314
6284 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5 6315 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf" >&5
6285$as_echo_n "checking for gdk-pixbuf... " >&6; } 6316$as_echo_n "checking for gdk-pixbuf... " >&6; }
6286 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-xlib-2.0; then 6317 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
6287 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --cflags`" 6318 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
6288 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-xlib-2.0 --libs`" 6319 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
6289 support_pixbuf=yes 6320 support_pixbuf=yes
6290 fi 6321 fi
6291 6322
6292 if test x$support_pixbuf = xyes; then 6323 if test x$support_pixbuf = xyes; then
6293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 6324 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
… …
6417fi 6448fi
6418 6449
6419done 6450done
6420 6451
6421 6452
6422{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPointer" >&5
6423$as_echo_n "checking for XPointer... " >&6; }
6424if test "${rxvt_cv_xpointer+set}" = set; then :
6425 $as_echo_n "(cached) " >&6
6426else
6427 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6428/* end confdefs.h. */
6429#include <X11/Xlib.h>
6430int
6431main ()
6432{
6433XPointer dummy;
6434 ;
6435 return 0;
6436}
6437_ACEOF
6438if ac_fn_cxx_try_compile "$LINENO"; then :
6439 rxvt_cv_xpointer=yes
6440else
6441 rxvt_cv_xpointer=no
6442fi
6443rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6444fi
6445{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rxvt_cv_xpointer" >&5
6446$as_echo "$rxvt_cv_xpointer" >&6; }
6447if test x$rxvt_cv_xpointer = xyes; then
6448
6449$as_echo "#define HAVE_XPOINTER 1" >>confdefs.h
6450
6451fi
6452
6453{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB_ILLEGAL_ACCESS" >&5 6453{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB_ILLEGAL_ACCESS" >&5
6454$as_echo_n "checking for XLIB_ILLEGAL_ACCESS... " >&6; } 6454$as_echo_n "checking for XLIB_ILLEGAL_ACCESS... " >&6; }
6455if test "${rxvt_cv_xlib_illegal_access+set}" = set; then : 6455if test "${rxvt_cv_xlib_illegal_access+set}" = set; then :
6456 $as_echo_n "(cached) " >&6 6456 $as_echo_n "(cached) " >&6
6457else 6457else
… …
6981#include <stdio.h> 6981#include <stdio.h>
6982#include <stdlib.h> 6982#include <stdlib.h>
6983#include <sys/types.h> 6983#include <sys/types.h>
6984#include <utmp.h> 6984#include <utmp.h>
6985#include <errno.h> 6985#include <errno.h>
6986main() 6986int main()
6987{ 6987{
6988 char **u, *utmplist[] = { 6988 char **u, *utmplist[] = {
6989 "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL }; 6989 "/var/run/utmp", "/var/adm/utmp", "/etc/utmp", "/usr/etc/utmp", "/usr/adm/utmp", NULL };
6990 FILE *a, *f=fopen("conftestval", "w"); 6990 FILE *a, *f=fopen("conftestval", "w");
6991 if (!f) exit(1); 6991 if (!f) exit(1);
… …
7043#include <sys/types.h> 7043#include <sys/types.h>
7044#ifdef HAVE_UTMP_H 7044#ifdef HAVE_UTMP_H
7045#include <utmp.h> 7045#include <utmp.h>
7046#endif 7046#endif
7047#include <errno.h> 7047#include <errno.h>
7048main() 7048int main()
7049{ 7049{
7050 char **w, *wtmplist[] = { 7050 char **w, *wtmplist[] = {
7051 "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL }; 7051 "/var/log/wtmp", "/var/adm/wtmp", "/etc/wtmp", "/usr/etc/wtmp", "/usr/adm/wtmp", NULL };
7052 FILE *a, *f=fopen("conftestval", "w"); 7052 FILE *a, *f=fopen("conftestval", "w");
7053 if (!f) exit(1); 7053 if (!f) exit(1);
… …
7103#include <stdlib.h> 7103#include <stdlib.h>
7104#ifdef HAVE_UTMPX_H 7104#ifdef HAVE_UTMPX_H
7105#include <utmpx.h> 7105#include <utmpx.h>
7106#endif 7106#endif
7107#include <errno.h> 7107#include <errno.h>
7108main() 7108int main()
7109{ 7109{
7110 char **w, *wtmplist[] = { 7110 char **w, *wtmplist[] = {
7111 "/var/log/wtmpx", "/var/adm/wtmpx", NULL }; 7111 "/var/log/wtmpx", "/var/adm/wtmpx", NULL };
7112 FILE *a, *f=fopen("conftestval", "w"); 7112 FILE *a, *f=fopen("conftestval", "w");
7113 if (!f) exit(1); 7113 if (!f) exit(1);
… …
7169#endif 7169#endif
7170#ifdef HAVE_LASTLOG_H 7170#ifdef HAVE_LASTLOG_H
7171#include <lastlog.h> 7171#include <lastlog.h>
7172#endif 7172#endif
7173#include <errno.h> 7173#include <errno.h>
7174main() 7174int main()
7175{ 7175{
7176 char **w, *lastloglist[] = { "/var/log/lastlog", NULL }; 7176 char **w, *lastloglist[] = { "/var/log/lastlog", NULL };
7177 FILE *a, *f=fopen("conftestval", "w"); 7177 FILE *a, *f=fopen("conftestval", "w");
7178 if (!f) exit(1); 7178 if (!f) exit(1);
7179#ifdef LASTLOG_FILE 7179#ifdef LASTLOG_FILE
… …
7228#include <stdlib.h> 7228#include <stdlib.h>
7229#ifdef HAVE_UTMPX_H 7229#ifdef HAVE_UTMPX_H
7230#include <utmpx.h> 7230#include <utmpx.h>
7231#endif 7231#endif
7232#include <errno.h> 7232#include <errno.h>
7233main() 7233int main()
7234{ 7234{
7235 char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL }; 7235 char **w, *wtmplist[] = { "/var/log/lastlogx", "/var/adm/lastlogx", NULL };
7236 FILE *a, *f=fopen("conftestval", "w"); 7236 FILE *a, *f=fopen("conftestval", "w");
7237 if (!f) exit(1); 7237 if (!f) exit(1);
7238#ifdef LASTLOGX_FILE 7238#ifdef LASTLOGX_FILE
… …
7284$as_echo_n "checking for working Xlocale... " >&6; } 7284$as_echo_n "checking for working Xlocale... " >&6; }
7285if test "${rxvt_cv_func_xlocale+set}" = set; then : 7285if test "${rxvt_cv_func_xlocale+set}" = set; then :
7286 $as_echo_n "(cached) " >&6 7286 $as_echo_n "(cached) " >&6
7287else 7287else
7288 if test "$cross_compiling" = yes; then : 7288 if test "$cross_compiling" = yes; then :
7289 : 7289 :
7290else 7290else
7291 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 7291 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7292/* end confdefs.h. */ 7292/* end confdefs.h. */
7293
7293#include <X11/Xlib.h> 7294 #include <X11/Xlib.h>
7294 #include <stdlib.h> 7295 #include <stdlib.h>
7295 main() { 7296 int main() {
7296 char *p; 7297 char *p;
7297 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) 7298 if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p)
7298 exit (XSupportsLocale() ? 0 : 1); 7299 exit (XSupportsLocale() ? 0 : 1);
7299 else 7300 else
7300 exit (1);} 7301 exit (1);
7302 }
7303
7301_ACEOF 7304_ACEOF
7302if ac_fn_cxx_try_run "$LINENO"; then : 7305if ac_fn_cxx_try_run "$LINENO"; then :
7303 rxvt_cv_func_xlocale=yes 7306 rxvt_cv_func_xlocale=yes
7304else 7307else
7305 rxvt_cv_func_xlocale=no 7308 rxvt_cv_func_xlocale=no
7306fi 7309fi
7307rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ 7310rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
7308 conftest.$ac_objext conftest.beam conftest.$ac_ext 7311 conftest.$ac_objext conftest.beam conftest.$ac_ext
… …
7709#include <sys/types.h> 7712#include <sys/types.h>
7710#include <sys/stat.h> 7713#include <sys/stat.h>
7711#include <unistd.h> 7714#include <unistd.h>
7712#include <grp.h> 7715#include <grp.h>
7713 7716
7714main() 7717int main()
7715{ 7718{
7716 struct stat st; 7719 struct stat st;
7717 struct group *gr; 7720 struct group *gr;
7718 char *tty; 7721 char *tty;
7719 gr = getgrnam("tty"); 7722 gr = getgrnam("tty");
… …
7743 7746
7744$as_echo "#define TTY_GID_SUPPORT 1" >>confdefs.h 7747$as_echo "#define TTY_GID_SUPPORT 1" >>confdefs.h
7745 7748
7746fi 7749fi
7747 7750
7748if test x$support_xft = xyes; then 7751if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then
7752 rxvt_have_xrender=no
7749 # Extract the first word of "pkg-config", so it can be a program name with args. 7753 # Extract the first word of "pkg-config", so it can be a program name with args.
7750set dummy pkg-config; ac_word=$2 7754set dummy pkg-config; ac_word=$2
7751{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 7755{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7752$as_echo_n "checking for $ac_word... " >&6; } 7756$as_echo_n "checking for $ac_word... " >&6; }
7753if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 7757if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
… …
7785 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 7789 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7786$as_echo "no" >&6; } 7790$as_echo "no" >&6; }
7787fi 7791fi
7788 7792
7789 7793
7794 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
7795 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
7796 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
7797 rxvt_have_xrender=yes
7798
7799 save_LIBS="$LIBS"
7800 LIBS="$LIBS $X_LIBS"
7801 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
7802if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
7803
7804else
7805 rxvt_have_xrender=no
7806fi
7807
7808
7809 ac_fn_cxx_check_func "$LINENO" "XRenderFindStandardFormat" "ac_cv_func_XRenderFindStandardFormat"
7810if test "x$ac_cv_func_XRenderFindStandardFormat" = x""yes; then :
7811
7812else
7813 rxvt_have_xrender=no
7814fi
7815
7816 LIBS="$save_LIBS"
7817 fi
7818fi
7819
7820if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
7821 # Extract the first word of "pkg-config", so it can be a program name with args.
7822set dummy pkg-config; ac_word=$2
7823{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7824$as_echo_n "checking for $ac_word... " >&6; }
7825if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7826 $as_echo_n "(cached) " >&6
7827else
7828 case $PKG_CONFIG in
7829 [\\/]* | ?:[\\/]*)
7830 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7831 ;;
7832 *)
7833 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7834for as_dir in $PATH
7835do
7836 IFS=$as_save_IFS
7837 test -z "$as_dir" && as_dir=.
7838 for ac_exec_ext in '' $ac_executable_extensions; do
7839 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7840 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7841 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7842 break 2
7843 fi
7844done
7845 done
7846IFS=$as_save_IFS
7847
7848 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7849 ;;
7850esac
7851fi
7852PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7853if test -n "$PKG_CONFIG"; then
7854 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7855$as_echo "$PKG_CONFIG" >&6; }
7856else
7857 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7858$as_echo "no" >&6; }
7859fi
7860
7861
7790 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 7862 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
7791 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 7863 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
7792 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 7864 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
7793 else 7865 else
7794 # Extract the first word of "xft-config", so it can be a program name with args. 7866 # Extract the first word of "xft-config", so it can be a program name with args.
… …
7836 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 7908 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
7837 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 7909 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
7838 fi 7910 fi
7839 fi 7911 fi
7840 7912
7913 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
7914 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
7915 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
7916 fi
7917
7841 save_LIBS="$LIBS" 7918 save_LIBS="$LIBS"
7842 LIBS="$LIBS $X_LIBS" 7919 LIBS="$LIBS $X_LIBS"
7843 for ac_header in X11/Xft/Xft.h 7920 for ac_header in X11/Xft/Xft.h
7844do : 7921do :
7845 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default" 7922 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
… …
7894 : 7971 :
7895else 7972else
7896 support_xft=no 7973 support_xft=no
7897fi 7974fi
7898 7975
7976 for ac_header in fontconfig/fontconfig.h
7977do :
7978 ac_fn_cxx_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default"
7979if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then :
7980 cat >>confdefs.h <<_ACEOF
7981#define HAVE_FONTCONFIG_FONTCONFIG_H 1
7982_ACEOF
7983
7984else
7985 support_xft=no
7986fi
7987
7988done
7989
7990 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcPatternGet in -lfontconfig" >&5
7991$as_echo_n "checking for FcPatternGet in -lfontconfig... " >&6; }
7992if test "${ac_cv_lib_fontconfig_FcPatternGet+set}" = set; then :
7993 $as_echo_n "(cached) " >&6
7994else
7995 ac_check_lib_save_LIBS=$LIBS
7996LIBS="-lfontconfig $LIBS"
7997cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7998/* end confdefs.h. */
7999
8000/* Override any GCC internal prototype to avoid an error.
8001 Use char because int might match the return type of a GCC
8002 builtin and then its argument prototype would still apply. */
8003#ifdef __cplusplus
8004extern "C"
8005#endif
8006char FcPatternGet ();
8007int
8008main ()
8009{
8010return FcPatternGet ();
8011 ;
8012 return 0;
8013}
8014_ACEOF
8015if ac_fn_cxx_try_link "$LINENO"; then :
8016 ac_cv_lib_fontconfig_FcPatternGet=yes
8017else
8018 ac_cv_lib_fontconfig_FcPatternGet=no
8019fi
8020rm -f core conftest.err conftest.$ac_objext \
8021 conftest$ac_exeext conftest.$ac_ext
8022LIBS=$ac_check_lib_save_LIBS
8023fi
8024{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcPatternGet" >&5
8025$as_echo "$ac_cv_lib_fontconfig_FcPatternGet" >&6; }
8026if test "x$ac_cv_lib_fontconfig_FcPatternGet" = x""yes; then :
8027 :
8028else
8029 support_xft=no
8030fi
8031
7899 LIBS="$save_LIBS" 8032 LIBS="$save_LIBS"
7900 8033
7901 if test x$support_xft = xyes; then 8034 if test x$support_xft = xyes; then
7902 8035
7903$as_echo "#define XFT 1" >>confdefs.h 8036$as_echo "#define XFT 1" >>confdefs.h
7904 8037
7905 fi 8038 fi
7906fi 8039fi
8040if test x$support_styles = xyes; then
8041
8042$as_echo "#define ENABLE_STYLES 1" >>confdefs.h
8043
8044fi
8045if test x$support_iso14755 = xyes; then
8046
8047$as_echo "#define ISO_14755 1" >>confdefs.h
8048
8049fi
8050if test x$support_8bitctrls = xyes; then
8051
8052$as_echo "#define EIGHT_BIT_CONTROLS 1" >>confdefs.h
8053
8054fi
8055if test x$support_fading = xyes; then
8056
8057$as_echo "#define OFF_FOCUS_FADING 1" >>confdefs.h
8058
8059fi
7907if test x$support_inheritpixmap = xyes; then 8060if test x$support_inheritpixmap = xyes; then
7908 support_xrender=yes
7909 # Extract the first word of "pkg-config", so it can be a program name with args.
7910set dummy pkg-config; ac_word=$2
7911{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
7912$as_echo_n "checking for $ac_word... " >&6; }
7913if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
7914 $as_echo_n "(cached) " >&6
7915else
7916 case $PKG_CONFIG in
7917 [\\/]* | ?:[\\/]*)
7918 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7919 ;;
7920 *)
7921 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7922for as_dir in $PATH
7923do
7924 IFS=$as_save_IFS
7925 test -z "$as_dir" && as_dir=.
7926 for ac_exec_ext in '' $ac_executable_extensions; do
7927 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7928 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7929 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7930 break 2
7931 fi
7932done
7933 done
7934IFS=$as_save_IFS
7935
7936 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7937 ;;
7938esac
7939fi
7940PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7941if test -n "$PKG_CONFIG"; then
7942 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
7943$as_echo "$PKG_CONFIG" >&6; }
7944else
7945 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7946$as_echo "no" >&6; }
7947fi
7948
7949
7950 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
7951 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
7952 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
7953
7954 save_LIBS="$LIBS"
7955 LIBS="$LIBS $X_LIBS"
7956 ac_fn_cxx_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default"
7957if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then :
7958
7959else
7960 support_xrender=no
7961fi
7962
7963
7964 ac_fn_cxx_check_func "$LINENO" "XRenderFindStandardFormat" "ac_cv_func_XRenderFindStandardFormat"
7965if test "x$ac_cv_func_XRenderFindStandardFormat" = x""yes; then :
7966
7967else
7968 support_xrender=no
7969fi
7970
7971 LIBS="$save_LIBS"
7972 fi
7973
7974 if test x$support_xrender = xyes; then 8061 if test x$rxvt_have_xrender = xyes; then
7975 LIBS="$LIBS -lm" 8062 LIBS="$LIBS -lm"
7976 8063
7977$as_echo "#define XRENDER 1" >>confdefs.h 8064$as_echo "#define XRENDER 1" >>confdefs.h
7978 8065
7979 fi 8066 fi
7980fi
7981if test x$support_styles = xyes; then
7982
7983$as_echo "#define ENABLE_STYLES 1" >>confdefs.h
7984
7985fi
7986if test x$support_iso14755 = xyes; then
7987
7988$as_echo "#define ISO_14755 1" >>confdefs.h
7989
7990fi
7991if test x$support_8bitctrls = xyes; then
7992
7993$as_echo "#define EIGHT_BIT_CONTROLS 1" >>confdefs.h
7994
7995fi
7996if test x$support_fading = xyes; then
7997
7998$as_echo "#define OFF_FOCUS_FADING 1" >>confdefs.h
7999
8000fi
8001if test x$support_inheritpixmap = xyes; then
8002 8067
8003$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h 8068$as_echo "#define ENABLE_TRANSPARENCY 1" >>confdefs.h
8004 8069
8005fi 8070fi
8006if test x$support_keepscrolling = xno; then 8071if test x$support_keepscrolling = xno; then

Diff Legend

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