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.151 by sf-exg, Tue Apr 7 20:24:40 2015 UTC vs.
Revision 1.152 by sf-exg, Tue Jun 16 11:56:37 2015 UTC

… …
429 429
430PIXBUF_CFLAGS= 430PIXBUF_CFLAGS=
431PIXBUF_LIBS= 431PIXBUF_LIBS=
432 432
433if test x$support_pixbuf = xyes; then 433if test x$support_pixbuf = xyes; then
434 support_pixbuf=no 434 RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [
435 AC_MSG_CHECKING(for gdk-pixbuf)
436 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
437 PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
438 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
439 support_pixbuf=yes
440 fi
441
442 if test x$support_pixbuf = xyes; then
443 AC_MSG_RESULT(ok)
444 image_lib=gdk-pixbuf 435 image_lib=gdk-pixbuf
445 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)
446 else 437 ], [:])
447 AC_MSG_RESULT(no)
448 fi
449fi 438fi
450 439
451AC_SUBST(PIXBUF_CFLAGS) 440AC_SUBST(PIXBUF_CFLAGS)
452AC_SUBST(PIXBUF_LIBS) 441AC_SUBST(PIXBUF_LIBS)
453 442
454STARTUP_NOTIFICATION_CFLAGS= 443STARTUP_NOTIFICATION_CFLAGS=
455STARTUP_NOTIFICATION_LIBS= 444STARTUP_NOTIFICATION_LIBS=
456 445
457if test x$support_startup_notification = xyes; then 446if test x$support_startup_notification = xyes; then
458 support_startup_notification=no 447 RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [
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
… …
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 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 574 RXVT_CHECK_MODULES([XRENDER], [xrender], [
597 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 575 X_LIBS="$XRENDER_LIBS $X_LIBS"
598 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" 576 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
599 rxvt_have_xrender=yes 577 rxvt_have_xrender=yes
600 578
601 save_LIBS="$LIBS" 579 save_LIBS="$LIBS"
602 LIBS="$LIBS $X_LIBS" 580 LIBS="$LIBS $X_LIBS"
603 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) 581 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
604 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) 582 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
605 LIBS="$save_LIBS" 583 LIBS="$save_LIBS"
606 fi 584 ], [:])
607fi 585fi
608 586
609if 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
610 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 588 RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
611 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 589 X_LIBS="$XFT_LIBS $X_LIBS"
612 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 590 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
613 else 591 ], [
614 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 592 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
615 if test $XFT_CONFIG != no; then 593 if test $XFT_CONFIG != no; then
616 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 594 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
617 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 595 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
618 fi 596 fi
619 fi 597 ])
620
621 if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then
622 X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS"
623 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`"
624 fi
625 598
626 save_LIBS="$LIBS" 599 save_LIBS="$LIBS"
627 LIBS="$LIBS $X_LIBS" 600 LIBS="$LIBS $X_LIBS"
628 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])
629 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