$NetBSD: patch-aa,v 1.2 2000/10/06 14:05:50 agc Exp $

--- ../configure.orig	Wed Apr 19 14:33:08 2000
+++ ../configure	Sat Jun 17 20:50:20 2000
@@ -1659,57 +1659,14 @@
   :
 fi
 
-if test "$with_included_jpeg" != "yes" ; then
-    echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
-echo "configure:1665: checking for libjpeg version = 6b" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 1667 "configure"
-#include "confdefs.h"
-#include <jpeglib.h>
-         x JPEG_LIB_VERSION x
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "x 62  x" >/dev/null 2>&1; then
-  rm -rf conftest*
-          echo "$ac_t""yes" 1>&6
         LIBJPEG='-ljpeg'
         MAKEJPEG='#'
-else
-  rm -rf conftest*
-          echo "$ac_t""no" 1>&6
-        LIBJPEG='../libjpeg.a'              
-fi
-rm -f conftest*
+	JPEGINCL=-I${LOCALBASE}/include
 
-    echo $ac_n "checking for libpng version = 1.0.1""... $ac_c" 1>&6
-echo "configure:1686: checking for libpng version = 1.0.1" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 1688 "configure"
-#include "confdefs.h"
-#include <png.h>
-	x PNG_LIBPNG_VER_STRING x
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "x \"1.0.1\"  x" >/dev/null 2>&1; then
-  rm -rf conftest*
-          echo "$ac_t""yes" 1>&6
         LIBPNG='-lpng'
         LIBZ=''
 	MAKEPNG='#'
-else
-  rm -rf conftest*
-          echo "$ac_t""no" 1>&6
-        LIBPNG='../libpng.a'
-        LIBZ='../libz.a'
-        
-fi
-rm -f conftest*
-
-else
-    LIBJPEG='../libjpeg.a'
-    LIBPNG='../libpng.a'
-    LIBZ='../libz.a'
-fi
+	PNGINCL=-I${LOCALBASE}/include
 
 
 
@@ -6220,6 +6177,7 @@
     /usr/local/lesstif/include\
     /usr/gnu/lesstif/include  \
     $HOME/lesstif/include     \
+    $MOTIFBASE/include		\
     ; \
   do
     if test -r "$ac_dir/$motif_direct_test_include"; then
@@ -6271,6 +6229,7 @@
     /usr/local/lesstif/lib\
     /usr/gnu/lesstif/lib  \
     $HOME/lesstif/lib     \
+    $MOTIFBASE/lib		\
     ; \
 do
   for ac_extension in a so sl; do