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.151 by sf-exg, Tue Apr 7 20:24:40 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 support_pixbuf=no
433 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
434 AC_MSG_CHECKING(for gdk-pixbuf) 435 AC_MSG_CHECKING(for gdk-pixbuf)
435 if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then 436 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_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
437 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" 438 PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
438 support_pixbuf=yes 439 support_pixbuf=yes
… …
453STARTUP_NOTIFICATION_CFLAGS= 454STARTUP_NOTIFICATION_CFLAGS=
454STARTUP_NOTIFICATION_LIBS= 455STARTUP_NOTIFICATION_LIBS=
455 456
456if test x$support_startup_notification = xyes; then 457if test x$support_startup_notification = xyes; then
457 support_startup_notification=no 458 support_startup_notification=no
458 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
459 AC_MSG_CHECKING(for libstartup-notification) 459 AC_MSG_CHECKING(for libstartup-notification)
460 if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then 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`" 461 STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
462 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`" 462 STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
463 support_startup_notification=yes 463 support_startup_notification=yes
… …
525dnl# -------------------------------------------------------------------------- 525dnl# --------------------------------------------------------------------------
526dnl# -------------------------------------------------------------------------- 526dnl# --------------------------------------------------------------------------
527 527
528dnl# this is a really hack test for some basic Xlocale stuff 528dnl# this is a really hack test for some basic Xlocale stuff
529save_LIBS=$LIBS 529save_LIBS=$LIBS
530save_CFLAGS=$CFLAGS 530save_CXXFLAGS=$CXXFLAGS
531CFLAGS="$CFLAGS $X_CFLAGS" 531CXXFLAGS="$CXXFLAGS $X_CFLAGS"
532LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" 532LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11"
533if test x$support_xim = xyes; then 533if test x$support_xim = xyes; then
534 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, 534 AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale,
535 [AC_RUN_IFELSE([AC_LANG_SOURCE([[ 535 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
536 #include <X11/Xlib.h> 536 #include <X11/Xlib.h>
… …
568#include <X11/Xlocale.h>]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_xsetlocale=yes],[rxvt_cv_func_xsetlocale=no])]) 568#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 569if test x$rxvt_cv_func_xsetlocale = xyes; then
570 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) 570 AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works)
571fi 571fi
572LIBS=$save_LIBS 572LIBS=$save_LIBS
573CFLAGS=$save_CFLAGS 573CXXFLAGS=$save_CXXFLAGS
574 574
575AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, 575AC_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])]) 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])])
577if test x$rxvt_cv_func_nl_langinfo = xyes; then 577if test x$rxvt_cv_func_nl_langinfo = xyes; then
578 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) 578 AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works)
… …
591if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then 591if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
592 support_image=yes 592 support_image=yes
593fi 593fi
594if test x$support_xft = xyes || test x$support_image = xyes; then 594if test x$support_xft = xyes || test x$support_image = xyes; then
595 rxvt_have_xrender=no 595 rxvt_have_xrender=no
596 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
597 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 596 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
598 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 597 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS"
599 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" 598 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
600 rxvt_have_xrender=yes 599 rxvt_have_xrender=yes
601 600
… …
606 LIBS="$save_LIBS" 605 LIBS="$save_LIBS"
607 fi 606 fi
608fi 607fi
609 608
610if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 609if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
611 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
612 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 610 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then
613 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 611 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS"
614 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 612 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`"
615 else 613 else
616 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 614 AC_PATH_PROG(XFT_CONFIG, xft-config, no)

Diff Legend

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