diff options
| author | Glenn Morris | 2012-07-12 17:14:13 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-12 17:14:13 -0400 |
| commit | ba9e4b84ac8322e84cd0cc1c5fe6d5d8a8453ff5 (patch) | |
| tree | 43ee247f654ae26a785c95c9c4a4ba3bef2ea3af /src | |
| parent | a7208036ed514ead06b0e95bdcdb306adb91e0df (diff) | |
| download | emacs-ba9e4b84ac8322e84cd0cc1c5fe6d5d8a8453ff5.tar.gz emacs-ba9e4b84ac8322e84cd0cc1c5fe6d5d8a8453ff5.zip | |
Move NO_EDITRES from src/s to configure
* configure.ac (NO_EDITRES): Move here from src/s.
* src/s/aix4-2.h, src/s/hpux10-20.h: Let configure set NO_EDITRES.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/s/aix4-2.h | 5 | ||||
| -rw-r--r-- | src/s/hpux10-20.h | 4 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f0b532df145..49014c340dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,8 +1,3 @@ | |||
| 1 | 2012-07-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * s/gnu-linux.h, s/hpux10-20.h: | ||
| 4 | Do not unconditionally define HAVE_XRMSETDATABASE. | ||
| 5 | |||
| 6 | 2012-07-12 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-07-12 Eli Zaretskii <eliz@gnu.org> |
| 7 | 2 | ||
| 8 | * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in | 3 | * xdisp.c (insert_left_trunc_glyphs): Fix incorrect size in |
| @@ -19,6 +14,11 @@ | |||
| 19 | 14 | ||
| 20 | 2012-07-12 Glenn Morris <rgm@gnu.org> | 15 | 2012-07-12 Glenn Morris <rgm@gnu.org> |
| 21 | 16 | ||
| 17 | * s/aix4-2.h, s/hpux10-20.h: Let configure set NO_EDITRES. | ||
| 18 | |||
| 19 | * s/gnu-linux.h, s/hpux10-20.h: | ||
| 20 | Do not unconditionally define HAVE_XRMSETDATABASE. | ||
| 21 | |||
| 22 | * s/gnu-linux.h (UNIX98_PTYS): Let configure set it. | 22 | * s/gnu-linux.h (UNIX98_PTYS): Let configure set it. |
| 23 | 23 | ||
| 24 | 2012-07-12 Paul Eggert <eggert@cs.ucla.edu> | 24 | 2012-07-12 Paul Eggert <eggert@cs.ucla.edu> |
diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h index 49eabfc8466..55000f6f279 100644 --- a/src/s/aix4-2.h +++ b/src/s/aix4-2.h | |||
| @@ -32,11 +32,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 32 | /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct. */ | 32 | /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct. */ |
| 33 | #undef sigmask | 33 | #undef sigmask |
| 34 | 34 | ||
| 35 | #ifndef HAVE_LIBXMU | ||
| 36 | /* Unfortunately without libXmu we cannot support EditRes. */ | ||
| 37 | #define NO_EDITRES | ||
| 38 | #endif | ||
| 39 | |||
| 40 | /* Conservative garbage collection has not been tested, so for now | 35 | /* Conservative garbage collection has not been tested, so for now |
| 41 | play it safe and stick with the old-fashioned way of marking. */ | 36 | play it safe and stick with the old-fashioned way of marking. */ |
| 42 | #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE | 37 | #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE |
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 00b384f1f3c..6115565e9d0 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h | |||
| @@ -26,10 +26,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 26 | 26 | ||
| 27 | /* Special hacks needed to make Emacs run on this system. */ | 27 | /* Special hacks needed to make Emacs run on this system. */ |
| 28 | 28 | ||
| 29 | /* Assar Westerlund <assar@sics.se> says this is necessary for | ||
| 30 | HP-UX 10.20, and that it works for HP-UX 0 as well. */ | ||
| 31 | #define NO_EDITRES | ||
| 32 | |||
| 33 | /* We have to go this route, rather than hpux9's approach of renaming the | 29 | /* We have to go this route, rather than hpux9's approach of renaming the |
| 34 | functions via macros. The system's stdlib.h has fully prototyped | 30 | functions via macros. The system's stdlib.h has fully prototyped |
| 35 | declarations, which yields a conflicting definition of srand48; it | 31 | declarations, which yields a conflicting definition of srand48; it |