--- configure.orig	Sat Jul 18 10:57:31 1998
+++ configure	Sun Jul 19 01:53:34 1998
@@ -1699,143 +1699,6 @@
   rm -f conf.gtktest
 
 
-
-
-# Extract the first word of "djpeg", so it can be a program name with args.
-set dummy djpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1708: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$DJPEG_PROG" in
-  /*)
-  ac_cv_path_DJPEG_PROG="$DJPEG_PROG" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_DJPEG_PROG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-DJPEG_PROG="$ac_cv_path_DJPEG_PROG"
-if test -n "$DJPEG_PROG"; then
-  echo "$ac_t""$DJPEG_PROG" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "cjpeg", so it can be a program name with args.
-set dummy cjpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1739: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$CJPEG_PROG" in
-  /*)
-  ac_cv_path_CJPEG_PROG="$CJPEG_PROG" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_CJPEG_PROG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-CJPEG_PROG="$ac_cv_path_CJPEG_PROG"
-if test -n "$CJPEG_PROG"; then
-  echo "$ac_t""$CJPEG_PROG" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-# Extract the first word of "convert", so it can be a program name with args.
-set dummy convert; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1771: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$CONVERT_PROG" in
-  /*)
-  ac_cv_path_CONVERT_PROG="$CONVERT_PROG" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_CONVERT_PROG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-CONVERT_PROG="$ac_cv_path_CONVERT_PROG"
-if test -n "$CONVERT_PROG"; then
-  echo "$ac_t""$CONVERT_PROG" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo "CONVERT_PROG is $CONVERT_PROG"
-CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'`
-echo "CONVERT_PATH is $CONVERT_PATH"
-
-
-# Extract the first word of "giftopnm", so it can be a program name with args.
-set dummy giftopnm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1807: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GIFTOPNM_PROG" in
-  /*)
-  ac_cv_path_GIFTOPNM_PROG="$GIFTOPNM_PROG" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GIFTOPNM_PROG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-GIFTOPNM_PROG="$ac_cv_path_GIFTOPNM_PROG"
-if test -n "$GIFTOPNM_PROG"; then
-  echo "$ac_t""$GIFTOPNM_PROG" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-echo "GIFTOPNM_PROG is $GIFTOPNM_PROG"
-NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'`
-echo "NETPBM_PATH is $NETPBM_PATH"
-
-
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 echo "configure:1841: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
@@ -3770,16 +3633,16 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:3776: checking for tiffio.h" >&5
+  ac_safe=`echo "tiff34/tiffio.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for tiff34/tiffio.h""... $ac_c" 1>&6
+echo "configure:3776: checking for tiff34/tiffio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 #line 3781 "configure"
 #include "confdefs.h"
-#include <tiffio.h>
+#include <tiff34/tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:3786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -3818,16 +3681,16 @@
 
 
 
-ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:3824: checking for gif_lib.h" >&5
+ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
+echo "configure:3824: checking for giflib/gif_lib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 #line 3829 "configure"
 #include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:3834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }