diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2001-01-03 08:42:48 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2001-01-03 08:42:48 +0000 |
| commit | d3c3fc18726707ed24c0a5e8feca6eff4be0fb89 (patch) | |
| tree | 6bc23ea608b6a217c6459e0c1e5454447ec26208 /configure.in | |
| parent | 2fbf3930ce075a0c4acf09430af1313616c26332 (diff) | |
| download | nautilus-d3c3fc18726707ed24c0a5e8feca6eff4be0fb89.tar.gz | |
reviewed by: Pavel Cisler<pavel@eazel.com>
Fix bugs 4677, 3031.
* configure.in:
* components/mozilla/Makefile.am:
Use the right RPATH flags depending on where mozilla was found.
This fixed the problem of trying to use mozilla built by
eazel-hacking instead of from RPMS.
* components/mozilla/nautilus-mozilla-content-view.c:
(nautilus_mozilla_content_view_initialize_class),
(mozilla_content_view_one_time_happenings),
(mozilla_content_view_setup_profile_directory):
Add support for setting up a Mozilla profile so that cookies and
cache work.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.in b/configure.in index f457351af..ca186d4c8 100644 --- a/configure.in +++ b/configure.in @@ -286,6 +286,7 @@ then AC_PROG_CXX found_mozilla=true + MOZILLA_COMPONENT_RPATH_FLAGS=-Wl,-rpath=$_mozilla_lib_place MOZILLA_COMPONENT_CFLAGS="-I$_mozilla_include_place -fno-rtti -fno-exceptions" MOZILLA_COMPONENT_LDFLAGS=-L$_mozilla_lib_place MOZILLA_COMPONENT_LIBS="$_mozilla_gtk_moz_embed_libs \ @@ -294,6 +295,7 @@ then $_mozilla_nspr_libs \ $_mozilla_plc_libs \ $_mozilla_plds_libs" + AC_SUBST(MOZILLA_COMPONENT_RPATH_FLAGS) AC_SUBST(MOZILLA_COMPONENT_CFLAGS) AC_SUBST(MOZILLA_COMPONENT_LDFLAGS) AC_SUBST(MOZILLA_COMPONENT_LIBS) @@ -867,6 +869,7 @@ Mozilla component : YES mozilla libraries : $_mozilla_lib_place mozilla includes : $_mozilla_include_place MOZILLA_MILESTONE : $MOZILLA_MILESTONE + MOZILLA_COMPONENT_RPATH_FLAGS : $MOZILLA_COMPONENT_RPATH_FLAGS MOZILLA_COMPONENT_DEBUG_FLAGS : $MOZILLA_COMPONENT_DEBUG_FLAGS" ;; *) |