 +BEOSGUI_DEFS	= -DFEAT_GUI_BEOS
 +BEOSGUI_IPATH	=
 +BEOSGUI_LIBS_DIR =
-+BEOSGUI_LIBS1	= -lbe -lroot -ltracker -lsupc++ -ltranslation
-+#BEOSGUI_LIBS1	= -lbe -lroot -ltracker -ltranslation
++BEOSGUI_LIBS1	= -lbe -lroot -ltracker -ltranslation
++ifeq ($(strip $(word 1, $(subst -, , $(subst ., , $(shell $(CC) -dumpversion))))), 4)
++BEOSGUI_LIBS1	+= -lsupc++
++endif
 +BEOSGUI_LIBS2	=
 +BEOSGUI_INSTALL = install_normal install_beos_extra
 +BEOSGUI_TARGETS	= installglinks_beos

 objects/gui_beval.o: gui_beval.c
 	$(CCC) -o $@ gui_beval.c
 
@@ -2585,6 +2603,9 @@
 objects/os_beos.o: os_beos.c
 	$(CCC) -o $@ os_beos.c
 

diff -Naur vim73/src/Makefile vim73.haiku/src/Makefile
--- vim73/src/Makefile	2010-08-15 12:56:15.017301504 +0000
+++ vim73.haiku/src/Makefile	2010-08-20 23:27:51.707264512 +0000
@@ -1242,6 +1242,23 @@
 # too:
 #EXTRA_LIBS = /usr/openwin/lib/libXmu.sa -lm
 
