46 lines
1.6 KiB
Plaintext
46 lines
1.6 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.4 2011/12/15 23:06:32 nigel Exp $
|
|
--- configure.in.orig Thu Nov 3 13:12:39 2011
|
|
+++ configure.in Wed Dec 14 14:31:15 2011
|
|
@@ -1059,7 +1059,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
|
|
|
|
MOZ_JS_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
|
|
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core'
|
|
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
|
|
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -L$(LIBXUL_DIST)/bin'
|
|
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom'
|
|
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
|
|
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
|
|
@@ -2403,7 +2403,7 @@ case "$target" in
|
|
;;
|
|
|
|
*-openbsd*)
|
|
- DLL_SUFFIX=".so.1.0"
|
|
+ DLL_SUFFIX=".so.${SO_VERSION}"
|
|
DSO_CFLAGS=''
|
|
DSO_PIC_CFLAGS='-fPIC'
|
|
DSO_LDOPTS='-shared -fPIC'
|
|
@@ -4132,9 +4132,9 @@ AC_CACHE_CHECK(for __thread keyword for TLS variables,
|
|
ac_cv_thread_keyword=yes,
|
|
ac_cv_thread_keyword=no)])
|
|
LDFLAGS=$_SAVE_LDFLAGS
|
|
-if test "$ac_cv_thread_keyword" = yes; then
|
|
- AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
|
|
-fi
|
|
+dnl if test "$ac_cv_thread_keyword" = yes; then
|
|
+dnl AC_DEFINE(HAVE_THREAD_TLS_KEYWORD)
|
|
+dnl fi
|
|
|
|
dnl End of C++ language/feature checks
|
|
AC_LANG_C
|
|
@@ -5211,8 +5211,8 @@ then
|
|
dnl GTK2 toolkit is in use.
|
|
if test "$MOZ_ENABLE_GTK2"
|
|
then
|
|
- MOZ_ENABLE_GNOMEVFS=1
|
|
- MOZ_ENABLE_GCONF=1
|
|
+ MOZ_ENABLE_GNOMEVFS=
|
|
+ MOZ_ENABLE_GCONF=
|
|
fi
|
|
|
|
MOZ_ARG_DISABLE_BOOL(gnomevfs,
|