mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
fix bustage, on machines with older libgnomeui, and on systems whose test doesn't support ==
This commit is contained in:
parent
9eb1d71925
commit
73833f787e
@ -93,7 +93,7 @@ MAKE_VERSION=3.78
|
|||||||
WINDRES_VERSION=2.14.90
|
WINDRES_VERSION=2.14.90
|
||||||
W32API_VERSION=2.4
|
W32API_VERSION=2.4
|
||||||
GNOMEVFS_VERSION=2.0
|
GNOMEVFS_VERSION=2.0
|
||||||
GNOMEUI_VERSION=2.0
|
GNOMEUI_VERSION=2.1.0
|
||||||
|
|
||||||
dnl Set various checks
|
dnl Set various checks
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
@ -3528,7 +3528,7 @@ then
|
|||||||
then
|
then
|
||||||
PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION,
|
PKG_CHECK_MODULES(MOZ_GNOMEUI, libgnomeui-2.0 >= $GNOMEUI_VERSION,
|
||||||
[MOZ_ENABLE_GNOMEUI=1], [
|
[MOZ_ENABLE_GNOMEUI=1], [
|
||||||
if test "$MOZ_ENABLE_GNOMEUI" == "force"
|
if test "$MOZ_ENABLE_GNOMEUI" = "force"
|
||||||
then
|
then
|
||||||
AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION])
|
AC_MSG_ERROR([* * * Could not find libgnomeui-2.0 >= $GNOMEUI_VERSION])
|
||||||
fi
|
fi
|
||||||
|
@ -38,6 +38,8 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
|
// Older versions of these headers seem to be missing an extern "C"
|
||||||
|
extern "C" {
|
||||||
#include <libgnome/libgnome.h>
|
#include <libgnome/libgnome.h>
|
||||||
#include <libgnomeui/gnome-icon-theme.h>
|
#include <libgnomeui/gnome-icon-theme.h>
|
||||||
#include <libgnomeui/gnome-icon-lookup.h>
|
#include <libgnomeui/gnome-icon-lookup.h>
|
||||||
@ -45,6 +47,7 @@
|
|||||||
|
|
||||||
#include <libgnomevfs/gnome-vfs-file-info.h>
|
#include <libgnomevfs/gnome-vfs-file-info.h>
|
||||||
#include <libgnomevfs/gnome-vfs-ops.h>
|
#include <libgnomevfs/gnome-vfs-ops.h>
|
||||||
|
}
|
||||||
|
|
||||||
#include "nsIMIMEService.h"
|
#include "nsIMIMEService.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user