31 lines
1.4 KiB
Plaintext
31 lines
1.4 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.12 2011/10/03 21:07:39 landry Exp $
|
|
hack to avoid conflict with our own MOZILLA_VERSION var.
|
|
fix linking of seamonkey-bin
|
|
--- configure.in.orig Sat Sep 17 03:22:59 2011
|
|
+++ configure.in Mon Sep 19 10:35:56 2011
|
|
@@ -1098,7 +1098,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
|
|
MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
|
|
MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
|
|
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
|
|
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin:/usr/lib:/usr/local/lib:/lib -Wl,-rpath-link,$(prefix)/lib'
|
|
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin:/usr/lib:/usr/local/lib:${X11BASE}/lib -Wl,-rpath-link,$(prefix)/lib'
|
|
XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
|
|
LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
|
|
XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
|
|
@@ -5043,14 +5043,7 @@ dnl ==================================================
|
|
|
|
# The GNOME component is built if one of
|
|
# gnome-vfs, gio, gconf or libnotify is available.
|
|
-if test "$MOZ_ENABLE_GCONF" || \
|
|
- test "$MOZ_ENABLE_GNOMEVFS" || \
|
|
- test "$MOZ_ENABLE_GIO" || \
|
|
- test "$MOZ_ENABLE_LIBNOTIFY"; then
|
|
- MOZ_ENABLE_GNOME_COMPONENT=1
|
|
-else
|
|
- MOZ_ENABLE_GNOME_COMPONENT=
|
|
-fi
|
|
+MOZ_ENABLE_GNOME_COMPONENT=
|
|
AC_SUBST(MOZ_ENABLE_GNOME_COMPONENT)
|
|
|
|
dnl ========================================================
|