bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS)

bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS)

[Dan Nicolaescu]

This patch moves OTHER_FILES definition from cpp to autoconf, it only affects NS.
[configure and src/config.in need to regenerated]

OK to check in?

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.607
diff -u -3 -p -u -p -r1.607 configure.in
--- configure.in 23 Aug 2009 02:15:00 -0000     1.607
+++ configure.in 14 Sep 2009 18:46:36 -0000
@@ -2188,6 +2201,7 @@ if test "${HAVE_NS}" = "yes"; then
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
+  OTHER_FILES=ns-app
 fi
 
 
@@ -2598,6 +2612,7 @@ AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
 AC_SUBST(GNU_OBJC_CFLAGS)
 AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
+AC_SUBST(OTHER_FILES)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
                                                   [Define to the canonical Emacs configuration name.])
@@ -2744,7 +2759,6 @@ AH_BOTTOM([
    side does this in s/darwin.h and we cannot
    parallel this exactly since GNUstep is multi-OS. */
 #ifdef HAVE_NS
-#define OTHER_FILES ns-app
 # ifdef NS_IMPL_GNUSTEP
 /* See also .m.o rule in Makefile.in */
 /* FIXME: are all these flags really needed?  Document here why.  */



Index: Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.446
diff -u -3 -p -u -p -r1.446 Makefile.in
--- Makefile.in  26 Aug 2009 08:28:25 -0000     1.446
+++ Makefile.in  14 Sep 2009 19:27:36 -0000
@@ -886,9 +886,3 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(L
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
    $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
 
-/* Enable recompilation of certain other files depending on system type.  */
-
-#ifndef OTHER_FILES
-#define OTHER_FILES
-#endif
-
@@ -898,11 +889,10 @@
-
 #ifdef HAVE_SHM
 RUN_TEMACS = `/bin/pwd`/temacs -nl
 #else
 RUN_TEMACS = `/bin/pwd`/temacs
 #endif
 
-all: emacs${EXEEXT} OTHER_FILES
+all: emacs${EXEEXT} @OTHER_FILES@
 
 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP}
 #ifdef CANNOT_DUMP

bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS)

[Andreas Schwab]

Dan Nicolaescu <dann@ics.uci.edu> writes:

> -all: emacs${EXEEXT} OTHER_FILES
> +all: emacs${EXEEXT} @OTHER_FILES@

Please define a variable with the substituted value and refer to it here
instead.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS)

[Dan Nicolaescu]

Andreas Schwab <schwab@linux-m68k.org> writes:

  > Dan Nicolaescu <dann@ics.uci.edu> writes:
  > 
  > > -all: emacs${EXEEXT} OTHER_FILES
  > > +all: emacs${EXEEXT} @OTHER_FILES@
  > 
  > Please define a variable with the substituted value and refer to it here
  > instead.

Sure.
OK, with that change?

bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS)

[Stefan Monnier]

> This patch moves OTHER_FILES definition from cpp to autoconf, it only
> affects NS.  [configure and src/config.in need to regenerated]

> OK to check in?

Yes, please, thank you.


        Stefan

bug#4435: marked as done (move OTHER_FILES definition from cpp to autoconf (only affects NS))

[Emacs bug Tracking System]

[-- Attachment #1: Type: text/plain, Size: 954 bytes --]

Your message dated Wed, 16 Sep 2009 23:15:36 -0700 (PDT)
with message-id <200909170615.n8H6FaUi020695@godzilla.ics.uci.edu>
and subject line Re: bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS)
has caused the Emacs bug report #4435,
regarding move OTHER_FILES definition from cpp to autoconf (only affects NS)
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@emacsbugs.donarmstrong.com
immediately.)


-- 
4435: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=4435
Emacs Bug Tracking System
Contact owner@emacsbugs.donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 4703 bytes --]

From: Dan Nicolaescu <dann@ics.uci.edu>
To: bug-gnu-emacs <bug-gnu-emacs@gnu.org>
Subject: move OTHER_FILES definition from cpp to autoconf (only affects NS)
Date: Mon, 14 Sep 2009 12:29:52 -0700 (PDT)
Message-ID: <200909141929.n8EJTqap023924@godzilla.ics.uci.edu>

This patch moves OTHER_FILES definition from cpp to autoconf, it only affects NS.
[configure and src/config.in need to regenerated]

OK to check in?

Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.607
diff -u -3 -p -u -p -r1.607 configure.in
--- configure.in 23 Aug 2009 02:15:00 -0000     1.607
+++ configure.in 14 Sep 2009 18:46:36 -0000
@@ -2188,6 +2201,7 @@ if test "${HAVE_NS}" = "yes"; then
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
+  OTHER_FILES=ns-app
 fi
 
 
@@ -2598,6 +2612,7 @@ AC_SUBST(GNUSTEP_SYSTEM_HEADERS)
 AC_SUBST(GNUSTEP_SYSTEM_LIBRARIES)
 AC_SUBST(GNU_OBJC_CFLAGS)
 AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
+AC_SUBST(OTHER_FILES)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
                                                   [Define to the canonical Emacs configuration name.])
@@ -2744,7 +2759,6 @@ AH_BOTTOM([
    side does this in s/darwin.h and we cannot
    parallel this exactly since GNUstep is multi-OS. */
 #ifdef HAVE_NS
-#define OTHER_FILES ns-app
 # ifdef NS_IMPL_GNUSTEP
 /* See also .m.o rule in Makefile.in */
 /* FIXME: are all these flags really needed?  Document here why.  */



Index: Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.446
diff -u -3 -p -u -p -r1.446 Makefile.in
--- Makefile.in  26 Aug 2009 08:28:25 -0000     1.446
+++ Makefile.in  14 Sep 2009 19:27:36 -0000
@@ -886,9 +886,3 @@ LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(L
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
    $(GNULIB_VAR) LIB_MATH LIB_STANDARD $(GNULIB_VAR)
 
-/* Enable recompilation of certain other files depending on system type.  */
-
-#ifndef OTHER_FILES
-#define OTHER_FILES
-#endif
-
@@ -898,11 +889,10 @@
-
 #ifdef HAVE_SHM
 RUN_TEMACS = `/bin/pwd`/temacs -nl
 #else
 RUN_TEMACS = `/bin/pwd`/temacs
 #endif
 
-all: emacs${EXEEXT} OTHER_FILES
+all: emacs${EXEEXT} @OTHER_FILES@
 
 emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} ${SOME_MACHINE_LISP}
 #ifdef CANNOT_DUMP



[-- Attachment #3: Type: message/rfc822, Size: 2273 bytes --]

From: Dan Nicolaescu <dann@ics.uci.edu>
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: 4435-done@emacsbugs.donarmstrong.com
Subject: Re: bug#4435: move OTHER_FILES definition from cpp to autoconf (only affects NS)
Date: Wed, 16 Sep 2009 23:15:36 -0700 (PDT)
Message-ID: <200909170615.n8H6FaUi020695@godzilla.ics.uci.edu>

Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

  > > This patch moves OTHER_FILES definition from cpp to autoconf, it only
  > > affects NS.  [configure and src/config.in need to regenerated]
  > 
  > > OK to check in?
  > 
  > Yes, please, thank you.

Thanks. Done.