diff -crN ./gnome-terminal/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/configure.in
*** ./gnome-terminal/configure.in	Thu Feb  6 02:38:24 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/configure.in	Fri Jul 11 14:12:11 2003
***************
*** 80,85 ****
--- 80,92 ----
     using_xft2=no
  fi
  
+ dnl Check for popt
+ 
+ AC_CHECK_LIB(popt, poptGetArgs, [POPT_LIBS="-lpopt"],
+ AC_MSG_ERROR([popt is required to build gnome-terminal.
+ You can download the latest version from ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/]))
+ AC_SUBST(POPT_LIBS)
+ 
  AC_OUTPUT([
  Makefile
  src/Makefile
diff -crN ./gnome-terminal/src/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/Makefile.am
*** ./gnome-terminal/src/Makefile.am	Sat Dec  7 03:49:51 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/Makefile.am	Fri Jul 11 14:11:46 2003
***************
*** 1,4 ****
--- 1,5 ----
  
+ 
  EFENCE=
  
  SUBDIRS=eel skey
***************
*** 57,63 ****
  	simple-x-font-selector.h		\
  	$(EGGFILES)
  
! gnome_terminal_LDADD= $(EFENCE) @TERM_LIBS@ @TERMINAL_WIDGET_LIBS@ eel/libeelcnp.la skey/libskey.la
  
  gladedir   = $(pkgdatadir)/glade
  glade_DATA = gnome-terminal.glade2
--- 58,64 ----
  	simple-x-font-selector.h		\
  	$(EGGFILES)
  
! gnome_terminal_LDADD= $(EFENCE) @TERM_LIBS@ @TERMINAL_WIDGET_LIBS@ eel/libeelcnp.la skey/libskey.la $(POPT_LIBS)
  
  gladedir   = $(pkgdatadir)/glade
  glade_DATA = gnome-terminal.glade2
diff -crN ./gnome-terminal/src/eggcellrendererkeys.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/eggcellrendererkeys.c
*** ./gnome-terminal/src/eggcellrendererkeys.c	Sun Dec  1 18:13:55 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/eggcellrendererkeys.c	Fri Jul 11 14:11:12 2003
***************
*** 582,590 ****
  }
  
  void
! egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
!                                         guint                keyval,
!                                         GdkModifierType      mask)
  {
    char *text;
    gboolean changed;
--- 582,590 ----
  }
  
  void
! egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys    *keys,
!                                         guint                  keyval,
!                                         EggVirtualModifierType mask)
  {
    char *text;
    gboolean changed;
***************
*** 623,631 ****
  }
  
  void
! egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
!                                         guint               *keyval,
!                                         GdkModifierType     *mask)
  {
    g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
  
--- 623,631 ----
  }
  
  void
! egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys    *keys,
!                                         guint                  *keyval,
!                                         EggVirtualModifierType *mask)
  {
    g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
  
diff -crN ./gnome-terminal/src/eggcellrendererkeys.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/eggcellrendererkeys.h
*** ./gnome-terminal/src/eggcellrendererkeys.h	Fri Aug 23 06:14:25 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/eggcellrendererkeys.h	Fri Jul 11 14:11:21 2003
***************
*** 39,45 ****
  typedef enum
  {
    EGG_CELL_RENDERER_KEYS_MODE_GTK,
!   EGG_CELL_RENDERER_KEYS_MODE_X,
  } EggCellRendererKeysMode;
  
  struct _EggCellRendererKeys
--- 39,45 ----
  typedef enum
  {
    EGG_CELL_RENDERER_KEYS_MODE_GTK,
!   EGG_CELL_RENDERER_KEYS_MODE_X
  } EggCellRendererKeysMode;
  
  struct _EggCellRendererKeys
diff -crN ./gnome-terminal/src/skey/skey.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/skey/skey.c
*** ./gnome-terminal/src/skey/skey.c	Wed Oct 30 21:26:23 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/skey/skey.c	Fri Jul 11 14:10:54 2003
***************
*** 4,9 ****
--- 4,11 ----
   *	      Kazuhiko Yamamoto <kazu@is.aist-nara.ac.jp>
   */
  
+ #include <stdlib.h>
+ 
  #include "config.h"
  #include "donkey.h"
  #include "md.h"
diff -crN ./gnome-terminal/src/terminal-widget-zvt.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/terminal-widget-zvt.c
*** ./gnome-terminal/src/terminal-widget-zvt.c	Tue Dec  3 06:20:43 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-terminal/src/terminal-widget-zvt.c	Fri Jul 11 14:11:36 2003
***************
*** 22,28 ****
--- 22,31 ----
  #include "terminal-widget.h"
  #include "terminal-intl.h"
  
+ /* ?? : BV : Added <libzvt/vt.h>*/
+ #include <libzvt/vt.h>
  #include <libzvt/libzvt.h>
+ 
  #include <string.h>
  #include <stdlib.h>
  #include <errno.h>