From 3c05f4b2fa6f64476f5186cc28fcdb50a0d779db Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 24 Jun 2011 10:29:09 +0100
Subject: bad merge, fix to enable extensions to build again

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

(limited to 'odk')

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index bbd18eeeef4a..e4fc05ada699 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=:
-- 
cgit