--- configure.orig	Tue Jan 19 07:04:57 1999
+++ configure	Thu Jan 21 14:27:55 1999
@@ -4873,7 +4873,9 @@
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  ac_save_LIBS="$LIBS"
+LIBS="-lintl $LIBS"
+cat > conftest.$ac_ext <<EOF
 #line 4878 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -6059,7 +6061,9 @@
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
+  ac_save_LIBS="$LIBS"
+LIBS="-lutil $LIBS"
+cat > conftest.$ac_ext <<EOF
 #line 6064 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -6114,8 +6118,8 @@
 #include "confdefs.h"
 
 #include <stdio.h>
-#include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/socket.h>
 
 int main() {
 
@@ -6613,7 +6617,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -ljpeg -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 6619 "configure"
 #include "confdefs.h"
@@ -6867,16 +6871,16 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:6873: 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:6873: 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 6878 "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:6883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -6943,16 +6947,16 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:6949: 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:6949: 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 6954 "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:6959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
@@ -9892,7 +9896,7 @@
 ZVT_LIBS="-lzvt $GTK_LIBS"
 
 GNOME_LIBDIR='-L${libdir}'
-GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
+GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H'
 GNOME_IDLDIR='-I${datadir}/idl'