← Back to branch summary

~ubuntu-branches/ubuntu/karmic/nss/karmic-updates

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/softoken/legacydb/config.mk

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 13:23:47 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616132347-311ysb8oep74b98y
Tags: 3.12.3-0ubuntu1
https://launchpad.net/bugs/387751
* new upstream release 3.12.3 RTM (NSS_3_12_3_RTM) (LP: #387751)
* adjust patches to changed upstream code base
  - update debian/patches/38_kbsd.patch
* needs nspr >= 4.7.4
  - update debian/control
* update 85_security_load.patch to latest debian version
  - update debian/patches/85_security_load.patch
* add new symbols for 3.12.3
  - update debian/libnss3-1d.symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/softoken/legacydb/config.mk
43
43
        CRYPTODIR=../crypto
44
44
endif
45
45
 
46
 
EXTRA_LIBS += \
47
 
        $(CRYPTOLIB) \
48
 
        $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
49
 
        $(NULL)
 
46
EXTRA_LIBS +=   $(CRYPTOLIB) 
 
47
 
 
48
ifndef NSS_DISABLE_DBM
 
49
EXTRA_LIBS +=   $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
 
50
endif
50
51
 
51
52
# can't do this in manifest.mn because OS_TARGET isn't defined there.
52
53
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
98
99
OS_LIBS += -lbsm 
99
100
endif
100
101
 
 
102
ifeq ($(OS_ARCH), HP-UX) 
 
103
ifneq ($(OS_TEST), ia64)
 
104
# pa-risc
 
105
ifeq ($(USE_64), 1)
 
106
MKSHLIB += +b '$$ORIGIN'
 
107
endif
 
108
endif
 
109
endif
 
110
 
101
111
ifeq ($(OS_TARGET),WINCE)
102
112
DEFINES += -DDBM_USING_NSPR
103
113
endif