$NetBSD: patch-ac,v 1.5 2002/08/25 18:40:44 jlam Exp $

--- configs/solaris-g++-static.in.orig	Wed Jun 13 04:56:50 2001
+++ configs/solaris-g++-static.in
@@ -2,31 +2,32 @@
 INTERFACE_DECL_PATH 	= .
 SYSCONF_CXX		= g++
 SYSCONF_CC		= gcc
+SYSCONF_CXX_LIB		= $(LIBTOOL) --mode=compile g++
 DASHCROSS		= 
 
 # Compiling with support libraries
-SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
+SYSCONF_CXXFLAGS_X11	= -I@X11BASE@/include
 SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
-SYSCONF_CXXFLAGS_OPENGL	= 
+SYSCONF_CXXFLAGS_OPENGL	= -I@LOCALBASE@/include -I@X11BASE@/include
 
 # Compiling YACC output
 SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
 
 # Linking with support libraries
-SYSCONF_RPATH_X11	= -Wl,-R,/usr/openwin/lib
-SYSCONF_RPATH_QT	= -Wl,-R,$(QTDIR)/lib
-SYSCONF_RPATH_OPENGL	= 
+SYSCONF_RPATH_X11	= -Wl,-R,@X11BASE@/lib
+SYSCONF_RPATH_QT	= -Wl,-R,@QTDIR@/lib
+SYSCONF_RPATH_OPENGL	= -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib
 
 # Linking with support libraries
 # X11
-SYSCONF_LFLAGS_X11	= -L/usr/openwin/lib
+SYSCONF_LFLAGS_X11	= -L@X11BASE@/lib
 SYSCONF_LIBS_X11	= -lXext -lX11 -lm -lresolv -lsocket -lnsl
 # Qt, Qt+OpenGL
 SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
 SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
 SYSCONF_LIBS_QT_OPENGL	= 
 # OpenGL
-SYSCONF_LFLAGS_OPENGL	= 
+SYSCONF_LFLAGS_OPENGL	= -L@LOCALBASE@/lib -L@X11BASE@/lib
 SYSCONF_LIBS_OPENGL	= -lGLU -lGL -lXmu
 # Yacc
 SYSCONF_LIBS_YACC	= 
@@ -77,13 +78,13 @@
 SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
 # Compiling application source
-SYSCONF_CXXFLAGS	= -O2
-SYSCONF_CFLAGS		= -O2
+#SYSCONF_CXXFLAGS	= -O2
+#SYSCONF_CFLAGS		= -O2
 SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
 SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
 # Compiling library source
-SYSCONF_CXXFLAGS_LIB	=
-SYSCONF_CFLAGS_LIB	=
+#SYSCONF_CXXFLAGS_LIB	=
+#SYSCONF_CFLAGS_LIB	=
 # Compiling shared-object source
 SYSCONF_CXXFLAGS_SHOBJ	= -fPIC
 SYSCONF_CFLAGS_SHOBJ	= -fPIC