$NetBSD: patch-aa,v 1.12 2004/05/04 08:08:19 wiz Exp $

--- configure.orig	2000-07-03 16:31:57.000000000 +0200
+++ configure
@@ -3543,6 +3543,11 @@ fi
 
 
 
+# Set DATADIRNAME to "${PKGLOCALEDIR}"
+DATADIRNAME="${PKGLOCALEDIR}"
+INTLDEPS=
+INTLLIBS="-lintl"
+
 cc_uses_g=yes
 if test x$GCC = xyes; then
     if test x$ac_cv_prog_gcc_g = xyes; then
@@ -9409,11 +9414,15 @@ fi
 
 
 	# Check whether --with-gnome or --without-gnome was given.
+gnomecodedirs=
+gnomeunixdirs=
 if test "${with_gnome+set}" = set; then
   withval="$with_gnome"
   if test x$withval = xyes; then
 	    		want_gnome=yes
 	    						    		
+	gnomecodedirs='gnome idl'
+	gnomeunixdirs='doc-gnome'
 	mx=mx
  	gmcdep=gmcdep
 	libgtkedit="libgtkedit.a"
@@ -10682,7 +10691,6 @@ EOF
 	LIBEDIT_A="libedit.a"
 	MCEDIT="mcedit"
 	LEDIT="-ledit"
-	CPPFLAGS="$CPPFLAGS -I\$(rootdir)"
 	EDIT_msg="yes"
 	echo "$ac_t""will call internal editor" 1>&6
 
@@ -10698,7 +10706,6 @@ EOF
 	LIBEDIT_A="libedit.a"
 	MCEDIT="mcedit"
 	LEDIT="-ledit"
-	CPPFLAGS="$CPPFLAGS -I\$(rootdir)"
 	EDIT_msg="yes"
 	echo "$ac_t""will call internal editor" 1>&6
 
@@ -11891,6 +11898,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@LOCALBASE@%$LOCALBASE%g
 s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
@@ -12019,6 +12027,8 @@ s%@GNOME_APPLETS_LIBS@%$GNOME_APPLETS_LI
 s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g
 s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
 s%@gnomeicondir@%$gnomeicondir%g
+s%@gnomecodedirs@%$gnomecodedirs%g
+s%@gnomeunixdirs@%$gnomeunixdirs%g
 s%@mx@%$mx%g
 s%@gmcdep@%$gmcdep%g
 s%@libgtkedit@%$libgtkedit%g