$NetBSD: patch-ad,v 1.3 2000/09/07 00:35:48 dmcmahill Exp $

--- configure.orig	Wed Apr 15 03:57:51 1998
+++ configure	Wed Sep  6 20:17:41 2000
@@ -1809,5 +1809,5 @@
 fi
 
-LIBS="$extra_libraries -L/usr/local/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
+LIBS="$extra_libraries -L${X11BASE}/lib -Wl,-R${X11BASE}/lib $X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lm"
 CPPFLAGS="$extra_includes $CPPFLAGS $X_CFLAGS"
 
@@ -2910,7 +2910,7 @@
 
 
-ac_safe=`echo "forms.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for forms.h""... $ac_c" 1>&6
-echo "configure:2915: checking for forms.h" >&5
+ac_safe=`echo "X11/forms.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for X11/forms.h""... $ac_c" 1>&6
+echo "configure:2915: checking for X11/forms.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2919,5 +2919,5 @@
 #line 2920 "configure"
 #include "confdefs.h"
-#include <forms.h>
+#include <X11/forms.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -2943,5 +2943,5 @@
  
 xfmail_error_txt="$xfmail_error_txt
-** Can't find forms.h. Please check that
+** Can't find X11/forms.h. Please check that
    the libforms library is installed correctly on your system.
 "
@@ -2949,5 +2949,5 @@
 fi
 
-if test $ac_cv_header_forms_h = yes; then
+if test $ac_cv_header_X11_forms_h = yes; then
   echo $ac_n "checking xforms library version""... $ac_c" 1>&6
 echo "configure:2954: checking xforms library version" >&5
@@ -2959,5 +2959,5 @@
 #include "confdefs.h"
 
-#include <forms.h>
+#include <X11/forms.h>
 #if ! defined(FL_INCLUDE_VERSION)
 %%%old!%%%