--- rxvt-unicode/configure.ac 2007/12/28 14:00:47 1.102 +++ rxvt-unicode/configure.ac 2010/03/31 13:14:50 1.109 @@ -13,11 +13,9 @@ 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 AC_SUBST(VERSION)dnl AC_SUBST(DATE)dnl -dnl AC_SUBST(LIBVERSION)dnl echo "" echo "configuring for rxvt $VERSION" @@ -36,7 +34,7 @@ AC_ISC_POSIX AC_LANG(C++) -dnl check wether we can link with gcc -lsupc++ +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++]) @@ -84,10 +82,6 @@ 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 - support_frills=yes support_inheritpixmap=yes support_fading=yes @@ -100,7 +94,6 @@ 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 @@ -117,15 +110,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 @@ -141,7 +128,6 @@ 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 @@ -170,7 +156,6 @@ 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 @@ -187,6 +172,16 @@ fi ]) +ASSERTIONS=no +AC_ARG_ENABLE(assert, + [ --enable-assert enable assertions], + [if test x$enableval = xyes; then + ASSERTIONS=yes + fi]) +if test x$ASSERTIONS = xno; then + AC_DEFINE(NDEBUG, 1, Disable assertions (good for debugging)) +fi + WARNINGS=no AC_ARG_ENABLE(warnings, [ --enable-warnings turn on g++ warnings], @@ -228,7 +223,7 @@ fi]) AC_ARG_ENABLE(afterimage, - [ --enable-afterimage enable integration with libAfterImage for background images], + [ --enable-afterimage enable integration with libAfterImage for background images], [if test x$enableval = xyes -o x$enableval = xno; then support_afterimage=$enableval fi]) @@ -275,12 +270,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 @@ -410,7 +399,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]) @@ -492,7 +481,7 @@ 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 +490,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 @@ -550,7 +539,7 @@ :])]) 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_CACHE_CHECK(for broken XIM callback, rxvt_cv_broken_ximcb, [AC_COMPILE_IFELSE([ #include @@ -560,9 +549,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 @@ -660,9 +649,12 @@ 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,10 +664,6 @@ 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) fi