Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 295898 Details for
Bug 434605
Devhelp fails to build against xulrunner
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
devhelp autoconf patch
devhelp-0.19-xulrunner-autoconf.patch (text/plain), 4.49 KB, created by
Martin Stransky
on 2008-02-26 11:27:47 UTC
(
hide
)
Description:
devhelp autoconf patch
Filename:
MIME Type:
Creator:
Martin Stransky
Created:
2008-02-26 11:27:47 UTC
Size:
4.49 KB
patch
obsolete
>diff -up devhelp-0.19/m4/gecko.m4.xl devhelp-0.19/m4/gecko.m4 >--- devhelp-0.19/m4/gecko.m4.xl 2007-02-13 09:34:26.000000000 +0100 >+++ devhelp-0.19/m4/gecko.m4 2008-02-26 12:10:21.000000000 +0100 >@@ -51,22 +51,32 @@ AC_PROG_AWK > AC_MSG_CHECKING([which gecko to use]) > > AC_ARG_WITH([gecko], >- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@], >+ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul@:>@], > [Which gecko engine to use (autodetected by default)])) > > # Backward compat > AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[]) > > gecko_cv_gecko=$with_gecko >+if $PKG_CONFIG --exists $with_gecko-xpcom; then >+ gecko_cv_gecko_xpcom=$with_gecko-xpcom >+else >+ gecko_cv_gecko_xpcom=$with_gecko >+fi > > # Autodetect gecko >-_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla" >+_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul" > if test -z "$gecko_cv_gecko"; then > for lizard in $_geckos; do > if $PKG_CONFIG --exists $lizard-xpcom; then > gecko_cv_gecko=$lizard >+ gecko_cv_gecko_xpcom=$lizard-xpcom > break; >- fi >+ elif $PKG_CONFIG --exists $lizard; then >+ gecko_cv_gecko=$lizard >+ gecko_cv_gecko_xpcom=$lizard >+ break; >+ fi > done > fi > >@@ -93,12 +103,13 @@ mozilla) gecko_cv_gecko_flavour=mozilla > seamonkey) gecko_cv_gecko_flavour=mozilla ;; > *firefox) gecko_cv_gecko_flavour=toolkit ;; > xulrunner) gecko_cv_gecko_flavour=toolkit ;; >+libxul*) 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 ${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}`" > > fi # if gecko_cv_have_gecko > >@@ -114,6 +125,7 @@ $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT > $1[]_LIBDIR=$_GECKO_LIBDIR > $1[]_HOME=$_GECKO_HOME > $1[]_PREFIX=$_GECKO_PREFIX >+$1[]_XPCOM=$gecko_cv_gecko_xpcom > > # ************************************************************** > # This is really gcc-only >@@ -359,10 +371,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS" > _SAVE_CXXFLAGS="$CXXFLAGS" > _SAVE_LDFLAGS="$LDFLAGS" > _SAVE_LIBS="$LIBS" >-CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)" >-CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)" >+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})" >+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})" > LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME" >-LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)" >+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})" > > _GECKO_DISPATCH_INCLUDEDIRS="$2" > >@@ -595,11 +607,11 @@ fi > AC_DEFUN([GECKO_XPIDL], > [AC_REQUIRE([GECKO_INIT])dnl > >-_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`" >+_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`" > > AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH]) > >-XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`" >+XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko_xpcom}`" > > # Older geckos don't have this variable, see > # https://bugzilla.mozilla.org/show_bug.cgi?id=240473 >diff -up devhelp-0.19/configure.in.xl devhelp-0.19/configure.in >--- devhelp-0.19/configure.in.xl 2008-02-07 10:18:55.000000000 +0100 >+++ devhelp-0.19/configure.in 2008-02-26 12:11:01.000000000 +0100 >@@ -73,6 +73,7 @@ AC_SUBST([GECKO_INCLUDE_ROOT]) > AC_SUBST([GECKO_HOME]) > AC_SUBST([GECKO_PREFIX]) > AC_SUBST([GECKO_EXTRA_LIBS]) >+AC_SUBST([GECKO_XPCOM]) > > case "$GECKO" in > mozilla) gecko_min_version=1.7 ;; >@@ -80,9 +81,10 @@ seamonkey) gecko_min_version=1.0 ;; > *firefox) gecko_min_version=1.0 ;; > *thunderbird) gecko_min_version=1.0 ;; > xulrunner) gecko_min_version=1.8 ;; >+libxul*) gecko_min_version=1.9 ;; > esac > >-PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version]) >+PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version]) > AC_SUBST([GECKO_CFLAGS]) > AC_SUBST([GECKO_LIBS]) >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 434605
: 295898