1 $NetBSD: patch-bo,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
3 diff -ruN ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
4 --- nsprpub/configure.in.orig 2008-04-29 08:21:11.000000000 +0900
5 +++ nsprpub/configure.in
6 @@ -62,7 +62,7 @@ USE_CPLUS=
9 _MACOSX_DEPLOYMENT_TARGET=
15 @@ -1010,7 +1010,7 @@ case "$target" in
19 - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
20 + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name $(libdir)/$(MOZILLA_PKG_NAME)/$@'
21 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
24 @@ -1020,7 +1020,6 @@ case "$target" in
26 # Add Mac OS X support for loading CFM & CFBundle plugins
27 if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
28 - AC_DEFINE(XP_MACOSX)
31 if test -n "$_MACOSX_DEPLOYMENT_TARGET" ; then
32 @@ -1177,6 +1176,34 @@ tools are selected during the Xcode/Deve
33 DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
34 MDCPUCFG_H=_freebsd.cfg
36 + if test "$LIBRUNPATH"; then
37 + DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
42 + if test -z "$USE_NSPR_THREADS"; then
47 + AC_DEFINE(HAVE_BSD_FLOCK)
48 + AC_DEFINE(HAVE_SOCKLEN_T)
49 + CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall"
50 + MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
51 + if test "$MOZ_OBJFORMAT" = "elf"; then
56 + MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
58 + DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
59 + MDCPUCFG_H=_freebsd.cfg
60 + PR_MD_CSRCS=freebsd.c
61 + if test "$LIBRUNPATH"; then
62 + DSO_LDOPTS="$DSO_LDOPTS -Wl,-R$LIBRUNPATH"
67 @@ -1726,6 +1753,7 @@ mips-nec-sysv*)
70 AC_DEFINE(HAVE_BSD_FLOCK)
71 + AC_DEFINE(HAVE_SOCKLEN_T)
73 MDCPUCFG_H=_netbsd.cfg
75 @@ -2248,8 +2276,6 @@ dnl since it's not used and not part of
76 dnl The same goes for BeOS.
82 AC_CHECK_LIB(dl, dlopen,
83 AC_CHECK_HEADER(dlfcn.h,
84 @@ -2490,7 +2516,7 @@ if test -n "$USE_PTHREADS"; then
85 if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
86 ac_cv_have_dash_pthread=yes
89 + freebsd* | dragonfly*)
90 # Freebsd doesn't use -pthread for compiles, it uses them for linking
93 @@ -2528,7 +2554,7 @@ if test -n "$USE_PTHREADS"; then
98 + *-freebsd* | *-dragonfly*)
100 AC_DEFINE(_THREAD_SAFE)
101 dnl -pthread links in -lc_r, so don't specify it explicitly.
102 @@ -2609,7 +2635,7 @@ case "$target" in
103 AC_DEFINE(_PR_NEED_PTHREAD_INIT)
107 +*-freebsd* | *-dragonfly*)
108 if test -n "$USE_NSPR_THREADS"; then
109 AC_DEFINE(_PR_LOCAL_THREADS_ONLY)