--- rxvt-unicode/configure.ac 2007/12/28 14:00:47 1.102 +++ rxvt-unicode/configure.ac 2021/11/22 15:41:18 1.159 @@ -3,21 +3,15 @@ dnl# AC_INIT -AC_PREREQ(2.50) +AC_PREREQ(2.71) AC_CONFIG_SRCDIR([src/feature.h]) -AC_CONFIG_HEADER(config.h:config.h.in) - -AC_CANONICAL_HOST +AC_CONFIG_HEADERS(config.h:config.h.in) 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` -changequote([, ])dnl +VERSION=`sed -n -e 's/^.* VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` +DATE=`sed -n -e 's/^.* DATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h` AC_SUBST(VERSION)dnl AC_SUBST(DATE)dnl -dnl AC_SUBST(LIBVERSION)dnl echo "" echo "configuring for rxvt $VERSION" @@ -28,15 +22,17 @@ dnl# Checks for programs. AC_PROG_CC AC_PROG_CXX -AC_PROG_CPP AC_PROG_INSTALL -AC_AIX -AC_GNU_SOURCE -AC_ISC_POSIX +AC_USE_SYSTEM_EXTENSIONS AC_LANG(C++) -dnl check wether we can link with gcc -lsupc++ +if test "$ac_prog_cxx_stdcxx" != cxx11; then + AC_MSG_ERROR([the compiler does not support C++11]) +fi + +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++]) @@ -44,14 +40,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" @@ -71,22 +66,12 @@ CFLAGS="$CXXFLAGS" fi -case $host in - *-*-solaris* ) - AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris) - ;; -esac - 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 @@ -100,10 +85,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 @@ -117,15 +101,9 @@ dnl# CHECKING COMMAND LINE OPTIONS dnl# -------------------------------------------------------------------------- -dnl if test "x$enable_shared" = xyes; then -dnl AC_DEFINE(LIBRXVT, 1, Build shared library version - specify via configure only) -dnl INSTALL_LIBRXVT=yes -dnl fi -dnl AC_SUBST(INSTALL_LIBRXVT) - AC_ARG_ENABLE(everything, [ --enable-everything enable standard non-multichoice features - NOTE: this option is order dependent], + NOTE: this option is order dependent], [ if test x$enableval = xno; then support_frills=no @@ -133,7 +111,6 @@ support_fading=no support_keepscrolling=no support_selectionscrolling=no - support_lastlog=no support_mousewheel=no support_mouseslipwheel=no support_text_blink=no @@ -141,12 +118,9 @@ 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 @@ -162,7 +136,6 @@ support_fading=yes support_keepscrolling=yes support_selectionscrolling=yes - support_lastlog=yes support_mousewheel=yes support_mouseslipwheel=yes support_text_blink=yes @@ -170,12 +143,9 @@ 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 @@ -187,22 +157,50 @@ 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" + for warning in \ + -Wall \ + -Wno-parentheses \ + -Wno-reorder \ + -Wno-sign-compare \ + -Wno-unused-value \ + ; do + CXXFLAGS="$CXXFLAGS $warning" + done 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 @@ -227,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 @@ -275,12 +267,6 @@ support_scroll_xterm=$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_ENABLE(perl, [ --enable-perl enable embedded perl interpreter], [if test x$enableval = xyes -o x$enableval = xno; then @@ -309,10 +295,11 @@ AC_DEFINE(NO_DELETE_KEY, 1, Define if you don't want support for the (non-keypad) delete key) fi]) +support_resources=yes AC_ARG_ENABLE(resources, [ --disable-resources disable all resource checking], [if test x$enableval = xno; then - AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) + support_resources=no fi]) AC_ARG_ENABLE(8bitctrls, @@ -352,7 +339,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, @@ -410,7 +396,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]) @@ -427,6 +413,14 @@ AC_DEFINE_UNQUOTED(RXVT_TERMINFO, "$withval", Set TERMINFO value to the value given by configure) terminfo="$withval" fi]) +if test x$support_resources = xno; then + if test x$support_frills = xyes || test x$support_perl = xyes; then + AC_MSG_ERROR([--disable-resources requires --disable-frills --disable-perl]) + fi + + AC_DEFINE(NO_RESOURCES, 1, Define if you don't want any resources read) +fi + dnl# -------------------------------------------------------------------------- LIBEV_M4_AVOID_LIBRT=1 @@ -438,39 +432,48 @@ AC_PATH_XTRA -AFTERIMAGE_CFLAGS= -AFTERIMAGE_LIBS= -AFTERIMAGE_VERSION= +AC_PATH_TOOL(PKG_CONFIG, pkg-config, no) -if test x$support_afterimage = xyes; then - support_afterimage=no +RXVT_CHECK_MODULES([PTYTTY], [libptytty], [:], [ + AC_MSG_ERROR([unable to find libptytty]) +]) - 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 - fi +AC_SUBST(PTYTTY_CFLAGS) +AC_SUBST(PTYTTY_LIBS) + +image_lib=none + +PIXBUF_CFLAGS= +PIXBUF_LIBS= + +if test x$support_pixbuf = xyes; then + RXVT_CHECK_MODULES([PIXBUF], [gdk-pixbuf-2.0], [ + image_lib=gdk-pixbuf + AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing) + ], [:]) +fi + +AC_SUBST(PIXBUF_CFLAGS) +AC_SUBST(PIXBUF_LIBS) + +STARTUP_NOTIFICATION_CFLAGS= +STARTUP_NOTIFICATION_LIBS= + +if test x$support_startup_notification = xyes; then + RXVT_CHECK_MODULES([STARTUP_NOTIFICATION], [libstartup-notification-1.0], [ + AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, Define if freedesktop startup notifications should be supported) + ], [:]) +fi + +AC_SUBST(STARTUP_NOTIFICATION_CFLAGS) +AC_SUBST(STARTUP_NOTIFICATION_LIBS) + +if test x$support_frills = xyes; then + RXVT_CHECK_MODULES([XMU], [xmu], [ + X_LIBS="$XMU_LIBS $X_LIBS" + CPPFLAGS="$CPPFLAGS $XMU_CFLAGS" + AC_DEFINE(HAVE_XMU, 1, Define to enable Xmu support) + ], [:]) fi dnl# -------------------------------------------------------------------------- @@ -483,16 +486,9 @@ sys/strredir.h \ stdint.h \ wchar.h \ - cwchar \ ) -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 @@ -501,9 +497,9 @@ 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 @@ -524,8 +520,6 @@ dnl# -------------------------------------------------------------------------- AC_CHECK_FUNCS(unsetenv) -UTMP_CHECK - dnl# -------------------------------------------------------------------------- dnl# -------------------------------------------------------------------------- @@ -533,25 +527,26 @@ dnl# this is a really hack test for some basic Xlocale stuff save_LIBS=$LIBS -save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS $X_CFLAGS" +save_CXXFLAGS=$CXXFLAGS +CXXFLAGS="$CXXFLAGS $X_CFLAGS" 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); @@ -560,9 +555,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 @@ -575,13 +570,7 @@ AC_DEFINE(HAVE_XSETLOCALE, 1, Define if setlocale (defined to Xsetlocale) works) fi 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 +CXXFLAGS=$save_CXXFLAGS 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])]) @@ -589,38 +578,72 @@ AC_DEFINE(HAVE_NL_LANGINFO, 1, Define if nl_langinfo(CODESET) works) fi -SCM_RIGHTS_CHECK - -PTY_CHECK - -TTY_GROUP_CHECK - dnl# -------------------------------------------------------------------------- dnl# now add and remove other stuff dnl# -------------------------------------------------------------------------- -if test x$support_xft = 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" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG xft --cflags`" - else +support_image=no +if test x$support_inheritpixmap = xyes || test x$support_pixbuf = xyes; then + support_image=yes +fi +if test x$support_xft = xyes || test x$support_image = xyes; then + rxvt_have_xrender=no + RXVT_CHECK_MODULES([XRENDER], [xrender], [ + X_LIBS="$XRENDER_LIBS $X_LIBS" + CPPFLAGS="$CPPFLAGS $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 + +if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then + RXVT_CHECK_MODULES([XFT], [fontconfig xft], [ + X_LIBS="$XFT_LIBS $X_LIBS" + CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" + ], [ AC_PATH_PROG(XFT_CONFIG, xft-config, no) if test $XFT_CONFIG != no; then X_LIBS="`$XFT_CONFIG --libs` $X_LIBS" CPPFLAGS="$CPPFLAGS `$XFT_CONFIG --cflags`" fi - 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(X11/Xft/Xft.h fontconfig/fontconfig.h,,[support_xft=no]) + AC_CHECK_FUNCS(XftDrawString32 FcPatternGet,,[support_xft=no]) LIBS="$save_LIBS" if test x$support_xft = xyes; then AC_DEFINE(XFT, 1, Define to enable xft support) fi fi + +if test x$support_image = xyes && test x$rxvt_have_xrender = xyes; then + AC_MSG_CHECKING(for Render >= 0.11) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include +#if RENDER_MAJOR == 0 && RENDER_MINOR <= 10 +error +#endif +]])],[],[support_image=no]) + if test x$support_image = xyes; then + AC_MSG_RESULT(ok) + LIBS="$LIBS -lm" + AC_DEFINE(XRENDER, 1, Define to enable xrender support) + + if test x$support_inheritpixmap = xyes; then + AC_DEFINE(ENABLE_TRANSPARENCY, 1, Define if you want your background to use the parent window background) + fi + else + AC_MSG_RESULT(no) + fi +fi + if test x$support_styles = xyes; then AC_DEFINE(ENABLE_STYLES, 1, Define if you want bold and italic support) fi @@ -633,9 +656,6 @@ if test x$support_fading = xyes; then AC_DEFINE(OFF_FOCUS_FADING, 1, Define if you want faded colors when focus is lost) fi -if test x$support_inheritpixmap = xyes; then - 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 AC_DEFINE(NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING, 1, Define for continual scrolling when you keep the scrollbar button pressed) fi @@ -651,18 +671,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) @@ -672,12 +687,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) @@ -705,8 +716,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 @@ -747,20 +757,6 @@ 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 AC_CONFIG_FILES([Makefile \ doc/Makefile \ @@ -790,8 +786,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 ".----------------------------------------------------------------."