Mercurial > emacs
changeset 108621:880007fe488b
* configure.in: Remove references to usg5-4 and bsd-common, $opsys
does not use them.
(X11R5_INHIBIT_I18N): Remove, unused.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 15 May 2010 22:58:55 -0700 |
| parents | b70fd76537a3 |
| children | 3191c35765a2 |
| files | ChangeLog configure configure.in src/config.in |
| diffstat | 4 files changed, 11 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 15 22:40:10 2010 -0700 +++ b/ChangeLog Sat May 15 22:58:55 2010 -0700 @@ -1,3 +1,9 @@ +2010-05-16 Dan Nicolaescu <dann@ics.uci.edu> + + * configure.in: Remove references to usg5-4 and bsd-common, $opsys + does not use them. + (X11R5_INHIBIT_I18N): Remove, unused. + 2010-05-15 Glenn Morris <rgm@gnu.org> * configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.
--- a/configure Sat May 15 22:40:10 2010 -0700 +++ b/configure Sat May 15 22:58:55 2010 -0700 @@ -21603,7 +21603,7 @@ ## hpux10-20: Use the system provided termcap(3) library. ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this ## is necessary. Otherwise Emacs dumps core when run -nw. - aix4-2|cygwin|hpux*|irix6-5|openbsd|usg5-4|sol2*|unixware) TERMINFO=yes ;; + aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;; ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. ## The ncurses library has been moved out of the System framework in
--- a/configure.in Sat May 15 22:40:10 2010 -0700 +++ b/configure.in Sat May 15 22:58:55 2010 -0700 @@ -2612,7 +2612,7 @@ ## Use terminfo instead of termcap? ## Note only system files NOT using terminfo are: -## bsd-common, freebsd < 40000, ms-w32, msdos, netbsd, and +## freebsd < 40000, ms-w32, msdos, netbsd, and ## darwin|gnu without ncurses. TERMINFO=no LIBS_TERMCAP= @@ -2621,7 +2621,7 @@ ## hpux10-20: Use the system provided termcap(3) library. ## openbsd: David Mazieres <dm@reeducation-labor.lcs.mit.edu> says this ## is necessary. Otherwise Emacs dumps core when run -nw. - aix4-2|cygwin|hpux*|irix6-5|openbsd|usg5-4|sol2*|unixware) TERMINFO=yes ;; + aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;; ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. ## The ncurses library has been moved out of the System framework in @@ -3487,8 +3487,6 @@ #ifdef HAVE_X11R6 #define HAVE_X_I18N -#elif !defined X11R5_INHIBIT_I18N -#define HAVE_X_I18N #endif /* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support. */ @@ -3508,11 +3506,7 @@ that the stack is continuous. */ #ifdef __GNUC__ # ifndef GC_SETJMP_WORKS - /* GC_SETJMP_WORKS is nearly always appropriate for GCC -- - see NON_SAVING_SETJMP in the target descriptions. */ - /* Exceptions (see NON_SAVING_SETJMP in target description) are - SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86. - Fixme: Deal with SVR3. */ + /* GC_SETJMP_WORKS is nearly always appropriate for GCC. */ # define GC_SETJMP_WORKS 1 # endif # ifndef GC_LISP_OBJECT_ALIGNMENT
--- a/src/config.in Sat May 15 22:40:10 2010 -0700 +++ b/src/config.in Sat May 15 22:58:55 2010 -0700 @@ -1179,8 +1179,6 @@ #ifdef HAVE_X11R6 #define HAVE_X_I18N -#elif !defined X11R5_INHIBIT_I18N -#define HAVE_X_I18N #endif /* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support. */ @@ -1200,11 +1198,7 @@ that the stack is continuous. */ #ifdef __GNUC__ # ifndef GC_SETJMP_WORKS - /* GC_SETJMP_WORKS is nearly always appropriate for GCC -- - see NON_SAVING_SETJMP in the target descriptions. */ - /* Exceptions (see NON_SAVING_SETJMP in target description) are - SCO5 non-ELF (but Emacs specifies ELF) and SVR3 on x86. - Fixme: Deal with SVR3. */ + /* GC_SETJMP_WORKS is nearly always appropriate for GCC. */ # define GC_SETJMP_WORKS 1 # endif # ifndef GC_LISP_OBJECT_ALIGNMENT