From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sun, 27 Jan 2008 16:06:02 +0000 (+0000)
Subject: * configure.in: Update comment.
X-Git-Tag: emacs-pretest-23.0.90~8371
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c28b587abe1ebf89059753b6983d597402042d8;p=emacs.git

* configure.in: Update comment.

* Makefile.in: Remove references to unused macros.
---

diff --git a/ChangeLog b/ChangeLog
index 1f9820d386a..6932c0f904d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* configure.in: Update comment.
+
 2008-01-26  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in (--without-gcc): By default, neither off nor on.
diff --git a/configure.in b/configure.in
index abf67196b74..6b9de40756a 100644
--- a/configure.in
+++ b/configure.in
@@ -2676,8 +2676,7 @@ AH_BOTTOM([
 #endif
 
 /* Multi-tty support relies on MULTI_KBOARD.  It seems safe to turn it
-   on unconditionally.  Note that src/s/darwin.h disables this at
-   present.  */
+   on unconditionally. */
 #ifndef MULTI_KBOARD
 #define MULTI_KBOARD
 #endif
diff --git a/src/ChangeLog b/src/ChangeLog
index b3ab1ad9904..114bbc5b0e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-27  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* Makefile.in: Remove references to unused macros.
+
 2008-01-26  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32.c (g_b_init_get_sid_sub_authority)
diff --git a/src/Makefile.in b/src/Makefile.in
index 88acbbf802f..b8f62055f07 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -993,12 +993,7 @@ ${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${shortlisp} ${SOME_MACHINE_LIS
 ${libsrc}make-docfile${EXEEXT}:
 	cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT}
 
-/* Some systems define this to cause parallel Make-ing.  */
-#ifndef MAKE_PARALLEL
-#define MAKE_PARALLEL
-#endif
-
-temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
+temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
 	echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
 	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
@@ -1010,11 +1005,6 @@ temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} $
 prefix-args${EXEEXT}: prefix-args.c $(config_h)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
 
-/* Do not lose if this was not defined.  */
-#ifndef OLDXMENU_OPTIONS
-#define OLDXMENU_OPTIONS
-#endif
-
 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK)
 
 /* We use stamp-xmenu with these two deps
@@ -1060,7 +1050,7 @@ C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
 C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
 C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
 really-oldXMenu:
-	cd ${oldXMenudir}; ${MAKE} ${MFLAGS} OLDXMENU_OPTIONS \
+	cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
     CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
     "C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
     "C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \