From: ayin <ayin>
Date: Wed, 13 Jun 2007 12:34:32 +0000 (+0000)
Subject: rxvtc needs only the c++ lib.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4b2835f24a464a20e16b170c738fa542ffa017a3;p=dana%2Furxvt.git

rxvtc needs only the c++ lib.
---

diff --git a/configure.ac b/configure.ac
index 2f591eb1..0a22899d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,10 @@ 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)],
+      [
+         AC_MSG_RESULT(ok)
+         CXXLIB="-lsupc++"
+      ],
       [
          AC_MSG_RESULT([no, making everything bigger and slower])
          LIBS="$save_LIBS"
@@ -58,6 +61,7 @@ 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 edbd4d0e..9e8955f1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -24,6 +24,7 @@ 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) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $(DEBUG) $(XINC) -I.. -I$(srcdir) -I.
 LINK = @LINKER@ $(LDFLAGS)
 
@@ -81,8 +82,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 $(LIBS)
-#	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(LIBS) -o $@
+	$(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass.o $(CXXLIB)
+#	$(LIBTOOL) --mode=link $(LINK) rxvtc.o rxvtdaemon.o $(CXXLIB) -o $@
 
 #librxvt.la: $(LIBOBJS)
 #	$(LIBTOOL) --mode=link $(LINK) -rpath $(libdir) -version-info $(LIBVERSION) $(LIBOBJS) $(LIBS) -o $@