diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2010-05-22 15:59:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2010-05-22 15:59:46 +0100 |
| commit | e46b02d99de966eaf3edb0801dd4d403d59b4cfa (patch) | |
| tree | c1730f0a4460dcf931f3ba397b48b437f7af7463 /configure.in | |
| parent | 2d04ea5160c67570ddcc0031e11f3acaab0b2d25 (diff) | |
cmcfixes75: #i111770# remove configure.in hacks and handle prelinked system-stdlibs properly and fix the so.1 -> so.2 for hppa and m68k
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/configure.in b/configure.in index 928e08275213..2a09bc5ff9f6 100644 --- a/configure.in +++ b/configure.in @@ -133,7 +133,7 @@ AC_ARG_ENABLE(evolution2, ],,) AC_ARG_WITH(system-stdlibs, [ --with-system-stdlibs use libstdc++/libgcc_s already on system -],,checkforstdlibproblems=yes) +],,) AC_ARG_ENABLE(cups, [ --disable-cups disable cups support in the psprint project ],,enable_cups=yes) @@ -3510,23 +3510,6 @@ fi AC_SUBST(BUILD_QADEVOOO) dnl =================================================================== -dnl Check for prelinked libgcc_s.so.1 -dnl =================================================================== -if test "$_os" = "Linux" -a -z "$with_system_stdlibs" -a -z "$with_system_libs"; then - if test -n "$checkforstdlibproblems"; then - if test -f /etc/rpm/macros.prelink; then - with_system_stdlibs=yes - AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) - echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn - elif test "$GCC" = "yes" -a ! -e `$CC -print-file-name=libgcc_s.so.1`; then - with_system_stdlibs=yes - AC_MSG_WARN([platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override]) - echo "platform doesn't have a libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn - fi - fi -fi - -dnl =================================================================== dnl Check for system stdlibs dnl =================================================================== AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset]) |