From: root <root>
Date: Wed, 4 Jan 2006 05:12:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=efd7fa1f11099f963662a22ee6df1884b62154f2;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index d6c1c68f..8663b3be 100644
--- a/Changes
+++ b/Changes
@@ -9,9 +9,9 @@ WISH: OnTheSpot editing, or maybe switch to miiiiiiif
 WISH: just for fun, do shade and tint with XRender.
 WISH: make builtin character glyphs optional
 
-SECURITY FIX: systems using openpty (most BSDs) had wrong permissions
-on the tty. Systems using unix pty's (such as GNU/Linux) were not
-affected. Apart from this, the meta8 option is no longer forcefully
+SECURITY FIX: systems using openpty (most BSDs) had wrong permissions on
+the tty. Other systems (such as GNU/Linux) were not affected. Bug fixes:
+the meta8 option ("weird alt key behaviour") is no longer forcefully
 enabled. New features: urxvt now supports embedded perl, which can already
 do useful things and will certainly be extended in the future.
 
@@ -19,8 +19,9 @@ do useful things and will certainly be extended in the future.
         - SECURITY FIX: on systems using openpty, permissions were
           not correctly updated on the tty device and were left as
           world-readable and world-writable (likely in original rxvt,
-          too), and were not restored properly. Affected are only systems
-          using non-unix ptys (such as most BSDs, not GNU/Linux).
+          too), and were not restored properly. Affected are only
+          systems where non-unix ptys were used (such as most BSDs, not
+          GNU/Linux). (found, patched and debugged by Ryan Beasley).
         - meta8 support was forcefully enabled in most configurations.
           restored configurability of this (useless) feature (reported
           by Mikachu).
diff --git a/autoconf/configure.in b/autoconf/configure.in
index 410c76a1..ab316d7c 100644
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -101,7 +101,7 @@ MALLOC_TYPE=S
 
 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_next=yes
 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 @@ if test x$support_perl = xyes; then
 
   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 <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
+],[
+     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)
diff --git a/configure b/configure
index 01457317..1cbc3657 100755
--- a/configure
+++ b/configure
@@ -4322,7 +4322,7 @@ MALLOC_TYPE=S
 
 support_addstrings=no
 support_frills=yes
-support_inheritpixmap=no
+support_inheritpixmap=yes
 support_tinting=yes
 support_fading=yes
 support_keepscrolling=yes
@@ -4340,14 +4340,14 @@ support_scroll_next=yes
 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
 
 
@@ -12741,21 +12741,87 @@ fi
 echo $ECHO_N "checking for $PERL suitability... $ECHO_C" >&6
   if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
 
+     save_CXXFLAGS="$CXXFLAGS"
+     save_LIBS="$LIBS"
+     CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`"
+     LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`"
+     cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+#include <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
+
+int
+main ()
+{
+
+     PerlInterpreter *perl = perl_alloc ();
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  rxvt_perl_link=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+rxvt_perl_link=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+     CXXFLAGS="$save_CXXFLAGS"
+     LIBS="$save_LIBS"
+
+     if test x$rxvt_perl_link = xyes; then
+        echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6
+
 cat >>confdefs.h <<\_ACEOF
 #define ENABLE_PERL 1
 _ACEOF
 
-     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}'`"
-     echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
+        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
+        echo "$as_me:$LINENO: result: no, unable to link" >&5
+echo "${ECHO_T}no, unable to link" >&6
+     fi
   else
      { { echo "$as_me:$LINENO: error: no working perl found" >&5
 echo "$as_me: error: no working perl found" >&2;}
    { (exit or perl not version >= 5.8); exit or perl not version >= 5.8; }; }
+     support_perl=no
   fi
 fi
 
diff --git a/reconf b/reconf
index a561e7ad..915e2ab8 100755
--- a/reconf
+++ b/reconf
@@ -11,5 +11,5 @@ if [ "x$HOSTNAME" = xcerebro -o "x$HOSTNAME" = xfuji ]; then
 fi
 
 ./configure --prefix=/opt/rxvt --with-name=rxvt --enable-perl \
-            --enable-transparency --enable-menubar --enable-xpm-background --enable-xgetdefault \
+            --enable-menubar --enable-xgetdefault \
             "$@"