5 files changed, 22 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 59f9981bc3f..0132571d2e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-13  Glenn Morris  <rgm@gnu.org>
+
+        * configure.ac (ULIMIT_BREAK_VALUE): Move here from src/s.
+
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
         * configure.ac (AH_BOTTOM) [DARWIN_OS]: Move SYSTEM_PURESIZE_EXTRA
diff --git a/configure.ac b/configure.ac
index 24ad6b59f57..90016de779b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3545,6 +3545,7 @@ case $opsys in
 esac
 
 
+AH_TEMPLATE(ULIMIT_BREAK_VALUE, [Undocumented.])
 AH_TEMPLATE(TAB3, [Undocumented.])
 
 case $opsys in
@@ -3555,10 +3556,25 @@ case $opsys in
     AC_DEFINE(TAB3, OXTABS)
     ;;
 
+  gnu-linux | gnu-kfreebsd )
+    dnl libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared
+    dnl library, we cannot get the maximum address for brk.
+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#ifndef __i386__
+# error "not i386"
+#endif
+      ]], [[]])], AC_DEFINE(ULIMIT_BREAK_VALUE, [(32*1024*1024)]), [])
+    ;;
+
   hpux*)
     AC_DEFINE(RUN_TIME_REMAP, 1, [Define if emacs.c needs to call
       run_time_remap; for HPUX.])
     ;;
+
+  irix6-5)
+    dnl Ulimit(UL_GMEMLIM) is busted...
+    AC_DEFINE(ULIMIT_BREAK_VALUE, [0x14000000])
+    ;;
 esac
 
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 4f08d108f5d..c66b38147ff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-13  Glenn Morris  <rgm@gnu.org>
 
+        * s/gnu-linux.h, s/irix6-5.h: Let configure set ULIMIT_BREAK_VALUE.
+
         * process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION.
         * s/darwin.h (MIN_PTY_KERNEL_VERSION): Remove single-use macro.
 
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 569b69f574b..30bdf0407be 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -57,9 +57,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #else
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
 #endif
-
-#ifdef __i386__
-/* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */
-/* we cannot get the maximum address for brk */
-# define ULIMIT_BREAK_VALUE (32*1024*1024)
-#endif
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 39ac59a00c2..a8923d230d2 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -30,9 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 char *_getpty();
 #endif
 
-/* Ulimit(UL_GMEMLIM) is busted...  */
-#define ULIMIT_BREAK_VALUE 0x14000000
-
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
 
 #undef TIOCSIGSEND              /* defined in usg5-4-common.h */