diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-03-11 18:15:17 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-03-11 18:15:17 +0800 |
| commit | f26a212542b73730f869991e28720744d62e445c (patch) | |
| tree | af17f7cd36f639054610118b97e9c02be2ef789d /configure.ac | |
| parent | 7720c783b8a8f8911a79b965d9176aba839829e6 (diff) | |
| download | gsoc2013-epiphany-f26a212542b73730f869991e28720744d62e445c.tar gsoc2013-epiphany-f26a212542b73730f869991e28720744d62e445c.tar.gz gsoc2013-epiphany-f26a212542b73730f869991e28720744d62e445c.tar.bz2 gsoc2013-epiphany-f26a212542b73730f869991e28720744d62e445c.tar.lz gsoc2013-epiphany-f26a212542b73730f869991e28720744d62e445c.tar.xz gsoc2013-epiphany-f26a212542b73730f869991e28720744d62e445c.tar.zst gsoc2013-epiphany-f26a212542b73730f869991e28720744d62e445c.zip | |
Try to fix the build with 1.8
svn path=/trunk/; revision=8095
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index b21883565..b90f1b020 100644 --- a/configure.ac +++ b/configure.ac @@ -245,9 +245,16 @@ esac # Added $gecko_cv_gecko-js for debian xulrunner brokenness if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then - PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) + # debian xulrunner lacks -xpcom -> -js depends + if pkg-config --exists ${gecko_cv_gecko}-js; then + gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-js" + fi + GECKO_CFLAGS=`pkg-config --cflags ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies` + GECKO_LIBS=`pkg-config --libs ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies` + +# PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies]) else - GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG" + GECKO_CFLAGS="$GECKO_CFLAGS" GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`" fi |