[Emacs-diffs] Changes to emacs/src/Makefile.in

[Jan Djärv]

Index: emacs/src/Makefile.in
diff -c emacs/src/Makefile.in:1.305 emacs/src/Makefile.in:1.306
*** emacs/src/Makefile.in:1.305 Tue Nov  9 08:19:51 2004
--- emacs/src/Makefile.in       Tue Nov  9 10:59:49 2004
***************
*** 962,968 ****
  #define OLDXMENU_OPTIONS
  #endif
  
! #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS)
  
  /* We use stamp-xmenu with these two deps
     to both ensure that lwlib gets remade based on its dependencies
--- 962,968 ----
  #define OLDXMENU_OPTIONS
  #endif
  
! #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && 
! defined (HAVE_GTK)
  
  /* We use stamp-xmenu with these two deps
     to both ensure that lwlib gets remade based on its dependencies
***************
*** 1018,1029 ****
        @true  /* make -t should not create really-oldXMenu.  */
  .PHONY: really-oldXMenu
  #endif /* not USE_X_TOOLKIT */
! #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
  
  /* We don\'t really need this, but satisfy the dependency.  */
  stamp-oldxmenu:
        touch stamp-oldxmenu
! #endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS) */
  
  ../config.status:: epaths.in
        @echo "The file epaths.h needs to be set up from epaths.in."
--- 1018,1029 ----
        @true  /* make -t should not create really-oldXMenu.  */
  .PHONY: really-oldXMenu
  #endif /* not USE_X_TOOLKIT */
! #else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
  
  /* We don\'t really need this, but satisfy the dependency.  */
  stamp-oldxmenu:
        touch stamp-oldxmenu
! #endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
  
  ../config.status:: epaths.in
        @echo "The file epaths.h needs to be set up from epaths.in."