*** empty log message ***

diff --git a/autoconf/Make.common.in b/autoconf/Make.common.in
index d2cee058ac2d1299d6ec17d60e6e37d76b28a78e..58917a73c46d2efe5a5fdaad5cf5e0ec549240ae 100644 (file)
--- a/autoconf/Make.common.in
+++ b/autoconf/Make.common.in
@@ -43,7 +43,7 @@ INSTALL_DATA = @INSTALL@ -m 644
 # Flags & libs
 # add -DBINDIR=\""$(bindir)/"\" to CPPFLAGS, if we need to spawn a program
 
-CFLAGS = @CFLAGS@ 
+CXXFLAGS = @CXXFLAGS@ 
 CPPFLAGS = @CPPFLAGS@ @XPM_CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@
@@ -57,8 +57,8 @@ XINC = @X_CFLAGS@ @XPM_CFLAGS@
 # extra libraries needed by X on some systems, X library location
 XLIB = @X_LIBS@ @XPM_LIBS@ -lX11 @X_EXTRA_LIBS@
 
-COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
-LINK = @LINKER@ $(CFLAGS) $(LDFLAGS)
+COMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I.
+LINK = @LINKER@ $(LDFLAGS)
 
 # End of common section of the Makefile
 #-------------------------------------------------------------------------

diff --git a/autoconf/configure.in b/autoconf/configure.in
index ab316d7cc4a8b04e9d7a2d951c93fa07d6f00e4c..847d913469357afec410cd8c1a5e715a00642863 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -1274,7 +1274,6 @@ dnl# now add and remove other stuff
 dnl# --------------------------------------------------------------------------
 if test x$support_xft = xyes; then
   LIBS="$LIBS `pkg-config xft --libs`"
-  CFLAGS="$CFLAGS `pkg-config xft --cflags`"
   CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
 
   AC_CHECK_HEADERS(X11/Xft/Xft.h,,[support_xft=no])

diff --git a/configure b/configure
index 1cbc3657273bd6e03d4b93f2b96d9f05dd1a8eb9..f0d78bd5fe0e670cf3ea999a3a2dce617f3f36d1 100755 (executable)
--- a/configure
+++ b/configure
@@ -12187,7 +12187,6 @@ fi
 
 if test x$support_xft = xyes; then
   LIBS="$LIBS `pkg-config xft --libs`"
-  CFLAGS="$CFLAGS `pkg-config xft --cflags`"
   CPPFLAGS="$CPPFLAGS `pkg-config xft --cflags`"
 
 

diff --git a/reconf b/reconf
index 915e2ab8356a0d47ac454e50e302b14d4829e2e2..357d73da2972d452fd227fa450684482ceada141 100755 (executable)
--- a/reconf
+++ b/reconf
@@ -10,6 +10,6 @@ if [ "x$HOSTNAME" = xcerebro -o "x$HOSTNAME" = xfuji ]; then
    export CC CXX
 fi
 
-./configure --prefix=/opt/rxvt --with-name=rxvt --enable-perl \
+./configure --prefix=/opt/rxvt --with-name=rxvt \
             --enable-menubar --enable-xgetdefault \
             "$@"

diff --git a/src/screen.C b/src/screen.C
index 85cc0cd932f1ed199132c00ef4102bda6c886e72..93d27d3db598c773babf9e95cc98d4ca4678aa28 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -3138,7 +3138,6 @@ rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, r
       break;
     }
 
-Old_Word_Selection_You_Die:
   if (dirn == DN)
     col++;                  /* put us on one past the end */