$NetBSD: patch-aa,v 1.5 1999/04/27 20:33:58 tron Exp $

--- Imakefile.orig	Thu Mar  5 04:19:56 1998
+++ Imakefile	Sun Jun 28 18:56:38 1998
@@ -60,6 +60,20 @@
     EXTRASYSLIBS = -ldl
 #endif
 
+EXTINCSRC=	$(X11BASE)/include/X11/extensions
+SERVERSRC=	../../..
+XINCLUDESRC=	$(X11BASE)/include/X11
+
+TCLLIBDIR=	$(LOCALBASE)/lib
+TCLINCDIR=	$(LOCALBASE)/include/tcl8.0
+TCLLIBNAME=	tcl80
+TCLLIBRARY=	-L$(TCLLIBDIR) -l$(TCLLIBNAME)
+
+TKLIBDIR=	$(LOCALBASE)/lib
+TKINCDIR=	$(LOCALBASE)/include/tk8.0
+TKLIBNAME=	tk80
+TKLIBRARY=	-L$(TKLIBDIR) -l$(TKLIBNAME)
+
 #if XF86SetupUsesStaticTk
        TKLIBRARY = StaticLibrary($(TKLIBDIR),$(TKLIBNAME))
 #endif
@@ -82,7 +96,7 @@
 
  XF86SETUPLIBDIR = $(LIBDIR)/XF86Setup
          DEFINES = -DCARD_DATABASE_FILE='"$(CARDDBFILE)"' \
-		   $(XCONFIG_DEFINES)
+		   $(XCONFIG_DEFINES) `cat res_cpp_symbol`
         INCLUDES = -I../os-support -I../common \
 		   -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(INCLUDESRC) \
 		   -I$(EXTINCSRC) $(USEINSTALLEDINC) \
@@ -119,3 +133,5 @@
 
 #endif
 
+depend:: res_cpp_symbol
+	-sh ./configure