--- rxvt-unicode/autoconf/configure.in 2006/01/02 18:25:03 1.61 +++ rxvt-unicode/autoconf/configure.in 2006/01/04 05:12:04 1.62 @@ -101,7 +101,7 @@ support_addstrings=no support_frills=yes -support_inheritpixmap=no +support_inheritpixmap=yes support_tinting=yes support_fading=yes support_keepscrolling=yes @@ -119,14 +119,14 @@ support_scroll_xterm=yes support_scroll_plain=yes support_xim=yes -support_xpm=no +support_xpm=yes support_xft=yes support_unicode3=no support_combining=yes support_8bitctrls=no support_iso14755=yes support_styles=yes -support_perl=no +support_perl=yes codesets=all dnl# -------------------------------------------------------------------------- @@ -1390,15 +1390,36 @@ AC_MSG_CHECKING(for $PERL suitability) if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then - AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) - IF_PERL= - PERL_O=rxvtperl.o - PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" - PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" - PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" - AC_MSG_RESULT(ok) + + save_CXXFLAGS="$CXXFLAGS" + save_LIBS="$LIBS" + CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" + LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" + AC_TRY_LINK([ +#include +#include +#include +],[ + PerlInterpreter *perl = perl_alloc (); +],[rxvt_perl_link=yes],[rxvt_perl_link=no]) + CXXFLAGS="$save_CXXFLAGS" + LIBS="$save_LIBS" + + if test x$rxvt_perl_link = xyes; then + AC_MSG_RESULT(ok) + AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) + IF_PERL= + PERL_O=rxvtperl.o + PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" + PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" + PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" + else + support_perl=no + AC_MSG_RESULT([no, unable to link]) + fi else AC_MSG_ERROR(no working perl found, or perl not version >= 5.8) + support_perl=no fi fi AC_SUBST(PERLLIB)