APPROVE COMMIT 21.5
Vin Shelton <acs(a)xemacs.org> writes:
This combines yesterday's 2 proposed patches for configure:
removing
the non-working -fno-gnu-linker call from gcc under Solaris 5.5 and
below and also replaces 'head -1' 'with sed 1q'.
xemacs-21.5/ChangeLog addition:
2005-03-23 Vin Shelton <acs(a)xemacs.org>
* configure.in: Remove -fno-gnu-linker option from Solaris
dynodump builds; it doesn't do anything.
Don't use 'head -1' - it's deprecated by coreutils-5.3.0 on some
platforms.
21.5 source patch:
Diff command: cvs -q diff -u
Files affected: configure.ac
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.4
diff -a -u -u -r1.4 configure.ac
--- configure.ac 2005/03/15 12:37:14 1.4
+++ configure.ac 2005/03/24 00:53:25
@@ -2302,8 +2302,6 @@
*86* ) dynodump_arch=i386 ;;
powerpc ) dynodump_arch=ppc ;;
esac
- dnl Dynodump requires the system linker
- test "$GCC" = "yes" && XE_APPEND(-fno-gnu-linker,
ld_switch_site)
fi
dnl Feed s&m crud to src/Makefile
@@ -2359,12 +2357,12 @@
dnl run through the AC_PROG_CC mill.
dnl Would anybody really build libsrc with GCC and XEmacs with non-GCC?
if test "$GCC" = "yes"; then
- compiler_version=`$XEMACS_CC --version | head -1`
- gcc_compiler_specs=`$XEMACS_CC -v 2>&1 | sed 's/.* \([[^ ]]\)/\1/' |
head -1`
+ compiler_version=`$XEMACS_CC --version | sed 1q`
+ gcc_compiler_specs=`$XEMACS_CC -v 2>&1 | sed 's/.* \([[^ ]]\)/\1/' |
sed 1q`
else case "$XEMACS_CC" in
dnl The Intel cc compiler
ic*)
- compiler_version=`icc -V 2>&1 | head -1`
+ compiler_version=`icc -V 2>&1 | sed 1q`
;;
dnl non-gcc machine-specific magic - contributions welcome
*) case "$ac_cv_build" in
@@ -2393,7 +2391,7 @@
;;
*-*-solaris*)
- compiler_version=`$XEMACS_CC -V 2>&1 | head -1`
+ compiler_version=`$XEMACS_CC -V 2>&1 | sed 1q`
;;
alpha*-dec-osf*)