[Emacs-diffs] /srv/bzr/emacs/trunk r100313: Always define LIBXMENU in src/Makefile.in.

[Glenn Morris]

------------------------------------------------------------
revno: 100313
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-15 15:33:24 -0700
message:
  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.
modified:
  ChangeLog
  configure.in
  msdos/ChangeLog
  msdos/sed1v2.inp
  msdos/sed1x.inp
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-15 21:31:19 +0000
+++ b/ChangeLog 2010-05-15 22:33:24 +0000
@@ -1,5 +1,7 @@
 2010-05-15  Glenn Morris  <address@hidden>
 
+       * configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.
+
        * configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.
 
 2010-05-15  Ken Raeburn  <address@hidden>

=== modified file 'configure.in'
--- a/configure.in      2010-05-15 21:31:19 +0000
+++ b/configure.in      2010-05-15 22:33:24 +0000
@@ -3152,7 +3152,12 @@
   LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)"
 else
   OLDXMENU=
-  LIBXMENU="-lXMenu"
+  ## FIXME This case (!HAVE_X11 && HAVE_X_WINDOWS) is no longer possible(?).
+  if test "${HAVE_X_WINDOWS}" = "yes"; then
+    LIBXMENU="-lXMenu"
+  else
+    LIBXMENU=
+  fi
   LIBX_OTHER=
 fi
 

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2010-05-15 22:01:22 +0000
+++ b/msdos/ChangeLog   2010-05-15 22:33:24 +0000
@@ -1,5 +1,8 @@
 2010-05-15  Glenn Morris  <address@hidden>
 
+       * sed1v2.inp (LIBXMENU): Edit to empty.
+       * sed1x.inp (LIBXMENU): Expect empty initial value.
+
        * sed1v2.inp (OLDXMENU): Edit to empty.
        * sed1x.inp (OLDXMENU): Expect empty initial value.
 

=== modified file 'msdos/sed1v2.inp'
--- a/msdos/sed1v2.inp  2010-05-15 22:01:22 +0000
+++ b/msdos/sed1v2.inp  2010-05-15 22:33:24 +0000
@@ -113,6 +113,7 @@
 /^LIBGPM *=/s/@LIBGPM@//
 /^EXEEXT *=/s/@EXEEXT@/.exe/
 /^OLDXMENU *=/s/@OLDXMENU@//
+/^LIBXMENU *=/s/@LIBXMENU@//
 /^LIBX_OTHER *=/s/@LIBX_OTHER@//
 /^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
 /^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/

=== modified file 'msdos/sed1x.inp'
--- a/msdos/sed1x.inp   2010-05-15 22:01:22 +0000
+++ b/msdos/sed1x.inp   2010-05-15 22:33:24 +0000
@@ -5,7 +5,7 @@
 s!^    @true *$!       @rem!
 s/DOC/DOC-X/g
 /^OLDXMENU *=/s!= *!= ${oldXMenudir}libXMenu11.a!
-/^LIBXMENU *=/address@hidden@!${OLDXMENU}!
+/^LIBXMENU *=/s!= *!= ${OLDXMENU}!
 /^LIBX_OTHER *=/s!= *!= ${LIBXT} ${LIBX_EXTRA}!
 /^OLDXMENU_TARGET *=/s!= *!= really-oldxmenu!
 /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-15 22:01:22 +0000
+++ b/src/ChangeLog     2010-05-15 22:33:24 +0000
@@ -1,6 +1,6 @@
 2010-05-15  Glenn Morris  <address@hidden>
 
-       * Makefile.in (OLDXMENU, LIBX_OTHER): Always define.
+       * Makefile.in (OLDXMENU, LIBXMENU, LIBX_OTHER): Always define.
 
        * Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
        (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-15 22:15:49 +0000
+++ b/src/Makefile.in   2010-05-15 22:33:24 +0000
@@ -177,6 +177,11 @@
 ## Else ${oldXMenudir}libXMenu11.a.
 address@hidden@
 
+## If !HAVE_X11 && HAVE_X_WINDOWS, -lXMenu (this case no longer possible).
+## Else if !HAVE_X11 || USE_GTK, empty.
+## Else $(OLDXMENU).
address@hidden@
+
 address@hidden@
 address@hidden@
 
@@ -300,7 +305,6 @@
        $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifdef HAVE_X_WINDOWS
address@hidden@
 LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
 LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
 #endif /* HAVE_X_WINDOWS */