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.150 by sf-exg, Sat Nov 8 13:00:55 2014 UTC vs.
Revision 1.154 by sf-exg, Tue Jun 16 12:00:07 2015 UTC

… …
293 [ --disable-delete-key disable handling of the delete key], 293 [ --disable-delete-key disable handling of the delete key],
294 [if test x$enableval = xno; then 294 [if test x$enableval = xno; then
295 AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key) 295 AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key)
296 fi]) 296 fi])
297 297
298support_resources=yes
298AC_ARG_ENABLE(resources, 299AC_ARG_ENABLE(resources,
299 [ --disable-resources disable all resource checking], 300 [ --disable-resources disable all resource checking],
300 [if test x$enableval = xno; then 301 [if test x$enableval = xno; then
301 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) 302 support_resources=no
302 fi]) 303 fi])
303 304
304AC_ARG_ENABLE(8bitctrls, 305AC_ARG_ENABLE(8bitctrls,
305 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)], 306 [ --enable-8bitctrls enable 8 bit control sequences (not recommended)],
306 [if test x$enableval = xyes -o x$enableval = xno; then 307 [if test x$enableval = xyes -o x$enableval = xno; then
… …
410 [ --with-terminfo=PATH set the path to the terminfo tree to PATH], 411 [ --with-terminfo=PATH set the path to the terminfo tree to PATH],
411 [if test x$withval != x; then 412 [if test x$withval != x; then
412 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" 413 AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval"
413 fi]) 414 fi])
414 415
416if test x$support_resources = xno; then
417 if test x$support_frills = xyes || test x$support_perl = xyes; then
418 AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl])
419 fi
420
421 AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read)
422fi
423
415dnl# -------------------------------------------------------------------------- 424dnl# --------------------------------------------------------------------------
416 425
417LIBEV_M4_AVOID_LIBRT=1 426LIBEV_M4_AVOID_LIBRT=1
418m4_include([libev/libev.m4]) 427m4_include([libev/libev.m4])
419 428
… …
421 430
422AC_PATH_PROG(TIC, tic, :) 431AC_PATH_PROG(TIC, tic, :)
423 432
424AC_PATH_XTRA 433AC_PATH_XTRA
425 434
435AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
436
426image_lib=none 437image_lib=none
427 438
428PIXBUF_CFLAGS= 439PIXBUF_CFLAGS=
429PIXBUF_LIBS= 440PIXBUF_LIBS=
430 441
431if test x$support_pixbuf = xyes; then 442if test x$support_pixbuf = xyes; then
432 support_pixbuf=no 443 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 444 image_lib=gdk-pixbuf
444 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) 445 AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
445 else 446 ], [:])
446 AC_MSG_RESULT(no)
447 fi
448fi 447fi
449 448
450AC_SUBST(PIXBUF_CFLAGS) 449AC_SUBST(PIXBUF_CFLAGS)
451AC_SUBST(PIXBUF_LIBS) 450AC_SUBST(PIXBUF_LIBS)
452 451
453STARTUP_NOTIFICATION_CFLAGS= 452STARTUP_NOTIFICATION_CFLAGS=
454STARTUP_NOTIFICATION_LIBS= 453STARTUP_NOTIFICATION_LIBS=
455 454
456if test x$support_startup_notification = xyes; then 455if test x$support_startup_notification = xyes; then
457 support_startup_notification=no 456 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) 457 AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported)
469 else 458 ], [:])
470 AC_MSG_RESULT(no)
471 fi
472fi 459fi
473 460
474AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) 461AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
475AC_SUBST(STARTUP_NOTIFICATION_LIBS) 462AC_SUBST(STARTUP_NOTIFICATION_LIBS)
463
464if test x$support_frills = xyes; then
465 RXVT_CHECK_MODULES([XMU], [xmu], [
466 X_LIBS="$XMU_LIBS $X_LIBS"
467 CPPFLAGS="$CPPFLAGS $XMU_CFLAGS"
468 AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support)
469 ], [:])
470fi
476 471
477dnl# -------------------------------------------------------------------------- 472dnl# --------------------------------------------------------------------------
478dnl# CHECKING FOR HEADER FILES 473dnl# CHECKING FOR HEADER FILES
479dnl# -------------------------------------------------------------------------- 474dnl# --------------------------------------------------------------------------
480AC_CHECK_HEADERS( \ 475AC_CHECK_HEADERS( \
… …
591if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then 586if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then
592 support_image=yes 587 support_image=yes
593fi 588fi
594if test x$support_xft = xyes || test x$support_image = xyes; then 589if test x$support_xft = xyes || test x$support_image = xyes; then
595 rxvt_have_xrender=no 590 rxvt_have_xrender=no
596 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 591 RXVT_CHECK_MODULES([XRENDER], [xrender], [
597 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then 592 X_LIBS="$XRENDER_LIBS $X_LIBS"
598 X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" 593 CPPFLAGS="$CPPFLAGS $XRENDER_CFLAGS"
599 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`"
600 rxvt_have_xrender=yes 594 rxvt_have_xrender=yes
601 595
602 save_LIBS="$LIBS" 596 save_LIBS="$LIBS"
603 LIBS="$LIBS $X_LIBS" 597 LIBS="$LIBS $X_LIBS"
604 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) 598 AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no])
605 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) 599 AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no])
606 LIBS="$save_LIBS" 600 LIBS="$save_LIBS"
607 fi 601 ], [:])
608fi 602fi
609 603
610if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then 604if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
611 AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 605 RXVT_CHECK_MODULES([XFT], [fontconfig xft], [
612 if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then 606 X_LIBS="$XFT_LIBS $X_LIBS"
613 X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" 607 CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
614 CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" 608 ], [
615 else
616 AC_PATH_PROG(XFT_CONFIG, xft-config, no) 609 AC_PATH_PROG(XFT_CONFIG, xft-config, no)
617 if test $XFT_CONFIG != no; then 610 if test $XFT_CONFIG != no; then
618 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" 611 X_LIBS="`$XFT_CONFIG --libs` $X_LIBS"
619 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" 612 CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`"
620 fi 613 fi
621 fi 614 ])
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 615
628 save_LIBS="$LIBS" 616 save_LIBS="$LIBS"
629 LIBS="$LIBS $X_LIBS" 617 LIBS="$LIBS $X_LIBS"
630 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no]) 618 AC_CHECK_HEADERS(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no])
631 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no]) 619 AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no])

Diff Legend

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