Mercurial > emacs

comparison configure.in @ 108729:83fdad33d6fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build simplifications for oldxmenu. * configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK. (OLDXMENU_TARGET): Set to empty if USE_GTK. * src/Makefile.in (../src/$(OLDXMENU), $(OLDXMENU)): Always define rules. * msdos/sed1x.inp (OLDXMENU): Replace any initial value. * msdos/sed1v2.inp (OLDXMENU): Edit to "nothing".
author Glenn Morris <rgm@gnu.org>
date Thu, 20 May 2010 17:40:12 -0700
parents d8f404311eaf
children c554bb2aba83
comparison
equal deleted inserted replaced
108728:d0ebe5586d94 108729:83fdad33d6fa
3179 else 3179 else
3180 LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" 3180 LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext"
3181 OLDXMENU_TARGET="really-lwlib" 3181 OLDXMENU_TARGET="really-lwlib"
3182 fi 3182 fi
3183 AC_SUBST(LIBXT_OTHER) 3183 AC_SUBST(LIBXT_OTHER)
3184 AC_SUBST(OLDXMENU_TARGET)
3185 3184
3186 ## The X Menu stuff is present in the X10 distribution, but missing 3185 ## The X Menu stuff is present in the X10 distribution, but missing
3187 ## from X11. If we have X10, just use the installed library; 3186 ## from X11. If we have X10, just use the installed library;
3188 ## otherwise, use our own copy. 3187 ## otherwise, use our own copy.
3189 if test "${HAVE_X11}" = "yes" ; then 3188 if test "${HAVE_X11}" = "yes" ; then
3198 fi 3197 fi
3199 LIBXMENU="\$(OLDXMENU)" 3198 LIBXMENU="\$(OLDXMENU)"
3200 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" 3199 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
3201 OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}" 3200 OLDXMENU_DEPS="\${OLDXMENU} ../src/\${OLDXMENU}"
3202 else 3201 else
3203 OLDXMENU= 3202 ## For a syntactically valid Makefile; not actually used for anything.
3203 ## See comments in src/Makefile.in.
3204 OLDXMENU=nothing
3204 ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?). 3205 ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?).
3205 if test "${HAVE_X_WINDOWS}" = "yes"; then 3206 if test "${HAVE_X_WINDOWS}" = "yes"; then
3206 LIBXMENU="-lXMenu" 3207 LIBXMENU="-lXMenu"
3207 else 3208 else
3208 LIBXMENU= 3209 LIBXMENU=
3210 LIBX_OTHER= 3211 LIBX_OTHER=
3211 OLDXMENU_DEPS= 3212 OLDXMENU_DEPS=
3212 fi 3213 fi
3213 3214
3214 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then 3215 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then
3215 OLDXMENU= 3216 OLDXMENU_TARGET=
3217 OLDXMENU=nothing
3216 LIBXMENU= 3218 LIBXMENU=
3217 OLDXMENU_DEPS= 3219 OLDXMENU_DEPS=
3218 fi 3220 fi
3219 3221
3222 AC_SUBST(OLDXMENU_TARGET)
3220 AC_SUBST(OLDXMENU) 3223 AC_SUBST(OLDXMENU)
3221 AC_SUBST(LIBXMENU) 3224 AC_SUBST(LIBXMENU)
3222 AC_SUBST(LIBX_OTHER) 3225 AC_SUBST(LIBX_OTHER)
3223 AC_SUBST(OLDXMENU_DEPS) 3226 AC_SUBST(OLDXMENU_DEPS)
3224 3227