Mercurial > hg > xemacs-beta
comparison configure @ 5494:861f2601a38b
Sync s/ files with GNU 23.1.92, delete obsolete stuff, simplify other stuff
--- ChangeLog
2010-02-20 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
irix6-0.h renamed to irix6-5.h; sco7.h deleted.
bsd4-3.h renamed to bsd-common.h.
Simplify setting machine= for intel386, mips.
Put back linux.h.
Incorporate some stuff about debug/optimization flags in irix6-5.h
into configure.ac.
Add a comment about LCC stuff with optimization flags that should be
fixed up.
--- src/ChangeLog
2010-02-20 Ben Wing <ben@xemacs.org>
* sysdep.c:
* sysdep.c (qxe_reliable_signal):
* sysdep.c (retry_open_1):
* sysdep.c (retry_close):
* sysdep.c (retry_read_1):
* sysdep.c (retry_write_1):
* sysdep.c (retry_fopen):
* sysdep.c (retry_fclose):
* sysdep.c (retry_fread):
* sysdep.c (retry_fwrite):
Remove conditionalization on INTERRUPTIBLE_IO, INTERRUPTIBLE_OPEN,
INTERRUPTIBLE_CLOSE -- always check for EINTR as there's no harm
in it.
Remove old #if 0'ed out SA_RESTART code.
Use manifest constant IRIX6_5 instead of IRIX.
* Makefile.in.in:
* dired.c:
* dired.c (Ffile_attributes):
Use manifest constant IRIX6_5 instead of IRIX.
Eliminate constant BSD4_2, use BSD4_3 instead.
* getloadavg.c:
* getloadavg.c (getloadavg):
* getloadavg.c (LDAV_PRIVILEGED):
* getloadavg.c (LDAV_DONE):
Sync with GNU 23.1.92.
2010-02-20 Ben Wing <ben@xemacs.org>
* s/README:
* s/aix4-2.h:
* s/aix4-2.h (MAIL_USE_LOCKF):
* s/bsd-common.h:
* s/freebsd.h:
* s/freebsd.h (Carey):
* s/freebsd.h (or):
* s/gnu.h:
* s/gnu.h (DATA_START):
* s/hpux11-shr.h:
* s/hpux11.h:
* s/hpux11.h (random):
* s/irix6-5.h:
* s/linux.h:
* s/mach-bsd4-3.h:
* s/netbsd.h:
* s/netbsd.h (or):
* s/netbsd.h (A_TEXT_OFFSET):
* s/netbsd.h (NO_MATHERR):
* s/openbsd.h:
* s/sol2.h:
* s/usg5-4-2.h:
* s/usg5-4.h:
* s/usg5-4.h (or):
* s/usg5-4.h (ORDINARY_LINK):
Sync with GNU 23.1.92.
Put back linux.h.
Rename: bsd4-3.h -> bsd-common.h; irix6-0.h -> irix6-5.h.
Delete: template.h (useless).
Delete a whole bunch of obsolete stuff in sol2.h, linux.h,
freebsd.h -- assume anything over 10 years old is sufficiently
obsolete to be deleted.
Remove LIBS_DEBUG, C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, KERNEL_FILE,
LDAV_SYMBOL, most remaining PTY stuff, remaining TERMINFO/TERMCAP
stuff. Update README appropriately.
Remove stuff in hpux11-shr.h duplicated in hpux11.h.
Remove sco7.h, identical with usg5-4-2.h.
Remove unused POSIX flag, BROKEN_TIOC*, NO_SIOCTL_H.
2010-02-20 Ben Wing <ben@xemacs.org>
* m/arm.h:
* m/hp800.h:
* m/intel386.h:
* m/mips.h:
* m/powerpc.h:
* m/sparc.h:
* m/template.h:
Temporarily ifdef out all defines involving load-average stuff --
using define ENABLE_SM_FILE_DECLS_OF_LOADAVG_STUFF, which is not
defined.
I'm pretty sure getloadavg.c will take care of defining stuff
properly on all systems without the need to duplicate the info
in m/*. --ben
Delete LIBS_TERMCAP; configure auto-handles this.
Delete extra stuff in hp800.h.
Delete C_DEBUG_SWITCH, C_OPTIMIZE_SWITCH, LDAV_SYMBOL; incorporate
some stuff into configure.ac.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Feb 2010 06:03:00 -0600 |
parents | 2ade80e8c640 |
children | 1f0b15040456 |
comparison
equal
deleted
inserted
replaced
5493:f62141fe007d | 5494:861f2601a38b |
---|---|
5796 machine='' opsys='' | 5796 machine='' opsys='' |
5797 | 5797 |
5798 case "$ac_cv_build" in | 5798 case "$ac_cv_build" in |
5799 sparc-*-* ) machine=sparc ;; | 5799 sparc-*-* ) machine=sparc ;; |
5800 alpha*-*-* ) machine=alpha ;; | 5800 alpha*-*-* ) machine=alpha ;; |
5801 mips*-linux ) machine=mips ;; | 5801 mips*-* ) machine=mips ;; |
5802 rs6000-ibm-aix* ) machine=ibmrs6000 ;; | 5802 rs6000-ibm-aix* ) machine=ibmrs6000 ;; |
5803 powerpc-ibm-aix* ) machine=ibmrs6000 ;; | 5803 powerpc-ibm-aix* ) machine=ibmrs6000 ;; |
5804 powerpc*-* ) machine=powerpc ;; | 5804 powerpc*-* ) machine=powerpc ;; |
5805 hppa-*-* ) machine=hp800 ;; | 5805 hppa-*-* ) machine=hp800 ;; |
5806 arm* ) machine=arm ;; | 5806 arm* ) machine=arm ;; |
5807 i[3-9]86-*-* ) machine=intel386 ;; | |
5807 esac | 5808 esac |
5808 | 5809 |
5809 case "$ac_cv_build" in | 5810 case "$ac_cv_build" in |
5811 *-*-linux* ) opsys=linux ;; | |
5810 *-*-netbsd* ) opsys=netbsd ;; | 5812 *-*-netbsd* ) opsys=netbsd ;; |
5811 *-*-openbsd* ) opsys=openbsd ;; | 5813 *-*-openbsd* ) opsys=openbsd ;; |
5812 | 5814 |
5813 *-*-aix[4-9]* ) opsys=aix4-2 ;; | 5815 *-*-aix[4-9]* ) opsys=aix4-2 ;; |
5814 | 5816 |
5815 *-gnu* ) opsys=gnu ;; | 5817 *-gnu* ) opsys=gnu ;; |
5816 *-*-bsd4.3 ) opsys=bsd4-3 ;; | 5818 *-*-bsd4.3 ) opsys=bsd-common ;; |
5817 *-*-aos* ) opsys=bsd4-3 ;; | 5819 *-*-aos* ) opsys=bsd-common ;; |
5818 *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;; | 5820 *-*-sysv4.1* | *-*-sysvr4.1* )opsys=usg5-4 NON_GNU_CPP=/usr/lib/cpp ;; |
5819 *-*-sysv4.[2-9]* | *-sysvr4.[2-9]* ) | 5821 *-*-sysv4.[2-9]* | *-sysvr4.[2-9]* ) |
5820 if test -z "$NON_GNU_CPP" ; then | 5822 if test -z "$NON_GNU_CPP" ; then |
5821 for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do | 5823 for prog in "/usr/ccs/lib/cpp" "/lib/cpp"; do |
5822 if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi | 5824 if test -f "$prog"; then NON_GNU_CPP="$prog"; break; fi |
5827 *-*-mach_bsd4.3* ) opsys=mach-bsd4-3 ;; | 5829 *-*-mach_bsd4.3* ) opsys=mach-bsd4-3 ;; |
5828 esac | 5830 esac |
5829 | 5831 |
5830 case "$ac_cv_build" in | 5832 case "$ac_cv_build" in |
5831 | 5833 |
5832 *-*-netbsd* ) | |
5833 case "${ac_cv_build}" in | |
5834 i[3-9]86-*-netbsd*) machine=intel386 ;; | |
5835 esac | |
5836 ;; | |
5837 | |
5838 *-*-openbsd* ) | |
5839 case "${ac_cv_build}" in | |
5840 i386-*-openbsd*) machine=intel386 ;; | |
5841 esac | |
5842 ;; | |
5843 | |
5844 *-*-darwin*) | 5834 *-*-darwin*) |
5845 opsys=darwin | 5835 opsys=darwin |
5846 $as_echo "#define USE_PARAM_H 1" >>confdefs.h | 5836 $as_echo "#define USE_PARAM_H 1" >>confdefs.h |
5847 | 5837 |
5848 ;; | 5838 ;; |
5851 NON_GNU_CC="cc -Ae" NON_GNU_CPP="cc -Ae -E" | 5841 NON_GNU_CC="cc -Ae" NON_GNU_CPP="cc -Ae -E" |
5852 | 5842 |
5853 case "$ac_cv_build" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac | 5843 case "$ac_cv_build" in *-hp-hpux*shr* ) opsys="${opsys}-shr" ;; esac |
5854 ;; | 5844 ;; |
5855 | 5845 |
5856 mips-mips-bsd* ) machine=mips opsys=bsd4-3 ;; | 5846 mips-mips-bsd* ) opsys=bsd-common ;; |
5857 mips-mips-* ) machine=mips opsys=usg5-4-2 ;; | 5847 mips-mips-* ) opsys=usg5-4-2 ;; |
5858 | 5848 |
5859 mips-sgi-irix6* ) opsys=irix6-0 ;; | 5849 mips-sgi-irix6* ) opsys=irix6-5 ;; |
5860 | 5850 |
5861 *-*-solaris* | *-sun-mach* | *-sun-bsd* ) | 5851 *-*-solaris* | *-sun-mach* | *-sun-bsd* ) |
5862 case "$ac_cv_build" in | |
5863 i*86-*-* ) machine=intel386 ;; | |
5864 esac | |
5865 | |
5866 case "$ac_cv_build" in *-sunos5*) | 5852 case "$ac_cv_build" in *-sunos5*) |
5867 ac_cv_build=`echo $ac_cv_build | sed -e s/sunos5/solaris2/`;; | 5853 ac_cv_build=`echo $ac_cv_build | sed -e s/sunos5/solaris2/`;; |
5868 esac | 5854 esac |
5869 | 5855 |
5870 case "$ac_cv_build" in | 5856 case "$ac_cv_build" in |
5886 #define OS_RELEASE $os_release | 5872 #define OS_RELEASE $os_release |
5887 _ACEOF | 5873 _ACEOF |
5888 ;; | 5874 ;; |
5889 | 5875 |
5890 *-mach* ) opsys=mach-bsd4-3 ;; | 5876 *-mach* ) opsys=mach-bsd4-3 ;; |
5891 * ) opsys=bsd4-3 ;; | 5877 * ) opsys=bsd-common ;; |
5892 esac | 5878 esac |
5893 | 5879 |
5894 test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC="" | 5880 test "$opsys $CC" = "sol2 /usr/ucb/cc" && CC="" |
5895 ;; | 5881 ;; |
5896 | 5882 |
5897 i[3-9]86-*-* ) | 5883 i[3-9]86-*-* ) |
5898 machine=intel386 | |
5899 case "$ac_cv_build" in | 5884 case "$ac_cv_build" in |
5900 *-mach* ) opsys=mach-bsd4-3 ;; | 5885 *-mach* ) opsys=mach-bsd4-3 ;; |
5901 *-sysv5* ) opsys=sco7 ;; | 5886 *-sysv5* ) opsys=usg5-4-2 ;; |
5902 *-freebsd* ) opsys=freebsd ;; | 5887 *-freebsd* ) opsys=freebsd ;; |
5903 *-pc-cygwin* ) opsys=cygwin32 ;; | 5888 *-pc-cygwin* ) opsys=cygwin32 ;; |
5904 *-pc-mingw* ) opsys=mingw32 ; | 5889 *-pc-mingw* ) opsys=mingw32 ; |
5905 test -z "$with_tty" && with_tty="no";; | 5890 test -z "$with_tty" && with_tty="no";; |
5906 esac | 5891 esac |
9597 with_cflags_optimization="-O3" | 9582 with_cflags_optimization="-O3" |
9598 elif test "$CC" = "xlc"; then | 9583 elif test "$CC" = "xlc"; then |
9599 with_cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000" | 9584 with_cflags_optimization="-O3 -qstrict -qnoansialias -qlibansi -qmaxmem=20000" |
9600 elif test "$__ICC" = "yes"; then | 9585 elif test "$__ICC" = "yes"; then |
9601 with_cflags_optimization="-O3 -Ob2" | 9586 with_cflags_optimization="-O3 -Ob2" |
9602 else | 9587 elif test "$opsys" = "irix6-5"; then |
9588 with_cflags_optimization="-O -OPT:Olimit=3500" | |
9589 else | |
9603 with_cflags_optimization="-O" ; fi | 9590 with_cflags_optimization="-O" ; fi |
9604 elif test "$XEMACS_CC_GPP" = "yes" ; then | 9591 elif test "$XEMACS_CC_GPP" = "yes" ; then |
9605 with_cflags_optimization="-fno-strict-aliasing" | 9592 with_cflags_optimization="-fno-strict-aliasing" |
9606 fi | 9593 fi |
9607 fi | 9594 fi |
9610 $as_echo "${with_cflags_optimization}" >&6; } | 9597 $as_echo "${with_cflags_optimization}" >&6; } |
9611 | 9598 |
9612 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred debugging flags" >&5 | 9599 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for preferred debugging flags" >&5 |
9613 $as_echo_n "checking for preferred debugging flags... " >&6; } | 9600 $as_echo_n "checking for preferred debugging flags... " >&6; } |
9614 if test "$cflags_debugging_specified" = "no"; then | 9601 if test "$cflags_debugging_specified" = "no"; then |
9602 if test "$GCC" = "no" -a "$opsys" = "irix6-5" -a "$with_optimization" = "yes" ; then | |
9603 with_cflags_debugging="-g3" | |
9604 else | |
9615 with_cflags_debugging="-g" | 9605 with_cflags_debugging="-g" |
9606 fi | |
9616 | 9607 |
9617 debugging_ok_with_optimization=no | 9608 debugging_ok_with_optimization=no |
9618 if test "$GCC" = "yes" -o "$CC" = "xlc" -o "$__ICC" = "yes"; then | 9609 if test "$GCC" = "yes" -o "$CC" = "xlc" -o "$__ICC" = "yes" -o "$opsys" = "irix6-5"; then |
9619 debugging_ok_with_optimization=yes | 9610 debugging_ok_with_optimization=yes |
9620 fi | 9611 fi |
9621 | 9612 |
9622 if test "$with_optimization" = "yes" -a "$debugging_ok_with_optimization" = "no"; then | 9613 if test "$with_optimization" = "yes" -a "$debugging_ok_with_optimization" = "no"; then |
9623 with_cflags_debugging= | 9614 with_cflags_debugging= |