diff -ruN gimp-1.0.3/ChangeLog gimp-1.0.4/ChangeLog
--- gimp-1.0.3/ChangeLog	Mon Mar 29 12:34:49 1999
+++ gimp-1.0.4/ChangeLog	Sat Apr  3 21:36:41 1999
@@ -1,3 +1,22 @@
+Sat Apr  3 21:34:22 PST 1999 Manish Singh <yosh@gimp.org>
+
+	* Made 1.0.4 release
+
+	* illusion/illusion.c
+	* whirlpinch/whirlpinch.c: added missing #includes
+
+Wed Mar 31 01:17:38 EST 1999  Matt Wilson  <msw@gimp.org>
+
+	* app/colormaps.c: fix for 8 bit displays
+
+Wed Mar 31 00:33:28 EST 1999  Matt Wilson  <msw@gimp.org>
+
+	* app/commands.[ch]: changed callbacks invoked by ItemFactories to
+	the the correct parameters.  This fixes the following problems:
+	- tool election via hotkeys and right click menu selection
+	- reshow last filter repeating last filter
+	- possible new file dialog problems
+
 Mon Mar 29 11:33:38 PST 1999 Manish Singh <yosh@gimp.org>
 
 	* Made 1.0.3 release
@@ -75,7 +94,7 @@
 
 Mon Mar 15 12:07:59 1999  Owen Taylor  <otaylor@redhat.com>
 
-	* app/menus.[ch] app/gimprc.c app/gradient.c (menus_quit): 
+	* app/menus.[ch] app/gimprc.c app/gradient.c (menus_quit):
 	Merge in menufactory => itemfactory changes from head
 
 Mon Mar 15 11:44:13 1999  Owen Taylor  <otaylor@redhat.com>
diff -ruN gimp-1.0.3/Makefile.in gimp-1.0.4/Makefile.in
--- gimp-1.0.3/Makefile.in	Mon Mar 29 13:12:32 1999
+++ gimp-1.0.4/Makefile.in	Sat Apr  3 22:16:10 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/NEWS gimp-1.0.4/NEWS
--- gimp-1.0.3/NEWS	Mon Mar 29 11:39:16 1999
+++ gimp-1.0.4/NEWS	Tue Mar 30 22:41:07 1999
@@ -1,3 +1,8 @@
+What's new in GIMP 1.0.4
+
+* Fixes in the menu code - hotkey accelerators for tools work again
+* Fixes for 8 bit visual rendering
+
 What's new in GIMP 1.0.3
 
 * GTK+ 1.2 support. Now the GIMP *requires* GTK+ 1.2
diff -ruN gimp-1.0.3/README gimp-1.0.4/README
--- gimp-1.0.3/README	Mon Mar 29 12:29:33 1999
+++ gimp-1.0.4/README	Tue Mar 30 22:41:07 1999
@@ -1,7 +1,7 @@
 The GIMP: the GNU Image Manipulation Program
 --------------------------------------------
 
-The main difference between v1.0.3 and much earlier versions is the
+The main difference between v1.0.4 and much earlier versions is the
 use of a tile based memory management for images. This allows the GIMP
 to work with images much larger than physical memory in a usable
 fashion. Before such memory management, the GIMP was nearly unusable
@@ -54,7 +54,7 @@
 sometime in the future to implement some form of compression for the
 tiles.
 
-The GIMP's home page is at 
+The GIMP's home page is at
 
 	http://www.gimp.org
 
diff -ruN gimp-1.0.3/aclocal.m4 gimp-1.0.4/aclocal.m4
--- gimp-1.0.3/aclocal.m4	Mon Mar 29 12:52:09 1999
+++ gimp-1.0.4/aclocal.m4	Wed Mar 31 18:53:07 1999
@@ -126,28 +126,58 @@
 changequote([,]))])
 
 
-# serial 29 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
+# serial 35 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+
+# Save cache, so that ltconfig can load it
+AC_CACHE_SAVE
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+DLLTOOL="$DLLTOOL" AS="$AS" \
+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+|| AC_MSG_ERROR([libtool configure failed])
+
+# Reload cache, that may have been modified by ltconfig
+AC_CACHE_LOAD
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+AC_DEFUN(AC_LIBTOOL_SETUP,
+[AC_PREREQ(2.13)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([AC_PROG_RANLIB])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AM_SYS_NM_PARSE])dnl
-AC_REQUIRE([AM_SYS_SYMBOL_UNDERSCORE])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_SYS_NM_PARSE])dnl
+AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags=
+libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
 test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
@@ -186,8 +216,8 @@
   fi
   ;;
 
-*-*-cygwin32*)
-  AM_SYS_LIBTOOL_CYGWIN32
+*-*-cygwin*)
+  AC_SYS_LIBTOOL_CYGWIN
   ;;
 
 esac
@@ -202,30 +232,20 @@
 if test x"$need_locks" = xno; then
   libtool_flags="$libtool_flags --disable-lock"
 fi
-
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
 ])
 
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
+# AC_LIBTOOL_DLOPEN - check for dlopen support
+AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes])
+
+# AC_ENABLE_SHARED - implement the --enable-shared flag
+# Usage: AC_ENABLE_SHARED[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_SHARED,
+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(shared,
 changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT],
+<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
 case "$enableval" in
@@ -243,26 +263,22 @@
   IFS="$ac_save_ifs"
   ;;
 esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
+enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
 ])
 
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
+# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+AC_DEFUN(AC_DISABLE_SHARED,
+[AC_ENABLE_SHARED(no)])
 
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
+# AC_ENABLE_STATIC - implement the --enable-static flag
+# Usage: AC_ENABLE_STATIC[(DEFAULT)]
 #   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
 #   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_DEFUN(AC_ENABLE_STATIC,
+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE(static,
 changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT],
+<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
 changequote([, ])dnl
 [p=${PACKAGE-default}
 case "$enableval" in
@@ -280,12 +296,50 @@
   IFS="$ac_save_ifs"
   ;;
 esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
+enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+])
+
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC,
+[AC_ENABLE_STATIC(no)])
+
+
+# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+#   `yes'.
+AC_DEFUN(AC_ENABLE_FAST_INSTALL,
+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+AC_ARG_ENABLE(fast-install,
+changequote(<<, >>)dnl
+<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+changequote([, ])dnl
+[p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+  enable_fast_install=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_fast_install=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac],
+enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
 ])
 
+# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
+AC_DEFUN(AC_DISABLE_FAST_INSTALL,
+[AC_ENABLE_FAST_INSTALL(no)])
+
 
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
+# AC_PROG_LD - find the path to the GNU or non-GNU linker
+AC_DEFUN(AC_PROG_LD,
 [AC_ARG_WITH(gnu-ld,
 [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
@@ -300,47 +354,15 @@
   case "$ac_prog" in
     # Accept absolute paths.
 changequote(,)dnl
-    /* | [A-Za-z]:/*)
-      # Canonicalize the path of ld
+    /* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
 changequote([,])dnl
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
-      ;;
-    ##
-    ## FIXME:  The code fails later on if we try to use an $LD with
-    ##         '\\' path separators.
-    ##
-changequote(,)dnl
-    [A-Za-z]:[\\]*)
       # Canonicalize the path of ld
-      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
-      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
-changequote([,])dnl
-      sub_uncdir='s%\\%/%g'
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
+      test -z "$LD" && LD="$ac_prog"
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -369,7 +391,7 @@
       if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
-        test "$with_gnu_ld" != yes && break
+	test "$with_gnu_ld" != yes && break
       fi
     fi
   done
@@ -385,10 +407,10 @@
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_SUBST(LD)
-AM_PROG_LD_GNU
+AC_PROG_LD_GNU
 ])
 
-AC_DEFUN(AM_PROG_LD_GNU,
+AC_DEFUN(AC_PROG_LD_GNU,
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -398,8 +420,8 @@
 fi])
 ])
 
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
+# AC_PROG_NM - find the path to a BSD-compatible name lister
+AC_DEFUN(AC_PROG_NM,
 [AC_MSG_CHECKING([for BSD-compatible nm])
 AC_CACHE_VAL(ac_cv_path_NM,
 [if test -n "$NM"; then
@@ -407,20 +429,22 @@
   ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/nm; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
+	ac_cv_path_NM="$ac_dir/nm -B"
+	break
       elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
+	ac_cv_path_NM="$ac_dir/nm -p"
+	break
       else
-        ac_cv_path_NM="$ac_dir/nm"
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+	continue # so that we can try to find one that supports BSD flags
       fi
-      break
     fi
   done
   IFS="$ac_save_ifs"
@@ -431,11 +455,11 @@
 AC_SUBST(NM)
 ])
 
-# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
+# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
 # by C symbol name from nm.
-AC_DEFUN(AM_SYS_NM_PARSE,
+AC_DEFUN(AC_SYS_NM_PARSE,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 AC_MSG_CHECKING([command to parse $NM output])
 AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
@@ -444,52 +468,51 @@
 
 changequote(,)dnl
 # Character class describing NM global symbol codes.
-ac_symcode='[BCDEGRSTU]'
+ac_symcode='[BCDEGRST]'
 
 # Regexp to match symbols that can be accessed directly from C.
 ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
 # Transform the above into a raw symbol and a C symbol.
-ac_symxfrm='\1 \1'
+ac_symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
 
 # Define system-specific variables.
 case "$host_os" in
 aix*)
-  ac_symcode='[BCDTU]'
+  ac_symcode='[BCDT]'
   ;;
-sunos* | cygwin32* | mingw32*)
-  ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-  ac_symxfrm='_\1 \1'
+cygwin* | mingw*)
+  ac_symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
   ;;
 irix*)
-  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
   ac_symcode='[BCDEGRST]'
   ;;
 solaris*)
-  ac_symcode='[BDTU]'
+  ac_symcode='[BDT]'
   ;;
 esac
 
 # If we're using GNU nm, then use its standard symbol codes.
 if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  ac_symcode='[ABCDGISTUW]'
-fi
-
-case "$host_os" in
-cygwin32* | mingw32*)
-  # We do not want undefined symbols on cygwin32.  The user must
-  # arrange to define them via -l arguments.
   ac_symcode='[ABCDGISTW]'
-  ;;
-esac
+fi
 changequote([,])dnl
 
-# Write the raw and C identifiers.
-ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
 
-# Check to see that the pipe works correctly.
-ac_pipe_works=no
-cat > conftest.$ac_ext <<EOF
+  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($ac_symcode\)[ 	][ 	]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  ac_pipe_works=no
+  rm -f conftest.$ac_ext
+  cat > conftest.$ac_ext <<EOF
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -500,96 +523,100 @@
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
-if AC_TRY_EVAL(ac_compile); then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
 
-    # Try sorting and uniquifying the output.
-    if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-      mv -f "$ac_nlist"T "$ac_nlist"
-      ac_wcout=`wc "$ac_nlist" 2>/dev/null`
-changequote(,)dnl
-      ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
-changequote([,])dnl
-      (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
-    else
-      rm -f "$ac_nlist"T
-      ac_count=-1
-    fi
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    ac_nlist=conftest.nm
+  
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+
+      # Try sorting and uniquifying the output.
+      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
+	mv -f "$ac_nlist"T "$ac_nlist"
+      else
+	rm -f "$ac_nlist"T
+      fi
 
-    # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
-	cat <<EOF > conftest.c
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+	  cat <<EOF > conftest.c
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 EOF
-        # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+	  # Now generate the symbol file.
+	  eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
 
-	cat <<EOF >> conftest.c
+	  cat <<EOF >> conftest.c
 #if defined (__STDC__) && __STDC__
-# define __ptr_t void *
+# define lt_ptr_t void *
 #else
-# define __ptr_t char *
+# define lt_ptr_t char *
+# define const
 #endif
 
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $ac_count;
-
 /* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
+const struct {
+  const char *name;
+  lt_ptr_t address;
 }
 changequote(,)dnl
-dld_preloaded_symbols[] =
+lt_preloaded_symbols[] =
 changequote([,])dnl
 {
 EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-        cat <<\EOF >> conftest.c
-  {0, (__ptr_t) 0}
+	sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+	cat <<\EOF >> conftest.c
+  {0, (lt_ptr_t) 0}
 };
 
 #ifdef __cplusplus
 }
 #endif
 EOF
-        # Now try linking the two files.
-        mv conftest.$ac_objext conftestm.$ac_objext
-	ac_save_LIBS="$LIBS"
-	ac_save_CFLAGS="$CFLAGS"
-        LIBS="conftestm.$ac_objext"
-	CFLAGS="$CFLAGS$no_builtin_flag"
-        if AC_TRY_EVAL(ac_link) && test -s conftest; then
-          ac_pipe_works=yes
-        else
-          echo "configure: failed program was:" >&AC_FD_CC
-          cat conftest.c >&AC_FD_CC
-        fi
-        LIBS="$ac_save_LIBS"
-	CFLAGS="$ac_save_CFLAGS"
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftestm.$ac_objext
+	  ac_save_LIBS="$LIBS"
+	  ac_save_CFLAGS="$CFLAGS"
+	  LIBS="conftestm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
+	    ac_pipe_works=yes
+	  else
+	    echo "configure: failed program was:" >&AC_FD_CC
+	    cat conftest.c >&AC_FD_CC
+	  fi
+	  LIBS="$ac_save_LIBS"
+	  CFLAGS="$ac_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+	fi
       else
-        echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+	echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
       fi
     else
-      echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
+      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
     fi
   else
-    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+    echo "$progname: failed program was:" >&AC_FD_CC
+    cat conftest.c >&AC_FD_CC
   fi
-else
-  echo "$progname: failed program was:" >&AC_FD_CC
-  cat conftest.c >&AC_FD_CC
-fi
-rm -rf conftest*
+  rm -rf conftest*
 
-# Do not use the global_symbol_pipe unless it works.
-test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$ac_pipe_works" = yes; then
+    if test x"$ac_symprfx" = x"_"; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      ac_cv_sys_symbol_underscore=no
+    fi
+    break
+  else
+    ac_cv_sys_global_symbol_pipe=
+  fi
+done
 ])
 
 ac_result=yes
@@ -599,17 +626,17 @@
 AC_MSG_RESULT($ac_result)
 ])
 
-# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
-AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32,
+# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
+AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN,
 [AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 AC_CHECK_TOOL(AS, as, false)
 ])
 
-# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
+# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
 #                            with an underscore?
-AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE,
-[AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AM_SYS_NM_PARSE])dnl
+AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
+[AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_SYS_NM_PARSE])dnl
 AC_MSG_CHECKING([for _ prefix in compiled symbols])
 AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
 [ac_cv_sys_symbol_underscore=no
@@ -622,13 +649,13 @@
   ac_nlist=conftest.nm
   if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
     # See whether the symbols have a leading underscore.
-    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
+    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
       ac_cv_sys_symbol_underscore=yes
     else
-      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
-        :
+      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
+	:
       else
-        echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+	echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
       fi
     fi
   else
@@ -641,11 +668,66 @@
 rm -rf conftest*
 ])
 AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
-if test x$ac_cv_sys_symbol_underscore = xyes; then
-  AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
-  [define if compiled symbols have a leading underscore])
-fi
+USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
+AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
 ])
+
+# AC_CHECK_LIBM - check for math library
+AC_DEFUN(AC_CHECK_LIBM, [
+AC_CHECK_LIB(mw, _mwvalidcheckl)
+AC_CHECK_LIB(m, cos)
+])
+
+# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl convenience library, adds --enable-ltdl-convenience to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
+  case "$enable_ltdl_convenience" in
+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+  "") enable_ltdl_convenience=yes
+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+  esac
+  LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
+])
+
+# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+# the libltdl installable library, and adds --enable-ltdl-install to
+# the configure arguments.  Note that LIBLTDL is not AC_SUBSTed, nor
+# is AC_CONFIG_SUBDIRS called.  If DIR is not provided, it is assumed
+# to be `${top_builddir}/libltdl'.  Make sure you start DIR with
+# '${top_builddir}/' (note the single quotes!) if your package is not
+# flat, and, if you're not using automake, define top_builddir as
+# appropriate in the Makefiles.
+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
+  AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
+    case "$enable_ltdl_install" in
+    no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
+    "") enable_ltdl_install=yes
+        ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
+    esac
+  ])
+  if test x"$enable_ltdl_install" != x"no"; then
+    LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
+  fi
+])
+
+dnl old names
+AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl
+AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
+AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
+AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
+AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
+AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
+AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
+AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl
 
 # Add --enable-maintainer-mode option to configure.
 # From Jim Meyering
diff -ruN gimp-1.0.3/app/Makefile.in gimp-1.0.4/app/Makefile.in
--- gimp-1.0.3/app/Makefile.in	Mon Mar 29 13:15:07 1999
+++ gimp-1.0.4/app/Makefile.in	Sat Apr  3 22:34:47 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/app/colormaps.c gimp-1.0.4/app/colormaps.c
--- gimp-1.0.3/app/colormaps.c	Sat Mar 13 17:40:55 1999
+++ gimp-1.0.4/app/colormaps.c	Tue Mar 30 22:19:56 1999
@@ -65,9 +65,6 @@
 gulong *color_pixel_vals;
 gulong *gray_pixel_vals;
 
-static int reserved_entries = 4;  /* extra colors aside from color cube */
-static gulong *reserved_pixels;
-
 static void make_color (gulong *pixel_ptr,
 			int     red,
 			int     green,
@@ -75,22 +72,9 @@
 			int     readwrite);
 
 static void
-set_app_colors ()
+set_app_colors (void)
 {
-  int i;
-
-  if ((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
-      (g_visual->type == GDK_VISUAL_GRAYSCALE))
-    {
-      foreground_pixel = reserved_pixels[0];
-      background_pixel = reserved_pixels[1];
-      old_color_pixel = reserved_pixels[2];
-      new_color_pixel = reserved_pixels[3];
-    }
-  else
-    {
-      cycled_marching_ants = FALSE;
-    }
+  cycled_marching_ants = FALSE;
 
   make_color (&g_black_pixel, 0, 0, 0, FALSE);
   make_color (&g_gray_pixel, 127, 127, 127, FALSE);
@@ -104,19 +88,8 @@
   store_color (&old_color_pixel, 0, 0, 0);
   store_color (&new_color_pixel, 255, 255, 255);
 
-  /* marching ants pixels--if enabled */
-  if (cycled_marching_ants)
-    for (i = 0; i < 8; i++)
-      {
-	marching_ants_pixels[i] = reserved_pixels[i + reserved_entries - 8];
-	if (i < 4)
-	  store_color (&marching_ants_pixels[i], 0, 0, 0);
-	else
-	  store_color (&marching_ants_pixels[i], 255, 255, 255);
-      }
 }
-
-
+/* poof - can't use this anymore
 static unsigned int
 gamma_correct (int intensity, double gamma)
 {
@@ -134,7 +107,7 @@
 
   return val;
 }
-
+*/
 
 /*************************************************************************/
 
@@ -144,17 +117,7 @@
 	   int green,
 	   int blue)
 {
-  gulong pixel;
-
-  if ((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
-      (g_visual->type == GDK_VISUAL_GRAYSCALE))
-    pixel = color_pixel_vals [(red_ordered_dither[red].s[1] +
-			       green_ordered_dither[green].s[1] +
-			       blue_ordered_dither[blue].s[1])];
-  else
-    store_color (&pixel, red, green, blue);
-
-  return pixel;
+  return gdk_rgb_xpixel_from_rgb ((red << 16) | (green << 8) | blue);
 }
 
 
@@ -165,24 +128,7 @@
 	    int     blue,
 	    int     readwrite)
 {
-  GdkColor col;
-
-  red = gamma_correct (red, gamma_val);
-  green = gamma_correct (green, gamma_val);
-  blue = gamma_correct (blue, gamma_val);
-
-  col.red = red * (65535 / 255);
-  col.green = green * (65535 / 255);
-  col.blue = blue * (65535 / 255);
-  col.pixel = *pixel_ptr;
-
-  if (readwrite && ((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
-		    (g_visual->type == GDK_VISUAL_GRAYSCALE)))
-    gdk_color_change (g_cmap, &col);
-  else
-    gdk_color_alloc (g_cmap, &col);
-
-  *pixel_ptr = col.pixel;
+  *pixel_ptr = get_color (red, green, blue);
 }
 
 void
@@ -191,55 +137,20 @@
 	     int     green,
 	     int     blue)
 {
-  make_color (pixel_ptr, red, green, blue, TRUE);
+  *pixel_ptr = get_color (red, green, blue);
 }
 
-
 void
 get_standard_colormaps ()
 {
   GtkPreviewInfo *info;
 
-  if (cycled_marching_ants)
-    reserved_entries += 8;
-
-  gtk_preview_set_gamma (gamma_val);
-  gtk_preview_set_color_cube (color_cube_shades[0], color_cube_shades[1],
-			      color_cube_shades[2], color_cube_shades[3]);
-  gtk_preview_set_install_cmap (install_cmap);
-  gtk_preview_set_reserved (reserved_entries);
-
-  /* so we can reinit the colormaps */
-  gtk_preview_reset ();
-
   gtk_widget_set_default_visual (gtk_preview_get_visual ());
   gtk_widget_set_default_colormap (gtk_preview_get_cmap ());
 
   info = gtk_preview_get_info ();
   g_visual = info->visual;
 
-  /*
-  if (((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
-       (g_visual->type == GDK_VISUAL_GRAYSCALE)) &&
-      info->reserved_pixels == NULL) {
-  */ /* XXXXXXXXXX fix me */
-  if (((g_visual->type == GDK_VISUAL_PSEUDO_COLOR) ||
-       (g_visual->type == GDK_VISUAL_GRAYSCALE))) {
-    g_print("GIMP cannot get enough colormaps to boot.\n");
-    g_print("Try exiting other color intensive applications.\n");
-    g_print("Also try enabling the (install-colormap) option in gimprc.\n");
-    swapping_free ();
-    brushes_free ();
-    patterns_free ();
-    palettes_free ();
-    gradients_free ();
-    palette_free ();
-    procedural_db_free ();
-    plug_in_kill ();
-    tile_swap_exit ();
-    gtk_exit(0);
-  }
-
   g_cmap = info->cmap;
 #if 0
   color_pixel_vals = info->color_pixels;
@@ -257,6 +168,6 @@
   g_lookup_green = info->lookup_green;
   g_lookup_blue = info->lookup_blue;
 #endif
-  
+
   set_app_colors ();
 }
diff -ruN gimp-1.0.3/app/commands.c gimp-1.0.4/app/commands.c
--- gimp-1.0.3/app/commands.c	Thu Jul  9 00:19:26 1998
+++ gimp-1.0.4/app/commands.c	Tue Mar 30 21:53:07 1999
@@ -215,11 +215,11 @@
     gimage_disable_undo (gimage);
     gimage_add_layer (gimage, layer, 0);
     gimage_enable_undo (gimage);
-    
+
     drawable_fill (GIMP_DRAWABLE(layer), vals->fill_type);
 
     gimage_clean_all (gimage);
-    
+
     gdisplay = gdisplay_new (gimage, 0x0101);
   }
 
@@ -235,7 +235,7 @@
 
   return TRUE;
 }
-  
+
 
 static void
 file_new_cancel_callback (GtkWidget *widget,
@@ -263,8 +263,9 @@
 }
 
 void
-file_new_cmd_callback (GtkWidget *widget,
-		       gpointer   client_data)
+file_new_cmd_callback (GtkWidget           *widget,
+		       gpointer             callback_data,
+		       guint                callback_action)
 {
   GDisplay *gdisp;
   NewImageValues *vals;
@@ -282,13 +283,13 @@
       last_width = default_width;
       last_height = default_height;
       last_type = default_type;
-      new_dialog_run = 1;  
+      new_dialog_run = 1;
     }
 
   /*  Before we try to determine the responsible gdisplay,
    *  make sure this wasn't called from the toolbox
    */
-  if ((long) client_data)
+  if ((long) callback_action)
     gdisp = gdisplay_active ();
   else
     gdisp = NULL;
@@ -574,7 +575,7 @@
 			GtkWidget *dlg)
 {
 
-  if (levels_of_undo < 0) 
+  if (levels_of_undo < 0)
     {
       g_message ("Error: Levels of undo must be zero or greater.");
       levels_of_undo = old_levels_of_undo;
@@ -597,8 +598,8 @@
       g_message ("Error: Default height must be one or greater.");
       default_height = old_default_height;
       return;
-    }  
-      
+    }
+
   gtk_widget_destroy (dlg);
   prefs_dlg = NULL;
 
@@ -761,7 +762,7 @@
 
   if (restart_notification)
     g_message ("You will need to restart GIMP for these changes to take effect.");
-  
+
   g_list_free (update);
   g_list_free (remove);
 }
@@ -769,7 +770,7 @@
 static int
 file_prefs_delete_callback (GtkWidget *widget,
 			    GdkEvent *event,
-			    GtkWidget *dlg) 
+			    GtkWidget *dlg)
 {
   file_prefs_cancel_callback (widget, dlg);
 
@@ -854,7 +855,7 @@
   else if (data==&default_type)
     {
       default_type = (long) gtk_object_get_user_data (GTK_OBJECT (widget));
-    } 
+    }
   else if (GTK_TOGGLE_BUTTON (widget)->active)
     {
       val = data;
@@ -967,11 +968,11 @@
       {"Small",32},
       {"Medium",64},
       {"Large",128}
-    }; 
+    };
   int ntransparencies = sizeof (transparencies) / sizeof (transparencies[0]);
   int nchecks = sizeof (checks) / sizeof (checks[0]);
   int ndirs = sizeof(dirs) / sizeof (dirs[0]);
-  int npreview_sizes = sizeof(preview_sizes) / sizeof (preview_sizes[0]); 
+  int npreview_sizes = sizeof(preview_sizes) / sizeof (preview_sizes[0]);
   int i;
 
   if (!prefs_dlg)
@@ -980,7 +981,7 @@
 	{
 	  /* first time dialog is opened - copy config vals to edit
              variables. */
-	  edit_temp_path = file_prefs_strdup (temp_path);	
+	  edit_temp_path = file_prefs_strdup (temp_path);
 	  edit_swap_path = file_prefs_strdup (swap_path);
 	  edit_brush_path = file_prefs_strdup (brush_path);
 	  edit_pattern_path = file_prefs_strdup (pattern_path);
@@ -1028,7 +1029,7 @@
 			  prefs_dlg);
 
       gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (prefs_dlg)->action_area), 2);
-      
+
       /* Action area */
       button = gtk_button_new_with_label ("OK");
       GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
@@ -1077,7 +1078,7 @@
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
       gtk_widget_show (hbox);
 
-      frame = gtk_frame_new ("Image size"); 
+      frame = gtk_frame_new ("Image size");
       gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
       gtk_widget_show (frame);
 
@@ -1091,7 +1092,7 @@
       gtk_table_set_col_spacings (GTK_TABLE (table), 2);
       gtk_box_pack_start (GTK_BOX (abox), table, TRUE, TRUE, 0);
       gtk_widget_show (table);
-      
+
       label = gtk_label_new ("Width:");
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
@@ -1103,7 +1104,7 @@
       gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
 			GTK_FILL, GTK_FILL, 0, 0);
       gtk_widget_show (label);
-      
+
       entry = gtk_entry_new ();
       gtk_widget_set_usize (entry, 25, 0);
       sprintf (buffer, "%d", default_width);
@@ -1118,7 +1119,7 @@
       entry = gtk_entry_new ();
       gtk_widget_set_usize (entry, 25, 0);
       sprintf (buffer, "%d", default_height);
-      gtk_entry_set_text (GTK_ENTRY (entry), buffer); 
+      gtk_entry_set_text (GTK_ENTRY (entry), buffer);
       gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2,
 			GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
       gtk_signal_connect (GTK_OBJECT (entry), "changed",
@@ -1149,7 +1150,7 @@
       group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
       gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
       gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) GRAY);
-      if (last_type == GRAY) 
+      if (last_type == GRAY)
 	  gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
       gtk_signal_connect (GTK_OBJECT (button), "toggled",
                          (GtkSignalFunc) file_prefs_toggle_callback,
@@ -1158,11 +1159,11 @@
       hbox = gtk_hbox_new (FALSE, 2);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
       gtk_widget_show (hbox);
-      
+
       label = gtk_label_new ("Preview size:");
       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
       gtk_widget_show (label);
-      
+
       menu = gtk_menu_new ();
       for (i = 0; i < npreview_sizes; i++)
         {
@@ -1180,7 +1181,7 @@
       for (i = 0; i < npreview_sizes; i++)
 	if (preview_size==preview_sizes[i].size)
 	  gtk_option_menu_set_history(GTK_OPTION_MENU (optionmenu),i);
-	  
+
       button = gtk_check_button_new_with_label("Cubic interpolation");
       gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button),
                                    cubic_interpolation);
@@ -1242,7 +1243,7 @@
                               &transparency_size);
           gtk_widget_show (button);
         }
-      
+
 
       label = gtk_label_new ("Display");
       gtk_notebook_append_page (GTK_NOTEBOOK(notebook), out_frame, label);
@@ -1256,7 +1257,7 @@
       gtk_container_border_width (GTK_CONTAINER (vbox), 1);
       gtk_container_add (GTK_CONTAINER (out_frame), vbox);
       gtk_widget_show (vbox);
-      
+
       hbox = gtk_hbox_new (FALSE, 2);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
@@ -1274,7 +1275,7 @@
                           (GtkSignalFunc) file_prefs_text_callback,
                           &levels_of_undo);
       gtk_widget_show (entry);
-      
+
       button = gtk_check_button_new_with_label("Resize window on zoom");
       gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button),
                                    allow_resize_windows);
@@ -1283,10 +1284,10 @@
                           (GtkSignalFunc) file_prefs_toggle_callback,
                           &allow_resize_windows);
       gtk_widget_show (button);
-      
-      /* Don't show the Auto-save button until we really 
+
+      /* Don't show the Auto-save button until we really
 	 have auto-saving in the gimp.
-      
+
 	 button = gtk_check_button_new_with_label("Auto save");
 	 gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button),
                                    auto_save);
@@ -1331,7 +1332,7 @@
       gtk_signal_connect (GTK_OBJECT (entry), "changed",
                           (GtkSignalFunc) file_prefs_text_callback,
                           &marching_speed);
-      gtk_widget_show (entry);      
+      gtk_widget_show (entry);
 
       label = gtk_label_new ("Interface");
       gtk_notebook_append_page (GTK_NOTEBOOK(notebook), out_frame, label);
@@ -1346,7 +1347,7 @@
       gtk_container_border_width (GTK_CONTAINER (vbox), 1);
       gtk_container_add (GTK_CONTAINER (out_frame), vbox);
       gtk_widget_show (vbox);
-      
+
       button = gtk_check_button_new_with_label("Conservative memory usage");
       gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button),
                                    stingy_memory_use);
@@ -1355,7 +1356,7 @@
 			  (GtkSignalFunc) file_prefs_toggle_callback,
 			  &edit_stingy_memory_use);
       gtk_widget_show (button);
-      
+
       hbox = gtk_hbox_new (FALSE, 2);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
@@ -1373,7 +1374,7 @@
                           (GtkSignalFunc) file_prefs_text_callback,
                           &edit_tile_cache_size);
       gtk_widget_show (entry);
-      
+
       button = gtk_check_button_new_with_label("Install colormap (8-bit only)");
       gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button),
 				   install_cmap);
@@ -1393,7 +1394,7 @@
       if (g_visual->depth != 8)
 	gtk_widget_set_sensitive (GTK_WIDGET(button), FALSE);
       gtk_widget_show (button);
-      
+
       label = gtk_label_new ("Environment");
       gtk_notebook_append_page (GTK_NOTEBOOK(notebook), out_frame, label);
 
@@ -1421,7 +1422,7 @@
 	  gtk_table_attach (GTK_TABLE (table), label, 0, 1, i, i+1,
                             GTK_FILL, GTK_FILL, 0, 0);
 	  gtk_widget_show (label);
- 
+
           entry = gtk_entry_new ();
           gtk_widget_set_usize (entry, 25, 0);
           gtk_entry_set_text (GTK_ENTRY (entry), *(dirs[i].mpath));
@@ -1430,7 +1431,7 @@
 			      dirs[i].mpath);
           gtk_table_attach (GTK_TABLE (table), entry, 1, 2, i, i+1,
                             GTK_EXPAND | GTK_FILL, 0, 0, 0);
-          gtk_widget_show (entry); 
+          gtk_widget_show (entry);
 	}
 
       label = gtk_label_new ("Directories");
@@ -2371,13 +2372,14 @@
 }
 
 void
-tools_select_cmd_callback (GtkWidget *widget,
-			   gpointer   client_data)
+tools_select_cmd_callback (GtkWidget           *widget,
+			   gpointer             callback_data,
+			   guint                callback_action)
 {
   GDisplay * gdisp;
 
   /*  Activate the approriate widget  */
-  gtk_widget_activate (tool_widgets[tool_info[(long) client_data].toolbar_position]);
+  gtk_widget_activate (tool_widgets[tool_info[(long) callback_action].toolbar_position]);
 
   gdisp = gdisplay_active ();
 
@@ -2385,10 +2387,11 @@
 }
 
 void
-filters_repeat_cmd_callback (GtkWidget *widget,
-			     gpointer   client_data)
+filters_repeat_cmd_callback (GtkWidget           *widget,
+			     gpointer             callback_data,
+			     guint                callback_action)
 {
-  plug_in_repeat ((long) client_data);
+  plug_in_repeat (callback_action);
 }
 
 void
@@ -2483,7 +2486,7 @@
   if ((gimage = gimage_get_ID (image_resize->gimage_id)) != NULL)
     {
       if (image_resize->resize->width > 0 &&
-	  image_resize->resize->height > 0) 
+	  image_resize->resize->height > 0)
 	{
 	  gimage_resize (gimage,
 			 image_resize->resize->width,
@@ -2492,7 +2495,7 @@
 			 image_resize->resize->off_y);
 	  gdisplays_flush ();
 	}
-      else 
+      else
 	{
 	  g_message ("Resize Error: Both width and height must be greater than zero.");
 	  return;
@@ -2515,14 +2518,14 @@
   if ((gimage = gimage_get_ID (image_scale->gimage_id)) != NULL)
     {
       if (image_scale->resize->width > 0 &&
-	  image_scale->resize->height > 0) 
+	  image_scale->resize->height > 0)
 	{
 	  gimage_scale (gimage,
 			image_scale->resize->width,
 			image_scale->resize->height);
 	  gdisplays_flush ();
 	}
-      else 
+      else
 	{
 	  g_message ("Scale Error: Both width and height must be greater than zero.");
 	  return;
@@ -2628,9 +2631,3 @@
   gimage_mask_shrink (gimage, shrink_pixels);
   gdisplays_flush ();
 }
-
-
-
-
-
-
diff -ruN gimp-1.0.3/app/commands.h gimp-1.0.4/app/commands.h
--- gimp-1.0.3/app/commands.h	Fri Apr  3 03:58:02 1998
+++ gimp-1.0.4/app/commands.h	Tue Mar 30 21:53:08 1999
@@ -4,7 +4,9 @@
 
 #include "gtk/gtk.h"
 
-void file_new_cmd_callback (GtkWidget *, gpointer);
+void file_new_cmd_callback (GtkWidget           *widget,
+			    gpointer             callback_data,
+			    guint                callback_action);
 void file_open_cmd_callback (GtkWidget *, gpointer);
 void file_save_cmd_callback (GtkWidget *, gpointer);
 void file_save_as_cmd_callback (GtkWidget *, gpointer);
@@ -80,8 +82,12 @@
 void layers_add_alpha_channel_cmd_callback (GtkWidget *, gpointer);
 void tools_default_colors_cmd_callback (GtkWidget *, gpointer);
 void tools_swap_colors_cmd_callback (GtkWidget *, gpointer);
-void tools_select_cmd_callback (GtkWidget *, gpointer);
-void filters_repeat_cmd_callback (GtkWidget *, gpointer);
+void tools_select_cmd_callback (GtkWidget           *widget,
+				gpointer             callback_data,
+				guint                callback_action);
+void filters_repeat_cmd_callback (GtkWidget           *widget,
+				  gpointer             callback_data,
+				  guint                callback_action);
 void dialogs_brushes_cmd_callback (GtkWidget *, gpointer);
 void dialogs_patterns_cmd_callback (GtkWidget *, gpointer);
 void dialogs_palette_cmd_callback (GtkWidget *, gpointer);
diff -ruN gimp-1.0.3/config.h.in gimp-1.0.4/config.h.in
--- gimp-1.0.3/config.h.in	Fri Mar 26 22:15:27 1999
+++ gimp-1.0.4/config.h.in	Sat Apr  3 22:16:00 1999
@@ -82,7 +82,3 @@
 
 /* Define if you have the <sys/ndir.h> header file.  */
 #undef HAVE_SYS_NDIR_H
-
-/* define if compiled symbols have a leading underscore */
-#undef WITH_SYMBOL_UNDERSCORE
-
diff -ruN gimp-1.0.3/configure gimp-1.0.4/configure
--- gimp-1.0.3/configure	Mon Mar 29 12:52:47 1999
+++ gimp-1.0.4/configure	Wed Mar 31 18:56:41 1999
@@ -16,6 +16,8 @@
 ac_help="$ac_help
   --enable-static[=PKGS]  build static libraries [default=yes]"
 ac_help="$ac_help
+  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
+ac_help="$ac_help
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
 ac_help="$ac_help
   --disable-libtool-lock  force libtool not to do file locking"
@@ -559,7 +561,7 @@
 
 GIMP_MAJOR_VERSION=1
 GIMP_MINOR_VERSION=0
-GIMP_MICRO_VERSION=3
+GIMP_MICRO_VERSION=4
 
 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
 
@@ -594,7 +596,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:598: checking for a BSD compatible install" >&5
+echo "configure:600: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -647,7 +649,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:651: checking whether build environment is sane" >&5
+echo "configure:653: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -704,7 +706,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:708: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:710: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -743,7 +745,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:747: checking for working aclocal" >&5
+echo "configure:749: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -756,7 +758,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:760: checking for working autoconf" >&5
+echo "configure:762: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -769,7 +771,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:773: checking for working automake" >&5
+echo "configure:775: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -782,7 +784,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:786: checking for working autoheader" >&5
+echo "configure:788: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -795,7 +797,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:799: checking for working makeinfo" >&5
+echo "configure:801: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -859,6 +861,29 @@
   enable_static=yes
 fi
 
+# Check whether --enable-fast-install or --disable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then
+  enableval="$enable_fast_install"
+  p=${PACKAGE-default}
+case "$enableval" in
+yes) enable_fast_install=yes ;;
+no) enable_fast_install=no ;;
+*)
+  enable_fast_install=no
+  # Look at the argument we got.  We use all the common list separators.
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+  for pkg in $enableval; do
+    if test "X$pkg" = "X$p"; then
+      enable_fast_install=yes
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+else
+  enable_fast_install=yes
+fi
+
 
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
@@ -866,7 +891,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:870: checking host system type" >&5
+echo "configure:895: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -887,7 +912,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:891: checking build system type" >&5
+echo "configure:916: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -907,7 +932,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:911: checking for $ac_word" >&5
+echo "configure:936: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -937,7 +962,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:941: checking for $ac_word" >&5
+echo "configure:966: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -967,7 +992,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:971: checking for $ac_word" >&5
+echo "configure:996: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1018,7 +1043,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1022: checking for $ac_word" >&5
+echo "configure:1047: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1050,7 +1075,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1054: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1079: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1061,12 +1086,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1065 "configure"
+#line 1090 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1092,12 +1117,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1096: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1121: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1101: checking whether we are using GNU C" >&5
+echo "configure:1126: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1106,7 +1131,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1125,7 +1150,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1129: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1154: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1168,48 +1193,18 @@
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1172: checking for ld used by GCC" >&5
+echo "configure:1197: checking for ld used by GCC" >&5
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
     # Accept absolute paths.
-    /* | [A-Za-z]:/*)
-      # Canonicalize the path of ld
+    /* | [A-Za-z]:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
-      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
-      ;;
-    ##
-    ## FIXME:  The code fails later on if we try to use an $LD with
-    ##         '\\' path separators.
-    ##
-    [A-Za-z]:[\\]*)
       # Canonicalize the path of ld
-      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
-      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
-      sub_uncdir='s%\\%/%g'
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
       done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
-	;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-	;;
-      esac
+      test -z "$LD" && LD="$ac_prog"
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
@@ -1222,10 +1217,10 @@
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1226: checking for GNU ld" >&5
+echo "configure:1221: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1229: checking for non-GNU ld" >&5
+echo "configure:1224: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1242,7 +1237,7 @@
       if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 	test "$with_gnu_ld" != no && break
       else
-        test "$with_gnu_ld" != yes && break
+	test "$with_gnu_ld" != yes && break
       fi
     fi
   done
@@ -1261,7 +1256,7 @@
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1265: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1260: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1277,7 +1272,7 @@
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1281: checking for BSD-compatible nm" >&5
+echo "configure:1276: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1286,20 +1281,22 @@
   ac_cv_path_NM="$NM"
 else
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/nm; then
       # Check to see if the nm accepts a BSD-compat flag.
       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
       #   nm: unknown option "B" ignored
       if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
+	ac_cv_path_NM="$ac_dir/nm -B"
+	break
       elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
+	ac_cv_path_NM="$ac_dir/nm -p"
+	break
       else
-        ac_cv_path_NM="$ac_dir/nm"
+	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+	continue # so that we can try to find one that supports BSD flags
       fi
-      break
     fi
   done
   IFS="$ac_save_ifs"
@@ -1313,7 +1310,7 @@
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:1317: checking command to parse $NM output" >&5
+echo "configure:1314: checking command to parse $NM output" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1321,51 +1318,50 @@
 # {They come from Ultrix.  What could be older than Ultrix?!! ;)}
 
 # Character class describing NM global symbol codes.
-ac_symcode='[BCDEGRSTU]'
+ac_symcode='[BCDEGRST]'
 
 # Regexp to match symbols that can be accessed directly from C.
 ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
 # Transform the above into a raw symbol and a C symbol.
-ac_symxfrm='\1 \1'
+ac_symxfrm='\1 \2\3 \3'
+
+# Transform an extracted symbol line into a proper C declaration
+ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
 
 # Define system-specific variables.
 case "$host_os" in
 aix*)
-  ac_symcode='[BCDTU]'
+  ac_symcode='[BCDT]'
   ;;
-sunos* | cygwin32* | mingw32*)
-  ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-  ac_symxfrm='_\1 \1'
+cygwin* | mingw*)
+  ac_symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
   ;;
 irix*)
-  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
   ac_symcode='[BCDEGRST]'
   ;;
 solaris*)
-  ac_symcode='[BDTU]'
+  ac_symcode='[BDT]'
   ;;
 esac
 
 # If we're using GNU nm, then use its standard symbol codes.
 if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  ac_symcode='[ABCDGISTUW]'
+  ac_symcode='[ABCDGISTW]'
 fi
 
-case "$host_os" in
-cygwin32* | mingw32*)
-  # We do not want undefined symbols on cygwin32.  The user must
-  # arrange to define them via -l arguments.
-  ac_symcode='[ABCDGISTW]'
-  ;;
-esac
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
 
-# Write the raw and C identifiers.
-ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
+  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* 	\($ac_symcode\) 	 	*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
 
-# Check to see that the pipe works correctly.
-ac_pipe_works=no
-cat > conftest.$ac_ext <<EOF
+  # Check to see that the pipe works correctly.
+  ac_pipe_works=no
+  rm -f conftest.$ac_ext
+  cat > conftest.$ac_ext <<EOF
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1376,92 +1372,98 @@
 #endif
 int main(){nm_test_var='a';nm_test_func;return 0;}
 EOF
-if { (eval echo configure:1380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if { (eval echo configure:1383: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
 
-    # Try sorting and uniquifying the output.
-    if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-      mv -f "$ac_nlist"T "$ac_nlist"
-      ac_wcout=`wc "$ac_nlist" 2>/dev/null`
-      ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
-      (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
-    else
-      rm -f "$ac_nlist"T
-      ac_count=-1
-    fi
+  if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    # Now try to grab the symbols.
+    ac_nlist=conftest.nm
+  
+    if { (eval echo configure:1381: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+
+      # Try sorting and uniquifying the output.
+      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
+	mv -f "$ac_nlist"T "$ac_nlist"
+      else
+	rm -f "$ac_nlist"T
+      fi
 
-    # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
-	cat <<EOF > conftest.c
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+	  cat <<EOF > conftest.c
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 EOF
-        # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+	  # Now generate the symbol file.
+	  eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
 
-	cat <<EOF >> conftest.c
+	  cat <<EOF >> conftest.c
 #if defined (__STDC__) && __STDC__
-# define __ptr_t void *
+# define lt_ptr_t void *
 #else
-# define __ptr_t char *
+# define lt_ptr_t char *
+# define const
 #endif
 
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $ac_count;
-
 /* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
+const struct {
+  const char *name;
+  lt_ptr_t address;
 }
-dld_preloaded_symbols[] =
+lt_preloaded_symbols[] =
 {
 EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-        cat <<\EOF >> conftest.c
-  {0, (__ptr_t) 0}
+	sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+	cat <<\EOF >> conftest.c
+  {0, (lt_ptr_t) 0}
 };
 
 #ifdef __cplusplus
 }
 #endif
 EOF
-        # Now try linking the two files.
-        mv conftest.$ac_objext conftestm.$ac_objext
-	ac_save_LIBS="$LIBS"
-	ac_save_CFLAGS="$CFLAGS"
-        LIBS="conftestm.$ac_objext"
-	CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo configure:1441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-          ac_pipe_works=yes
-        else
-          echo "configure: failed program was:" >&5
-          cat conftest.c >&5
-        fi
-        LIBS="$ac_save_LIBS"
-	CFLAGS="$ac_save_CFLAGS"
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftestm.$ac_objext
+	  ac_save_LIBS="$LIBS"
+	  ac_save_CFLAGS="$CFLAGS"
+	  LIBS="conftestm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	    ac_pipe_works=yes
+	  else
+	    echo "configure: failed program was:" >&5
+	    cat conftest.c >&5
+	  fi
+	  LIBS="$ac_save_LIBS"
+	  CFLAGS="$ac_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $ac_nlist" >&5
+	fi
       else
-        echo "cannot find nm_test_func in $ac_nlist" >&5
+	echo "cannot find nm_test_var in $ac_nlist" >&5
       fi
     else
-      echo "cannot find nm_test_var in $ac_nlist" >&5
+      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5
     fi
   else
-    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5
+    echo "$progname: failed program was:" >&5
+    cat conftest.c >&5
   fi
-else
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-rm -rf conftest*
+  rm -rf conftest*
 
-# Do not use the global_symbol_pipe unless it works.
-test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$ac_pipe_works" = yes; then
+    if test x"$ac_symprfx" = x"_"; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      ac_cv_sys_symbol_underscore=no
+    fi
+    break
+  else
+    ac_cv_sys_global_symbol_pipe=
+  fi
+done
 
 fi
 
@@ -1473,7 +1475,7 @@
 echo "$ac_t""$ac_result" 1>&6
 
 echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:1477: checking for _ prefix in compiled symbols" >&5
+echo "configure:1479: checking for _ prefix in compiled symbols" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1482,18 +1484,18 @@
 void nm_test_func(){}
 int main(){nm_test_func;return 0;}
 EOF
-if { (eval echo configure:1486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   # Now try to grab the symbols.
   ac_nlist=conftest.nm
-  if { (eval echo configure:1489: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+  if { (eval echo configure:1491: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
     # See whether the symbols have a leading underscore.
-    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
+    if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
       ac_cv_sys_symbol_underscore=yes
     else
-      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
-        :
+      if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
+	:
       else
-        echo "configure: cannot find nm_test_func in $ac_nlist" >&5
+	echo "configure: cannot find nm_test_func in $ac_nlist" >&5
       fi
     fi
   else
@@ -1508,15 +1510,10 @@
 fi
 
 echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6
-if test x$ac_cv_sys_symbol_underscore = xyes; then
-  cat >> confdefs.h <<\EOF
-#define WITH_SYMBOL_UNDERSCORE 1
-EOF
-
-fi
+USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1520: checking whether ln -s works" >&5
+echo "configure:1517: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1542,13 +1539,13 @@
   ac_tool_prefix=
 fi
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 # Check for any special flags to pass to ltconfig.
-libtool_flags=
+libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
 test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
 test "$silent" = yes && libtool_flags="$libtool_flags --silent"
 test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
 test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
@@ -1558,8 +1555,8 @@
 case "$host" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1562 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1559 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1580,19 +1577,19 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1584: checking whether the C compiler needs -belf" >&5
+echo "configure:1581: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1589 "configure"
+#line 1586 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -1611,11 +1608,11 @@
   fi
   ;;
 
-*-*-cygwin32*)
+*-*-cygwin*)
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1619: checking for $ac_word" >&5
+echo "configure:1616: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1647,7 +1644,7 @@
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1651: checking for $ac_word" >&5
+echo "configure:1648: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1682,7 +1679,7 @@
 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1686: checking for $ac_word" >&5
+echo "configure:1683: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1714,7 +1711,7 @@
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1718: checking for $ac_word" >&5
+echo "configure:1715: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1767,6 +1764,55 @@
 fi
 
 
+# Save cache, so that ltconfig can load it
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+
 # Actually configure libtool.  ac_aux_dir is where install-sh is found.
 CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
 LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
@@ -1775,13 +1821,29 @@
 $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
+# Reload cache, that may have been modified by ltconfig
+if test -r "$cache_file"; then
+  echo "loading cache $cache_file"
+  . $cache_file
+else
+  echo "creating cache $cache_file"
+  > $cache_file
+fi
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
 # Redirect the config.log output again, so that the ltconfig log is not
 # clobbered by the next message.
 exec 5>>./config.log
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1785: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1847: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -1811,7 +1873,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1815: checking host system type" >&5
+echo "configure:1877: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1871,7 +1933,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1875: checking for $ac_word" >&5
+echo "configure:1937: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1901,7 +1963,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1905: checking for $ac_word" >&5
+echo "configure:1967: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1952,7 +2014,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1956: checking for $ac_word" >&5
+echo "configure:2018: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1984,7 +2046,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1988: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2050: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1995,12 +2057,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1999 "configure"
+#line 2061 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2026,12 +2088,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2030: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2092: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2035: checking whether we are using GNU C" >&5
+echo "configure:2097: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2040,7 +2102,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2059,7 +2121,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2063: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2125: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2094,7 +2156,7 @@
 
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:2098: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:2160: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2110,7 +2172,7 @@
 do
   CC="$ac_save_CC $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 2114 "configure"
+#line 2176 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2147,7 +2209,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -2182,7 +2244,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2186: checking for a BSD compatible install" >&5
+echo "configure:2248: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2235,7 +2297,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2239: checking whether ln -s works" >&5
+echo "configure:2301: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2256,7 +2318,7 @@
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2260: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2322: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2283,7 +2345,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2287: checking how to run the C preprocessor" >&5
+echo "configure:2349: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2298,13 +2360,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2302 "configure"
+#line 2364 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2315,13 +2377,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2319 "configure"
+#line 2381 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2332,13 +2394,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2336 "configure"
+#line 2398 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2414,7 +2476,7 @@
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2418: checking for $ac_word" >&5
+echo "configure:2480: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2449,7 +2511,7 @@
 
   min_gtk_version=1.2.0
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:2453: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:2515: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -2472,7 +2534,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 2476 "configure"
+#line 2538 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -2550,7 +2612,7 @@
 }
 
 EOF
-if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2584,7 +2646,7 @@
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 2588 "configure"
+#line 2650 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -2594,7 +2656,7 @@
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:2598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -2665,19 +2727,19 @@
 fi
 
 echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
-echo "configure:2669: checking for extra flags to get ANSI library prototypes" >&5
+echo "configure:2731: checking for extra flags to get ANSI library prototypes" >&5
 gimp_save_LIBS=$LIBS
 LIBS="$LIBS -lm"
 if test "$cross_compiling" = yes; then
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2676 "configure"
+#line 2738 "configure"
 #include "confdefs.h"
 #include <math.h>
              int main (void) { return (log(1) != log(1.)); }
 EOF
-if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""none needed" 1>&6
 else
@@ -2690,12 +2752,12 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2694 "configure"
+#line 2756 "configure"
 #include "confdefs.h"
 #include <math.h>
                int main (void) { return (log(1) != log(1.)); }
 EOF
-if { (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""-std1" 1>&6
 else
@@ -2716,16 +2778,16 @@
 LIBS=$gimp_save_LIBS
 
 echo $ac_n "checking for extra flags for POSIX compliance""... $ac_c" 1>&6
-echo "configure:2720: checking for extra flags for POSIX compliance" >&5
+echo "configure:2782: checking for extra flags for POSIX compliance" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2722 "configure"
+#line 2784 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 int main() {
 DIR *dir;
 ; return 0; }
 EOF
-if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""none needed" 1>&6
 else
@@ -2735,14 +2797,14 @@
   gimp_save_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -posix"
   cat > conftest.$ac_ext <<EOF
-#line 2739 "configure"
+#line 2801 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 int main() {
 DIR *dir;
 ; return 0; }
 EOF
-if { (eval echo configure:2746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""-posix" 1>&6
 else
@@ -2767,7 +2829,7 @@
 
   if test -z "$LIBXMU_LIB"; then
     echo $ac_n "checking for XmuClientWindow in -lXmu""... $ac_c" 1>&6
-echo "configure:2771: checking for XmuClientWindow in -lXmu" >&5
+echo "configure:2833: checking for XmuClientWindow in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuClientWindow | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2775,7 +2837,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu -lXt -lSM -lICE $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2779 "configure"
+#line 2841 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2786,7 +2848,7 @@
 XmuClientWindow()
 ; return 0; }
 EOF
-if { (eval echo configure:2790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2803,17 +2865,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xmu/WinUtil.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xmu/WinUtil.h""... $ac_c" 1>&6
-echo "configure:2807: checking for X11/Xmu/WinUtil.h" >&5
+echo "configure:2869: checking for X11/Xmu/WinUtil.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 2812 "configure"
+#line 2874 "configure"
 #include "confdefs.h"
 #include <X11/Xmu/WinUtil.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2838,7 +2900,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for XmuUpdateMapHints in -lXmu""... $ac_c" 1>&6
-echo "configure:2842: checking for XmuUpdateMapHints in -lXmu" >&5
+echo "configure:2904: checking for XmuUpdateMapHints in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuUpdateMapHints | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2846,7 +2908,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXmu -lXt $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2850 "configure"
+#line 2912 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2857,7 +2919,7 @@
 XmuUpdateMapHints()
 ; return 0; }
 EOF
-if { (eval echo configure:2861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2874,17 +2936,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xmu/WinUtil.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xmu/WinUtil.h""... $ac_c" 1>&6
-echo "configure:2878: checking for X11/Xmu/WinUtil.h" >&5
+echo "configure:2940: checking for X11/Xmu/WinUtil.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 2883 "configure"
+#line 2945 "configure"
 #include "confdefs.h"
 #include <X11/Xmu/WinUtil.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2917,7 +2979,7 @@
 
   if test -z "$LIBAA_LIB"; then
     echo $ac_n "checking for aa_printf in -laa""... $ac_c" 1>&6
-echo "configure:2921: checking for aa_printf in -laa" >&5
+echo "configure:2983: checking for aa_printf in -laa" >&5
 ac_lib_var=`echo aa'_'aa_printf | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2925,7 +2987,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-laa  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2929 "configure"
+#line 2991 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2936,7 +2998,7 @@
 aa_printf()
 ; return 0; }
 EOF
-if { (eval echo configure:2940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2953,17 +3015,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "aalib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for aalib.h""... $ac_c" 1>&6
-echo "configure:2957: checking for aalib.h" >&5
+echo "configure:3019: checking for aalib.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 2962 "configure"
+#line 3024 "configure"
 #include "confdefs.h"
 #include <aalib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2994,7 +3056,7 @@
 
   if test -z "$LIBTIFF_LIB"; then
     echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
-echo "configure:2998: checking for TIFFReadScanline in -ltiff" >&5
+echo "configure:3060: checking for TIFFReadScanline in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3002,7 +3064,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3006 "configure"
+#line 3068 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3013,7 +3075,7 @@
 TIFFReadScanline()
 ; return 0; }
 EOF
-if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3030,17 +3092,17 @@
   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:3034: checking for tiffio.h" >&5
+echo "configure:3096: checking for 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 3039 "configure"
+#line 3101 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3065,7 +3127,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
-echo "configure:3069: checking for TIFFWriteScanline in -ltiff" >&5
+echo "configure:3131: checking for TIFFWriteScanline in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3073,7 +3135,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff -ljpeg -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3077 "configure"
+#line 3139 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3084,7 +3146,7 @@
 TIFFWriteScanline()
 ; return 0; }
 EOF
-if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3101,17 +3163,17 @@
   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:3105: checking for tiffio.h" >&5
+echo "configure:3167: checking for 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 3110 "configure"
+#line 3172 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3136,7 +3198,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for TIFFFlushData in -ltiff34""... $ac_c" 1>&6
-echo "configure:3140: checking for TIFFFlushData in -ltiff34" >&5
+echo "configure:3202: checking for TIFFFlushData in -ltiff34" >&5
 ac_lib_var=`echo tiff34'_'TIFFFlushData | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3144,7 +3206,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3148 "configure"
+#line 3210 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3155,7 +3217,7 @@
 TIFFFlushData()
 ; return 0; }
 EOF
-if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3172,17 +3234,17 @@
   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:3176: checking for tiffio.h" >&5
+echo "configure:3238: checking for 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 3181 "configure"
+#line 3243 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3248: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3217,7 +3279,7 @@
 
   if test -z "$LIBJPEG_LIB"; then
     echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:3221: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:3283: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3225,7 +3287,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3229 "configure"
+#line 3291 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3236,7 +3298,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3260,9 +3322,9 @@
 
     if test "$jpeg_ok" = yes; then
       echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:3264: checking for jpeglib.h" >&5
+echo "configure:3326: checking for jpeglib.h" >&5
       cat > conftest.$ac_ext <<EOF
-#line 3266 "configure"
+#line 3328 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #undef PACKAGE
@@ -3270,7 +3332,7 @@
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3294,7 +3356,7 @@
 
   if test -z "$LIBPNG_LIB"; then
     echo $ac_n "checking for png_read_info in -lpng""... $ac_c" 1>&6
-echo "configure:3298: checking for png_read_info in -lpng" >&5
+echo "configure:3360: checking for png_read_info in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_info | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3302,7 +3364,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3306 "configure"
+#line 3368 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3313,7 +3375,7 @@
 png_read_info()
 ; return 0; }
 EOF
-if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3330,17 +3392,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:3334: checking for png.h" >&5
+echo "configure:3396: checking for png.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 3339 "configure"
+#line 3401 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3369,16 +3431,16 @@
 
     if test "$png_ok" = yes; then
       echo $ac_n "checking for png_structp in png.h""... $ac_c" 1>&6
-echo "configure:3373: checking for png_structp in png.h" >&5
+echo "configure:3435: checking for png_structp in png.h" >&5
       cat > conftest.$ac_ext <<EOF
-#line 3375 "configure"
+#line 3437 "configure"
 #include "confdefs.h"
 #include <png.h>
 int main() {
 png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;
 ; return 0; }
 EOF
-if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   png_ok=yes
 else
@@ -3401,7 +3463,7 @@
 
   if test -z "$LIBMPEG_LIB"; then
     echo $ac_n "checking for GetMPEGFrame in -lmpeg""... $ac_c" 1>&6
-echo "configure:3405: checking for GetMPEGFrame in -lmpeg" >&5
+echo "configure:3467: checking for GetMPEGFrame in -lmpeg" >&5
 ac_lib_var=`echo mpeg'_'GetMPEGFrame | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3409,7 +3471,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lmpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3413 "configure"
+#line 3475 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3420,7 +3482,7 @@
 GetMPEGFrame()
 ; return 0; }
 EOF
-if { (eval echo configure:3424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3437,17 +3499,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "mpeg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for mpeg.h""... $ac_c" 1>&6
-echo "configure:3441: checking for mpeg.h" >&5
+echo "configure:3503: checking for mpeg.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 3446 "configure"
+#line 3508 "configure"
 #include "confdefs.h"
 #include <mpeg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3485,7 +3547,7 @@
 if test "x$with_xdelta" = "xyes"; then
   if test -z "$LIBXDELTA_LIB"; then
     echo $ac_n "checking for xd_checkin in -lxdelta""... $ac_c" 1>&6
-echo "configure:3489: checking for xd_checkin in -lxdelta" >&5
+echo "configure:3551: checking for xd_checkin in -lxdelta" >&5
 ac_lib_var=`echo xdelta'_'xd_checkin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3493,7 +3555,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lxdelta -lglib -lgdbm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3497 "configure"
+#line 3559 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3504,7 +3566,7 @@
 xd_checkin()
 ; return 0; }
 EOF
-if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3523,7 +3585,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for xd_checkout in -lxdelta""... $ac_c" 1>&6
-echo "configure:3527: checking for xd_checkout in -lxdelta" >&5
+echo "configure:3589: checking for xd_checkout in -lxdelta" >&5
 ac_lib_var=`echo xdelta'_'xd_checkout | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3531,7 +3593,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lxdelta -lglib -lgdbm -lz $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3535 "configure"
+#line 3597 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3542,7 +3604,7 @@
 xd_checkout()
 ; return 0; }
 EOF
-if { (eval echo configure:3546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3568,15 +3630,15 @@
 
     if test "$xdelta_ok" = yes; then
       echo $ac_n "checking for xdelta.h""... $ac_c" 1>&6
-echo "configure:3572: checking for xdelta.h" >&5
+echo "configure:3634: checking for xdelta.h" >&5
       cat > conftest.$ac_ext <<EOF
-#line 3574 "configure"
+#line 3636 "configure"
 #include "confdefs.h"
 #include <glib.h>
 #include <xdelta.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3601,7 +3663,7 @@
 
   if test -z "$LIBXPM_LIB"; then
     echo $ac_n "checking for XpmReadFileToXpmImage in -lXpm""... $ac_c" 1>&6
-echo "configure:3605: checking for XpmReadFileToXpmImage in -lXpm" >&5
+echo "configure:3667: checking for XpmReadFileToXpmImage in -lXpm" >&5
 ac_lib_var=`echo Xpm'_'XpmReadFileToXpmImage | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3609,7 +3671,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lXpm $X_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3613 "configure"
+#line 3675 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3620,7 +3682,7 @@
 XpmReadFileToXpmImage()
 ; return 0; }
 EOF
-if { (eval echo configure:3624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3637,17 +3699,17 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
-echo "configure:3641: checking for X11/xpm.h" >&5
+echo "configure:3703: checking for X11/xpm.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 3646 "configure"
+#line 3708 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3678,17 +3740,17 @@
 
 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:3682: checking for sys/ipc.h" >&5
+echo "configure:3744: checking for sys/ipc.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 3687 "configure"
+#line 3749 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3715,17 +3777,17 @@
 
 ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6
-echo "configure:3719: checking for sys/shm.h" >&5
+echo "configure:3781: checking for sys/shm.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 3724 "configure"
+#line 3786 "configure"
 #include "confdefs.h"
 #include <sys/shm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3752,12 +3814,12 @@
 
 if test "$ac_cv_header_sys_shm_h" = "yes"; then
   echo $ac_n "checking whether shmctl IPC_RMID allowes subsequent attaches""... $ac_c" 1>&6
-echo "configure:3756: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5
+echo "configure:3818: checking whether shmctl IPC_RMID allowes subsequent attaches" >&5
   if test "$cross_compiling" = yes; then
   echo "$ac_t""assuming no" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3761 "configure"
+#line 3823 "configure"
 #include "confdefs.h"
 
 	#include <sys/types.h>
@@ -3783,7 +3845,7 @@
 	}
     
 EOF
-if { (eval echo configure:3787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   cat >> confdefs.h <<\EOF
 #define IPC_RMID_DEFERRED_RELEASE 1
@@ -3806,12 +3868,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:3810: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3872: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3815 "configure"
+#line 3877 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3819,7 +3881,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -3844,7 +3906,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:3848: checking for opendir in -ldir" >&5
+echo "configure:3910: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3852,7 +3914,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3856 "configure"
+#line 3918 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3863,7 +3925,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3885,7 +3947,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:3889: checking for opendir in -lx" >&5
+echo "configure:3951: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3893,7 +3955,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3897 "configure"
+#line 3959 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3904,7 +3966,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:3908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3927,12 +3989,12 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3931: checking for ANSI C header files" >&5
+echo "configure:3993: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3936 "configure"
+#line 3998 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3940,7 +4002,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3957,7 +4019,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3961 "configure"
+#line 4023 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3975,7 +4037,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3979 "configure"
+#line 4041 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3996,7 +4058,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4000 "configure"
+#line 4062 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4007,7 +4069,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4031,12 +4093,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:4035: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:4097: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4040 "configure"
+#line 4102 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -4052,7 +4114,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:4056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -4073,12 +4135,12 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:4077: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:4139: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4082 "configure"
+#line 4144 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -4087,7 +4149,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:4091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -4110,17 +4172,17 @@
 
 ac_safe=`echo "sys/time.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/time.h""... $ac_c" 1>&6
-echo "configure:4114: checking for sys/time.h" >&5
+echo "configure:4176: checking for sys/time.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 4119 "configure"
+#line 4181 "configure"
 #include "confdefs.h"
 #include <sys/time.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4146,17 +4208,17 @@
 
 ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for unistd.h""... $ac_c" 1>&6
-echo "configure:4150: checking for unistd.h" >&5
+echo "configure:4212: checking for unistd.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 4155 "configure"
+#line 4217 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4182,12 +4244,12 @@
 
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4186: checking for pid_t" >&5
+echo "configure:4248: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4191 "configure"
+#line 4253 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4215,12 +4277,12 @@
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4219: checking return type of signal handlers" >&5
+echo "configure:4281: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4224 "configure"
+#line 4286 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4237,7 +4299,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:4241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -4256,12 +4318,12 @@
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:4260: checking for vprintf" >&5
+echo "configure:4322: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4265 "configure"
+#line 4327 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -4284,7 +4346,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -4308,12 +4370,12 @@
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:4312: checking for _doprnt" >&5
+echo "configure:4374: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4317 "configure"
+#line 4379 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -4336,7 +4398,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -4364,19 +4426,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:4368: checking for working alloca.h" >&5
+echo "configure:4430: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4373 "configure"
+#line 4435 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:4380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -4397,12 +4459,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:4401: checking for alloca" >&5
+echo "configure:4463: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4406 "configure"
+#line 4468 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -4430,7 +4492,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:4434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -4462,12 +4524,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4466: checking whether alloca needs Cray hooks" >&5
+echo "configure:4528: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4471 "configure"
+#line 4533 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4492,12 +4554,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4496: checking for $ac_func" >&5
+echo "configure:4558: checking for $ac_func" >&5
 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
-#line 4501 "configure"
+#line 4563 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4520,7 +4582,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4547,7 +4609,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4551: checking stack direction for C alloca" >&5
+echo "configure:4613: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4555,7 +4617,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4559 "configure"
+#line 4621 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -4574,7 +4636,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:4578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -4598,16 +4660,16 @@
 
 
 echo $ac_n "checking fd_set and sys/select""... $ac_c" 1>&6
-echo "configure:4602: checking fd_set and sys/select" >&5
+echo "configure:4664: checking fd_set and sys/select" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4604 "configure"
+#line 4666 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 fd_set readMask, writeMask;
 ; return 0; }
 EOF
-if { (eval echo configure:4611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gimp_ok=yes
 else
@@ -4619,7 +4681,7 @@
 rm -f conftest*
 if test $gimp_ok = no; then
     cat > conftest.$ac_ext <<EOF
-#line 4623 "configure"
+#line 4685 "configure"
 #include "confdefs.h"
 #include <sys/select.h>
 EOF
@@ -4647,12 +4709,12 @@
 
 LIBUCB_LIB=""
 echo $ac_n "checking for random""... $ac_c" 1>&6
-echo "configure:4651: checking for random" >&5
+echo "configure:4713: checking for random" >&5
 if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4656 "configure"
+#line 4718 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char random(); below.  */
@@ -4675,7 +4737,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_random=yes"
 else
@@ -4701,7 +4763,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for random in -lucb""... $ac_c" 1>&6
-echo "configure:4705: checking for random in -lucb" >&5
+echo "configure:4767: checking for random in -lucb" >&5
 ac_lib_var=`echo ucb'_'random | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4709,7 +4771,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lucb  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4713 "configure"
+#line 4775 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4720,7 +4782,7 @@
 random()
 ; return 0; }
 EOF
-if { (eval echo configure:4724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4748,12 +4810,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for lrand48""... $ac_c" 1>&6
-echo "configure:4752: checking for lrand48" >&5
+echo "configure:4814: checking for lrand48" >&5
 if eval "test \"`echo '$''{'ac_cv_func_lrand48'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4757 "configure"
+#line 4819 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char lrand48(); below.  */
@@ -4776,7 +4838,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_lrand48=yes"
 else
@@ -4814,12 +4876,12 @@
 
 
 echo $ac_n "checking for difftime""... $ac_c" 1>&6
-echo "configure:4818: checking for difftime" >&5
+echo "configure:4880: checking for difftime" >&5
 if eval "test \"`echo '$''{'ac_cv_func_difftime'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4823 "configure"
+#line 4885 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char difftime(); below.  */
@@ -4842,7 +4904,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_difftime=yes"
 else
@@ -4867,12 +4929,12 @@
 
 
 echo $ac_n "checking for putenv""... $ac_c" 1>&6
-echo "configure:4871: checking for putenv" >&5
+echo "configure:4933: checking for putenv" >&5
 if eval "test \"`echo '$''{'ac_cv_func_putenv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4876 "configure"
+#line 4938 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char putenv(); below.  */
@@ -4895,7 +4957,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_putenv=yes"
 else
@@ -4919,9 +4981,9 @@
 
 
 echo $ac_n "checking for inline definition in glibconfig.h""... $ac_c" 1>&6
-echo "configure:4923: checking for inline definition in glibconfig.h" >&5
+echo "configure:4985: checking for inline definition in glibconfig.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4925 "configure"
+#line 4987 "configure"
 #include "confdefs.h"
 #include <glibconfig.h>
 #ifdef inline
@@ -4942,21 +5004,21 @@
 echo "$ac_t""$have_glib_inline" 1>&6
 if test "$have_glib_inline" = "no"; then
   echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:4946: checking for inline" >&5
+echo "configure:5008: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 4953 "configure"
+#line 5015 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:4960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5005,7 +5067,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5009: checking for $ac_word" >&5
+echo "configure:5071: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_EMACS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5054,7 +5116,7 @@
 # Extract the first word of ""sendmail"", so it can be a program name with args.
 set dummy "sendmail"; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5058: checking for $ac_word" >&5
+echo "configure:5120: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5104,7 +5166,7 @@
 # Extract the first word of ""lp"", so it can be a program name with args.
 set dummy "lp"; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5108: checking for $ac_word" >&5
+echo "configure:5170: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LP_COMMAND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5154,7 +5216,7 @@
 # Extract the first word of ""lpstat"", so it can be a program name with args.
 set dummy "lpstat"; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5158: checking for $ac_word" >&5
+echo "configure:5220: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LPSTAT_COMMAND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5204,7 +5266,7 @@
 # Extract the first word of ""lpr"", so it can be a program name with args.
 set dummy "lpr"; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5208: checking for $ac_word" >&5
+echo "configure:5270: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LPR_COMMAND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5254,7 +5316,7 @@
 # Extract the first word of ""lpc"", so it can be a program name with args.
 set dummy "lpc"; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5258: checking for $ac_word" >&5
+echo "configure:5320: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LPC_COMMAND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5647,10 +5709,11 @@
 s%@CC@%$CC%g
 s%@LD@%$LD%g
 s%@NM@%$NM%g
+s%@USE_SYMBOL_UNDERSCORE@%$USE_SYMBOL_UNDERSCORE%g
 s%@LN_S@%$LN_S%g
-s%@LIBTOOL@%$LIBTOOL%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@AS@%$AS%g
+s%@LIBTOOL@%$LIBTOOL%g
 s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
 s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
 s%@MAINT@%$MAINT%g
diff -ruN gimp-1.0.3/configure.in gimp-1.0.4/configure.in
--- gimp-1.0.3/configure.in	Mon Mar 29 12:34:52 1999
+++ gimp-1.0.4/configure.in	Tue Mar 30 22:41:07 1999
@@ -7,7 +7,7 @@
 dnl $Format: "GIMP_MINOR_VERSION=$ReleaseMinorVersion$" $
 GIMP_MINOR_VERSION=0
 dnl $Format: "GIMP_MICRO_VERSION=$ReleaseMicroVersion$" $
-GIMP_MICRO_VERSION=3
+GIMP_MICRO_VERSION=4
 
 GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
 
diff -ruN gimp-1.0.3/data/Makefile.in gimp-1.0.4/data/Makefile.in
--- gimp-1.0.3/data/Makefile.in	Mon Mar 29 13:15:09 1999
+++ gimp-1.0.4/data/Makefile.in	Sat Apr  3 22:35:01 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/data/brushes/Makefile.in gimp-1.0.4/data/brushes/Makefile.in
--- gimp-1.0.3/data/brushes/Makefile.in	Mon Mar 29 13:15:10 1999
+++ gimp-1.0.4/data/brushes/Makefile.in	Sat Apr  3 22:35:10 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/data/gradients/Makefile.in gimp-1.0.4/data/gradients/Makefile.in
--- gimp-1.0.3/data/gradients/Makefile.in	Mon Mar 29 13:15:11 1999
+++ gimp-1.0.4/data/gradients/Makefile.in	Sat Apr  3 22:35:16 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/data/palettes/Makefile.in gimp-1.0.4/data/palettes/Makefile.in
--- gimp-1.0.3/data/palettes/Makefile.in	Mon Mar 29 13:15:12 1999
+++ gimp-1.0.4/data/palettes/Makefile.in	Sat Apr  3 22:35:23 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/data/patterns/Makefile.in gimp-1.0.4/data/patterns/Makefile.in
--- gimp-1.0.3/data/patterns/Makefile.in	Mon Mar 29 13:15:13 1999
+++ gimp-1.0.4/data/patterns/Makefile.in	Sat Apr  3 22:35:28 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/docs/Makefile.in gimp-1.0.4/docs/Makefile.in
--- gimp-1.0.3/docs/Makefile.in	Mon Mar 29 12:52:46 1999
+++ gimp-1.0.4/docs/Makefile.in	Wed Mar 31 18:56:32 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/docs/white-paper/Makefile.in gimp-1.0.4/docs/white-paper/Makefile.in
--- gimp-1.0.3/docs/white-paper/Makefile.in	Mon Mar 29 12:52:46 1999
+++ gimp-1.0.4/docs/white-paper/Makefile.in	Wed Mar 31 18:56:32 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/libgimp/Makefile.in gimp-1.0.4/libgimp/Makefile.in
--- gimp-1.0.3/libgimp/Makefile.in	Mon Mar 29 13:12:34 1999
+++ gimp-1.0.4/libgimp/Makefile.in	Sat Apr  3 22:16:21 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/libgimp/gimpfeatures.h gimp-1.0.4/libgimp/gimpfeatures.h
--- gimp-1.0.3/libgimp/gimpfeatures.h	Mon Mar 29 12:53:11 1999
+++ gimp-1.0.4/libgimp/gimpfeatures.h	Wed Mar 31 18:57:54 1999
@@ -27,8 +27,8 @@
 
 #define GIMP_MAJOR_VERSION				(1)
 #define GIMP_MINOR_VERSION				(0)
-#define GIMP_MICRO_VERSION				(3)
-#define GIMP_VERSION					"1.0.3"
+#define GIMP_MICRO_VERSION				(4)
+#define GIMP_VERSION					"1.0.4"
 
 #ifdef __cplusplus
 }
diff -ruN gimp-1.0.3/plug-ins/AlienMap/Makefile.in gimp-1.0.4/plug-ins/AlienMap/Makefile.in
--- gimp-1.0.3/plug-ins/AlienMap/Makefile.in	Mon Mar 29 13:12:51 1999
+++ gimp-1.0.4/plug-ins/AlienMap/Makefile.in	Sat Apr  3 22:19:35 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/CEL/Makefile.in gimp-1.0.4/plug-ins/CEL/Makefile.in
--- gimp-1.0.3/plug-ins/CEL/Makefile.in	Mon Mar 29 13:12:52 1999
+++ gimp-1.0.4/plug-ins/CEL/Makefile.in	Sat Apr  3 22:19:49 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/CML_explorer/Makefile.in gimp-1.0.4/plug-ins/CML_explorer/Makefile.in
--- gimp-1.0.3/plug-ins/CML_explorer/Makefile.in	Mon Mar 29 13:12:53 1999
+++ gimp-1.0.4/plug-ins/CML_explorer/Makefile.in	Sat Apr  3 22:20:03 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/Makefile.in gimp-1.0.4/plug-ins/Makefile.in
--- gimp-1.0.3/plug-ins/Makefile.in	Mon Mar 29 13:12:35 1999
+++ gimp-1.0.4/plug-ins/Makefile.in	Sat Apr  3 22:16:29 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/MapObject/Makefile.in gimp-1.0.4/plug-ins/MapObject/Makefile.in
--- gimp-1.0.3/plug-ins/MapObject/Makefile.in	Mon Mar 29 13:12:54 1999
+++ gimp-1.0.4/plug-ins/MapObject/Makefile.in	Sat Apr  3 22:20:14 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/aa/Makefile.in gimp-1.0.4/plug-ins/aa/Makefile.in
--- gimp-1.0.3/plug-ins/aa/Makefile.in	Mon Mar 29 13:12:44 1999
+++ gimp-1.0.4/plug-ins/aa/Makefile.in	Sat Apr  3 22:18:13 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/align_layers/Makefile.in gimp-1.0.4/plug-ins/align_layers/Makefile.in
--- gimp-1.0.3/plug-ins/align_layers/Makefile.in	Mon Mar 29 13:12:55 1999
+++ gimp-1.0.4/plug-ins/align_layers/Makefile.in	Sat Apr  3 22:20:27 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/animationplay/Makefile.in gimp-1.0.4/plug-ins/animationplay/Makefile.in
--- gimp-1.0.3/plug-ins/animationplay/Makefile.in	Mon Mar 29 13:12:59 1999
+++ gimp-1.0.4/plug-ins/animationplay/Makefile.in	Sat Apr  3 22:21:20 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/animoptimize/Makefile.in gimp-1.0.4/plug-ins/animoptimize/Makefile.in
--- gimp-1.0.3/plug-ins/animoptimize/Makefile.in	Mon Mar 29 13:12:56 1999
+++ gimp-1.0.4/plug-ins/animoptimize/Makefile.in	Sat Apr  3 22:20:41 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/apply_lens/Makefile.in gimp-1.0.4/plug-ins/apply_lens/Makefile.in
--- gimp-1.0.3/plug-ins/apply_lens/Makefile.in	Mon Mar 29 13:12:57 1999
+++ gimp-1.0.4/plug-ins/apply_lens/Makefile.in	Sat Apr  3 22:20:55 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/autocrop/Makefile.in gimp-1.0.4/plug-ins/autocrop/Makefile.in
--- gimp-1.0.3/plug-ins/autocrop/Makefile.in	Mon Mar 29 13:12:58 1999
+++ gimp-1.0.4/plug-ins/autocrop/Makefile.in	Sat Apr  3 22:21:07 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/autostretch_hsv/Makefile.in gimp-1.0.4/plug-ins/autostretch_hsv/Makefile.in
--- gimp-1.0.3/plug-ins/autostretch_hsv/Makefile.in	Mon Mar 29 13:13:01 1999
+++ gimp-1.0.4/plug-ins/autostretch_hsv/Makefile.in	Sat Apr  3 22:21:34 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/blinds/Makefile.in gimp-1.0.4/plug-ins/blinds/Makefile.in
--- gimp-1.0.3/plug-ins/blinds/Makefile.in	Mon Mar 29 13:13:02 1999
+++ gimp-1.0.4/plug-ins/blinds/Makefile.in	Sat Apr  3 22:21:47 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/blur/Makefile.in gimp-1.0.4/plug-ins/blur/Makefile.in
--- gimp-1.0.3/plug-ins/blur/Makefile.in	Mon Mar 29 13:13:03 1999
+++ gimp-1.0.4/plug-ins/blur/Makefile.in	Sat Apr  3 22:21:55 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/bmp/Makefile.in gimp-1.0.4/plug-ins/bmp/Makefile.in
--- gimp-1.0.3/plug-ins/bmp/Makefile.in	Mon Mar 29 13:13:04 1999
+++ gimp-1.0.4/plug-ins/bmp/Makefile.in	Sat Apr  3 22:22:04 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/bumpmap/Makefile.in gimp-1.0.4/plug-ins/bumpmap/Makefile.in
--- gimp-1.0.3/plug-ins/bumpmap/Makefile.in	Mon Mar 29 13:13:05 1999
+++ gimp-1.0.4/plug-ins/bumpmap/Makefile.in	Sat Apr  3 22:22:13 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/bz2/Makefile.in gimp-1.0.4/plug-ins/bz2/Makefile.in
--- gimp-1.0.3/plug-ins/bz2/Makefile.in	Mon Mar 29 13:13:06 1999
+++ gimp-1.0.4/plug-ins/bz2/Makefile.in	Sat Apr  3 22:22:21 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/c_astretch/Makefile.in gimp-1.0.4/plug-ins/c_astretch/Makefile.in
--- gimp-1.0.3/plug-ins/c_astretch/Makefile.in	Mon Mar 29 13:13:07 1999
+++ gimp-1.0.4/plug-ins/c_astretch/Makefile.in	Sat Apr  3 22:22:30 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/checkerboard/Makefile.in gimp-1.0.4/plug-ins/checkerboard/Makefile.in
--- gimp-1.0.3/plug-ins/checkerboard/Makefile.in	Mon Mar 29 13:13:08 1999
+++ gimp-1.0.4/plug-ins/checkerboard/Makefile.in	Sat Apr  3 22:22:43 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/colorify/Makefile.in gimp-1.0.4/plug-ins/colorify/Makefile.in
--- gimp-1.0.3/plug-ins/colorify/Makefile.in	Mon Mar 29 13:13:09 1999
+++ gimp-1.0.4/plug-ins/colorify/Makefile.in	Sat Apr  3 22:22:53 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/compose/Makefile.in gimp-1.0.4/plug-ins/compose/Makefile.in
--- gimp-1.0.3/plug-ins/compose/Makefile.in	Mon Mar 29 13:13:10 1999
+++ gimp-1.0.4/plug-ins/compose/Makefile.in	Sat Apr  3 22:23:07 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/convmatrix/Makefile.in gimp-1.0.4/plug-ins/convmatrix/Makefile.in
--- gimp-1.0.3/plug-ins/convmatrix/Makefile.in	Mon Mar 29 13:13:11 1999
+++ gimp-1.0.4/plug-ins/convmatrix/Makefile.in	Sat Apr  3 22:23:18 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/cubism/Makefile.in gimp-1.0.4/plug-ins/cubism/Makefile.in
--- gimp-1.0.3/plug-ins/cubism/Makefile.in	Mon Mar 29 13:13:12 1999
+++ gimp-1.0.4/plug-ins/cubism/Makefile.in	Sat Apr  3 22:23:26 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/dbbrowser/Makefile.in gimp-1.0.4/plug-ins/dbbrowser/Makefile.in
--- gimp-1.0.3/plug-ins/dbbrowser/Makefile.in	Mon Mar 29 13:12:40 1999
+++ gimp-1.0.4/plug-ins/dbbrowser/Makefile.in	Sat Apr  3 22:17:26 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/decompose/Makefile.in gimp-1.0.4/plug-ins/decompose/Makefile.in
--- gimp-1.0.3/plug-ins/decompose/Makefile.in	Mon Mar 29 13:13:13 1999
+++ gimp-1.0.4/plug-ins/decompose/Makefile.in	Sat Apr  3 22:23:40 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/deinterlace/Makefile.in gimp-1.0.4/plug-ins/deinterlace/Makefile.in
--- gimp-1.0.3/plug-ins/deinterlace/Makefile.in	Mon Mar 29 13:13:14 1999
+++ gimp-1.0.4/plug-ins/deinterlace/Makefile.in	Sat Apr  3 22:23:50 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/depthmerge/Makefile.in gimp-1.0.4/plug-ins/depthmerge/Makefile.in
--- gimp-1.0.3/plug-ins/depthmerge/Makefile.in	Mon Mar 29 13:13:15 1999
+++ gimp-1.0.4/plug-ins/depthmerge/Makefile.in	Sat Apr  3 22:24:03 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/despeckle/Makefile.in gimp-1.0.4/plug-ins/despeckle/Makefile.in
--- gimp-1.0.3/plug-ins/despeckle/Makefile.in	Mon Mar 29 13:13:16 1999
+++ gimp-1.0.4/plug-ins/despeckle/Makefile.in	Sat Apr  3 22:24:14 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/destripe/Makefile.in gimp-1.0.4/plug-ins/destripe/Makefile.in
--- gimp-1.0.3/plug-ins/destripe/Makefile.in	Mon Mar 29 13:13:17 1999
+++ gimp-1.0.4/plug-ins/destripe/Makefile.in	Sat Apr  3 22:24:25 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/diffraction/Makefile.in gimp-1.0.4/plug-ins/diffraction/Makefile.in
--- gimp-1.0.3/plug-ins/diffraction/Makefile.in	Mon Mar 29 13:13:18 1999
+++ gimp-1.0.4/plug-ins/diffraction/Makefile.in	Sat Apr  3 22:24:33 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/displace/Makefile.in gimp-1.0.4/plug-ins/displace/Makefile.in
--- gimp-1.0.3/plug-ins/displace/Makefile.in	Mon Mar 29 13:13:19 1999
+++ gimp-1.0.4/plug-ins/displace/Makefile.in	Sat Apr  3 22:24:38 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/edge/Makefile.in gimp-1.0.4/plug-ins/edge/Makefile.in
--- gimp-1.0.3/plug-ins/edge/Makefile.in	Mon Mar 29 13:13:20 1999
+++ gimp-1.0.4/plug-ins/edge/Makefile.in	Sat Apr  3 22:24:44 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/emboss/Makefile.in gimp-1.0.4/plug-ins/emboss/Makefile.in
--- gimp-1.0.3/plug-ins/emboss/Makefile.in	Mon Mar 29 13:13:21 1999
+++ gimp-1.0.4/plug-ins/emboss/Makefile.in	Sat Apr  3 22:24:50 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/engrave/Makefile.in gimp-1.0.4/plug-ins/engrave/Makefile.in
--- gimp-1.0.3/plug-ins/engrave/Makefile.in	Mon Mar 29 13:13:22 1999
+++ gimp-1.0.4/plug-ins/engrave/Makefile.in	Sat Apr  3 22:24:58 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/exchange/Makefile.in gimp-1.0.4/plug-ins/exchange/Makefile.in
--- gimp-1.0.3/plug-ins/exchange/Makefile.in	Mon Mar 29 13:13:23 1999
+++ gimp-1.0.4/plug-ins/exchange/Makefile.in	Sat Apr  3 22:25:05 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/faxg3/Makefile.in gimp-1.0.4/plug-ins/faxg3/Makefile.in
--- gimp-1.0.3/plug-ins/faxg3/Makefile.in	Mon Mar 29 13:13:24 1999
+++ gimp-1.0.4/plug-ins/faxg3/Makefile.in	Sat Apr  3 22:25:13 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/film/Makefile.in gimp-1.0.4/plug-ins/film/Makefile.in
--- gimp-1.0.3/plug-ins/film/Makefile.in	Mon Mar 29 13:13:25 1999
+++ gimp-1.0.4/plug-ins/film/Makefile.in	Sat Apr  3 22:25:19 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/fits/Makefile.in gimp-1.0.4/plug-ins/fits/Makefile.in
--- gimp-1.0.3/plug-ins/fits/Makefile.in	Mon Mar 29 13:13:26 1999
+++ gimp-1.0.4/plug-ins/fits/Makefile.in	Sat Apr  3 22:25:29 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/flame/Makefile.in gimp-1.0.4/plug-ins/flame/Makefile.in
--- gimp-1.0.3/plug-ins/flame/Makefile.in	Mon Mar 29 13:13:27 1999
+++ gimp-1.0.4/plug-ins/flame/Makefile.in	Sat Apr  3 22:25:36 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/flarefx/Makefile.in gimp-1.0.4/plug-ins/flarefx/Makefile.in
--- gimp-1.0.3/plug-ins/flarefx/Makefile.in	Mon Mar 29 13:13:28 1999
+++ gimp-1.0.4/plug-ins/flarefx/Makefile.in	Sat Apr  3 22:25:46 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/fractaltrace/Makefile.in gimp-1.0.4/plug-ins/fractaltrace/Makefile.in
--- gimp-1.0.3/plug-ins/fractaltrace/Makefile.in	Mon Mar 29 13:13:29 1999
+++ gimp-1.0.4/plug-ins/fractaltrace/Makefile.in	Sat Apr  3 22:25:55 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gauss_iir/Makefile.in gimp-1.0.4/plug-ins/gauss_iir/Makefile.in
--- gimp-1.0.3/plug-ins/gauss_iir/Makefile.in	Mon Mar 29 13:13:30 1999
+++ gimp-1.0.4/plug-ins/gauss_iir/Makefile.in	Sat Apr  3 22:26:03 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gauss_rle/Makefile.in gimp-1.0.4/plug-ins/gauss_rle/Makefile.in
--- gimp-1.0.3/plug-ins/gauss_rle/Makefile.in	Mon Mar 29 13:13:31 1999
+++ gimp-1.0.4/plug-ins/gauss_rle/Makefile.in	Sat Apr  3 22:26:13 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gbr/Makefile.in gimp-1.0.4/plug-ins/gbr/Makefile.in
--- gimp-1.0.3/plug-ins/gbr/Makefile.in	Mon Mar 29 13:13:32 1999
+++ gimp-1.0.4/plug-ins/gbr/Makefile.in	Sat Apr  3 22:26:20 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gee/Makefile.in gimp-1.0.4/plug-ins/gee/Makefile.in
--- gimp-1.0.3/plug-ins/gee/Makefile.in	Mon Mar 29 13:13:33 1999
+++ gimp-1.0.4/plug-ins/gee/Makefile.in	Sat Apr  3 22:26:28 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gfig/Makefile.in gimp-1.0.4/plug-ins/gfig/Makefile.in
--- gimp-1.0.3/plug-ins/gfig/Makefile.in	Mon Mar 29 13:13:34 1999
+++ gimp-1.0.4/plug-ins/gfig/Makefile.in	Sat Apr  3 22:26:39 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gfig/gfig-examples/Makefile.in gimp-1.0.4/plug-ins/gfig/gfig-examples/Makefile.in
--- gimp-1.0.3/plug-ins/gfig/gfig-examples/Makefile.in	Mon Mar 29 13:13:34 1999
+++ gimp-1.0.4/plug-ins/gfig/gfig-examples/Makefile.in	Sat Apr  3 22:26:44 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gfli/Makefile.in gimp-1.0.4/plug-ins/gfli/Makefile.in
--- gimp-1.0.3/plug-ins/gfli/Makefile.in	Mon Mar 29 13:13:36 1999
+++ gimp-1.0.4/plug-ins/gfli/Makefile.in	Sat Apr  3 22:26:53 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gicon/Makefile.in gimp-1.0.4/plug-ins/gicon/Makefile.in
--- gimp-1.0.3/plug-ins/gicon/Makefile.in	Mon Mar 29 13:13:37 1999
+++ gimp-1.0.4/plug-ins/gicon/Makefile.in	Sat Apr  3 22:27:01 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gif/Makefile.in gimp-1.0.4/plug-ins/gif/Makefile.in
--- gimp-1.0.3/plug-ins/gif/Makefile.in	Mon Mar 29 13:13:38 1999
+++ gimp-1.0.4/plug-ins/gif/Makefile.in	Sat Apr  3 22:27:10 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/glasstile/Makefile.in gimp-1.0.4/plug-ins/glasstile/Makefile.in
--- gimp-1.0.3/plug-ins/glasstile/Makefile.in	Mon Mar 29 13:13:39 1999
+++ gimp-1.0.4/plug-ins/glasstile/Makefile.in	Sat Apr  3 22:27:18 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gpc/Makefile.in gimp-1.0.4/plug-ins/gpc/Makefile.in
--- gimp-1.0.3/plug-ins/gpc/Makefile.in	Mon Mar 29 13:12:39 1999
+++ gimp-1.0.4/plug-ins/gpc/Makefile.in	Sat Apr  3 22:17:15 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gqbist/Makefile.in gimp-1.0.4/plug-ins/gqbist/Makefile.in
--- gimp-1.0.3/plug-ins/gqbist/Makefile.in	Mon Mar 29 13:13:40 1999
+++ gimp-1.0.4/plug-ins/gqbist/Makefile.in	Sat Apr  3 22:27:25 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gradmap/Makefile.in gimp-1.0.4/plug-ins/gradmap/Makefile.in
--- gimp-1.0.3/plug-ins/gradmap/Makefile.in	Mon Mar 29 13:13:41 1999
+++ gimp-1.0.4/plug-ins/gradmap/Makefile.in	Sat Apr  3 22:27:35 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/grid/Makefile.in gimp-1.0.4/plug-ins/grid/Makefile.in
--- gimp-1.0.3/plug-ins/grid/Makefile.in	Mon Mar 29 13:13:42 1999
+++ gimp-1.0.4/plug-ins/grid/Makefile.in	Sat Apr  3 22:27:47 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gtm/Makefile.in gimp-1.0.4/plug-ins/gtm/Makefile.in
--- gimp-1.0.3/plug-ins/gtm/Makefile.in	Mon Mar 29 13:13:43 1999
+++ gimp-1.0.4/plug-ins/gtm/Makefile.in	Sat Apr  3 22:27:53 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/gz/Makefile.in gimp-1.0.4/plug-ins/gz/Makefile.in
--- gimp-1.0.3/plug-ins/gz/Makefile.in	Mon Mar 29 13:13:44 1999
+++ gimp-1.0.4/plug-ins/gz/Makefile.in	Sat Apr  3 22:27:59 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/header/Makefile.in gimp-1.0.4/plug-ins/header/Makefile.in
--- gimp-1.0.3/plug-ins/header/Makefile.in	Mon Mar 29 13:13:45 1999
+++ gimp-1.0.4/plug-ins/header/Makefile.in	Sat Apr  3 22:28:05 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/hot/Makefile.in gimp-1.0.4/plug-ins/hot/Makefile.in
--- gimp-1.0.3/plug-ins/hot/Makefile.in	Mon Mar 29 13:13:46 1999
+++ gimp-1.0.4/plug-ins/hot/Makefile.in	Sat Apr  3 22:28:10 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/hrz/Makefile.in gimp-1.0.4/plug-ins/hrz/Makefile.in
--- gimp-1.0.3/plug-ins/hrz/Makefile.in	Mon Mar 29 13:13:47 1999
+++ gimp-1.0.4/plug-ins/hrz/Makefile.in	Sat Apr  3 22:28:17 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/ifscompose/Makefile.in gimp-1.0.4/plug-ins/ifscompose/Makefile.in
--- gimp-1.0.3/plug-ins/ifscompose/Makefile.in	Mon Mar 29 13:13:48 1999
+++ gimp-1.0.4/plug-ins/ifscompose/Makefile.in	Sat Apr  3 22:28:27 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/illusion/Makefile.in gimp-1.0.4/plug-ins/illusion/Makefile.in
--- gimp-1.0.3/plug-ins/illusion/Makefile.in	Mon Mar 29 13:13:49 1999
+++ gimp-1.0.4/plug-ins/illusion/Makefile.in	Sat Apr  3 22:28:33 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/illusion/illusion.c gimp-1.0.4/plug-ins/illusion/illusion.c
--- gimp-1.0.3/plug-ins/illusion/illusion.c	Fri Jun 26 10:59:37 1998
+++ gimp-1.0.4/plug-ins/illusion/illusion.c	Wed Mar 31 09:48:03 1999
@@ -21,6 +21,7 @@
 
 *******************************************************************************/
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
diff -ruN gimp-1.0.3/plug-ins/iwarp/Makefile.in gimp-1.0.4/plug-ins/iwarp/Makefile.in
--- gimp-1.0.3/plug-ins/iwarp/Makefile.in	Mon Mar 29 13:13:50 1999
+++ gimp-1.0.4/plug-ins/iwarp/Makefile.in	Sat Apr  3 22:28:38 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/jpeg/Makefile.in gimp-1.0.4/plug-ins/jpeg/Makefile.in
--- gimp-1.0.3/plug-ins/jpeg/Makefile.in	Mon Mar 29 13:12:45 1999
+++ gimp-1.0.4/plug-ins/jpeg/Makefile.in	Sat Apr  3 22:18:25 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/laplace/Makefile.in gimp-1.0.4/plug-ins/laplace/Makefile.in
--- gimp-1.0.3/plug-ins/laplace/Makefile.in	Mon Mar 29 13:13:51 1999
+++ gimp-1.0.4/plug-ins/laplace/Makefile.in	Sat Apr  3 22:28:44 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/libgck/Makefile.in gimp-1.0.4/plug-ins/libgck/Makefile.in
--- gimp-1.0.3/plug-ins/libgck/Makefile.in	Mon Mar 29 13:12:36 1999
+++ gimp-1.0.4/plug-ins/libgck/Makefile.in	Sat Apr  3 22:16:41 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/libgck/gck/Makefile.in gimp-1.0.4/plug-ins/libgck/gck/Makefile.in
--- gimp-1.0.3/plug-ins/libgck/gck/Makefile.in	Mon Mar 29 13:12:37 1999
+++ gimp-1.0.4/plug-ins/libgck/gck/Makefile.in	Sat Apr  3 22:16:53 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/mail/Makefile.in gimp-1.0.4/plug-ins/mail/Makefile.in
--- gimp-1.0.3/plug-ins/mail/Makefile.in	Mon Mar 29 13:13:52 1999
+++ gimp-1.0.4/plug-ins/mail/Makefile.in	Sat Apr  3 22:28:49 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/max_rgb/Makefile.in gimp-1.0.4/plug-ins/max_rgb/Makefile.in
--- gimp-1.0.3/plug-ins/max_rgb/Makefile.in	Mon Mar 29 13:13:53 1999
+++ gimp-1.0.4/plug-ins/max_rgb/Makefile.in	Sat Apr  3 22:28:55 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/maze/Makefile.in gimp-1.0.4/plug-ins/maze/Makefile.in
--- gimp-1.0.3/plug-ins/maze/Makefile.in	Mon Mar 29 13:13:54 1999
+++ gimp-1.0.4/plug-ins/maze/Makefile.in	Sat Apr  3 22:29:03 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/mblur/Makefile.in gimp-1.0.4/plug-ins/mblur/Makefile.in
--- gimp-1.0.3/plug-ins/mblur/Makefile.in	Mon Mar 29 13:13:55 1999
+++ gimp-1.0.4/plug-ins/mblur/Makefile.in	Sat Apr  3 22:29:09 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/megawidget/Makefile.in gimp-1.0.4/plug-ins/megawidget/Makefile.in
--- gimp-1.0.3/plug-ins/megawidget/Makefile.in	Mon Mar 29 13:12:38 1999
+++ gimp-1.0.4/plug-ins/megawidget/Makefile.in	Sat Apr  3 22:17:05 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/mosaic/Makefile.in gimp-1.0.4/plug-ins/mosaic/Makefile.in
--- gimp-1.0.3/plug-ins/mosaic/Makefile.in	Mon Mar 29 13:13:56 1999
+++ gimp-1.0.4/plug-ins/mosaic/Makefile.in	Sat Apr  3 22:29:15 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/mpeg/Makefile.in gimp-1.0.4/plug-ins/mpeg/Makefile.in
--- gimp-1.0.3/plug-ins/mpeg/Makefile.in	Mon Mar 29 13:12:46 1999
+++ gimp-1.0.4/plug-ins/mpeg/Makefile.in	Sat Apr  3 22:18:39 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/nlfilt/Makefile.in gimp-1.0.4/plug-ins/nlfilt/Makefile.in
--- gimp-1.0.3/plug-ins/nlfilt/Makefile.in	Mon Mar 29 13:13:57 1999
+++ gimp-1.0.4/plug-ins/nlfilt/Makefile.in	Sat Apr  3 22:29:20 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/noisify/Makefile.in gimp-1.0.4/plug-ins/noisify/Makefile.in
--- gimp-1.0.3/plug-ins/noisify/Makefile.in	Mon Mar 29 13:13:58 1999
+++ gimp-1.0.4/plug-ins/noisify/Makefile.in	Sat Apr  3 22:29:26 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/normalize/Makefile.in gimp-1.0.4/plug-ins/normalize/Makefile.in
--- gimp-1.0.3/plug-ins/normalize/Makefile.in	Mon Mar 29 13:13:59 1999
+++ gimp-1.0.4/plug-ins/normalize/Makefile.in	Sat Apr  3 22:29:31 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/nova/Makefile.in gimp-1.0.4/plug-ins/nova/Makefile.in
--- gimp-1.0.3/plug-ins/nova/Makefile.in	Mon Mar 29 13:14:00 1999
+++ gimp-1.0.4/plug-ins/nova/Makefile.in	Sat Apr  3 22:29:37 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/oilify/Makefile.in gimp-1.0.4/plug-ins/oilify/Makefile.in
--- gimp-1.0.3/plug-ins/oilify/Makefile.in	Mon Mar 29 13:14:01 1999
+++ gimp-1.0.4/plug-ins/oilify/Makefile.in	Sat Apr  3 22:29:45 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/pagecurl/Makefile.in gimp-1.0.4/plug-ins/pagecurl/Makefile.in
--- gimp-1.0.3/plug-ins/pagecurl/Makefile.in	Mon Mar 29 13:14:02 1999
+++ gimp-1.0.4/plug-ins/pagecurl/Makefile.in	Sat Apr  3 22:29:51 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/palette/Makefile.in gimp-1.0.4/plug-ins/palette/Makefile.in
--- gimp-1.0.3/plug-ins/palette/Makefile.in	Mon Mar 29 13:14:03 1999
+++ gimp-1.0.4/plug-ins/palette/Makefile.in	Sat Apr  3 22:29:58 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/papertile/Makefile.in gimp-1.0.4/plug-ins/papertile/Makefile.in
--- gimp-1.0.3/plug-ins/papertile/Makefile.in	Mon Mar 29 13:14:04 1999
+++ gimp-1.0.4/plug-ins/papertile/Makefile.in	Sat Apr  3 22:30:03 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/pat/Makefile.in gimp-1.0.4/plug-ins/pat/Makefile.in
--- gimp-1.0.3/plug-ins/pat/Makefile.in	Mon Mar 29 13:14:05 1999
+++ gimp-1.0.4/plug-ins/pat/Makefile.in	Sat Apr  3 22:30:10 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/pcx/Makefile.in gimp-1.0.4/plug-ins/pcx/Makefile.in
--- gimp-1.0.3/plug-ins/pcx/Makefile.in	Mon Mar 29 13:14:07 1999
+++ gimp-1.0.4/plug-ins/pcx/Makefile.in	Sat Apr  3 22:30:18 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/pix/Makefile.in gimp-1.0.4/plug-ins/pix/Makefile.in
--- gimp-1.0.3/plug-ins/pix/Makefile.in	Mon Mar 29 13:14:08 1999
+++ gimp-1.0.4/plug-ins/pix/Makefile.in	Sat Apr  3 22:30:23 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/pixelize/Makefile.in gimp-1.0.4/plug-ins/pixelize/Makefile.in
--- gimp-1.0.3/plug-ins/pixelize/Makefile.in	Mon Mar 29 13:14:08 1999
+++ gimp-1.0.4/plug-ins/pixelize/Makefile.in	Sat Apr  3 22:30:29 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/plasma/Makefile.in gimp-1.0.4/plug-ins/plasma/Makefile.in
--- gimp-1.0.3/plug-ins/plasma/Makefile.in	Mon Mar 29 13:14:09 1999
+++ gimp-1.0.4/plug-ins/plasma/Makefile.in	Sat Apr  3 22:30:35 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/png/Makefile.in gimp-1.0.4/plug-ins/png/Makefile.in
--- gimp-1.0.3/plug-ins/png/Makefile.in	Mon Mar 29 13:12:47 1999
+++ gimp-1.0.4/plug-ins/png/Makefile.in	Sat Apr  3 22:18:48 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/pnm/Makefile.in gimp-1.0.4/plug-ins/pnm/Makefile.in
--- gimp-1.0.3/plug-ins/pnm/Makefile.in	Mon Mar 29 13:14:10 1999
+++ gimp-1.0.4/plug-ins/pnm/Makefile.in	Sat Apr  3 22:30:43 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/polar/Makefile.in gimp-1.0.4/plug-ins/polar/Makefile.in
--- gimp-1.0.3/plug-ins/polar/Makefile.in	Mon Mar 29 13:14:12 1999
+++ gimp-1.0.4/plug-ins/polar/Makefile.in	Sat Apr  3 22:30:48 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/print/Makefile.in gimp-1.0.4/plug-ins/print/Makefile.in
--- gimp-1.0.3/plug-ins/print/Makefile.in	Mon Mar 29 13:14:13 1999
+++ gimp-1.0.4/plug-ins/print/Makefile.in	Sat Apr  3 22:30:55 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/ps/Makefile.in gimp-1.0.4/plug-ins/ps/Makefile.in
--- gimp-1.0.3/plug-ins/ps/Makefile.in	Mon Mar 29 13:14:14 1999
+++ gimp-1.0.4/plug-ins/ps/Makefile.in	Sat Apr  3 22:31:02 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/psd/Makefile.in gimp-1.0.4/plug-ins/psd/Makefile.in
--- gimp-1.0.3/plug-ins/psd/Makefile.in	Mon Mar 29 13:14:15 1999
+++ gimp-1.0.4/plug-ins/psd/Makefile.in	Sat Apr  3 22:31:08 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/randomize/Makefile.in gimp-1.0.4/plug-ins/randomize/Makefile.in
--- gimp-1.0.3/plug-ins/randomize/Makefile.in	Mon Mar 29 13:14:18 1999
+++ gimp-1.0.4/plug-ins/randomize/Makefile.in	Sat Apr  3 22:31:16 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/ripple/Makefile.in gimp-1.0.4/plug-ins/ripple/Makefile.in
--- gimp-1.0.3/plug-ins/ripple/Makefile.in	Mon Mar 29 13:14:20 1999
+++ gimp-1.0.4/plug-ins/ripple/Makefile.in	Sat Apr  3 22:31:21 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/rotate/Makefile.in gimp-1.0.4/plug-ins/rotate/Makefile.in
--- gimp-1.0.3/plug-ins/rotate/Makefile.in	Mon Mar 29 13:14:22 1999
+++ gimp-1.0.4/plug-ins/rotate/Makefile.in	Sat Apr  3 22:31:27 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/rotators/Makefile.in gimp-1.0.4/plug-ins/rotators/Makefile.in
--- gimp-1.0.3/plug-ins/rotators/Makefile.in	Mon Mar 29 13:14:24 1999
+++ gimp-1.0.4/plug-ins/rotators/Makefile.in	Sat Apr  3 22:31:34 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/scatter_hsv/Makefile.in gimp-1.0.4/plug-ins/scatter_hsv/Makefile.in
--- gimp-1.0.3/plug-ins/scatter_hsv/Makefile.in	Mon Mar 29 13:14:26 1999
+++ gimp-1.0.4/plug-ins/scatter_hsv/Makefile.in	Sat Apr  3 22:31:41 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/screenshot/Makefile.in gimp-1.0.4/plug-ins/screenshot/Makefile.in
--- gimp-1.0.3/plug-ins/screenshot/Makefile.in	Mon Mar 29 13:14:29 1999
+++ gimp-1.0.4/plug-ins/screenshot/Makefile.in	Sat Apr  3 22:31:47 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/script-fu/Makefile.in gimp-1.0.4/plug-ins/script-fu/Makefile.in
--- gimp-1.0.3/plug-ins/script-fu/Makefile.in	Mon Mar 29 13:12:41 1999
+++ gimp-1.0.4/plug-ins/script-fu/Makefile.in	Sat Apr  3 22:17:35 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/script-fu/scripts/Makefile.in gimp-1.0.4/plug-ins/script-fu/scripts/Makefile.in
--- gimp-1.0.3/plug-ins/script-fu/scripts/Makefile.in	Mon Mar 29 13:12:42 1999
+++ gimp-1.0.4/plug-ins/script-fu/scripts/Makefile.in	Sat Apr  3 22:17:47 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/semiflatten/Makefile.in gimp-1.0.4/plug-ins/semiflatten/Makefile.in
--- gimp-1.0.3/plug-ins/semiflatten/Makefile.in	Mon Mar 29 13:14:31 1999
+++ gimp-1.0.4/plug-ins/semiflatten/Makefile.in	Sat Apr  3 22:31:52 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/sgi/Makefile.in gimp-1.0.4/plug-ins/sgi/Makefile.in
--- gimp-1.0.3/plug-ins/sgi/Makefile.in	Mon Mar 29 13:14:33 1999
+++ gimp-1.0.4/plug-ins/sgi/Makefile.in	Sat Apr  3 22:31:58 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/sharpen/Makefile.in gimp-1.0.4/plug-ins/sharpen/Makefile.in
--- gimp-1.0.3/plug-ins/sharpen/Makefile.in	Mon Mar 29 13:14:35 1999
+++ gimp-1.0.4/plug-ins/sharpen/Makefile.in	Sat Apr  3 22:32:06 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/shift/Makefile.in gimp-1.0.4/plug-ins/shift/Makefile.in
--- gimp-1.0.3/plug-ins/shift/Makefile.in	Mon Mar 29 13:14:36 1999
+++ gimp-1.0.4/plug-ins/shift/Makefile.in	Sat Apr  3 22:32:13 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/sinus/Makefile.in gimp-1.0.4/plug-ins/sinus/Makefile.in
--- gimp-1.0.3/plug-ins/sinus/Makefile.in	Mon Mar 29 13:14:38 1999
+++ gimp-1.0.4/plug-ins/sinus/Makefile.in	Sat Apr  3 22:32:18 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/smooth_palette/Makefile.in gimp-1.0.4/plug-ins/smooth_palette/Makefile.in
--- gimp-1.0.3/plug-ins/smooth_palette/Makefile.in	Mon Mar 29 13:14:39 1999
+++ gimp-1.0.4/plug-ins/smooth_palette/Makefile.in	Sat Apr  3 22:32:25 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/snoise/Makefile.in gimp-1.0.4/plug-ins/snoise/Makefile.in
--- gimp-1.0.3/plug-ins/snoise/Makefile.in	Mon Mar 29 13:14:40 1999
+++ gimp-1.0.4/plug-ins/snoise/Makefile.in	Sat Apr  3 22:32:30 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/snp/Makefile.in gimp-1.0.4/plug-ins/snp/Makefile.in
--- gimp-1.0.3/plug-ins/snp/Makefile.in	Mon Mar 29 13:14:41 1999
+++ gimp-1.0.4/plug-ins/snp/Makefile.in	Sat Apr  3 22:32:36 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/sobel/Makefile.in gimp-1.0.4/plug-ins/sobel/Makefile.in
--- gimp-1.0.3/plug-ins/sobel/Makefile.in	Mon Mar 29 13:14:44 1999
+++ gimp-1.0.4/plug-ins/sobel/Makefile.in	Sat Apr  3 22:32:44 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/sparkle/Makefile.in gimp-1.0.4/plug-ins/sparkle/Makefile.in
--- gimp-1.0.3/plug-ins/sparkle/Makefile.in	Mon Mar 29 13:14:45 1999
+++ gimp-1.0.4/plug-ins/sparkle/Makefile.in	Sat Apr  3 22:32:49 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/spread/Makefile.in gimp-1.0.4/plug-ins/spread/Makefile.in
--- gimp-1.0.3/plug-ins/spread/Makefile.in	Mon Mar 29 13:14:46 1999
+++ gimp-1.0.4/plug-ins/spread/Makefile.in	Sat Apr  3 22:32:55 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/struc/Makefile.in gimp-1.0.4/plug-ins/struc/Makefile.in
--- gimp-1.0.3/plug-ins/struc/Makefile.in	Mon Mar 29 13:14:47 1999
+++ gimp-1.0.4/plug-ins/struc/Makefile.in	Sat Apr  3 22:33:02 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/sunras/Makefile.in gimp-1.0.4/plug-ins/sunras/Makefile.in
--- gimp-1.0.3/plug-ins/sunras/Makefile.in	Mon Mar 29 13:14:48 1999
+++ gimp-1.0.4/plug-ins/sunras/Makefile.in	Sat Apr  3 22:33:07 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/tga/Makefile.in gimp-1.0.4/plug-ins/tga/Makefile.in
--- gimp-1.0.3/plug-ins/tga/Makefile.in	Mon Mar 29 13:14:49 1999
+++ gimp-1.0.4/plug-ins/tga/Makefile.in	Sat Apr  3 22:33:13 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/threshold_alpha/Makefile.in gimp-1.0.4/plug-ins/threshold_alpha/Makefile.in
--- gimp-1.0.3/plug-ins/threshold_alpha/Makefile.in	Mon Mar 29 13:14:51 1999
+++ gimp-1.0.4/plug-ins/threshold_alpha/Makefile.in	Sat Apr  3 22:33:19 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/tiff/Makefile.in gimp-1.0.4/plug-ins/tiff/Makefile.in
--- gimp-1.0.3/plug-ins/tiff/Makefile.in	Mon Mar 29 13:12:48 1999
+++ gimp-1.0.4/plug-ins/tiff/Makefile.in	Sat Apr  3 22:19:01 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/tile/Makefile.in gimp-1.0.4/plug-ins/tile/Makefile.in
--- gimp-1.0.3/plug-ins/tile/Makefile.in	Mon Mar 29 13:14:52 1999
+++ gimp-1.0.4/plug-ins/tile/Makefile.in	Sat Apr  3 22:33:25 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/tileit/Makefile.in gimp-1.0.4/plug-ins/tileit/Makefile.in
--- gimp-1.0.3/plug-ins/tileit/Makefile.in	Mon Mar 29 13:14:53 1999
+++ gimp-1.0.4/plug-ins/tileit/Makefile.in	Sat Apr  3 22:33:33 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/tiler/Makefile.in gimp-1.0.4/plug-ins/tiler/Makefile.in
--- gimp-1.0.3/plug-ins/tiler/Makefile.in	Mon Mar 29 13:14:53 1999
+++ gimp-1.0.4/plug-ins/tiler/Makefile.in	Sat Apr  3 22:33:38 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/url/Makefile.in gimp-1.0.4/plug-ins/url/Makefile.in
--- gimp-1.0.3/plug-ins/url/Makefile.in	Mon Mar 29 13:14:54 1999
+++ gimp-1.0.4/plug-ins/url/Makefile.in	Sat Apr  3 22:33:45 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/video/Makefile.in gimp-1.0.4/plug-ins/video/Makefile.in
--- gimp-1.0.3/plug-ins/video/Makefile.in	Mon Mar 29 13:14:56 1999
+++ gimp-1.0.4/plug-ins/video/Makefile.in	Sat Apr  3 22:33:49 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/vinvert/Makefile.in gimp-1.0.4/plug-ins/vinvert/Makefile.in
--- gimp-1.0.3/plug-ins/vinvert/Makefile.in	Mon Mar 29 13:14:57 1999
+++ gimp-1.0.4/plug-ins/vinvert/Makefile.in	Sat Apr  3 22:33:55 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/vpropagate/Makefile.in gimp-1.0.4/plug-ins/vpropagate/Makefile.in
--- gimp-1.0.3/plug-ins/vpropagate/Makefile.in	Mon Mar 29 13:14:58 1999
+++ gimp-1.0.4/plug-ins/vpropagate/Makefile.in	Sat Apr  3 22:34:00 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/waves/Makefile.in gimp-1.0.4/plug-ins/waves/Makefile.in
--- gimp-1.0.3/plug-ins/waves/Makefile.in	Mon Mar 29 13:14:58 1999
+++ gimp-1.0.4/plug-ins/waves/Makefile.in	Sat Apr  3 22:34:07 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/webbrowser/Makefile.in gimp-1.0.4/plug-ins/webbrowser/Makefile.in
--- gimp-1.0.3/plug-ins/webbrowser/Makefile.in	Mon Mar 29 13:12:49 1999
+++ gimp-1.0.4/plug-ins/webbrowser/Makefile.in	Sat Apr  3 22:19:12 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/whirlpinch/Makefile.in gimp-1.0.4/plug-ins/whirlpinch/Makefile.in
--- gimp-1.0.3/plug-ins/whirlpinch/Makefile.in	Mon Mar 29 13:14:59 1999
+++ gimp-1.0.4/plug-ins/whirlpinch/Makefile.in	Sat Apr  3 22:34:12 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/whirlpinch/whirlpinch.c gimp-1.0.4/plug-ins/whirlpinch/whirlpinch.c
--- gimp-1.0.3/plug-ins/whirlpinch/whirlpinch.c	Sun Apr 12 22:44:07 1998
+++ gimp-1.0.4/plug-ins/whirlpinch/whirlpinch.c	Tue Mar 30 22:05:37 1999
@@ -46,6 +46,7 @@
  * plug-ins.  */
 
 
+#include <stdio.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
diff -ruN gimp-1.0.3/plug-ins/xd/Makefile.in gimp-1.0.4/plug-ins/xd/Makefile.in
--- gimp-1.0.3/plug-ins/xd/Makefile.in	Mon Mar 29 12:52:14 1999
+++ gimp-1.0.4/plug-ins/xd/Makefile.in	Wed Mar 31 18:53:36 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/xpm/Makefile.in gimp-1.0.4/plug-ins/xpm/Makefile.in
--- gimp-1.0.3/plug-ins/xpm/Makefile.in	Mon Mar 29 13:12:50 1999
+++ gimp-1.0.4/plug-ins/xpm/Makefile.in	Sat Apr  3 22:19:23 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/xwd/Makefile.in gimp-1.0.4/plug-ins/xwd/Makefile.in
--- gimp-1.0.3/plug-ins/xwd/Makefile.in	Mon Mar 29 13:15:00 1999
+++ gimp-1.0.4/plug-ins/xwd/Makefile.in	Sat Apr  3 22:34:17 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@
diff -ruN gimp-1.0.3/plug-ins/zealouscrop/Makefile.in gimp-1.0.4/plug-ins/zealouscrop/Makefile.in
--- gimp-1.0.3/plug-ins/zealouscrop/Makefile.in	Mon Mar 29 13:15:02 1999
+++ gimp-1.0.4/plug-ins/zealouscrop/Makefile.in	Sat Apr  3 22:34:22 1999
@@ -104,6 +104,7 @@
 RANLIB = @RANLIB@
 SENDMAIL = @SENDMAIL@
 TIFF = @TIFF@
+USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
 VERSION = @VERSION@
 WEBBROWSER = @WEBBROWSER@
 XD = @XD@