Mercurial > hg > xemacs-beta
changeset 2692:7be4146ed65e
[xemacs-hg @ 2005-03-26 17:22:29 by vins]
configure.ac: Don't specify non-working -fno-gnu-linker on Solaris.
'head -1' is deprecated by coreutils-5.3.0 on some platforms;
replace it with 'sed 1q'
| author | vins |
|---|---|
| date | Sat, 26 Mar 2005 17:22:34 +0000 |
| parents | 8d4fa1c4e0b8 |
| children | f2018e8a7078 |
| files | ChangeLog configure configure.ac |
| diffstat | 3 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Mar 26 16:26:53 2005 +0000 +++ b/ChangeLog Sat Mar 26 17:22:34 2005 +0000 @@ -1,3 +1,11 @@ +2005-03-23 Vin Shelton <acs@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. + 2005-03-24 Aidan Kehoe <kehoea@parhasard.net> * configure: Regenerate.
--- a/configure Sat Mar 26 16:26:53 2005 +0000 +++ b/configure Sat Mar 26 17:22:34 2005 +0000 @@ -8028,7 +8028,6 @@ *86* ) dynodump_arch=i386 ;; powerpc ) dynodump_arch=ppc ;; esac - test "$GCC" = "yes" && ld_switch_site="$ld_switch_site -fno-gnu-linker" && if test "$verbose" = "yes"; then echo " Appending \"-fno-gnu-linker\" to \$ld_switch_site"; fi fi @@ -8145,11 +8144,11 @@ echo $ECHO_N "checking for compiler version information... $ECHO_C" >&6 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 ic*) - compiler_version=`icc -V 2>&1 | head -1` + compiler_version=`icc -V 2>&1 | sed 1q` ;; *) case "$ac_cv_build" in *-*-aix* ) @@ -8174,7 +8173,7 @@ ;; *-*-solaris*) - compiler_version=`$XEMACS_CC -V 2>&1 | head -1` + compiler_version=`$XEMACS_CC -V 2>&1 | sed 1q` ;; alpha*-dec-osf*)
--- a/configure.ac Sat Mar 26 16:26:53 2005 +0000 +++ b/configure.ac Sat Mar 26 17:22:34 2005 +0000 @@ -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*)