diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 13:55:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 13:55:20 +0000 |
| commit | 1c0a692c8f5758bc247c911c685d4d64992cb6e1 (patch) | |
| tree | a8f1ba525a85775c60aa0464b4c22171c10e9d19 /config_office | |
| parent | 444160e77a95793e4b134c5331a1f37a2f1db1d1 (diff) | |
INTEGRATION: CWS solarisgcc01 (1.78.2); FILE MERGED
2004/12/11 13:12:18 pjanik 1.78.2.1: #i34342#: Use GNU ld on Solaris/x86 with gcc.
Submitted by: TANIGUCHI Yasuaki.
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index 0cfecc1f8a1c..2f57611866e8 100644 --- a/config_office/configure.in +++ b/config_office/configure.in @@ -3,7 +3,7 @@ dnl * vi:set sw=3 ts=3 et: dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2005-01-18 14:35:13 $ +dnl * Date: $Date: 2005-01-18 14:55:20 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * necessary to build OpenOffice.org dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.83 $ ) +AC_REVISION( $Revision: 1.84 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -766,6 +766,13 @@ if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; th AC_MSG_ERROR([found version "$_gcc_version", use version 3+ of the gcc compiler]) fi AC_MSG_RESULT([checked (gcc $_gcc_version)]) + if test "$_os" = "SunOS"; then + AC_MSG_CHECKING([gcc linker]) + if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then + AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris]) + fi + AC_MSG_RESULT([ok (GNU ld)]) + fi fi dnl =================================================================== |