diff -crN ./eog/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/configure.in
*** ./eog/configure.in	Mon Mar 10 16:51:31 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/configure.in	Tue Jul  8 13:21:46 2003
***************
*** 25,31 ****
  AC_ISC_POSIX
  AC_HEADER_STDC
  AC_ARG_PROGRAM
! AC_PROG_RANLIB
  
  GNOME_COMPILE_WARNINGS
  
--- 25,31 ----
  AC_ISC_POSIX
  AC_HEADER_STDC
  AC_ARG_PROGRAM
! AM_PROG_LIBTOOL
  
  GNOME_COMPILE_WARNINGS
  
diff -crN ./eog/omf-install/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/omf-install/Makefile.am
*** ./eog/omf-install/Makefile.am	Thu Dec  5 20:53:10 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/omf-install/Makefile.am	Tue Jul  8 13:40:29 2003
***************
*** 20,26 ****
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
  	-for file in $(srcdir)/*.omf; do \
! 		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
  	done
  	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
  
--- 20,27 ----
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
  	-for file in $(srcdir)/*.omf; do \
! 		basefile=`basename $$file`; \
! 		$(INSTALL_DATA) $(srcdir)/$$basefile $(DESTDIR)$(omf_dest_dir); \
  	done
  	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) 
  
diff -crN ./eog/viewer/eog-control.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/viewer/eog-control.c
*** ./eog/viewer/eog-control.c	Fri Feb 14 13:05:47 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/viewer/eog-control.c	Tue Jul  8 13:22:54 2003
***************
*** 23,28 ****
--- 23,32 ----
  #include "libeog/image-view.h"
  #include <eog-control.h>
  
+ /* defined in bonobo-control-internal.h, but not installed ! */
+ 
+ BonoboPlug * bonobo_control_get_plug (BonoboControl *control);
+ 
  /* See plug_size_allocate_cb() below */
  #define BROKEN_SIZE_ALLOCATIONS 3
  
diff -crN ./eog/viewer/eog-image-io.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/viewer/eog-image-io.c
*** ./eog/viewer/eog-image-io.c	Thu Dec  5 20:53:15 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/viewer/eog-image-io.c	Tue Jul  8 13:22:43 2003
***************
*** 19,24 ****
--- 19,25 ----
   */
  
  #include <config.h>
+ #include <math.h>
  #include <gnome.h> /* Include this before png.h, or see lots of shadowed
  		      variable warnings */
  #include <stdio.h>
***************
*** 27,33 ****
  #include <X11/xpm.h>
  #endif
  #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <math.h>
  
  #include <bonobo.h>
  
--- 28,33 ----
diff -crN ./eog/xmldocs.make /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/xmldocs.make
*** ./eog/xmldocs.make	Thu Dec  5 20:53:05 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./eog/xmldocs.make	Tue Jul  8 13:22:01 2003
***************
*** 48,59 ****
  
  omf_timestamp: $(omffile)
  	-for file in $(omffile); do \
! 	  scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } /identifier/ {print $$0}' $${file} | awk 'BEGIN {FS="\""} /url/ {print $$2}'` $${file} $(omf_dir)/$${file}; \
  	done
  	touch omf_timestamp
  
  $(docname).xml: $(entities)
!         -ourdir=`pwd`;  \
          cd $(srcdir);   \
          cp $(entities) $$ourdir
  
--- 48,59 ----
  
  omf_timestamp: $(omffile)
  	-for file in $(omffile); do \
! 	  scrollkeeper-preinstall $(docdir)/`awk 'BEGIN {RS = ">" } /identifier/ {print $$0}' $(srcdir)/$${file} | awk 'BEGIN {FS="\""} /url/ {print $$2}'` $(srcdir)/$${file} $(omf_dir)/$${file}; \
  	done
  	touch omf_timestamp
  
  $(docname).xml: $(entities)
! 	-ourdir=`pwd`;  \
          cd $(srcdir);   \
          cp $(entities) $$ourdir
  
***************
*** 65,71 ****
  
  install-data-am: omf
  	-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
! 	-cp $(srcdir)/$(xml_files) $(DESTDIR)$(docdir)
  	-for file in $(srcdir)/figures/*.png; do \
  	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
  	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/figures/$$basefile; \
--- 65,73 ----
  
  install-data-am: omf
  	-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
! 	-for file in $(xml_files); do \
! 	  cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
! 	done
  	-for file in $(srcdir)/figures/*.png; do \
  	  basefile=`echo $$file | sed -e  's,^.*/,,'`; \
  	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/figures/$$basefile; \