diff -crN ./libbonoboui/bonobo/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/Makefile.am
*** ./libbonoboui/bonobo/Makefile.am	Mon Mar 25 12:15:55 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/Makefile.am	Fri Jul  4 13:55:22 2003
***************
*** 76,82 ****
  	bonobo-zoomable.h
  
  libbonoboui_2_la_LIBADD = \
! 	$(BONOBOUI_LIBS)
  
  libbonoboui_2_la_SOURCES = \
  	bonobo-a11y.c				\
--- 76,85 ----
  	bonobo-zoomable.h
  
  libbonoboui_2_la_LIBADD = \
! 	$(BONOBOUI_LIBS) \
! 	$(POPT_LIBS) \
!         $(X_LIBS) \
!         -lX11
  
  libbonoboui_2_la_SOURCES = \
  	bonobo-a11y.c				\
diff -crN ./libbonoboui/bonobo/bonobo-canvas-item.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-canvas-item.c
*** ./libbonoboui/bonobo/bonobo-canvas-item.c	Tue Feb 12 12:09:17 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-canvas-item.c	Fri Jul  4 13:55:54 2003
***************
*** 28,34 ****
  GNOME_CLASS_BOILERPLATE (BonoboCanvasItem,
  			 bonobo_canvas_item,
  			 GObject,
! 			 GNOME_TYPE_CANVAS_ITEM);
  
  typedef struct {
  	POA_Bonobo_Canvas_ComponentProxy proxy_servant;
--- 28,34 ----
  GNOME_CLASS_BOILERPLATE (BonoboCanvasItem,
  			 bonobo_canvas_item,
  			 GObject,
! 			 GNOME_TYPE_CANVAS_ITEM)
  
  typedef struct {
  	POA_Bonobo_Canvas_ComponentProxy proxy_servant;
***************
*** 46,52 ****
  enum {
  	PROP_0,
  	PROP_CORBA_FACTORY,
! 	PROP_CORBA_UI_CONTAINER,
  };
  
  /*
--- 46,52 ----
  enum {
  	PROP_0,
  	PROP_CORBA_FACTORY,
! 	PROP_CORBA_UI_CONTAINER
  };
  
  /*
diff -crN ./libbonoboui/bonobo/bonobo-dock-band.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-band.h
*** ./libbonoboui/bonobo/bonobo-dock-band.h	Wed Jun  5 19:17:50 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-band.h	Fri Jul  4 13:56:25 2003
***************
*** 66,72 ****
    guint num_children : 8;
    guint new_for_drag : 1;
    gboolean doing_drag : 1;
!   GtkOrientation orientation : 1;
  
    /*< private >*/
    BonoboDockBandPrivate *_priv;
--- 66,72 ----
    guint num_children : 8;
    guint new_for_drag : 1;
    gboolean doing_drag : 1;
!   unsigned int orientation : 1;  /* GtkOrientation */
  
    /*< private >*/
    BonoboDockBandPrivate *_priv;
diff -crN ./libbonoboui/bonobo/bonobo-dock-item.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-item.h
*** ./libbonoboui/bonobo/bonobo-dock-item.h	Wed Jun  5 19:17:50 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock-item.h	Fri Jul  4 13:57:00 2003
***************
*** 79,86 ****
    /* Position of the floating window.  */
    gint16                  float_x, float_y;
  
!   BonoboDockItemBehavior behavior : 5;
!   GtkOrientation        orientation : 1;
  
    guint                 float_window_mapped : 1;
    guint                 is_floating : 1;
--- 79,86 ----
    /* Position of the floating window.  */
    gint16                  float_x, float_y;
  
!   unsigned int          behavior : 5;  /* BonoboDockItemBehavior */
!   unsigned int          orientation : 1; /* GtkOrientation */
  
    guint                 float_window_mapped : 1;
    guint                 is_floating : 1;
diff -crN ./libbonoboui/bonobo/bonobo-dock.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock.c
*** ./libbonoboui/bonobo/bonobo-dock.c	Tue Mar 26 12:10:12 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-dock.c	Fri Jul  4 13:57:28 2003
***************
*** 32,38 ****
  #include <libgnome/gnome-macros.h>
  
  GNOME_CLASS_BOILERPLATE (BonoboDock, bonobo_dock,
! 			 GtkContainer, GTK_TYPE_CONTAINER);
  
  #define noBONOBO_DOCK_DEBUG
  
--- 32,38 ----
  #include <libgnome/gnome-macros.h>
  
  GNOME_CLASS_BOILERPLATE (BonoboDock, bonobo_dock,
! 			 GtkContainer, GTK_TYPE_CONTAINER)
  
  #define noBONOBO_DOCK_DEBUG
  
diff -crN ./libbonoboui/bonobo/bonobo-ui-private.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-private.h
*** ./libbonoboui/bonobo/bonobo-ui-private.h	Mon Sep  2 15:39:55 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-private.h	Fri Jul  4 13:58:04 2003
***************
*** 48,54 ****
  
  #ifndef   DEBUG_UI
  
! static inline void dprintf (const char *format, ...) { };
  
  #else  /* DEBUG_UI */
  
--- 48,54 ----
  
  #ifndef   DEBUG_UI
  
! static inline void dprintf (const char *format, ...) { }
  
  #else  /* DEBUG_UI */
  
diff -crN ./libbonoboui/bonobo/bonobo-ui-util.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-util.c
*** ./libbonoboui/bonobo/bonobo-ui-util.c	Fri Feb 28 16:40:12 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/bonobo/bonobo-ui-util.c	Fri Jul  4 13:58:36 2003
***************
*** 91,97 ****
  	return (nibble1 << 4) + nibble2;
  }
  
! static inline const guint32
  read_four_bytes (const char *pos)
  {
  	return ((read_byte (pos) << 24) |
--- 91,97 ----
  	return (nibble1 << 4) + nibble2;
  }
  
! static inline guint32
  read_four_bytes (const char *pos)
  {
  	return ((read_byte (pos) << 24) |
diff -crN ./libbonoboui/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/configure.in
*** ./libbonoboui/configure.in	Tue Mar  4 17:21:28 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/configure.in	Fri Jul  4 13:59:04 2003
***************
*** 75,80 ****
--- 75,88 ----
  # glib-mkenums
  AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
  
+ AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt,
+         [AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[
+ *** Couldn't find popt. Please download and install from
+ *** ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ and try again.]]))])
+ AC_SUBST(POPT_LIBS)
+ 
+ AC_PATH_XTRA
+ 
  ##################################################
  # Check for gtk-doc.
  ##################################################
diff -crN ./libbonoboui/doc/api/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/doc/api/Makefile.am
*** ./libbonoboui/doc/api/Makefile.am	Mon Feb  3 17:46:12 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/doc/api/Makefile.am	Mon Jul  7 15:01:01 2003
***************
*** 76,81 ****
--- 76,82 ----
  # if $(DOC_MODULE).types is non-empty.
  GTKDOC_CFLAGS =					\
  	@CFLAGS@				\
+ 	@CPPFLAGS@				\
  	-I$(top_srcdir)				\
  	$(BONOBOUI_CFLAGS)
  
***************
*** 198,205 ****
  	    echo '-- Installing '$$i ; \
  	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
  	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
  	fi)
  
  #
--- 199,204 ----
diff -crN ./libbonoboui/tests/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/tests/Makefile.am
*** ./libbonoboui/tests/Makefile.am	Tue Dec 17 11:43:22 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libbonoboui/tests/Makefile.am	Fri Jul  4 14:02:06 2003
***************
*** 25,31 ****
  	$(WARN_CFLAGS)					\
  	$(BONOBOUI_CFLAGS)
  
! LDADD =	$(top_builddir)/bonobo/libbonoboui-2.la -lpopt $(BONOBOUI_LIBS)
  
  test_ui_SOURCES = test-ui.c
  test_ui_auto_SOURCES = test-ui-auto.c
--- 25,31 ----
  	$(WARN_CFLAGS)					\
  	$(BONOBOUI_CFLAGS)
  
! LDADD =	$(top_builddir)/bonobo/libbonoboui-2.la $(BONOBOUI_LIBS) -lX11 $(POPT_LIBS)
  
  test_ui_SOURCES = test-ui.c
  test_ui_auto_SOURCES = test-ui-auto.c