diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-03-28 23:06:41 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-03-28 23:06:41 +0800 |
| commit | dd7afa031ea0d547d19f44696b4b8111f810b08f (patch) | |
| tree | 0b80b08e205dea247c7a9cfaa130f3cb274f0a54 | |
| parent | 0d86fa3258226628083b8340e6c20a78ca11f955 (diff) | |
| download | gsoc2013-epiphany-dd7afa031ea0d547d19f44696b4b8111f810b08f.tar gsoc2013-epiphany-dd7afa031ea0d547d19f44696b4b8111f810b08f.tar.gz gsoc2013-epiphany-dd7afa031ea0d547d19f44696b4b8111f810b08f.tar.bz2 gsoc2013-epiphany-dd7afa031ea0d547d19f44696b4b8111f810b08f.tar.lz gsoc2013-epiphany-dd7afa031ea0d547d19f44696b4b8111f810b08f.tar.xz gsoc2013-epiphany-dd7afa031ea0d547d19f44696b4b8111f810b08f.tar.zst gsoc2013-epiphany-dd7afa031ea0d547d19f44696b4b8111f810b08f.zip | |
Try to fix the build with 1.8
svn path=/branches/gnome-2-22/; revision=8143
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 109338f1b..2abbc4b46 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 |