diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-16 22:15:03 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-16 22:15:03 -0700 |
| commit | 16455a8509026404dcba9a1adfe389883b3ef990 (patch) | |
| tree | c29427ab4994ddc976477d27919d63934b5912ac /configure | |
| parent | 00681a3c86cde16a08be8ec7358942437cd857b3 (diff) | |
| download | emacs-16455a8509026404dcba9a1adfe389883b3ef990.tar.gz | |
Combine the two stamp-oldxmenu cases.
* configure.in (OLDXMENU_DEPS): New output variable.
* configure: Regenerate.
* src/Makefile.in (OLDXMENU_DEPS): New, set by configure.
(stamp-oldxmenu): Use $OLDXMENU_DEPS.
* msdos/sed1v2.inp (OLDXMENU_DEPS): Edit to empty.
* msdos/sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure index 6c6c97e56e1..e4eb0514da1 100755 --- a/configure +++ b/configure @@ -809,6 +809,7 @@ OLDXMENU_TARGET OLDXMENU LIBXMENU LIBX_OTHER +OLDXMENU_DEPS CYGWIN_OBJ PRE_ALLOC_OBJ POST_ALLOC_OBJ @@ -26488,6 +26489,7 @@ _ACEOF fi LIBXMENU="\$(OLDXMENU)" LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" + OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}" else OLDXMENU= ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?). @@ -26497,17 +26499,20 @@ else LIBXMENU= fi LIBX_OTHER= + OLDXMENU_DEPS= fi if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU= LIBXMENU= + OLDXMENU_DEPS= fi + if test "${HAVE_MENUS}" = "yes" ; then cat >>confdefs.h <<\_ACEOF |