diff -crN ./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h
*** ./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h	Sat Nov  2 00:31:52 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-dialog.h	Fri Jul  4 11:33:54 2003
***************
*** 65,71 ****
  	GNOME_PRINT_RANGE_ALL = (1 << 1),
  	GNOME_PRINT_RANGE_RANGE = (1 << 2),
  	GNOME_PRINT_RANGE_SELECTION = (1 << 3),
! 	GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE  = (1 << 4),
  };
  
  /*
--- 65,71 ----
  	GNOME_PRINT_RANGE_ALL = (1 << 1),
  	GNOME_PRINT_RANGE_RANGE = (1 << 2),
  	GNOME_PRINT_RANGE_SELECTION = (1 << 3),
! 	GNOME_PRINT_RANGE_SELECTION_UNSENSITIVE  = (1 << 4)
  };
  
  /*
***************
*** 83,89 ****
  enum GnomePrintButtons {
  	GNOME_PRINT_DIALOG_RESPONSE_PRINT = 1,
  	GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
! 	GNOME_PRINT_DIALOG_RESPONSE_CANCEL = GTK_RESPONSE_CANCEL,
  };
  
  GType gnome_print_dialog_get_type (void);
--- 83,89 ----
  enum GnomePrintButtons {
  	GNOME_PRINT_DIALOG_RESPONSE_PRINT = 1,
  	GNOME_PRINT_DIALOG_RESPONSE_PREVIEW,
! 	GNOME_PRINT_DIALOG_RESPONSE_CANCEL = GTK_RESPONSE_CANCEL
  };
  
  GType gnome_print_dialog_get_type (void);
diff -crN ./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c
*** ./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c	Thu Feb 27 17:59:56 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gnome-print-unit-selector.c	Fri Jul  4 11:32:49 2003
***************
*** 245,251 ****
  		
  		u = l->data;
  
! 		name = gnome_print_unit_get_name (u, us->plural, us->abbr, 0);
  		i = gtk_menu_item_new_with_label (name);
  		g_free (name);
  
--- 245,251 ----
  		
  		u = l->data;
  
! 		name = (gchar *)gnome_print_unit_get_name (u, us->plural, us->abbr, 0);
  		i = gtk_menu_item_new_with_label (name);
  		g_free (name);
  
diff -crN ./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am
*** ./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am	Sun Dec 29 19:41:05 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgnomeprintui/libgnomeprintui/gpaui/Makefile.am	Fri Jul  4 11:38:02 2003
***************
*** 14,20 ****
--- 14,22 ----
  	-DGNOME_DISABLE_DEPRECATED
  
  
+ # ?? : BV : added @CPPFLAGS@ to avoid the overwriting of the variable
  CPPFLAGS = \
+ 	@CPPFLAGS@ \
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
  	-DBINDIR=\""$(bindir)"\" \
  	-DDATADIR=\""$(datadir)"\"