Mercurial > emacs
diff src/Makefile.in @ 94119:5b10e5646973
* configure.in (SYNC_INPUT): Use OPTION_DEFAULT_ON and AC_DEFINE
rather than change CPPFLAGS.
(HAVE_GTK): Rename to USE_GTK.
* Makefile.in: Don't use HAVE_GTK and don't -DUSE_GTK since it's now
done in config.h.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 16 Apr 2008 19:53:06 +0000 |
| parents | 6c6216b3b878 |
| children | 3af508d0bd74 |
line wrap: on
line diff
--- a/src/Makefile.in Wed Apr 16 17:34:43 2008 +0000 +++ b/src/Makefile.in Wed Apr 16 19:53:06 2008 +0000 @@ -240,11 +240,6 @@ #endif /* not ORDINARY_LINK */ -#if HAVE_GTK -#define USE_GTK -TOOLKIT_DEFINES = -DUSE_GTK -#endif - #ifdef USE_X_TOOLKIT #define USE_@X_TOOLKIT_TYPE@ TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@ @@ -980,7 +975,7 @@ prefix-args${EXEEXT}: prefix-args.c $(config_h) $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args -#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK) +#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK) /* We use stamp-xmenu with these two deps to both ensure that lwlib gets remade based on its dependencies @@ -1029,12 +1024,12 @@ @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) */ +#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_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) */ +#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */ ../config.status:: epaths.in @echo "The file epaths.h needs to be set up from epaths.in."
