--- rxvt-unicode/configure.ac 2007/11/18 01:31:38 1.84 +++ rxvt-unicode/configure.ac 2012/05/10 22:42:03 1.142 @@ -11,14 +11,11 @@ dnl RXVT version changequote(, )dnl -VERSION=`sed -n -e 's/^.*[ \t]VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` -DATE=`sed -n -e 's/^.*[ \t]DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` -dnl LIBVERSION=`sed -n -e 's/^.*[ \t]LIBVERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` changequote([, ])dnl AC_SUBST(VERSION)dnl AC_SUBST(DATE)dnl -AC_SUBST(LSMDATE)dnl -AC_SUBST(LIBVERSION)dnl echo "" echo "configuring for rxvt $VERSION" @@ -27,18 +24,17 @@ orig_CXXFLAGS="$CXXFLAGS" dnl# Checks for programs. -dnl AC_MAKE_SET - AC_PROG_CC AC_PROG_CXX -AC_PROG_CPP AC_PROG_INSTALL AC_AIX +AC_GNU_SOURCE AC_ISC_POSIX AC_LANG(C++) -dnl check wether we can link with gcc -lsupc++ +LINKER="$CXX" +dnl check whether we can link with gcc -lsupc++ if test x$GCC = xyes && test x$GXX = xyes; then dnl FreeBSD (at least up to 5.3) has a broken GCC, workaround it AC_MSG_CHECKING([for working libsupc++]) @@ -46,14 +42,13 @@ save_LIBS="$LIBS" CXX="$CC" LIBS="$LIBS -lsupc++" - LINKER="$CC" AC_LINK_IFELSE( [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], - [AC_MSG_RESULT(ok)], + [AC_MSG_RESULT(ok) + LINKER="$CC"], [ AC_MSG_RESULT([no, making everything bigger and slower]) LIBS="$save_LIBS" - LINKER="$save_CXX" ] ) CXX="$save_CXX" @@ -65,7 +60,7 @@ dnl# if test -z "$orig_CXXFLAGS"; then if test x$GCC = xyes && test "x$GXX" = xyes; then - CXXFLAGS="-g -O3 -fno-threadsafe-statics -fno-enforce-eh-specs" + CXXFLAGS="-g -O3 -fno-rtti -fvisibility-inlines-hidden -fno-threadsafe-statics -fno-enforce-eh-specs" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) else CXXFLAGS="-O" @@ -73,28 +68,12 @@ CFLAGS="$CXXFLAGS" fi -AC_DEFINE(_GNU_SOURCE, 1, Use all glibc features.) - -case $host in - *-*-solaris* ) - AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris) - ;; -esac - -dnl if test x$GXX = xyes; then -dnl CXXFLAGS="$CXXFLAGS" dnl I once had -fno-exceptions, but I am using them now... -dnl fi - dnl# FreeBSD needs to link libxpg4 -AC_CHECK_FUNC(setlocale, [], [AC_CHECK_LIB(xpg4, setlocale, [LIBS="$LIBS -lxpg4"])]) +AC_SEARCH_LIBS(setlocale, xpg4) dnl# solaris needs to link libnsl and socket -AC_CHECK_FUNC(gethostbyname, [], [AC_CHECK_LIB(nsl, gethostbyname, [LIBS="$LIBS -lnsl"])]) -AC_CHECK_FUNC(socket, [], [AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"])]) - -dnl AC_ENABLE_SHARED(no)dnl# libtool -dnl AC_ENABLE_STATIC(yes)dnl# libtool -dnl AC_PROG_LIBTOOL()dnl# libtool +AC_SEARCH_LIBS(gethostbyname, nsl) +AC_SEARCH_LIBS(socket, socket) support_frills=yes support_inheritpixmap=yes @@ -108,10 +87,9 @@ support_scroll_rxvt=yes support_scroll_next=yes support_scroll_xterm=yes -support_scroll_plain=yes support_xim=yes -support_afterimage=yes -support_afterstep=yes +support_pixbuf=yes +support_startup_notification=yes support_xft=yes support_unicode3=no support_combining=yes @@ -125,16 +103,9 @@ dnl# CHECKING COMMAND LINE OPTIONS dnl# -------------------------------------------------------------------------- -if test "x$enable_shared" = xyes; then - AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only) - INSTALL_LIBRXVT=yes -fi -AC_SUBST(INSTALL_LIBRXVT) - AC_ARG_ENABLE(everything, [ --enable-everything enable standard non-multichoice features - NOTE: this option is order dependent - NOTE: automatically enabled with --enable-shared], + NOTE: this option is order dependent], [ if test x$enableval = xno; then support_frills=no @@ -150,12 +121,11 @@ support_scroll_rxvt=no support_scroll_next=no support_scroll_xterm=no - support_scroll_plain=no support_utmp=no support_wtmp=no support_xim=no - support_afterimage=no - support_afterstep=no + support_pixbuf=no + support_startup_notification=no support_xft=no support_unicode3=no support_combining=no @@ -179,12 +149,11 @@ support_scroll_rxvt=yes support_scroll_next=yes support_scroll_xterm=yes - support_scroll_plain=yes support_utmp=yes support_wtmp=yes support_xim=yes - support_afterimage=yes - support_afterstep=yes + support_pixbuf=yes + support_startup_notification=yes support_xft=yes support_unicode3=yes support_combining=yes @@ -196,22 +165,42 @@ fi ]) -WARNINGS=no +support_assertions=no +AC_ARG_ENABLE(assert, + [ --enable-assert enable assertions], + [if test x$enableval = xyes; then + support_assertions=yes + fi]) +if test x$support_assertions = xno; then + AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) +fi + +support_warnings=no AC_ARG_ENABLE(warnings, [ --enable-warnings turn on g++ warnings], [if test x$enableval = xyes; then - WARNINGS=yes + support_warnings=yes fi]) if test x$GXX = xyes; then - if test $WARNINGS = yes; then + if test $support_warnings = yes; then save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-non-virtual-dtor" + CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare -Wno-reorder -Wno-unused-value" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="$save_CXXFLAGS"]) else CXXFLAGS="$CXXFLAGS -w" fi fi +support_256_color=no +AC_ARG_ENABLE(256-color, + [ --enable-256-color enable 256-color support], + [if test x$enableval = xyes; then + support_256_color=yes + fi]) +if test x$support_256_color = xyes; then + AC_DEFINE(USE_256_COLORS, 1, Define if you want 256-color support) +fi + AC_ARG_ENABLE(unicode3, [ --enable-unicode3 use 21 instead of 16 bits to represent unicode characters], [if test x$enableval = xyes -o x$enableval = xno; then @@ -236,24 +225,18 @@ support_styles=$enableval fi]) -AC_ARG_ENABLE(afterimage, - [ --enable-afterimage enable integration with libAfterImage for background images], +AC_ARG_ENABLE(pixbuf, + [ --enable-pixbuf enable integration with gdk-pixbuf for background images], [if test x$enableval = xyes -o x$enableval = xno; then - support_afterimage=$enableval + support_pixbuf=$enableval fi]) -AC_ARG_WITH(afterimage_config, - [ --with-afterimage-config=DIR use libAfterImage config script in DIR], - [if test "x$withval" != x; then - afterimage_config=$withval/afterimage-config +AC_ARG_ENABLE(startup-notification, + [ --enable-startup-notification enable freedesktop startup notification support], + [if test x$enableval = xyes -o x$enableval = xno; then + support_startup_notification=$enableval fi]) -dnl AC_ARG_ENABLE(afterstep, -dnl [ --enable-afterstep enable integration with AfterStep window manager], -dnl [if test x$enableval = xyes -o x$enableval = xno; then -dnl support_afterstep=$enableval -dnl fi]) - AC_ARG_ENABLE(transparency, [ --enable-transparency enable transparent backgrounds], [if test x$enableval = xyes -o x$enableval = xno; then @@ -290,12 +273,6 @@ support_perl=$enableval fi]) -AC_ARG_ENABLE(plain-scroll, - [ --enable-plain-scroll enable plain style scrollbar], - [if test x$enableval = xyes -o x$enableval = xno; then - support_scroll_plain=$enableval - fi]) - AC_ARG_WITH(codesets, [ --with-codesets=CS,... compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], [codesets="$withval"]) @@ -361,7 +338,6 @@ [RXVTNAME="$withval"]) AC_DEFINE_UNQUOTED(RXVTNAME,"$RXVTNAME", [Binary base name]) -RXVTNAME=`echo "$RXVTNAME"|sed "$program_transform_name"` AC_SUBST(RXVTNAME) AC_ARG_ENABLE(swapscreen, @@ -419,7 +395,7 @@ fi]) AC_ARG_ENABLE(pointer-blank, - [ --enable-pointer-blank enable pointer blank when typing or inactive pointer], + [ --enable-pointer-blank enable pointer blanking when typing or inactive], [if test x$enableval = xyes -o x$enableval = xno; then support_pointer_blank=$enableval fi]) @@ -445,97 +421,73 @@ AC_PATH_PROG(TIC, tic, :) -dnl# need a neat way to detect SVR4 or its features -dnl# in src/command.c we use these functions: -dnl# grantpt(), unlockpt(), ptsname(), which are defined in -dnl# - but are these also defined for other systems? - -dnl# hack to find if this is SVR4 -- who knows? -dnl## AC_MSG_CHECKING(for SVR4) -dnl## AC_EGREP_CPP(yes, -dnl## [#if defined (SVR4) || defined (_SVR4) || defined (__svr4__) -dnl## yes; -dnl## #endif -dnl## ], [AC_MSG_RESULT(yes); AC_DEFINE(PERHAPS_SVR4)], AC_MSG_RESULT(perhaps not?)) - AC_PATH_XTRA -AFTERIMAGE_CFLAGS= -AFTERIMAGE_LIBS= -AFTERIMAGE_VERSION= - -if test x$support_afterimage = xyes; then - support_afterimage=no - - if test "x$afterimage_config" = "x" ; then - AC_PATH_PROG(afterimage_config, afterimage-config, no) - fi - if test "x$afterimage_config" != "xno" ; then - AC_MSG_CHECKING(for libAfterImage version >= 1.15) - xAFTERIMAGE_VERSION=`$afterimage_config --version` - if test -n "$xAFTERIMAGE_VERSION" ; then - xAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` - xAFTERIMAGE_LIBS=`$afterimage_config --libs` - if test "x$xAFTERIMAGE_LIBS" != "x"; then - libai_ver_major=`echo $xAFTERIMAGE_VERSION | cut -f 1 -d .` - libai_ver_minor=`echo $xAFTERIMAGE_VERSION | cut -f 2 -d .` - if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then - support_afterimage=yes - AFTERIMAGE_CFLAGS="$xAFTERIMAGE_CFLAGS" - AFTERIMAGE_LIBS="$xAFTERIMAGE_LIBS" - AFTERIMAGE_VERSION="$xAFTERIMAGE_VERSION" - fi - fi - fi - if test "x$support_afterimage" = "xyes"; then - AC_MSG_RESULT($AFTERIMAGE_LIBS) - else - AC_MSG_RESULT(no) - fi +image_lib=none + +PIXBUF_CFLAGS= +PIXBUF_LIBS= + +if test x$support_pixbuf = xyes; then + support_pixbuf=no + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + AC_MSG_CHECKING(for gdk-pixbuf) + if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then + PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`" + PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`" + support_pixbuf=yes + fi + + if test x$support_pixbuf = xyes; then + AC_MSG_RESULT(ok) + image_lib=gdk-pixbuf + AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) + AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.) + else + AC_MSG_RESULT(no) + fi +fi + +AC_SUBST(PIXBUF_CFLAGS) +AC_SUBST(PIXBUF_LIBS) + +STARTUP_NOTIFICATION_CFLAGS= +STARTUP_NOTIFICATION_LIBS= + +if test x$support_startup_notification = xyes; then + support_startup_notification=no + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + AC_MSG_CHECKING(for libstartup-notification) + if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then + STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`" + STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`" + support_startup_notification=yes + fi + + if test x$support_startup_notification = xyes; then + AC_MSG_RESULT(ok) + AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported) + else + AC_MSG_RESULT(no) fi fi +AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) +AC_SUBST(STARTUP_NOTIFICATION_LIBS) + dnl# -------------------------------------------------------------------------- dnl# CHECKING FOR HEADER FILES dnl# -------------------------------------------------------------------------- -AC_HEADER_SYS_WAIT AC_CHECK_HEADERS( \ - assert.h \ - fcntl.h \ - stdarg.h \ - stdlib.h \ - string.h \ - termios.h \ - unistd.h \ sys/byteorder.h \ sys/ioctl.h \ - sys/select.h \ sys/sockio.h \ sys/strredir.h \ - sys/time.h \ stdint.h \ wchar.h \ - cwchar \ - clocale \ ) -AC_HEADER_TIME - -dnl# check to allow both and -AC_CACHE_CHECK(whether termios.h and sys/ioctl.h may both be included, rxvt_cv_header_sysioctl, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include -#include -#ifdef HAVE_TERMIOS_H -#include -#endif]], [[int a = ECHO;]])],[rxvt_cv_header_sysioctl=yes],[rxvt_cv_header_sysioctl=no])]) - -AC_CACHE_CHECK([for XPointer], rxvt_cv_xpointer, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[XPointer dummy;]])],[rxvt_cv_xpointer=yes],[rxvt_cv_xpointer=no])]) -if test x$rxvt_cv_xpointer = xyes; then - AC_DEFINE(HAVE_XPOINTER, 1, Define if you have XPointer typedef) -fi - -AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, +AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_cv_xlib_illegal_access, [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([ #define XLIB_ILLEGAL_ACCESS @@ -544,112 +496,27 @@ Display *dpy; dpy->xdefaults = (char *)0; ])], - [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] + [rxvt_cv_xlib_illegal_access=yes],[rxvt_cv_xlib_illegal_access=no] )]) -if test x$rxvt_xlib_illegal_access = xyes; then +if test x$rxvt_cv_xlib_illegal_access = xyes; then AC_DEFINE(XLIB_ILLEGAL_ACCESS, 1, Define ONLY iff Xlib.h supports it) fi -AC_C_CONST -AC_C_INLINE - -dnl> AC_HEADER_STDC dnl# skip this test, Sun always fails anyhow. - dnl# -------------------------------------------------------------------------- dnl# CHECKING FOR MISSING TYPEDEFS dnl# -------------------------------------------------------------------------- dnl# Missing typedefs and replacements AC_TYPE_MODE_T -dnl> AC_CHECK_TYPE(umode_t, int) -dnl> AC_CHECK_TYPE(off_t, long) AC_TYPE_PID_T AC_TYPE_UID_T - -AC_CHECK_SIZEOF(short, 2) -AC_CHECK_SIZEOF(int, 4) -dnl AC_CHECK_SIZEOF(long, 4) -AC_CHECK_SIZEOF(long long, 8) -AC_CHECK_SIZEOF(int *, 4) - -dnl# see usage below -AC_DEFUN([RXVT_CHECK_SIZE], - [AC_CACHE_CHECK([for $2], $1, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[$2 dummy;]])],[$1=yes],[dnl -if test "$ac_cv_sizeof_char" -ge $3; then - $1="$4 char" -else - if test "$ac_cv_sizeof_short" -ge $3; then - $1="$4 short" - else - if test "$ac_cv_sizeof_int" -ge $3; then - $1="$4 int" - else - if test "$ac_cv_sizeof_long" -ge $3; then - $1="$4 long" - else - if test "$ac_cv_sizeof_long_long" -ge $3; then - $1="$4 long long" - else - $1="$4 $5" # we _must_ have a (possibly wrong) default - fi - fi - fi - fi -fi])])] -if test x"$$1" != xyes; then - $6="typedef $$1 $2;" -else - if test x"$4" = x; then - $6="/* typedef $5 $2; */" - else - $6="/* typedef $4 $5 $2; */" - fi -fi dnl -) -dnl# -dnl# Look for types the system may know about anyway. -dnl# -RXVT_CHECK_SIZE(rxvt_cv_int16_t, int16_t, 2, , short, rxvt_int16_typedef) -AC_SUBST(rxvt_int16_typedef) -RXVT_CHECK_SIZE(rxvt_cv_uint16_t, uint16_t, 2, unsigned, short, rxvt_uint16_typedef) -AC_SUBST(rxvt_uint16_typedef) -RXVT_CHECK_SIZE(rxvt_cv_int32_t, int32_t, 4, , int, rxvt_int32_typedef) -AC_SUBST(rxvt_int32_typedef) -RXVT_CHECK_SIZE(rxvt_cv_uint32_t, uint32_t, 4, unsigned, int, rxvt_uint32_typedef) -AC_SUBST(rxvt_uint32_typedef) -dnl RXVT_CHECK_SIZE(rxvt_cv_int64_t, int64_t, 8, , long long, rxvt_int64_typedef) -dnl AC_SUBST(rxvt_int64_typedef) -dnl RXVT_CHECK_SIZE(rxvt_cv_uint64_t, uint64_t, 8, unsigned, long long, rxvt_uint64_typedef) -dnl AC_SUBST(rxvt_uint64_typedef) -dnl# -dnl# Now look for another we use -dnl# -if test "$ac_cv_sizeof_int_p" -eq 8; then - rxvt_intp_define="#define intp_t int64_t" - rxvt_u_intp_define="#define u_intp_t u_int64_t" -else - if test "$ac_cv_sizeof_int_p" -eq 4; then - rxvt_intp_define="#define intp_t int32_t" - rxvt_u_intp_define="#define u_intp_t u_int32_t" - else - if test "$ac_cv_sizeof_int_p" -eq 2; then - rxvt_intp_define="#define intp_t int16_t" - rxvt_u_intp_define="#define u_intp_t u_int16_t" - else - rxvt_intp_define="#error set intp_t" - rxvt_u_intp_define="#error set u_intp_t" - fi - fi -fi -AC_SUBST(rxvt_intp_define) -AC_SUBST(rxvt_u_intp_define) +AC_TYPE_INT16_T +AC_TYPE_UINT16_T +AC_TYPE_INT32_T +AC_TYPE_UINT32_T dnl# -------------------------------------------------------------------------- dnl# CHECKING FOR LIBRARY FUNCTIONS dnl# -------------------------------------------------------------------------- -AC_TYPE_SIGNAL -dnl> AC_FUNC_VPRINTF - AC_CHECK_FUNCS(unsetenv) UTMP_CHECK @@ -666,20 +533,21 @@ LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" if test x$support_xim = xyes; then AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, - [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include + [AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include #include - main() { - char *p; - if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) - exit (XSupportsLocale() ? 0 : 1); - else - exit (1);}]])],[dnl - rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl - :])]) + int main() { + char *p; + if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) + exit (XSupportsLocale() ? 0 : 1); + else + exit (1); + } + ]])],[rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[:])]) if test x$rxvt_cv_func_xlocale = xyes; then AC_DEFINE(USE_XIM, 1, Define if you want to have XIM (X Input Method) protocol support - required for multibyte characters input) - AC_CACHE_CHECK(for broken XIM callback, rxvt_broken_ximcb, - [AC_COMPILE_IFELSE([ + AC_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #include void im_destroy_cb (XIC unused1, XPointer client_data, XPointer unused3); @@ -688,9 +556,9 @@ XIMCallback cb; cb.callback = im_destroy_cb; } - ],rxvt_broken_ximcb=yes,rxvt_broken_ximcb=no)]) + ]])],rxvt_cv_broken_ximcb=yes,rxvt_cv_broken_ximcb=no)]) - if test x$rxvt_broken_ximcb = xyes; then + if test x$rxvt_cv_broken_ximcb = xyes; then AC_DEFINE(XIMCB_PROTO_BROKEN, 1, Define if your XIMCallback specifies XIC as first type.) fi fi @@ -705,12 +573,6 @@ LIBS=$save_LIBS CFLAGS=$save_CFLAGS -AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale, -[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[setlocale(LC_CTYPE, "");]])],[rxvt_cv_func_setlocale=yes],[rxvt_cv_func_setlocale=no])]) -if test x$rxvt_cv_func_setlocale = xyes; then - AC_DEFINE(HAVE_SETLOCALE, 1, Define if plain old setlocale works) -fi - AC_CACHE_CHECK(for working nl_langinfo, rxvt_cv_func_nl_langinfo, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[nl_langinfo(CODESET);]])],[rxvt_cv_func_nl_langinfo=yes],[rxvt_cv_func_nl_langinfo=no])]) if test x$rxvt_cv_func_nl_langinfo = xyes; then @@ -726,7 +588,23 @@ dnl# -------------------------------------------------------------------------- dnl# now add and remove other stuff dnl# -------------------------------------------------------------------------- -if test x$support_xft = xyes; then +if test x$support_xft = xyes || test x$support_inheritpixmap = xyes; then + rxvt_have_xrender=no + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then + X_LIBS="`$PKG_CONFIG xrender --libs` $X_LIBS" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xrender --cflags`" + rxvt_have_xrender=yes + + save_LIBS="$LIBS" + LIBS="$LIBS $X_LIBS" + AC_CHECK_HEADER(X11/extensions/Xrender.h,,[rxvt_have_xrender=no]) + AC_CHECK_FUNC(XRenderFindStandardFormat,,[rxvt_have_xrender=no]) + LIBS="$save_LIBS" + fi +fi + +if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test $PKG_CONFIG != no && $PKG_CONFIG --exists xft; then X_LIBS="`$PKG_CONFIG xft --libs` $X_LIBS" @@ -739,10 +617,17 @@ fi fi + if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig; then + X_LIBS="`$PKG_CONFIG fontconfig --libs` $X_LIBS" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG fontconfig --cflags`" + fi + save_LIBS="$LIBS" LIBS="$LIBS $X_LIBS" AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no]) AC_CHECK_LIB(Xft,XftDrawString32,:,[support_xft=no]) + AC_CHECK_HEADERS(fontconfig/fontconfig.h,,[support_xft=no]) + AC_CHECK_LIB(fontconfig,FcPatternGet,:,[support_xft=no]) LIBS="$save_LIBS" if test x$support_xft = xyes; then @@ -762,6 +647,10 @@ AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) fi if test x$support_inheritpixmap = xyes; then + if test x$rxvt_have_xrender = xyes; then + LIBS="$LIBS -lm" + AC_DEFINE(XRENDER, 1, Define to enable xrender support) + fi AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) fi if test x$support_keepscrolling = xno; then @@ -779,18 +668,13 @@ if test x$support_mouseslipwheel = xyes; then AC_DEFINE(MOUSE_SLIP_WHEELING, 1, Define to have CTRL cause wheel events to accelerate scrolling. Release CTRL to halt scrolling) fi -if test x$support_afterimage = xyes; then - AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) - AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps. Needs libAfterImage) -fi -dnl if test x$support_afterstep = xyes; then -dnl AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) -dnl fi +scrolltypes=plain +AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars) if test x$support_scroll_rxvt = xyes; then AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) - scrolltypes="rxvt" + scrolltypes="$scrolltypes rxvt" fi if test x$support_scroll_next = xyes; then AC_DEFINE(NEXT_SCROLLBAR, 1, Support NeXT style scrollbars) @@ -800,12 +684,8 @@ AC_DEFINE(XTERM_SCROLLBAR, 1, Support Xterm style scrollbars) scrolltypes="$scrolltypes xterm" fi -if test x$support_scroll_plain = xyes; then - AC_DEFINE(PLAIN_SCROLLBAR, 1, Support plain style scrollbars) - scrolltypes="$scrolltypes plain" -fi if test x$support_pointer_blank = xyes; then - AC_DEFINE(POINTER_BLANK, 1, Define if you want hide the pointer while typing) + AC_DEFINE(POINTER_BLANK, 1, Define if you want to hide the pointer while typing) fi if test x$support_text_blink = xyes; then AC_DEFINE(TEXT_BLINK, 1, Define if you want blinking text support) @@ -833,8 +713,7 @@ IF_PERL=\# if test x$support_perl = xyes; then - AC_PATH_PROG(PERL, perl5) - AC_PATH_PROG(PERL, perl) + AC_PATH_PROG(PERL, perl5, perl) AC_MSG_CHECKING(for $PERL suitability) if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then @@ -843,13 +722,13 @@ save_LIBS="$LIBS" CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" - AC_TRY_LINK([ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include #include -],[ +]], [[ PerlInterpreter *perl = perl_alloc (); -],[rxvt_perl_link=yes],[rxvt_perl_link=no]) +]])],[rxvt_perl_link=yes],[rxvt_perl_link=no]) CXXFLAGS="$save_CXXFLAGS" LIBS="$save_LIBS" @@ -875,50 +754,10 @@ AC_SUBST(IF_PERL) AC_SUBST(PERL_O) -AC_SUBST(CFLAGS) -AC_SUBST(CPPFLAGS) -AC_SUBST(LDFLAGS) -AC_SUBST(X_CFLAGS) - -dnl# Attack the libs -AC_SUBST(LIBS) -AC_SUBST(X_LIBS) -AC_SUBST(X_EXTRA_LIBS) - -AC_SUBST(AFTERIMAGE_CFLAGS) -AC_SUBST(AFTERIMAGE_LIBS) - -AC_ARG_PROGRAM - -dnl# test for "sun" or "__sun__" before include sys_ioctl - -dnl# revert HAVE_BLAH_H into a "#include " -AC_DEFUN([RXVT_DEFINE_TO_INCLUDE], dnl -[if test "$$3" = "$4" -o "$$5" = "$6"; then - $1="#include <$2>" -else - $1="/* #include <$2> */" -fi dnl -AC_SUBST($1)]) - -RXVT_DEFINE_TO_INCLUDE(include_stdint_h, stdint.h, ac_cv_header_stdint_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_stdarg_h, cstdarg, ac_cv_header_stdarg_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_stdlib_h, cstdlib, ac_cv_header_stdlib_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_unistd_h, unistd.h, ac_cv_header_unistd_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_string_h, cstring, ac_cv_header_string_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_fcntl_h, fcntl.h, ac_cv_header_fcntl_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_util_h, util.h, ac_cv_header_util_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_assert_h, assert.h, ac_cv_header_assert_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_sys_ioctl_h, sys/ioctl.h, rxvt_cv_header_sysioctl, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_sys_select_h, sys/select.h, ac_cv_header_sys_select_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_sys_strredir_h, sys/strredir.h, ac_cv_header_sys_strredir_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_sys_time_h, sys/time.h, ac_cv_header_sys_time_h, yes, notset, dontmatch) -RXVT_DEFINE_TO_INCLUDE(include_time_h, time.h, ac_cv_header_sys_time_h, no, ac_cv_header_time, yes) AC_CONFIG_FILES([Makefile \ doc/Makefile \ src/Makefile \ -src/rxvtlib.h \ ]) AC_OUTPUT @@ -944,8 +783,7 @@ fi echo echo " embedded perl: $support_perl" -echo " libafterimage: $support_afterimage" -dnl echo " AfterStep integration: $support_afterstep" +echo " image library: $image_lib" echo if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then echo ".----------------------------------------------------------------."