--- rxvt-unicode/configure.ac 2006/01/28 21:25:12 1.31 +++ rxvt-unicode/configure.ac 2007/06/25 23:11:23 1.55 @@ -15,10 +15,10 @@ 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 -AC_SUBST(LSMDATE)dnl -AC_SUBST(LIBVERSION)dnl +AC_SUBST(VERSION)dnl +AC_SUBST(DATE)dnl +AC_SUBST(LSMDATE)dnl +AC_SUBST(LIBVERSION)dnl echo "" echo "configuring for rxvt $VERSION" echo "" @@ -47,8 +47,11 @@ 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_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])], + [ + AC_MSG_RESULT(ok) + CXXLIB="-lsupc++" + ], [ AC_MSG_RESULT([no, making everything bigger and slower]) LIBS="$save_LIBS" @@ -58,15 +61,15 @@ CXX="$save_CXX" fi AC_SUBST(LINKER,[$LINKER]) +AC_SUBST(CXXLIB) -AC_LANG(C++) dnl# -------------------------------------------------------------------------- dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure' 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" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [], [CXXFLAGS="-g -O3"]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])], [], [CXXFLAGS="-g -O3"]) else CXXFLAGS="-O" fi @@ -77,9 +80,7 @@ case $host in *-*-solaris* ) - AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) - AC_DEFINE(_XOPEN_SOURCE, 2, Needed to get declarations for msg_control and msg_controllen on Solaris) - AC_DEFINE(__EXTENSIONS__, 1, Needed to get declarations for msg_control and msg_controllen on Solaris) + AC_DEFINE(_XOPEN_SOURCE, 500, Needed to get declarations for msg_control and msg_controllen on Solaris) ;; esac @@ -114,6 +115,8 @@ support_scroll_plain=yes support_xim=yes support_xpm=yes +support_afterimage=yes +support_afterstep=yes support_xft=yes support_unicode3=no support_combining=yes @@ -158,6 +161,8 @@ support_wtmp=no support_xim=no support_xpm=no + support_afterimage=no + support_afterstep=no support_xft=no support_unicode3=no support_combining=no @@ -187,6 +192,8 @@ support_wtmp=yes support_xim=yes support_xpm=yes + support_afterimage=yes + support_afterstep=yes support_xft=yes support_unicode3=yes support_combining=yes @@ -223,11 +230,29 @@ fi]) AC_ARG_ENABLE(xpm-background, - [ --enable-xpm-background enable XPM background pixmaps], + [ --enable-xpm-background enable background pixmaps], [if test x$enableval = xyes -o x$enableval = xno; then support_xpm=$enableval fi]) +AC_ARG_ENABLE(afterimage, + [ --enable-afterimage enable integration with libAfterImage for background images], + [if test x$enableval = xyes -o x$enableval = xno; then + support_afterimage=$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 + fi]) + +AC_ARG_ENABLE(afterstep, + [ --enable-afterstep enable integration with AfterStep window manager], + [if test x$enableval = xyes -o x$enableval = xno; then + support_afterstep=$enableval + fi]) + AC_ARG_ENABLE(transparency, [ --enable-transparency enable transparent backgrounds], [if test x$enableval = xyes -o x$enableval = xno; then @@ -276,12 +301,6 @@ support_scroll_plain=$enableval fi]) -dnl AC_ARG_ENABLE(half-shadow, -dnl [ --enable-half-shadow use half width/height shadow on rxvt scrollbar], -dnl [if test x$enableval = xyes; then -dnl AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less) -dnl fi]) - AC_ARG_WITH(codesets, [ --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)], [codesets="$withval"]) @@ -424,12 +443,6 @@ dnl# -------------------------------------------------------------------------- -AC_PATH_PROG(MV, mv, mv) -AC_PATH_PROG(CP, cp, cp) -AC_PATH_PROG(LN, ln, ln) -AC_PATH_PROG(SED, sed, sed) -AC_PATH_PROG(ECHO, echo, echo) -AC_PATH_PROG(CMP, cmp, cmp) AC_PATH_PROG(TIC, tic) dnl# need a neat way to detect SVR4 or its features @@ -450,7 +463,34 @@ dnl# the only reasonable way to find libXpm is do-it-yourself dnl# only check if we want xpm-background -if test x$support_xpm = xyes; then +LIBAFTERIMAGE_CFLAGS= +AFTERIMAGE_LIBS= +have_afterimage= + +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 + + AC_MSG_CHECKING(for libAfterImage) + if $afterimage_config --version >/dev/null 2>&1 ; then + LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags` + AFTERIMAGE_LIBS=`$afterimage_config --libs` + if test "x$AFTERIMAGE_LIBS" != "x"; then + support_afterimage=yes + fi + fi + + if test "x$support_afterimage" = "xyes"; then + AC_MSG_RESULT($AFTERIMAGE_LIBS) + else + AC_MSG_RESULT(no) + fi +fi + +if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then VT_FIND_LIBXPM if test x$no_xpm = xyes; then support_xpm=needsmanualspecification @@ -508,25 +548,27 @@ CFLAGS="$CFLAGS $X_CFLAGS" LIBS=`echo "$LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` AC_CACHE_CHECK([for -rpath dynamic library path recording], rxvt_cv_rpath, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[ +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include +#include main() { exit(0); (void) XOpenDisplay("foobar"); -}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl - AC_MSG_WARN(You may need to check the LIBS line)])]) +}]])],[rxvt_cv_rpath=yes],[rxvt_cv_rpath=no],[dnl + AC_MSG_WARN(You may need to check the LIBS line)])]) if test x$rxvt_cv_rpath != xyes; then changequote(, )dnl R_TRANSLATE='s/-L\([^ ]*\)/-L\1 '$LDARG'-R\1/g' changequote([, ])dnl LIBS=`echo "$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" | sed "$R_TRANSLATE"` AC_CACHE_CHECK([for -R dynamic library path recording], rxvt_cv_R, -[AC_RUN_IFELSE([AC_LANG_SOURCE([[ +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include +#include main() { exit(0); (void) XOpenDisplay("foobar"); -}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) +}]])],[rxvt_cv_R=yes],[rxvt_cv_R=no],[rxvt_cv_R=no])]) if test x$rxvt_cv_R != xyes; then LIBS="$ac_save_LIBS $X_LIBS $X_EXTRA_LIBS -lX11" fi @@ -540,6 +582,20 @@ LIBS=$ac_save_LIBS CFLAGS=$ac_save_CFLAGS +AC_CACHE_CHECK([for XLIB_ILLEGAL_ACCESS], rxvt_xlib_illegal_access, +[AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([ +#define XLIB_ILLEGAL_ACCESS +#include + ],[ + Display *dpy; + dpy->xdefaults = (char *)0; + ])], + [rxvt_xlib_illegal_access=yes],[rxvt_xlib_illegal_access=no] +)]) +if test x$rxvt_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 @@ -656,7 +712,7 @@ [for ttys_file in dnl /etc/ttys /etc/ttytab; do - if test -f "$ttys_file" ; then + if test -f "$ttys_file" ; then rxvt_cv_path_ttytab=$ttys_file break fi @@ -679,6 +735,7 @@ fi AC_CACHE_CHECK(for working Xlocale, rxvt_cv_func_xlocale, [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include +#include main() { char *p; if ((p = XSetLocaleModifiers("@im=none")) != NULL && *p) @@ -686,9 +743,11 @@ else exit (1);}]])],[dnl rxvt_cv_func_xlocale=yes],[rxvt_cv_func_xlocale=no],[dnl - AC_MSG_WARN(Define NO_XLOCALE in config.h manually)])]) -if test x$rxvt_cv_func_xlocale = xyes; then - AC_DEFINE(HAVE_XLOCALE, 1, Define if Xlocale support works) + :])]) +if test x$support_xim = xyes; then + 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) + fi fi AC_CACHE_CHECK(for working X setlocale, rxvt_cv_func_xsetlocale, @@ -790,14 +849,18 @@ 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_xim = xyes -o x$multichar_set = xyes; then - 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) - fi +if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then + AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm or libAfterImage) fi -if test x$support_xpm = xyes; then - AC_DEFINE(XPM_BACKGROUND, 1, Define if you want to have sexy-looking background pixmaps. Needs libXpm) + +if test x$support_afterimage = xyes; then + AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing) fi + +if test x$support_afterstep = xyes; then + AC_DEFINE(AFTERSTEP_INTEGRATION, 1, Define if you want to integrate with AfterStep window manager) +fi + if test x$support_scroll_rxvt = xyes; then AC_DEFINE(RXVT_SCROLLBAR, 1, Support Rxvt original style scrollbars) scrolltypes="rxvt" @@ -889,14 +952,6 @@ support_frills=yes fi -dnl> AC_CHECK_FUNCS(gettimeofday putenv select socket) - -CFLAGS=${CFLAGS--O} -LDFLAGS=${LDFLAGS--O} - -CPPFLAGS="$CPPFLAGS" -AC_SUBST(DEBUG) -AC_SUBST(DINCLUDE) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) @@ -904,17 +959,18 @@ dnl# Attack the libs if test x$rxvt_cv_rpath = xyes -o x$rxvt_cv_R = xyes; then - DLIB=`echo $DLIB | sed "$R_TRANSLATE"` LIBS=`echo $LIBS | sed "$R_TRANSLATE"` X_LIBS=`echo $X_LIBS | sed "$R_TRANSLATE"` X_EXTRA_LIBS=`echo $X_EXTRA_LIBS | sed "$R_TRANSLATE"` XPM_LIBS=`echo $XPM_LIBS | sed "$R_TRANSLATE"` fi -AC_SUBST(DLIB) AC_SUBST(LIBS) AC_SUBST(X_LIBS) AC_SUBST(X_EXTRA_LIBS) +AC_SUBST(LIBAFTERIMAGE_CFLAGS) +AC_SUBST(AFTERIMAGE_LIBS) + AC_ARG_PROGRAM dnl# test for "sun" or "__sun__" before include sys_ioctl @@ -955,13 +1011,21 @@ Source code location: $srcdir Install path: ${prefix}/bin Compiler: $CXX - Compiler flags: $CFLAGS + Compiler flags: $CXXFLAGS Linker: $LINKER" if test x$support_xpm = xyes; then echo " Xpm library: $XPM_LIBS" fi +if test x$support_afterimage = xyes; then + echo " AfterImage support: yes" +fi + +if test x$support_afterstep = xyes; then + echo " AfterStep integration: yes" +fi + if test x$term != x; then echo " set TERM to: $term" fi @@ -994,17 +1058,6 @@ echo ".----------------------------------------------------------------." fi -echo " *** Optionally check src/feature.h for further options ***" -echo - -echo ".----------------------------------------------------------------." -echo ". NOTE: some features are disabled by default, try ." -echo ". configure --help to get an idea of the optional features, ." -echo ". or read ./README.configure ." -echo ". ." -echo ". The script ./reconf gives a reasonable baseline, try it if ." -echo ". you do not want to read documentation and still want some ." -echo ". useful features. ." -echo ".----------------------------------------------------------------." +echo "*** Optionally check src/feature.h for further, rarely used options ***" echo