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

Comparing rxvt-unicode/configure.ac (file contents):
Revision 1.149 by sf-exg, Sun Nov 2 15:52:39 2014 UTC vs.
Revision 1.152 by sf-exg, Tue Jun 16 11:56:37 2015 UTC

… …
421 421
422AC_PATH_PROG(TIC, tic, :) 422AC_PATH_PROG(TIC, tic, :)
423 423
424AC_PATH_XTRA 424AC_PATH_XTRA
425 425
426AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
427
426image_lib=none 428image_lib=none
427 429
428PIXBUF_CFLAGS= 430PIXBUF_CFLAGS=
429PIXBUF_LIBS= 431PIXBUF_LIBS=
430 432
431if test x$support_pixbuf = xyes; then 433if test x$support_pixbuf = xyes; then
432 support_pixbuf=no 434 RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [
433 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
434 AC_MSG_CHECKING(for gdk-pixbuf)
435 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
436 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
437 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
438 support_pixbuf=yes
439 fi
440
441 if test x$support_pixbuf = xyes; then
442 AC_MSG_RESULT(ok)
443 image_lib=gdk-pixbuf 435 image_lib=gdk-pixbuf
444 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 436 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
445 else 437 ], [:])
446 AC_MSG_RESULT(no)
447 fi
448fi 438fi
449 439
450AC_SUBST(PIXBUF_CFLAGS) 440AC_SUBST(PIXBUF_CFLAGS)
451AC_SUBST(PIXBUF_LIBS) 441AC_SUBST(PIXBUF_LIBS)
452 442
453STARTUP_NOTIFICATION_CFLAGS= 443STARTUP_NOTIFICATION_CFLAGS=
454STARTUP_NOTIFICATION_LIBS= 444STARTUP_NOTIFICATION_LIBS=
455 445
456if test x$support_startup_notification = xyes; then 446if test x$support_startup_notification = xyes; then
457 support_startup_notification=no 447 RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [
458 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
459 AC_MSG_CHECKING(for libstartup-notification)
460 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
461 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
462 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
463 support_startup_notification=yes
464 fi
465
466 if test x$support_startup_notification = xyes; then
467 AC_MSG_RESULT(ok)
468 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported) 448 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
469 else 449 ], [:])
470 AC_MSG_RESULT(no)
471 fi
472fi 450fi
473 451
474AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) 452AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
475AC_SUBST(STARTUP_NOTIFICATION_LIBS) 453AC_SUBST(STARTUP_NOTIFICATION_LIBS)
476 454
… …
525dnl# -------------------------------------------------------------------------- 503dnl# --------------------------------------------------------------------------
526dnl# -------------------------------------------------------------------------- 504dnl# --------------------------------------------------------------------------
527 505
528dnl# this is a really hack test for some basic Xlocale stuff 506dnl# this is a really hack test for some basic Xlocale stuff
529save_LIBS=$LIBS 507save_LIBS=$LIBS
530save_CFLAGS=$CFLAGS 508save_CXXFLAGS=$CXXFLAGS
531CFLAGS="$CFLAGS $X_CFLAGS" 509CXXFLAGS="$CXXFLAGS $X_CFLAGS"
532LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 510LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
533if test x$support_xim = xyes; then 511if test x$support_xim = xyes; then
534 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 512 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
535 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ 513 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
536 #include <X11/Xlib.h> 514 #include <X11/Xlib.h>
… …
568#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 546#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])])
569if test x$rxvt_cv_func_xsetlocale = xyes; then 547if test x$rxvt_cv_func_xsetlocale = xyes; then
570 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 548 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
571fi 549fi
572LIBS=$save_LIBS 550LIBS=$save_LIBS
573CFLAGS=$save_CFLAGS 551CXXFLAGS=$save_CXXFLAGS
574 552
575AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 553AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo,
576[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) 554[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])])
577if test x$rxvt_cv_func_nl_langinfo = xyes; then 555if test x$rxvt_cv_func_nl_langinfo = xyes; then
578 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 556 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
… …
591if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then 569if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
592 support_image=yes 570 support_image=yes
593fi 571fi
594if test x$support_xft = xyes || test x$support_image = xyes; then 572if test x$support_xft = xyes || test x$support_image = xyes; then
595 rxvt_have_xrender=no 573 rxvt_have_xrender=no
596 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 574 RXVT_CHECK_MODULES([XRENDER], [xrender], [
597 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 575 X_LIBS="$XRENDER_LIBS $X_LIBS"
598 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 576 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
599 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
600 rxvt_have_xrender=yes 577 rxvt_have_xrender=yes
601 578
602 save_LIBS="$LIBS" 579 save_LIBS="$LIBS"
603 LIBS="$LIBS $X_LIBS" 580 LIBS="$LIBS $X_LIBS"
604 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) 581 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
605 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) 582 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
606 LIBS="$save_LIBS" 583 LIBS="$save_LIBS"
607 fi 584 ], [:])
608fi 585fi
609 586
610if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 587if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
611 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 588 RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
612 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 589 X_LIBS="$XFT_LIBS $X_LIBS"
613 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 590 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
614 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 591 ], [
615 else
616 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 592 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
617 if test $XFT_CONFIG != no; then 593 if test $XFT_CONFIG != no; then
618 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 594 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
619 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 595 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
620 fi 596 fi
621 fi 597 ])
622
623 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
624 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
625 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
626 fi
627 598
628 save_LIBS="$LIBS" 599 save_LIBS="$LIBS"
629 LIBS="$LIBS $X_LIBS" 600 LIBS="$LIBS $X_LIBS"
630 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no]) 601 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
631 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no]) 602 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])

Diff Legend

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