diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/config.in | 8 |
4 files changed, 11 insertions, 17 deletions
@@ -1,3 +1,9 @@ +2010-05-16 Dan Nicolaescu <[email protected]> + + * 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 <[email protected]> * configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS. @@ -21603,7 +21603,7 @@ case "$opsys" in ## hpux10-20: Use the system provided termcap(3) library. ## openbsd: David Mazieres <[email protected]> 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 diff --git a/configure.in b/configure.in index eb15b2204b..a3ce2b3af4 100644 --- a/configure.in +++ b/configure.in @@ -2612,7 +2612,7 @@ HAVE_LIBNCURSES=yes ## 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 @@ case "$opsys" in ## hpux10-20: Use the system provided termcap(3) library. ## openbsd: David Mazieres <[email protected]> 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 @@ typedef unsigned size_t; #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 @@ typedef unsigned size_t; 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 diff --git a/src/config.in b/src/config.in index 3553094368..99a95d7f15 100644 --- a/src/config.in +++ b/src/config.in @@ -1179,8 +1179,6 @@ typedef unsigned size_t; #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 @@ typedef unsigned size_t; 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 |