Move more things from src/s to configure

* configure.ac (BROKEN_GET_CURRENT_DIR_NAME, BROKEN_PTY_READ_AFTER_EAGAIN)
(G_SLICE_ALWAYS_MALLOC): Move here from src/s.

* src/s/freebsd.h (BROKEN_PTY_READ_AFTER_EAGAIN):
* src/s/cygwin.h (G_SLICE_ALWAYS_MALLOC):
* src/s/aix4-2.h (BROKEN_GET_CURRENT_DIR_NAME): Let configure set them.

4 files changed, 3 insertions, 39 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6aa14c96198..52e9364f6ea 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
+        * s/cygwin.h (G_SLICE_ALWAYS_MALLOC):
+        * s/freebsd.h (BROKEN_PTY_READ_AFTER_EAGAIN):
         * s/irix6-5.h (SETPGRP_RELEASES_CTTY, PREFER_VSUSP):
         * s/hpux10-20.h (RUN_TIME_REMAP):
         * s/bsd-common.h (TABDLY): Move to configure.
@@ -9,7 +11,7 @@
         * s/bsd-common.h, s/darwin.h: Move TAB3 to configure.
 
         * s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
-        (BROKEN_SIGPOLL): Let configure set them.
+        (BROKEN_SIGPOLL, BROKEN_GET_CURRENT_DIR_NAME): Let configure set them.
 
         * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set them.
 
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index ec7a1eeb0b8..4287eea9dcc 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -43,23 +43,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_EDITRES
 #endif
 
-/* On AIX Emacs uses the gmalloc.c malloc implementation.  But given
-   the way this system works, libc functions that return malloced
-   memory use the libc malloc implementation. Calling xfree or
-   xrealloc on the results of such functions results in a crash.
-
-   One solution for this could be to define SYSTEM_MALLOC in configure,
-   but that does not currently work on this system.
-
-   It is possible to completely override the malloc implementation on
-   AIX, but that involves putting the malloc functions in a shared
-   library and setting the MALLOCTYPE environment variable to point to
-   that shared library.
-
-   Emacs currently calls xrealloc on the results of get_current_dir name,
-   to avoid a crash just use the Emacs implementation for that function.  */
-#define BROKEN_GET_CURRENT_DIR_NAME 1
-
 /* Conservative garbage collection has not been tested, so for now
    play it safe and stick with the old-fashioned way of marking.  */
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 0c9bfe203b1..fb5d3b08f4e 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -36,9 +36,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Used in various places to enable cygwin-specific code changes.  */
 #define CYGWIN 1
-
-/* Emacs supplies its own malloc, but glib (part of Gtk+) calls
-   memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
-   As malloc is not the Cygwin malloc, the Cygwin memalign always
-   returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
-#define G_SLICE_ALWAYS_MALLOC
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index b6bd160cc91..8200238bf1f 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -33,21 +33,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BSD_SYSTEM 199506
 #endif
 
-/* Circumvent a bug in FreeBSD.  In the following sequence of
-   writes/reads on a PTY, read(2) returns bogus data:
-
-   write(2)  1022 bytes
-   write(2)   954 bytes, get EAGAIN
-   read(2)   1024 bytes in process_read_output
-   read(2)     11 bytes in process_read_output
-
-   That is, read(2) returns more bytes than have ever been written
-   successfully.  The 1033 bytes read are the 1022 bytes written
-   successfully after processing (for example with CRs added if the
-   terminal is set up that way which it is here).  The same bytes will
-   be seen again in a later read(2), without the CRs.  */
-#define BROKEN_PTY_READ_AFTER_EAGAIN 1
-
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1