Mercurial > emacs

comparison configure.in @ 108612:60489ff8b450

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always define LIBXMENU in src/Makefile.in. * configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS. * src/Makefile.in (LIBXMENU): Always define. * msdos/sed1v2.inp (LIBXMENU): Edit to empty. * msdos/sed1x.inp (LIBXMENU): Expect empty initial value.
author Glenn Morris <rgm@gnu.org>
date Sat, 15 May 2010 15:33:24 -0700
parents 095e338e1fd8
children 880007fe488b
comparison
equal deleted inserted replaced
108611:a32b146e01b5 108612:60489ff8b450
3150 fi 3150 fi
3151 LIBXMENU="\$(OLDXMENU)" 3151 LIBXMENU="\$(OLDXMENU)"
3152 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" 3152 LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
3153 else 3153 else
3154 OLDXMENU= 3154 OLDXMENU=
3155 LIBXMENU="-lXMenu" 3155 ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?).
3156 if test "${HAVE_X_WINDOWS}" = "yes"; then
3157 LIBXMENU="-lXMenu"
3158 else
3159 LIBXMENU=
3160 fi
3156 LIBX_OTHER= 3161 LIBX_OTHER=
3157 fi 3162 fi
3158 3163
3159 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then 3164 if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then
3160 OLDXMENU= 3165 OLDXMENU=