* s/darwin.h (OTHER_FILES): Do not define here, defined in

config.in.

* Makefile.in (ALL_OBJC_CFLAGS): New variable.
(.m.o): Use it.
* config.in: Regenerate.

* Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES.  Do
not special case for NS_IMPL_COCOA.

* configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable.
AC_SUBST it.
(GNU_OBJC_CFLAGS): Define as a shell variable instead of #define.
AC_SUBST it.
(OTHER_FILES): Always define for HAVE_NS.
(C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA.
* configure: Regenerate.

9 files changed, 57 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 652f53e731e..115603eabdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * configure.in (LIB_SRC_EXTRA_INSTALLABLES): New variable.
+        AC_SUBST it.
+        (GNU_OBJC_CFLAGS): Define as a shell variable instead of #define.
+        AC_SUBST it.
+        (OTHER_FILES): Always define for HAVE_NS.
+        (C_SWITCH_X_SYSTEM): Don't define as empty for NS_IMPL_COCOA.
+        * configure: Regenerate.
+
 2008-08-07  Andreas Schwab  <schwab@suse.de>
 
         * configure.in: Correctly handle
diff --git a/configure b/configure
index 934ff01b5bb..ffed3a5fb61 100755
--- a/configure
+++ b/configure
@@ -738,6 +738,8 @@ ns_appbindir
 ns_appresdir
 ns_appsrc
 GNUSTEP_MAKEFILES
+GNU_OBJC_CFLAGS
+LIB_SRC_EXTRA_INSTALLABLES
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -14881,6 +14883,8 @@ cat >>confdefs.h <<\_ACEOF
 #define NS_IMPL_COCOA 1
 _ACEOF
 
+    GNU_OBJC_CFLAGS=
+    LIB_SRC_EXTRA_INSTALLABLES=mac-fix-env
   fi
   if test "${EN_COCOA_EXPERIMENTAL_CTRL_G}" = "yes"; then
 
@@ -14895,6 +14899,7 @@ cat >>confdefs.h <<\_ACEOF
 #define NS_IMPL_GNUSTEP 1
 _ACEOF
 
+    GNU_OBJC_CFLAGS="-fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
   fi
   if test "${NS_HAVE_NSINTEGER}" = "yes"; then
 
@@ -16653,7 +16658,6 @@ cat >>conftest.$ac_ext <<_ACEOF
 # endif
 #endif
 
-#include <limits.h>
 #include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
@@ -16802,15 +16806,12 @@ main ()
      isn't worth using anyway.  */
   alarm (60);
 
-  for (;;)
-    {
-      t = (time_t_max << 1) + 1;
-      if (t <= time_t_max)
-        break;
-      time_t_max = t;
-    }
-  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
-
+  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
+    continue;
+  time_t_max--;
+  if ((time_t) -1 < 0)
+    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
+      continue;
   delta = time_t_max / 997; /* a suitable prime number */
   for (i = 0; i < N_STRINGS; i++)
     {
@@ -16825,12 +16826,10 @@ main ()
              && mktime_test ((time_t) (60 * 60 * 24))))
         return 1;
 
-      for (j = 1; ; j <<= 1)
+      for (j = 1; 0 < j; j *= 2)
         if (! bigtime_test (j))
           return 1;
-        else if (INT_MAX / 2 < j)
-          break;
-      if (! bigtime_test (INT_MAX))
+      if (! bigtime_test (j - 1))
         return 1;
     }
   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());
@@ -24134,6 +24133,8 @@ fi
 
 
 
+
+
 cat >>confdefs.h <<_ACEOF
 #define EMACS_CONFIGURATION "${canonical}"
 _ACEOF
@@ -25165,10 +25166,12 @@ ns_appbindir!$ns_appbindir$ac_delim
 ns_appresdir!$ns_appresdir$ac_delim
 ns_appsrc!$ns_appsrc$ac_delim
 GNUSTEP_MAKEFILES!$GNUSTEP_MAKEFILES$ac_delim
+GNU_OBJC_CFLAGS!$GNU_OBJC_CFLAGS$ac_delim
+LIB_SRC_EXTRA_INSTALLABLES!$LIB_SRC_EXTRA_INSTALLABLES$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index 55b3d3d286a..e6b5ea338e2 100644
--- a/configure.in
+++ b/configure.in
@@ -2049,12 +2049,15 @@ if test "${HAVE_NS}" = "yes"; then
   AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.])
   if test "${NS_IMPL_COCOA}" = "yes"; then
     AC_DEFINE(NS_IMPL_COCOA, 1, [Define to 1 if you are using NS windowing under MacOS X.])
+    GNU_OBJC_CFLAGS=
+    LIB_SRC_EXTRA_INSTALLABLES=mac-fix-env
   fi
   if test "${EN_COCOA_EXPERIMENTAL_CTRL_G}" = "yes"; then
     AC_DEFINE(COCOA_EXPERIMENTAL_CTRL_G, 1, [Define to 1 if you are trying experimental enhanced Ctrl-g support using NS windowing under MacOS X.])
   fi
   if test "${NS_IMPL_GNUSTEP}" = "yes"; then
     AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
+    GNU_OBJC_CFLAGS="-fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
   fi
   if test "${NS_HAVE_NSINTEGER}" = "yes"; then
     AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
@@ -2464,6 +2467,8 @@ AC_SUBST(ns_appbindir)
 AC_SUBST(ns_appresdir)
 AC_SUBST(ns_appsrc)
 AC_SUBST(GNUSTEP_MAKEFILES)
+AC_SUBST(GNU_OBJC_CFLAGS)
+AC_SUBST(LIB_SRC_EXTRA_INSTALLABLES)
 
 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION,  "${canonical}",
                    [Define to the canonical Emacs configuration name.])
@@ -2607,18 +2612,14 @@ 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 */
 #  define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
-#  define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE
-#  define OTHER_FILES ns-app
-# else /* NS_IMPL_COCOA */
-#  define C_SWITCH_X_SYSTEM
-#  define GNU_OBJC_CFLAGS
-# endif /* NS_IMPL_COCOA */
+# endif /* NS_IMPL_GNUSTEP */
 #endif /* HAVE_NS */
 
-/* Define `subprocesses' should be defined if you want to
+/* `subprocesses' should be defined if you want to
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
    Only MSDOS does not support this.  */
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 48a50a5fb43..34e9df8289b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (INSTALLABLES): Add LIB_SRC_EXTRA_INSTALLABLES.  Do
+        not special case for NS_IMPL_COCOA.
+
 2008-07-16  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
         * Makefile.in (CFLAGS): Drop -universal under NS_IMPL_COCOA.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 70bb8111c02..d9964518ffe 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -105,7 +105,7 @@ INSTALL_STRIP =
 
 # Things that a user might actually run,
 # which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT}
+INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} @LIB_SRC_EXTRA_INSTALLABLES@
 INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
 
 # Things that Emacs runs internally, or during the build process,
@@ -144,11 +144,6 @@ MOVE_FLAGS=
 #define NOT_C_CODE
 #include "../src/config.h"
 
-#if defined(NS_IMPL_COCOA)
-/* Add mac-fix-env for OS X systems running NS version. */
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} mac-fix-env${EXEEXT}
-#endif
-
 /* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
diff --git a/src/ChangeLog b/src/ChangeLog
index d1bd1e3b488..4544bf0b841 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * s/darwin.h (OTHER_FILES): Do not define here, defined in
+        config.in.
+
+        * Makefile.in (ALL_OBJC_CFLAGS): New variable.
+        (.m.o): Use it.
+        * config.in: Regenerate.
+
 2008-08-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (redisplay_window): Revert last change.
diff --git a/src/Makefile.in b/src/Makefile.in
index 3a12c7e2e95..a17a5acc221 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -254,11 +254,13 @@ DBUS_OBJ = dbusbind.o
 /* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
    since it may have -I options that should override those two.  */
 ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@
+ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
+
 .SUFFIXES: .m
 .c.o:
         $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 .m.o:
-        $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) GNU_OBJC_CFLAGS $<
+        $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
 
 #ifndef LIBX11_SYSTEM
 #define LIBX11_SYSTEM
diff --git a/src/config.in b/src/config.in
index ffa4688462e..1b10aa399cc 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1039,18 +1039,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    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 */
 #  define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
-#  define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE
-#  define OTHER_FILES ns-app
-# else /* NS_IMPL_COCOA */
-#  define C_SWITCH_X_SYSTEM
-#  define GNU_OBJC_CFLAGS
-# endif /* NS_IMPL_COCOA */
+# endif /* NS_IMPL_GNUSTEP */
 #endif /* HAVE_NS */
 
-/* Define `subprocesses' should be defined if you want to
+/* `subprocesses' should be defined if you want to
    have code for asynchronous subprocesses
    (as used in M-x compile and M-x shell).
    Only MSDOS does not support this.  */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 4dcf8bb5fdd..068531df146 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -154,7 +154,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Definitions for how to compile & link.  */
 
 #ifdef HAVE_NS
-#define OTHER_FILES ns-app
 /* XXX: lresolv is here because configure when testing #undefs res_init,
         a macro in /usr/include/resolv.h for res_9_init, not in stdc lib. */
 #define LIBS_NSGUI -framework AppKit -lresolv