1 diff -up devhelp-0.19.1/configure.in.xulrunner devhelp-0.19.1/configure.in
2 --- devhelp-0.19.1/configure.in.xulrunner 2008-05-25 12:56:13.000000000 -0400
3 +++ devhelp-0.19.1/configure.in 2008-05-26 12:18:07.000000000 -0400
4 @@ -73,6 +73,7 @@ AC_SUBST([GECKO_INCLUDE_ROOT])
6 AC_SUBST([GECKO_PREFIX])
7 AC_SUBST([GECKO_EXTRA_LIBS])
8 +AC_SUBST([GECKO_XPCOM])
11 mozilla) gecko_min_version=1.7 ;;
12 @@ -80,9 +81,10 @@ seamonkey) gecko_min_version=1.0 ;;
13 *firefox) gecko_min_version=1.0 ;;
14 *thunderbird) gecko_min_version=1.0 ;;
15 xulrunner) gecko_min_version=1.8 ;;
16 +libxul*) gecko_min_version=1.9 ;;
19 -PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO-xpcom >= $gecko_min_version])
20 +PKG_CHECK_MODULES([GECKO],[$GECKO_EXTRA_PKG_DEPENDENCIES $GECKO_XPCOM >= $gecko_min_version])
21 AC_SUBST([GECKO_CFLAGS])
22 AC_SUBST([GECKO_LIBS])
24 diff -up devhelp-0.19.1/m4/gecko.m4.xulrunner devhelp-0.19.1/m4/gecko.m4
25 --- devhelp-0.19.1/m4/gecko.m4.xulrunner 2008-05-25 12:55:36.000000000 -0400
26 +++ devhelp-0.19.1/m4/gecko.m4 2008-05-26 12:18:07.000000000 -0400
27 @@ -51,22 +51,32 @@ AC_PROG_AWK
28 AC_MSG_CHECKING([which gecko to use])
31 - AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
32 + AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul@:>@],
33 [Which gecko engine to use (autodetected by default)]))
36 AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[])
38 gecko_cv_gecko=$with_gecko
39 +if $PKG_CONFIG --exists $with_gecko-xpcom; then
40 + gecko_cv_gecko_xpcom=$with_gecko-xpcom
42 + gecko_cv_gecko_xpcom=$with_gecko
46 -_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla"
47 +_geckos="xulrunner firefox mozilla-firefox seamonkey mozilla libxul"
48 if test -z "$gecko_cv_gecko"; then
49 for lizard in $_geckos; do
50 if $PKG_CONFIG --exists $lizard-xpcom; then
51 gecko_cv_gecko=$lizard
52 + gecko_cv_gecko_xpcom=$lizard-xpcom
55 + elif $PKG_CONFIG --exists $lizard; then
56 + gecko_cv_gecko=$lizard
57 + gecko_cv_gecko_xpcom=$lizard
63 @@ -93,12 +103,13 @@ mozilla) gecko_cv_gecko_flavour=mozilla
64 seamonkey) gecko_cv_gecko_flavour=mozilla ;;
65 *firefox) gecko_cv_gecko_flavour=toolkit ;;
66 xulrunner) gecko_cv_gecko_flavour=toolkit ;;
67 +libxul*) gecko_cv_gecko_flavour=toolkit ;;
70 -_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
71 -_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
72 -_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
73 -_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
74 +_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko_xpcom}`"
75 +_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
76 +_GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
77 +_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko_xpcom}`"
79 fi # if gecko_cv_have_gecko
81 @@ -114,6 +125,7 @@ $1[]_INCLUDE_ROOT=$_GECKO_INCLUDE_ROOT
82 $1[]_LIBDIR=$_GECKO_LIBDIR
83 $1[]_HOME=$_GECKO_HOME
84 $1[]_PREFIX=$_GECKO_PREFIX
85 +$1[]_XPCOM=$gecko_cv_gecko_xpcom
87 # **************************************************************
88 # This is really gcc-only
89 @@ -359,10 +371,10 @@ _SAVE_CPPFLAGS="$CPPFLAGS"
90 _SAVE_CXXFLAGS="$CXXFLAGS"
91 _SAVE_LDFLAGS="$LDFLAGS"
93 -CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
94 -CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
95 +CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko_xpcom})"
96 +CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko_xpcom})"
97 LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
98 -LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
99 +LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko_xpcom})"
101 _GECKO_DISPATCH_INCLUDEDIRS="$2"
103 @@ -595,11 +607,11 @@ fi
104 AC_DEFUN([GECKO_XPIDL],
105 [AC_REQUIRE([GECKO_INIT])dnl
107 -_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
108 +_GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko_xpcom}`"
110 AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
112 -XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
113 +XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko_xpcom}`"
115 # Older geckos don't have this variable, see
116 # https://bugzilla.mozilla.org/show_bug.cgi?id=240473