From 8b44daa00a4d78de2e1d59203176f2373d9a057d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 14 May 2010 18:58:36 -0700 Subject: [PATCH] Regenerate configure. --- configure | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/configure b/configure index 0a1c2ee3d3b..426842fc41b 100755 --- a/configure +++ b/configure @@ -805,6 +805,7 @@ XOBJ WIDGET_OBJ TOOLKIT_LIBW LIBXT_OTHER +OLDXMENU_TARGET OLDXMENU LIBXMENU LIBX_OTHER @@ -26456,11 +26457,14 @@ esac if test "$USE_X_TOOLKIT" = "none"; then LIBXT_OTHER="\$(LIBXSM)" + OLDXMENU_TARGET="really-oldXMenu" else LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" + OLDXMENU_TARGET="really-lwlib" fi + ## The X Menu stuff is present in the X10 distribution, but missing ## from X11. If we have X10, just use the installed library; ## otherwise, use our own copy. @@ -26722,6 +26726,9 @@ test "${exec_prefix}" != NONE && # the C preprocessor to some helpful value like 1, or maybe the empty # string. Needless to say consequent macro substitutions are less # than conducive to the makefile finding the correct directory. +# src/Makefile.in used to treat X11 as equivalent to HAVE_X11. +# But nothing in Emacs defines X11, and everywhere else uses HAVE_X11, +# so that cannot have been doing anything. cpp_undefs="`echo $srcdir $configuration $canonical unix mktime register X11 | sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g'`" -- 2.39.5