[Libreoffice-commits] .: Branch 'libreoffice-3-4' - odk/settings

[Caolán McNamara]

 odk/settings/settings.mk |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 7b88a07f74525dba783ebc9d25cfdc0f3903d259
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 24 10:29:09 2011 +0100

    bad merge, fix to enable extensions to build again
    (cherry picked from commit 194da0076d3b4a6968496261fd2eaca9e8e955f9)

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index bbd18ee..e4fc05a 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -502,11 +502,9 @@ PLATFORM=kfreebsd
 ifeq "$(PROCTYPE)" "x86_64"
 PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
 UNOPKG_PLATFORM=kFreeBSD_x86_64
-STLPORT=no
 else
 PACKAGE_LIB_DIR=kfreebsd_x86.plt
 UNOPKG_PLATFORM=kFreeBSD_x86
-STLPORT=no
 endif
 else
 PLATFORM=freebsd
@@ -570,10 +568,6 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 SALHELPERLIB=-luno_salhelper$(COMID)
 REGLIB=-lreg
 STORELIB=-lstore
-ifeq "$(STLPORT)" "yes"
-endif
-else
-STLPORTLIB=
 
 EMPTYSTRING=
 PATH_SEPARATOR=: