← Back to branch summary

~ubuntu-branches/ubuntu/precise/nspr/precise-proposed

« back to all changes in this revision

Viewing changes to mozilla/nsprpub/configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack
  • Date: 2009-06-16 11:28:24 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090616112824-cg6qzhvt63lx7bub
Tags: 4.7.5-0ubuntu1
https://launchpad.net/bugs/387745
* New upstream version: 4.7.5 (LP: #387745)

* adjust patches to changed upstream code base
  - update debian/patches/99_configure.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/nsprpub/configure.in
50
50
dnl ========================================================
51
51
MOD_MAJOR_VERSION=4
52
52
MOD_MINOR_VERSION=7
53
 
MOD_PATCH_VERSION=3
 
53
MOD_PATCH_VERSION=5
54
54
NSPR_MODNAME=nspr20
55
55
_HAVE_PTHREADS=
56
56
USE_PTHREADS=
1729
1729
    AC_DEFINE(XP_UNIX)
1730
1730
    AC_DEFINE(NETBSD)
1731
1731
    AC_DEFINE(HAVE_BSD_FLOCK)
1732
 
    USE_NSPR_THREADS=1
 
1732
    if test -z "$USE_NSPR_THREADS"; then
 
1733
        USE_PTHREADS=1
 
1734
    fi
1733
1735
    MDCPUCFG_H=_netbsd.cfg
1734
1736
    PR_MD_CSRCS=netbsd.c
1735
1737
 
1989
1991
    LD=/usr/ccs/bin/ld
1990
1992
    MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
1991
1993
    RESOLVE_LINK_SYMBOLS=1
 
1994
    case "${OS_RELEASE}" in
 
1995
    5.8|5.9)
 
1996
        ;;
 
1997
    *)
 
1998
        # It is safe to use the -Bdirect linker flag on Solaris 10 or later.
 
1999
        USE_B_DIRECT=1
 
2000
        ;;
 
2001
    esac
1992
2002
    if test -n "$GNU_CC"; then
1993
2003
        DSO_CFLAGS=-fPIC
1994
2004
        if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then
1995
2005
            GCC_USE_GNU_LD=1
1996
2006
        fi
1997
2007
        DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' 
 
2008
        if test -n "$USE_B_DIRECT"; then
 
2009
            DSO_LDOPTS="$DSO_LDOPTS,-Bdirect"
 
2010
        fi
1998
2011
    else
1999
2012
        DSO_CFLAGS=-KPIC
2000
2013
        DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore'
 
2014
        if test -n "$USE_B_DIRECT"; then
 
2015
            DSO_LDOPTS="$DSO_LDOPTS -Bdirect"
 
2016
        fi
2001
2017
    fi
2002
2018
    if test -n "$GNU_CC"; then
2003
2019
        CFLAGS="$CFLAGS -Wall"