Commit cf496b8e authored by Ramiro Estrugo's avatar Ramiro Estrugo

Add voodoo to support --with-mozilla.

* configure.in: Add voodoo to support --with-mozilla.

* components/Makefile.am: Add conditional build of mozilla subdir.

* components/mozilla/Makefile.am: Un-hardcode cflags and libs.
Use the values set in configure instead.
parent fef65467
2000-04-18 Ramiro Estrugo <ramiro@eazel.com>
* configure.in: Add voodoo to support --with-mozilla.
* components/Makefile.am: Add conditional build of mozilla subdir.
* components/mozilla/Makefile.am: Un-hardcode cflags and libs.
Use the values set in configure instead.
2000-04-18 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-clean.sh: Grep out "emacs" so that this nice script
......
......@@ -4,7 +4,11 @@ if EAZEL_SERVICES
SERVICE_SUBDIRS = services
endif
SUBDIRS =\
if BUILD_MOZILLA_COMPONENT
MOZILLA_COMPONENT_SUBDIRS = mozilla
endif
SUBDIRS = \
help \
history \
html \
......@@ -14,4 +18,5 @@ SUBDIRS =\
sample \
websearch \
$(SERVICE_SUBDIRS) \
$(MOZILLA_COMPONENT_SUBDIRS) \
$(NULL)
# yes, i know its hardcoded
NULL =
CPPFLAGS = \
-DPREFIX=\"$(prefix)\"
CPPFLAGS = \
-DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\"Nautilus-Mozilla\"
INCLUDES = \
-I/home/ramiro/b/sekhmet/s/mozilla/dist/include \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GNOMEUI_CFLAGS) \
$(WERROR)
INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GNOMEUI_CFLAGS) \
$(WERROR) \
$(MOZILLA_COMPONENT_CFLAGS) \
$(NULL)
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
nautilus-mozilla-content-view.goad
gnorba_DATA = \
nautilus-mozilla-content-view.goad \
$(NULL)
bin_PROGRAMS =\
nautilus-mozilla-content-view \
$(NULL)
bin_PROGRAMS = \
nautilus-mozilla-content-view
nautilus_mozilla_content_view_SOURCES = \
nautilus-mozilla-content-view.c \
main.c \
$(NULL)
nautilus_mozilla_content_view_SOURCES = \
nautilus-mozilla-content-view.c \
main.c
nautilus_mozilla_content_view_LDFLAGS = \
$(top_builddir)/libnautilus/libnautilus.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(VFS_LIBS) \
nautilus_mozilla_content_view_LDFLAGS = \
$(top_builddir)/libnautilus/libnautilus.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(VFS_LIBS) \
$(GNORBA_LIBS) \
-L/home/ramiro/b/sekhmet/s/mozilla/dist/bin \
-lgtkembedmoz \
-lgtksuperwin \
-lxpcom \
-lnspr4 \
-lplc4 \
-lplds4
EXTRA_DIST = nautilus-mozilla-content-view.goad
$(MOZILLA_COMPONENT_LDFLAGS) \
$(MOZILLA_COMPONENT_LIBS) \
$(NULL)
EXTRA_DIST = \
nautilus-mozilla-content-view.goad \
$(NULL)
......@@ -50,6 +50,73 @@ AC_SUBST(EAZEL_SERVICES)
AM_CONDITIONAL(EAZEL_SERVICES, test "x$EAZEL_SERVICES" = "x1")
dnl ====================================
dnl =
dnl = mozilla embedded component support
dnl =
dnl ====================================
BUILD_MOZILLA_COMPONENT=
try_mozilla="false"
mozilla_place=
AC_MSG_CHECKING(for Mozilla)
AC_ARG_WITH(mozilla,
[--{with,without}-mozilla Compile with Mozilla embedded component support or without it],
if test "$withval" = "no"; then
try_mozilla="false"
else
try_mozilla="true"
mozilla_place=$withval
fi
)
dnl FIXME: there obviously needs to be a better test that checking for libxpcom.so
if test "$try_mozilla" = "true"
then
found_mozilla="false"
if test -d $mozilla_place/dist/bin
then
if test -x $mozilla_place/dist/bin/libxpcom.so
then
found_mozilla="true"
fi
fi
if test "$found_mozilla" = "true"
then
AC_MSG_RESULT(yes)
echo " Using Mozilla installation in $mozilla_place"
MOZILLA_COMPONENT_CFLAGS=-I${mozilla_place}/dist/include
MOZILLA_COMPONENT_LDFLAGS=-L${mozilla_place}/dist/bin
MOZILLA_COMPONENT_LIBS="-lgtkembedmoz -lgtksuperwin -lxpcom -lnspr4 -lplc4 -lplds4"
AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
AC_SUBST(MOZILLA_COMPONENT_LDFLAGS)
AC_SUBST(MOZILLA_COMPONENT_LIBS)
else
AC_MSG_RESULT(no)
AC_MSG_ERROR(
***
*** There doesnt seem to be a valid mozilla installation in $mozilla_place.
*** Please fetch the latest mozilla milestone from
*** ftp://ftp.mozilla.org/pub/mozilla/releases/.
***)
fi
else
AC_MSG_RESULT(no)
fi
AM_CONDITIONAL(BUILD_MOZILLA_COMPONENT, test "x$found_mozilla" = "xtrue")
dnl ====================================
dnl = end mozilla hacks
dnl ====================================
dnl Checks for libraries.
AM_PATH_GLIB(1.2.0,,
AC_MSG_ERROR([
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment