53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
|
--- configure.in.old 2011-08-25 18:51:45.000000000 +0200
|
||
|
|
+++ configure.in 2011-08-29 14:29:38.000000000 +0200
|
||
|
|
@@ -5093,13 +5093,20 @@ if test -n "$with_system_mozilla" && tes
|
||
|
|
PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
|
||
|
|
fi
|
||
|
|
|
||
|
|
- if test "$MOZ_FLAVOUR" != "libxul"; then
|
||
|
|
+ WITH_MOZILLA_XUL=YES
|
||
|
|
+ if test "$MOZ_FLAVOUR" = "mozilla"; then
|
||
|
|
+ # firefox changed the development model, so there is not longer a stable API
|
||
|
|
+ # some distros provide only mozilla-nss and mozilla-nspr but not the XUL stuff
|
||
|
|
+ PKG_CHECK_EXISTS($MOZ_FLAVOUR-xpcom, , [WITH_MOZILLA_XUL=NO])
|
||
|
|
+ fi
|
||
|
|
+
|
||
|
|
+ if test "$MOZ_FLAVOUR" != "libxul" -a "$WITH_MOZILLA_XUL" = "YES" ; then
|
||
|
|
PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" )
|
||
|
|
MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
|
||
|
|
MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
|
||
|
|
fi
|
||
|
|
|
||
|
|
- if test -z "$HASXPCOM"; then
|
||
|
|
+ if test -z "$HASXPCOM" -a "$WITH_MOZILLA_XUL" = "YES" ; then
|
||
|
|
PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
|
||
|
|
MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
|
||
|
|
MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
|
||
|
|
@@ -5327,6 +5332,7 @@ AC_SUBST(ENABLE_NSS_MODULE)
|
||
|
|
AC_SUBST(MOZILLABUILD)
|
||
|
|
AC_SUBST(SYSTEM_MOZILLA)
|
||
|
|
AC_SUBST(MOZ_FLAVOUR)
|
||
|
|
+AC_SUBST(WITH_MOZILLA_XUL)
|
||
|
|
AC_SUBST(MOZ_INC)
|
||
|
|
AC_SUBST(MOZ_LIB)
|
||
|
|
AC_SUBST(MOZ_LIB_XPCOM)
|
||
|
|
--- set_soenv.in.old 2011-08-25 18:51:45.000000000 +0200
|
||
|
|
+++ set_soenv.in 2011-08-29 14:52:00.000000000 +0200
|
||
|
|
@@ -1411,7 +1411,7 @@ elsif ($platform =~ m/darwin/)
|
||
|
|
|
||
|
|
}
|
||
|
|
|
||
|
|
-if ($SYSTEM_MOZILLA eq "YES")
|
||
|
|
+if ($SYSTEM_MOZILLA eq "YES" && "@MOZ_LIB@" ne "")
|
||
|
|
{
|
||
|
|
$SOLARLIB .= $L."@MOZ_LIB@"
|
||
|
|
}
|
||
|
|
@@ -1892,6 +1892,7 @@ ToFile( "WITH_OPENLDAP", "@WITH_OPEN
|
||
|
|
ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" );
|
||
|
|
ToFile( "SYSTEM_MOZILLA", "@SYSTEM_MOZILLA@", "e" );
|
||
|
|
ToFile( "MOZ_FLAVOUR", "@MOZ_FLAVOUR@", "e" );
|
||
|
|
+ToFile( "WITH_MOZILLA_XUL", "@WITH_MOZILLA_XUL@", "e" );
|
||
|
|
ToFile( "NSPR_LIB", "@NSPR_LIB@", "e" );
|
||
|
|
ToFile( "NSS_LIB", "@NSS_LIB@", "e" );
|
||
|
|
ToFile( "MOZ_INC", "@MOZ_INC@", "e" );
|