$NetBSD: patch-aa,v 1.7 2001/05/01 16:43:40 jlam Exp $

--- configs/netbsd-g++-static.orig	Fri Feb 26 12:02:07 1999
+++ configs/netbsd-g++-static
@@ -1,5 +1,6 @@
 # Compiling
-SYSCONF_CXX		= g++
+SYSCONF_CXX		= c++
+SYSCONF_CXX_LIB		= $(LIBTOOL) --mode=compile c++
 
 # Compiling with support libraries
 SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
@@ -14,8 +15,8 @@
 SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
 SYSCONF_LIBS_X11	= -lX11 -lXext
 # Qt, Qt+OpenGL
-SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
-SYSCONF_LIBS_QT		= -lqt
+SYSCONF_LFLAGS_QT	= 
+SYSCONF_LIBS_QT		= $(QTDIR)/src/libqt.la
 SYSCONF_LIBS_QT_OPENGL	= -lqgl
 # OpenGL
 SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
@@ -24,38 +25,24 @@
 SYSCONF_LIBS_YACC	= 
 
 # Linking applications
-SYSCONF_LINK		= g++
+SYSCONF_LINK		= $(LIBTOOL) --mode=link c++
 SYSCONF_LFLAGS		= 
 SYSCONF_LIBS		= 
 
-# Link flags shared objects
-SYSCONF_LFLAGS_SHOBJ	= -Bshareable
-
 # Meta-object compiler
 SYSCONF_MOC		= $(QTDIR)/bin/moc
 
-# Linking shared libraries
-#   - Build the $(TARGET) library, eg. lib$(TARGET).so.0.0
-#   - Place target in $(DESTDIR) - which has a trailing /
-#   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
-#
-SYSCONF_LINK_SHLIB	= ld
-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-SYSCONF_LINK_LIB_SHARED	= $(SYSCONF_LINK_SHLIB) -Bshareable $(LFLAGS) -o $(DESTDIR)$(SYSCONF_LINK_TARGET_SHARED) `lorder /usr/lib/c++rt0.o $(OBJECTS) $(OBJMOC) | tsort` $(LIBS)
-
-# Linking static libraries
+# Linking libtool libraries
 #   - Build the $(TARGET) library, eg. lib$(TARGET).a
 #   - Place target in $(DESTDIR) - which has a trailing /
 #
-SYSCONF_AR		= ar cqs
-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
-SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
-				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+SYSCONF_LINK_TARGET = lib$(TARGET).la
+SYSCONF_LINK_LIB	= rm -f $(SYSCONF_LINK_TARGET) ; \
+	$(LIBTOOL) --mode=link c++ -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
+	-o $(SYSCONF_LINK_TARGET) $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) 
 # Compiling application source
-SYSCONF_CXXFLAGS	= -O2 -fno-strength-reduce
+SYSCONF_CXXFLAGS	= ${CXXOPTS} -fno-strength-reduce
 # Compiling library source
-SYSCONF_CXXFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
+SYSCONF_CXXFLAGS_LIB	=
 # Compiling shared-object source
-SYSCONF_CXXFLAGS_SHOBJ	= -O2 -fno-strength-reduce -fPIC
-SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
-SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+SYSCONF_CXXFLAGS_SHOBJ	= ${CXXOPTS} -fno-strength-reduce