Mercurial > emacs
changeset 108458:30b11e5df204
Merge from mainline.
| author | Katsumi Yamaoka <katsumi@flagship2> |
|---|---|
| date | Wed, 28 Apr 2010 12:11:11 +0000 |
| parents | aeb8069f9ba3 (current diff) 533b15049ee7 (diff) |
| children | 1d1025faed5f |
| files | |
| diffstat | 12 files changed, 252 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 27 12:24:59 2010 +0000 +++ b/ChangeLog Wed Apr 28 12:11:11 2010 +0000 @@ -1,3 +1,18 @@ +2010-04-28 Glenn Morris <rgm@gnu.org> + + * configure.in (CYGWIN_OBJ): New output variable. + + * configure.in (GPM_MOUSE_SUPPORT): New output variable. + + * configure.in (FONT_OBJ): New output variable. + + * configure.in (LIBXMU): New output variable. + + * configure.in (NS_OBJ, NS_SUPPORT): New output variables. + + * configure.in (machine, canonical): On amdx86-64, check for a 32-bit + userland and maybe change values to i386 (move test from s/amdx86-64.h). + 2010-04-27 Glenn Morris <rgm@gnu.org> * configure.in (LIBXTR6): New output variable. Move unixware special
--- a/configure Tue Apr 27 12:24:59 2010 +0000 +++ b/configure Wed Apr 28 12:11:11 2010 +0000 @@ -711,6 +711,8 @@ CFLAGS_SOUND SET_MAKE XMKMF +NS_OBJ +NS_SUPPORT HAVE_XSERVER RSVG_CFLAGS RSVG_LIBS @@ -724,6 +726,7 @@ GCONF_LIBS LIBSELINUX_LIBS LIBXTR6 +LIBXMU FONTCONFIG_CFLAGS FONTCONFIG_LIBS XFT_CFLAGS @@ -732,6 +735,7 @@ LIBOTF_LIBS M17N_FLT_CFLAGS M17N_FLT_LIBS +FONT_OBJ FREETYPE_CFLAGS FREETYPE_LIBS LIBXPM @@ -740,6 +744,7 @@ LIBTIFF LIBGIF LIBGPM +GPM_MOUSE_SUPPORT LIBXSM ALLOCA liblockfile @@ -794,6 +799,7 @@ XOBJ WIDGET_OBJ TOOLKIT_LIBW +CYGWIN_OBJ LTLIBOBJS' ac_subst_files='' ac_user_opts=' @@ -5448,6 +5454,73 @@ fi fi + +## Although we're running on an amd64 kernel, we're actually compiling for +## the x86 architecture. The user should probably have provided an +## explicit --build to `configure', but if everything else than the kernel +## is running in i386 mode, we can help them out. +if test "$machine" = "amdx86-64"; then + { $as_echo "$as_me:$LINENO: checking whether i386 is declared" >&5 +$as_echo_n "checking whether i386 is declared... " >&6; } +if test "${ac_cv_have_decl_i386+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef i386 + (void) i386; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_i386=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_i386=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_i386" >&5 +$as_echo "$ac_cv_have_decl_i386" >&6; } + + if test "$ac_cv_have_decl_i386" = "yes"; then + canonical=`echo "$canonical" | sed -e 's/^amd64/i386/' -e 's/^x86_64/i386/'` + machine=intel386 + machfile="m/${machine}.h" + fi +fi + # Extract the first word of "install-info", so it can be a program name with args. set dummy install-info; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -9922,6 +9995,9 @@ NS_HAVE_NSINTEGER=no fi fi + +NS_OBJ= +NS_SUPPORT= if test "${HAVE_NS}" = yes; then window_system=nextstep with_xft=no @@ -9931,10 +10007,14 @@ if test "${EN_NS_SELF_CONTAINED}" = yes; then prefix=${ns_appresdir} fi + NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" + NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" + + case "${window_system}" in x11 ) HAVE_X_WINDOWS=yes @@ -13176,6 +13256,15 @@ fi +LIBXMU=-lXmu +case "$machine" in + ## These machines don't supply Xmu. + hpux* | aix4-2 ) + test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" = "Xno" && LIBXMU= + ;; +esac + + # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D. if test "${HAVE_X11}" = "yes"; then if test "${USE_X_TOOLKIT}" != "none"; then @@ -14442,6 +14531,15 @@ HAVE_LIBOTF=no HAVE_M17N_FLT=no fi + +FONT_OBJ=xfont.o +if test "$HAVE_XFT" = "yes"; then + FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" +elif test "$HAVE_FREETYPE" = "yes"; then + FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o" +fi + + ### End of font-backend (under X11) section. @@ -15735,6 +15833,7 @@ ### Use -lgpm if available, unless `--with-gpm=no'. HAVE_GPM=no LIBGPM= +GPM_MOUSE_SUPPORT= if test "${with_gpm}" != "no"; then if test "${ac_cv_header_gpm_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for gpm.h" >&5 @@ -15944,8 +16043,10 @@ _ACEOF LIBGPM=-lgpm - fi -fi + GPM_MOUSE_SUPPORT="\${lispsource}mouse.elc" + fi +fi + if test "${ac_cv_header_malloc_malloc_h+set}" = set; then @@ -26038,6 +26139,9 @@ fi +CYGWIN_OBJ= +test "$opsys" = "cygwin" && CYGWIN_OBJ="sheap.o" +
--- a/configure.in Tue Apr 27 12:24:59 2010 +0000 +++ b/configure.in Wed Apr 28 12:11:11 2010 +0000 @@ -761,6 +761,20 @@ if test "x$RANLIB" = x; then AC_PROG_RANLIB fi + +## Although we're running on an amd64 kernel, we're actually compiling for +## the x86 architecture. The user should probably have provided an +## explicit --build to `configure', but if everything else than the kernel +## is running in i386 mode, we can help them out. +if test "$machine" = "amdx86-64"; then + AC_CHECK_DECL([i386]) + if test "$ac_cv_have_decl_i386" = "yes"; then + canonical=`echo "$canonical" | sed -e 's/^amd64/i386/' -e 's/^x86_64/i386/'` + machine=intel386 + machfile="m/${machine}.h" + fi +fi + AC_PATH_PROG(INSTALL_INFO, install-info) AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin) AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin) @@ -1390,6 +1404,9 @@ NS_HAVE_NSINTEGER=no fi fi + +NS_OBJ= +NS_SUPPORT= if test "${HAVE_NS}" = yes; then window_system=nextstep with_xft=no @@ -1399,9 +1416,13 @@ if test "${EN_NS_SELF_CONTAINED}" = yes; then prefix=${ns_appresdir} fi + NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" + NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" +AC_SUBST(NS_OBJ) +AC_SUBST(NS_SUPPORT) case "${window_system}" in x11 ) @@ -1869,6 +1890,17 @@ fi AC_SUBST(LIBXTR6) +dnl FIXME the logic here seems weird, but this is what cpp was doing. +dnl Why not just test for libxmu in the normal way? +LIBXMU=-lXmu +case "$machine" in + ## These machines don't supply Xmu. + hpux* | aix4-2 ) + test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" = "Xno" && LIBXMU= + ;; +esac +AC_SUBST(LIBXMU) + # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D. if test "${HAVE_X11}" = "yes"; then if test "${USE_X_TOOLKIT}" != "none"; then @@ -2089,6 +2121,15 @@ HAVE_LIBOTF=no HAVE_M17N_FLT=no fi + +FONT_OBJ=xfont.o +if test "$HAVE_XFT" = "yes"; then + FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" +elif test "$HAVE_FREETYPE" = "yes"; then + FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o" +fi +AC_SUBST(FONT_OBJ) + ### End of font-backend (under X11) section. AC_SUBST(FREETYPE_CFLAGS) @@ -2250,6 +2291,7 @@ ### Use -lgpm if available, unless `--with-gpm=no'. HAVE_GPM=no LIBGPM= +GPM_MOUSE_SUPPORT= if test "${with_gpm}" != "no"; then AC_CHECK_HEADER(gpm.h, [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)]) @@ -2257,9 +2299,11 @@ if test "${HAVE_GPM}" = "yes"; then AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).]) LIBGPM=-lgpm + GPM_MOUSE_SUPPORT="\${lispsource}mouse.elc" fi fi AC_SUBST(LIBGPM) +AC_SUBST(GPM_MOUSE_SUPPORT) dnl Check for malloc/malloc.h on darwin AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.])]) @@ -2884,6 +2928,9 @@ buffer space.]) fi +CYGWIN_OBJ= +test "$opsys" = "cygwin" && CYGWIN_OBJ="sheap.o" +AC_SUBST(CYGWIN_OBJ) AH_TOP([/* GNU Emacs site configuration template file. Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005,
--- a/lisp/ChangeLog Tue Apr 27 12:24:59 2010 +0000 +++ b/lisp/ChangeLog Wed Apr 28 12:11:11 2010 +0000 @@ -1,3 +1,19 @@ +2010-04-27 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): + Avoid re-enabling a minor mode after the user turned the minor mode + off if MODE-enable-in-buffers is run twice (typically once from + fundamental-mode's after-change-major-mode-hook and a second time from + run-mode-hook's own after-change-major-mode-hook). + + * emacs-lisp/lisp.el (lisp-complete-symbol): Fail gracefully. + +2010-04-27 Sam Steingold <sds@gnu.org> + + * progmodes/bug-reference.el (bug-reference-url-format): Mark as + `safe-local-variable' if the value is a string or a function, as + documented and implemented on 2010-04-02. + 2010-04-27 Juanma Barranquero <lekktu@gmail.com> * ido.el (ido-buffer-internal): Bind `ido-use-virtual-buffers' to nil
--- a/lisp/emacs-lisp/easy-mmode.el Tue Apr 27 12:24:59 2010 +0000 +++ b/lisp/emacs-lisp/easy-mmode.el Wed Apr 28 12:11:11 2010 +0000 @@ -361,13 +361,14 @@ (dolist (buf ,MODE-buffers) (when (buffer-live-p buf) (with-current-buffer buf - (if ,mode - (unless (eq ,MODE-major-mode major-mode) - (,mode -1) - (,turn-on) - (setq ,MODE-major-mode major-mode)) - (,turn-on) - (setq ,MODE-major-mode major-mode)))))) + (unless (eq ,MODE-major-mode major-mode) + (if ,mode + (progn + (,mode -1) + (,turn-on) + (setq ,MODE-major-mode major-mode)) + (,turn-on) + (setq ,MODE-major-mode major-mode))))))) (put ',MODE-enable-in-buffers 'definition-name ',global-mode) (defun ,MODE-check-buffers ()
--- a/lisp/emacs-lisp/lisp.el Tue Apr 27 12:24:59 2010 +0000 +++ b/lisp/emacs-lisp/lisp.el Wed Apr 28 12:11:11 2010 +0000 @@ -624,9 +624,12 @@ (interactive) (let* ((data (lisp-completion-at-point predicate)) (plist (nthcdr 3 data))) - (let ((completion-annotate-function (plist-get plist :annotate-function))) - (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) - (plist-get plist :predicate))))) + (if (null data) + (minibuffer-message "Nothing to complete") + (let ((completion-annotate-function + (plist-get plist :annotate-function))) + (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) + (plist-get plist :predicate)))))) (defun lisp-completion-at-point (&optional predicate)
--- a/lisp/progmodes/bug-reference.el Tue Apr 27 12:24:59 2010 +0000 +++ b/lisp/progmodes/bug-reference.el Wed Apr 28 12:11:11 2010 +0000 @@ -51,7 +51,8 @@ There is no default setting for this, it must be set per file.") ;;;###autoload -(put 'bug-reference-url-format 'safe-local-variable 'stringp) +(put 'bug-reference-url-format 'safe-local-variable + (lambda (s) (or (stringp s) (functionp s)))) (defconst bug-reference-bug-regexp "\\([Bb]ug ?#\\|[Pp]atch ?#\\|RFE ?#\\|PR [a-z-+]+/\\)\\([0-9]+\\)"
--- a/src/ChangeLog Tue Apr 27 12:24:59 2010 +0000 +++ b/src/ChangeLog Wed Apr 28 12:11:11 2010 +0000 @@ -1,3 +1,25 @@ +2010-04-28 Glenn Morris <rgm@gnu.org> + + * Makefile.in (BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT): New variables. + (WINDOW_SUPPORT) [HAVE_WINDOW_SYSTEM]: Use them. + + * Makefile.in (CYGWIN_OBJ): Set with configure, not cpp. + + * Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure. + (MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT. + + * Makefile.in (FONT_OBJ): New, set by configure. + (FONT_DRIVERS): Use $FONT_OBJ. + + * Makefile.in (LIBXMU): Set with configure, not cpp. + * s/aix4-2.h (LIBXMU): + * s/hpux10-20.h (LIBXMU): + Remove definition, now set in configure. + + * Makefile.in (NS_OBJ, NS_SUPPORT): Set with configure, not cpp. + + * m/amdx86-64.h [i386]: Move this test to configure.in. + 2010-04-27 Glenn Morris <rgm@gnu.org> * Makefile.in (LIBXTR6): Set with configure, not cpp.
--- a/src/Makefile.in Tue Apr 27 12:24:59 2010 +0000 +++ b/src/Makefile.in Wed Apr 28 12:11:11 2010 +0000 @@ -86,6 +86,8 @@ GTK_OBJ=@GTK_OBJ@ +LIBXMU=@LIBXMU@ + LIBXSM=@LIBXSM@ LIBXTR6=@LIBXTR6@ @@ -104,6 +106,26 @@ ## widget.o if USE_X_TOOLKIT, otherwise empty. WIDGET_OBJ=@WIDGET_OBJ@ +## sheap.o if CYGWIN, otherwise empty. +CYGWIN_OBJ=@CYGWIN_OBJ@ + +NS_OBJ=@NS_OBJ@ +NS_SUPPORT=@NS_SUPPORT@ + +## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM. +FONT_OBJ=@FONT_OBJ@ + +## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty. +## Not used if HAVE_MOUSE. +GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@ + +BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ + ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ + ${lispsource}tool-bar.elc ${lispsource}mwheel.elc + +X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \ + ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc + LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ INTERVALS_H = dispextern.h intervals.h composite.h @@ -258,11 +280,7 @@ #ifdef USE_X_TOOLKIT LIBW=$(TOOLKIT_LIBW) -#ifndef LIBXMU -#define LIBXMU -lXmu -#endif - -LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext +LIBXT= $(LIBW) $(LIBXMU) -lXt $(LIBXTR6) -lXext #else /* not USE_X_TOOLKIT */ @@ -360,29 +378,16 @@ #endif #endif -#ifdef CYGWIN -CYGWIN_OBJ = sheap.o -#endif - #ifdef HAVE_NS ns_appdir=@ns_appdir@/ ns_appbindir=@ns_appbindir@/ ns_appresdir=@ns_appresdir@/ ns_appsrc=@ns_appsrc@ -/* Object files for NeXTstep */ -NS_OBJ= nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \ - fontset.o fringe.o image.o #endif /* HAVE_NS */ #ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_X_WINDOWS -#if defined (HAVE_XFT) -FONT_DRIVERS = xfont.o ftfont.o xftfont.o ftxfont.o -#elif defined (HAVE_FREETYPE) -FONT_DRIVERS = xfont.o ftfont.o ftxfont.o -#else /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */ -FONT_DRIVERS = xfont.o -#endif /* ! defined (HAVE_XFT) && ! defined (HAVE_FREETYPE) */ +FONT_DRIVERS=$(FONT_OBJ) #endif /* HAVE_X_WINDOWS */ #endif /* HAVE_WINDOW_SYSTEM */ @@ -457,11 +462,7 @@ #define MOUSE_SUPPORT ${lispsource}mouse.elc \ ${lispsource}select.elc ${lispsource}scroll-bar.elc #else -#ifdef HAVE_GPM -#define MOUSE_SUPPORT ${lispsource}mouse.elc -#else -#define MOUSE_SUPPORT -#endif +#define MOUSE_SUPPORT $(GPM_MOUSE_SUPPORT) #endif #ifdef MSDOS @@ -475,15 +476,9 @@ #ifdef HAVE_WINDOW_SYSTEM #ifdef HAVE_X_WINDOWS -#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ - ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ - ${lispsource}tool-bar.elc ${lispsource}mwheel.elc ${lispsource}x-dnd.elc \ - ${lispsource}term/common-win.elc ${lispsource}term/x-win.elc \ - ${lispsource}dynamic-setting.elc +#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT) #else -#define WINDOW_SUPPORT ${lispsource}fringe.elc ${lispsource}image.elc \ - ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ - ${lispsource}tool-bar.elc ${lispsource}mwheel.elc +#define WINDOW_SUPPORT $(BASE_WINDOW_SUPPORT) #endif #else #define WINDOW_SUPPORT @@ -504,13 +499,6 @@ #define TOOLTIP_SUPPORT #endif -#ifdef HAVE_NS -#define NS_SUPPORT ${lispsource}emacs-lisp/easymenu.elc \ - ${lispsource}term/ns-win.elc -#else -#define NS_SUPPORT -#endif - /* This is the platform-specific list of Lisp files loaded into the dumped Emacs. It is arranged like this because it is easier to generate it semi-mechanically from loadup.el this way. @@ -611,7 +599,7 @@ MSDOS_SUPPORT \ WINNT_SUPPORT \ WINDOW_SUPPORT \ - NS_SUPPORT \ + ${NS_SUPPORT} \ ${lispsource}widget.elc \ ${lispsource}window.elc \ ${lispsource}version.el
--- a/src/m/amdx86-64.h Tue Apr 27 12:24:59 2010 +0000 +++ b/src/m/amdx86-64.h Wed Apr 28 12:11:11 2010 +0000 @@ -17,15 +17,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -#ifdef i386 -/* Although we're running on an amd64 kernel, we're actually compiling for - the x86 architecture. The user should probably have provided an - explicit --build to `configure', but if everything else than the kernel - is running in i386 mode, then the bug is really ours: we should have - guessed better. */ -#include "m/intel386.h" -#else - /* The following line tells the configuration script what sort of operating system this machine is likely to run. USUAL-OPSYS="linux" */ @@ -90,7 +81,6 @@ #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o #endif /* SOLARIS2 */ -#endif /* !i386 */ /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e (do not change this comment) */
--- a/src/s/aix4-2.h Tue Apr 27 12:24:59 2010 +0000 +++ b/src/s/aix4-2.h Wed Apr 28 12:11:11 2010 +0000 @@ -136,8 +136,6 @@ #undef sigmask #ifndef HAVE_LIBXMU -#define LIBXMU - /* Unfortunately without libXmu we cannot support EditRes. */ #define NO_EDITRES #endif @@ -153,8 +151,8 @@ It is possible to completely override the malloc implementation on AIX, but that involves putting the malloc functions in a shared library and setting the MALLOCTYPE environment variable to point to - tha shared library. - + that shared library. + Emacs currently calls xrealloc on the results of get_current_dir name, to avoid a crash just use the Emacs implementation for that function. */
--- a/src/s/hpux10-20.h Tue Apr 27 12:24:59 2010 +0000 +++ b/src/s/hpux10-20.h Wed Apr 28 12:11:11 2010 +0000 @@ -105,12 +105,6 @@ /* This triggers a conditional in xfaces.c. */ #define XOS_NEEDS_TIME_H -#ifndef HAVE_LIBXMU -/* HP-UX doesn't supply Xmu. */ -#define LIBXMU - -#endif - /* Assar Westerlund <assar@sics.se> says this is necessary for HP-UX 10.20, and that it works for HP-UX 0 as well. */ #define NO_EDITRES