diff options
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | lib/src/Makefile.am | 3 |
2 files changed, 19 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 142e1af..2055119 100644 --- a/configure.ac +++ b/configure.ac @@ -24,12 +24,25 @@ AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) PKG_CHECK_MODULES(PYGTK, pygtk-2.0) -PKG_CHECK_MODULES(LIB, gtk+-2.0 xulrunner-gtkmozembed gstreamer-0.10 gstreamer-plugins-base-0.10) -MOZILLA_HOME="`$PKG_CONFIG --variable=libdir xulrunner-gtkmozembed`" +PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= 1.8], + [have_gecko=true; mozpackage=xulrunner], + [ +PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= 1.5], + [have_gecko=true; mozpackage=firefox], + have_gecko=false) + ]) + +if test "x$have_gecko" = xfalse; then + AC_MSG_ERROR([Could not find xulrunner, mozilla or firefox $mozilla_required_version]) +fi + +PKG_CHECK_MODULES(LIB, gtk+-2.0 $mozpackage-gtkmozembed gstreamer-0.10 gstreamer-plugins-base-0.10) + +MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`" AC_SUBST(MOZILLA_HOME) -MOZILLA_INCLUDE_DIR="`$PKG_CONFIG --variable=includedir xulrunner-gtkmozembed`" +MOZILLA_INCLUDE_DIR="`$PKG_CONFIG --variable=includedir $mozpackage-gtkmozembed`" AC_SUBST(MOZILLA_INCLUDE_DIR) GNOMEPYTHONEXTRAS_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am index 50ee2e2..4b26a49 100644 --- a/lib/src/Makefile.am +++ b/lib/src/Makefile.am @@ -1,10 +1,13 @@ libsugarprivate_la_CPPFLAGS = \ $(WARN_CFLAGS) \ $(LIB_CFLAGS) \ + -I$(MOZILLA_INCLUDE_DIR)/dom \ -I$(MOZILLA_INCLUDE_DIR)/exthandler \ -I$(MOZILLA_INCLUDE_DIR)/mimetype \ -I$(MOZILLA_INCLUDE_DIR)/necko \ + -I$(MOZILLA_INCLUDE_DIR)/pref \ -I$(MOZILLA_INCLUDE_DIR)/uriloader \ + -I$(MOZILLA_INCLUDE_DIR)/webbrwsr \ -DSHARE_DIR=\"$(pkgdatadir)\" noinst_LTLIBRARIES = libsugarprivate.la |