$NetBSD: patch-aa,v 1.5 2000/07/05 03:39:32 hubertf Exp $

--- configure.orig	Thu Jun 22 22:49:05 2000
+++ configure	Tue Jul  4 04:32:24 2000
@@ -668,7 +668,7 @@
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
@@ -4306,9 +4306,8 @@
 else
   GTK_TEMP_CFLAGS=`echo $GTK_CFLAGS | sed 's/^-I[^ ]* \(.*\)$/\1/'`
 fi
-GLIB_CFLAGS=`echo $GTK_TEMP_CFLAGS | sed 's/^\(-I[^ ]*glib[^ ]*  *-I[^ ]*\).*/\1/'`
-
-GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
+GLIB_CFLAGS=`${LOCALBASE}/bin/glib-config --cflags`
+GLIB_LDFLAGS=`${LOCALBASE}/bin/glib-config --libs`
 if test -z "$GLIB_LDFLAGS" ; then
   GLIB_LDFLAGS=`echo $GTK_LIBS | sed 's/^ *\(-L[^ ]*\) .*$/\1/'`
 fi 
@@ -4671,7 +4670,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 4677 "configure"
 #include "confdefs.h"
@@ -6915,6 +6914,7 @@
 
 fi  
 
+if false ; then
 # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -6950,6 +6950,7 @@
 else
   echo "$ac_t""no" 1>&6
 fi
+fi	# if false
 
 if test "$GNOME_CONFIG" = "no"; then
     HELPBROWSER=
@@ -7150,7 +7151,7 @@
 
 gimpdatadir=$datadir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
-localedir='${prefix}/${DATADIRNAME}/locale'
+localedir='${prefix}/share/locale'
 
 brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
 gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`