--- configure.orig	Wed Apr 10 12:03:15 2002
+++ configure	Sun Apr 14 20:35:36 2002
@@ -2022,7 +2022,7 @@
 	OpenBSD | FreeBSD | NetBSD)
 		# *BSD has important stuff (from ports)
 		# in /usr/local ...
-		CFLAGS="$CFLAGS -I/usr/local/include -L/usr/local/lib"
+		CFLAGS="$CFLAGS -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib"
 		FOUND_OS="bsd"
 		;;
 	*)
@@ -2585,10 +2585,10 @@
 /usr/XFree86/include/X11
 
 /usr/include
-/usr/local/include
+%%LOCALBASE%%/include
 /usr/unsupported/include
 /usr/athena/include
-/usr/local/x11r5/include
+%%LOCALBASE%%/x11r5/include
 /usr/lpp/Xamples/include
 
 /usr/openwin/include
@@ -4374,19 +4374,13 @@
 
 echo "$as_me:4375: checking for X11 config directory" >&5
 echo $ECHO_N "checking for X11 config directory... $ECHO_C" >&6
-x11conf=/usr/X11R6/lib/X11
-if test -d /etc/X11; then
-	x11conf=/etc/X11
-fi
+x11conf=%%X11BASE%%/lib/X11
 echo "$as_me:4381: result: $x11conf" >&5
 echo "${ECHO_T}$x11conf" >&6
 
 echo "$as_me:4384: checking for X11 app-defaults directory" >&5
 echo $ECHO_N "checking for X11 app-defaults directory... $ECHO_C" >&6
-resdir=/usr/X11R6/lib/X11
-if test -d /etc/X11/app-defaults; then
-	resdir=/etc/X11
-fi
+resdir=%%X11BASE%%/lib/X11
 echo "$as_me:4390: result: $resdir/app-defaults" >&5
 echo "${ECHO_T}$resdir/app-defaults" >&6
 
