diff options
| author | Christian Persch <chpe@src.gnome.org> | 2009-03-01 21:42:17 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2009-03-01 21:42:17 +0000 |
| commit | 6ae495e198f314ac7815b4a0856d474fead4805b (patch) | |
| tree | eb94e380e2823a8afb0abb85366ddd491c522c43 | |
| parent | 8aa50d0eb1dfbc4471ed5f5069791f6872e3aac5 (diff) | |
| download | yelp-6ae495e198f314ac7815b4a0856d474fead4805b.tar.gz | |
Treat libxul and libxul-embedding the same as far as the MOZILLA_COMPONENT
* configure.in: Treat libxul and libxul-embedding the same as far as the
MOZILLA_COMPONENT pkg-config check is concerned.
svn path=/trunk/; revision=3224
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2009-03-01 Christian Persch <chpe@gnome.org> + * configure.in: Treat libxul and libxul-embedding the same as far as the + MOZILLA_COMPONENT pkg-config check is concerned. + +2009-03-01 Christian Persch <chpe@gnome.org> + * m4/gecko.m4: Fix libxul[-embedding] detection. 2009-02-25 Thomas H.P. Andersen <phomes@gmail.com> diff --git a/configure.in b/configure.in index c073c74f..b6b72308 100644 --- a/configure.in +++ b/configure.in @@ -244,8 +244,8 @@ libxul*) gecko_min_version=1.9 ;; *) AC_MSG_ERROR([$gecko_cv_gecko is not supported]) esac -if test $MOZILLA = libxul-embedding; then - PKG_CHECK_MODULES([MOZILLA_COMPONENT],[libxul-embedding $gecko_cv_extra_pkg_dependencies]) +if test "$MOZILLA" = "libxul-embedding" -o "$MOZILLA" = "libxul"; then + PKG_CHECK_MODULES([MOZILLA_COMPONENT],[$MOZILLA $gecko_cv_extra_pkg_dependencies]) MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`" else PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies]) |