78 lines
4.7 KiB
Diff
78 lines
4.7 KiB
Diff
|
diff -up yelp-2.21.2/configure.libxul yelp-2.21.2/configure
|
||
|
|
--- yelp-2.21.2/configure.libxul 2008-01-08 16:46:27.000000000 -0500
|
||
|
|
+++ yelp-2.21.2/configure 2008-01-08 16:47:38.000000000 -0500
|
||
|
|
@@ -27017,10 +27017,10 @@ seamonkey) gecko_cv_gecko_flavour=mozill
|
||
|
|
xulrunner) gecko_cv_gecko_flavour=toolkit ;;
|
||
|
|
esac
|
||
|
|
|
||
|
|
-_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
|
||
|
|
-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
|
||
|
|
-_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
|
||
|
|
-_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
|
||
|
|
+_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir libxul`"
|
||
|
|
+_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir libxul`"
|
||
|
|
+_GECKO_HOME="`$PKG_CONFIG --variable=libdir libxul`"
|
||
|
|
+_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix libxul`"
|
||
|
|
|
||
|
|
fi # if gecko_cv_have_gecko
|
||
|
|
|
||
|
|
@@ -27583,12 +27583,12 @@ if test -n "$PKG_CONFIG"; then
|
||
|
|
pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS"
|
||
|
|
else
|
||
|
|
if test -n "$PKG_CONFIG" && \
|
||
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$gecko_min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
|
||
|
|
- ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies") 2>&5
|
||
|
|
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\libxul >= \$gecko_min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
|
||
|
|
+ ($PKG_CONFIG --exists --print-errors "libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies") 2>&5
|
||
|
|
ac_status=$?
|
||
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
|
|
(exit $ac_status); }; then
|
||
|
|
- pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
|
||
|
|
+ pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
|
||
|
|
else
|
||
|
|
pkg_failed=yes
|
||
|
|
fi
|
||
|
|
@@ -27601,12 +27601,12 @@ if test -n "$PKG_CONFIG"; then
|
||
|
|
pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS"
|
||
|
|
else
|
||
|
|
if test -n "$PKG_CONFIG" && \
|
||
|
|
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\${gecko_cv_gecko}-xpcom >= \$gecko_min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
|
||
|
|
- ($PKG_CONFIG --exists --print-errors "${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies") 2>&5
|
||
|
|
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\libxul >= \$gecko_min_version \$gecko_cv_extra_pkg_dependencies\"") >&5
|
||
|
|
+ ($PKG_CONFIG --exists --print-errors "libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies") 2>&5
|
||
|
|
ac_status=$?
|
||
|
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
|
|
(exit $ac_status); }; then
|
||
|
|
- pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
|
||
|
|
+ pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies" 2>/dev/null`
|
||
|
|
else
|
||
|
|
pkg_failed=yes
|
||
|
|
fi
|
||
|
|
@@ -27625,14 +27625,14 @@ else
|
||
|
|
_pkg_short_errors_supported=no
|
||
|
|
fi
|
||
|
|
if test $_pkg_short_errors_supported = yes; then
|
||
|
|
- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies"`
|
||
|
|
+ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies"`
|
||
|
|
else
|
||
|
|
- MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies"`
|
||
|
|
+ MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies"`
|
||
|
|
fi
|
||
|
|
# Put the nasty error message in config.log where it belongs
|
||
|
|
echo "$MOZILLA_COMPONENT_PKG_ERRORS" >&5
|
||
|
|
|
||
|
|
- { { echo "$as_me:$LINENO: error: Package requirements (${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies) were not met:
|
||
|
|
+ { { echo "$as_me:$LINENO: error: Package requirements (libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies) were not met:
|
||
|
|
|
||
|
|
$MOZILLA_COMPONENT_PKG_ERRORS
|
||
|
|
|
||
|
|
@@ -27643,7 +27643,7 @@ Alternatively, you may set the environme
|
||
|
|
and MOZILLA_COMPONENT_LIBS to avoid the need to call pkg-config.
|
||
|
|
See the pkg-config man page for more details.
|
||
|
|
" >&5
|
||
|
|
-echo "$as_me: error: Package requirements (${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies) were not met:
|
||
|
|
+echo "$as_me: error: Package requirements (libxul >= $gecko_min_version $gecko_cv_extra_pkg_dependencies) were not met:
|
||
|
|
|
||
|
|
$MOZILLA_COMPONENT_PKG_ERRORS
|
||
|
|
|