summaryrefslogtreecommitdiff
path: root/autogen
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-07-13 06:17:28 -0400
committerGlenn Morris <rgm@gnu.org>2012-07-13 06:17:28 -0400
commitd3127c14c23834d6a75249c2e3194a07f8cdd069 (patch)
tree8ad70153f7dd5e4ac828eac8642f8dcbb617907c /autogen
parentea814a5df444267f60807a3d2b064eac55bc2f48 (diff)
downloademacs-d3127c14c23834d6a75249c2e3194a07f8cdd069.tar.gz
Auto-commit of generated files.
Diffstat (limited to 'autogen')
-rw-r--r--autogen/config.in74
-rwxr-xr-xautogen/configure196
2 files changed, 261 insertions, 9 deletions
diff --git a/autogen/config.in b/autogen/config.in
index 32040cd4c24..ba1594aced6 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -70,6 +70,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if SIGPTY should not be used. */
#undef BROKEN_SIGPTY
+/* Define if the system is compatible with BSD 4.2. */
+#undef BSD4_2
+
+/* Define if the system is compatible with BSD 4.2. */
+#undef BSD_SYSTEM
+
+/* Define if AH_BOTTOM should change BSD_SYSTEM. */
+#undef BSD_SYSTEM_AHB
+
/* Define if Emacs cannot be dumped on your system. */
#undef CANNOT_DUMP
@@ -86,9 +95,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
*/
#undef CRAY_STACKSEG_END
+/* Define if the system is Cygwin. */
+#undef CYGWIN
+
/* Define to 1 if using 'alloca.c'. */
#undef C_ALLOCA
+/* Define if the system is Darwin. */
+#undef DARWIN_OS
+
/* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */
#undef DATA_SEG_BITS
@@ -167,6 +182,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Value of PENDING_OUTPUT_COUNT if using the GNU C library. */
#undef GNU_LIBRARY_PENDING_OUTPUT_COUNT
+/* Define if ths system is compatible with GNU/Linux. */
+#undef GNU_LINUX
+
/* Define to 1 if you want to use the GNU memory allocator. */
#undef GNU_MALLOC
@@ -1055,9 +1073,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to support using a Hesiod database to find the POP server. */
#undef HESIOD
+/* Define if the system is HPUX. */
+#undef HPUX
+
/* Define to read input using SIGIO. */
#undef INTERRUPT_INPUT
+/* Define if the system is IRIX. */
+#undef IRIX6_5
+
/* Define to support Kerberos-authenticated POP mail retrieval. */
#undef KERBEROS
@@ -1096,6 +1120,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Do not define abort in emacs.c. */
#undef NO_ABORT
+/* Define if XEditRes should not be used. */
+#undef NO_EDITRES
+
/* Define to 1 if you don't have struct exception in math.h. */
#undef NO_MATHERR
@@ -1105,6 +1132,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define if termio.h should not be included. */
#undef NO_TERMIO
+/* Minimum value of NSIG. */
+#undef NSIG_MINIMUM
+
/* Define to 1 if `NSInteger' is defined. */
#undef NS_HAVE_NSINTEGER
@@ -1210,6 +1240,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
'size_t'. */
#undef SIZE_T_SUFFIX
+/* Define if the system is Solaris. */
+#undef SOLARIS2
+
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
@@ -1255,6 +1288,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
timespec. */
#undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
+/* Undocumented. */
+#undef ULIMIT_BREAK_VALUE
+
/* Define to 1 for Encore UMAX. */
#undef UMAX
@@ -1262,6 +1298,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
<sys/cpustats.h>. */
#undef UMAX4_3
+/* Define if the system has Unix98 PTYs. */
+#undef UNIX98_PTYS
+
/* Define to 1 if using GTK. */
#undef USE_GTK
@@ -1283,6 +1322,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using an X toolkit. */
#undef USE_X_TOOLKIT
+/* Define if the system is compatible with System III. */
+#undef USG
+
+/* Define if the system is compatible with System V. */
+#undef USG5
+
/* Define for USG systems where it works to open a pty's tty in the parent
process, then close and reopen it in the child. */
#undef USG_SUBTTY_WORKS
@@ -1323,6 +1368,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
XPointer or XPointer*. */
#undef XRegisterIMInstantiateCallback_arg6
+/* Define if the system is AIX. */
+#undef _AIX
+
/* Enable large inode numbers on Mac OS X. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
@@ -1520,6 +1568,19 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
# error "alloca not available on this machine"
#endif
+/* This silences a few compilation warnings on FreeBSD. */
+#ifdef BSD_SYSTEM_AHB
+#undef BSD_SYSTEM_AHB
+#undef BSD_SYSTEM
+#if __FreeBSD__ == 1
+#define BSD_SYSTEM 199103
+#elif __FreeBSD__ == 2
+#define BSD_SYSTEM 199306
+#elif __FreeBSD__ >= 3
+#define BSD_SYSTEM 199506
+#endif
+#endif
+
/* Define AMPERSAND_FULL_NAME if you use the convention
that & in the full name stands for the login id. */
/* Turned on June 1996 supposing nobody will mind it. */
@@ -1538,13 +1599,14 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
# include config_opsysfile
#endif
-/* GNUstep needs a bit more pure memory. Of the existing knobs,
- SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.
- (There is probably a better place to do this, but right now the
- Cocoa side does this in s/darwin.h and we cannot parallel this
- exactly since GNUstep is multi-OS. */
-#if defined HAVE_NS && defined NS_IMPL_GNUSTEP
+/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs,
+ SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */
+#ifdef HAVE_NS
+#if defined NS_IMPL_GNUSTEP
# define SYSTEM_PURESIZE_EXTRA 30000
+#elif defined DARWIN_OS
+# define SYSTEM_PURESIZE_EXTRA 200000
+#endif
#endif
#ifdef emacs /* Don't do this for lib-src. */
diff --git a/autogen/configure b/autogen/configure
index 51f2dacf360..4423b06b095 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -19243,7 +19243,7 @@ _ACEOF
fi
test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
-fi
+ fi
LIBXMU=-lXmu
@@ -22634,12 +22634,35 @@ $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
+
+
+case $opsys in
+ aix4-2)
+ if test x$ac_cv_lib_Xmu_XmuConvertStandardSelection != xyes; then
+ $as_echo "#define NO_EDITRES 1" >>confdefs.h
+
+ fi
+ ;;
+
+ hpux*)
+ $as_echo "#define NO_EDITRES 1" >>confdefs.h
+
+ ;;
+esac
+
+
case $opsys in
darwin | gnu | hpux* | *bsd )
$as_echo "#define NO_TERMIO 1" >>confdefs.h
- ;;
+ ;;
+
+ irix6-5 | sol2* | unixware )
+
+$as_echo "#define NSIG_MINIMUM 32" >>confdefs.h
+
+ ;;
esac
@@ -22775,6 +22798,9 @@ case $opsys in
gnu-linux | gnu-kfreebsd )
if test "x$ac_cv_func_grantpt" = xyes; then
+
+$as_echo "#define UNIX98_PTYS 1" >>confdefs.h
+
$as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++) " >>confdefs.h
$as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptyname; sigblock (sigmask (SIGCHLD)); if (grantpt (fd) == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname(fd))) { sigunblock (sigmask (SIGCHLD)); close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); sigunblock (sigmask (SIGCHLD)); } " >>confdefs.h
@@ -22996,6 +23022,7 @@ esac
+
case $opsys in
darwin) $as_echo "#define TAB3 OXTABS" >>confdefs.h
;;
@@ -23008,11 +23035,39 @@ $as_echo "#define TABDLY OXTABS" >>confdefs.h
;;
+ gnu-linux | gnu-kfreebsd )
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifndef __i386__
+# error "not i386"
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ $as_echo "#define ULIMIT_BREAK_VALUE (32*1024*1024)" >>confdefs.h
+
+fi
+rm -f conftest.err conftest.$ac_ext
+ ;;
+
hpux*)
$as_echo "#define RUN_TIME_REMAP 1" >>confdefs.h
;;
+
+ irix6-5)
+ $as_echo "#define ULIMIT_BREAK_VALUE 0x14000000" >>confdefs.h
+
+ ;;
esac
@@ -23025,6 +23080,141 @@ $as_echo "#define XOS_NEEDS_TIME_H 1" >>confdefs.h
esac
+
+
+
+
+
+case $opsys in
+ aix4-2)
+ $as_echo "#define USG /**/" >>confdefs.h
+
+ $as_echo "#define USG5 /**/" >>confdefs.h
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifndef _AIX
+# error "_AIX not defined"
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+
+$as_echo "#define _AIX /**/" >>confdefs.h
+
+fi
+rm -f conftest.err conftest.$ac_ext
+ ;;
+
+ cygwin)
+ opsysfile=
+
+$as_echo "#define CYGWIN 1" >>confdefs.h
+
+ ;;
+
+ darwin)
+ $as_echo "#define BSD4_2 /**/" >>confdefs.h
+
+ $as_echo "#define BSD_SYSTEM /**/" >>confdefs.h
+
+
+$as_echo "#define DARWIN_OS /**/" >>confdefs.h
+
+ ;;
+
+ freebsd)
+ $as_echo "#define BSD4_2 /**/" >>confdefs.h
+
+
+$as_echo "#define BSD_SYSTEM_AHB 1" >>confdefs.h
+
+ ;;
+
+ gnu | netbsd | openbsd )
+ $as_echo "#define BSD4_2 /**/" >>confdefs.h
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#ifndef BSD_SYSTEM
+# error "BSD_SYSTEM not defined"
+#endif
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ $as_echo "#define BSD_SYSTEM 43" >>confdefs.h
+
+fi
+rm -f conftest.err conftest.$ac_ext
+ ;;
+
+ gnu-linux | gnu-kfreebsd )
+ $as_echo "#define USG /**/" >>confdefs.h
+
+
+$as_echo "#define GNU_LINUX /**/" >>confdefs.h
+
+ ;;
+
+ hpux*)
+ $as_echo "#define USG /**/" >>confdefs.h
+
+ $as_echo "#define USG5 /**/" >>confdefs.h
+
+
+$as_echo "#define HPUX /**/" >>confdefs.h
+
+ ;;
+
+ irix6-5)
+ $as_echo "#define USG /**/" >>confdefs.h
+
+ $as_echo "#define USG5 /**/" >>confdefs.h
+
+
+$as_echo "#define IRIX6_5 /**/" >>confdefs.h
+
+ ;;
+
+ sol2*)
+ $as_echo "#define USG /**/" >>confdefs.h
+
+ $as_echo "#define USG5 /**/" >>confdefs.h
+
+
+$as_echo "#define SOLARIS2 /**/" >>confdefs.h
+
+ ;;
+
+ unixware)
+ $as_echo "#define USG /**/" >>confdefs.h
+
+ $as_echo "#define USG5 /**/" >>confdefs.h
+
+ ;;
+esac
+
+
case $opsys in
cygwin)
@@ -23032,7 +23222,7 @@ $as_echo "#define G_SLICE_ALWAYS_MALLOC 1" >>confdefs.h
;;
- gnu) opsysfile="s/bsd-common.h" ;;
+ gnu) opsysfile= ;;
gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;