From 5d6c471d853664b1b173a590527145b703183666 Mon Sep 17 00:00:00 2001
From: ayin <ayin>
Date: Tue, 26 Jun 2007 21:59:13 +0000
Subject: [PATCH] *** empty log message ***

---
 configure.ac    | 6 +-----
 src/Makefile.in | 5 ++---
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index b55ba947..bae1d8dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,10 +48,7 @@ if test x$GCC = xyes && test x$GXX = xyes; then
    LINKER="$CC"
    AC_LINK_IFELSE(
       [AC_LANG_PROGRAM([struct test { }; void f() try { throw new test; } catch (...) { throw; }],[])],
-      [
-         AC_MSG_RESULT(ok)
-         CXXLIB="-lsupc++"
-      ],
+      [AC_MSG_RESULT(ok)],
       [
          AC_MSG_RESULT([no, making everything bigger and slower])
          LIBS="$save_LIBS"
@@ -61,7 +58,6 @@ if test x$GCC = xyes && test x$GXX = xyes; then
    CXX="$save_CXX"
 fi
 AC_SUBST(LINKER,[$LINKER])
-AC_SUBST(CXXLIB)
 
 dnl# --------------------------------------------------------------------------
 dnl# Supply default CXXFLAGS, if not specified by `CXXFLAGS=flags ./configure'
diff --git a/src/Makefile.in b/src/Makefile.in
index 871c9a0f..d2f2cac2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -21,7 +21,6 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 XINC = @X_CFLAGS@ @XPM_CFLAGS@  @LIBAFTERIMAGE_CFLAGS@
 XLIB = @X_LIBS@ @XPM_LIBS@  @AFTERIMAGE_LIBS@ -lX11 @X_EXTRA_LIBS@
-CXXLIB = @CXXLIB@
 COMPILE = $(CXX) $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(XINC) -I.. -I$(srcdir) -I.
 LINK = @LINKER@ $(LDFLAGS)
 
@@ -79,8 +78,8 @@ rxvtd: rxvtd.o $(COMMON) $(COMMON_DAEMON)
 #	$(LIBTOOL) --mode=link $(LINK) rxvtd.o rxvtdaemon.o librxvt.la $(LIBS) $(XLIB) -o $@
 
 rxvtc: rxvtc.o $(COMMON_DAEMON) fdpass.o
-	$(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o $(CXXLIB)
-#	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(CXXLIB) -o $@
+	$(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o $(LIBS)
+#	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) -o $@
 
 #librxvt.la: $(LIBOBJS)
 #	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@
-- 
2.34.1