wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1164525 - Ignore GAIADIR on B2G device builds, only useful for B2G desktop. r=mshal

Browse Source
This commit is contained in:
Andrew Osmond 2015-05-14 18:51:33 -04:00
parent ef4a07598c
commit 5da5f466e4
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
configure.in
View File

@ -166,24 +166,6 @@ if test -z "$PERL" -o "$PERL" = ":"; then
AC_MSG_ERROR([perl not found in \$PATH])
fi
if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then
AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory])
fi
AC_SUBST(GAIADIR)
if test -n "$GAIADIR" ; then
AC_DEFINE(PACKAGE_GAIA)
fi
if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then
AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined])
fi
if test -n "$FXOS_SIMULATOR" ; then
AC_DEFINE(FXOS_SIMULATOR)
AC_SUBST(FXOS_SIMULATOR)
fi
if test -n "$MOZTTDIR" -a ! -d "$MOZTTDIR" ; then
AC_MSG_ERROR([MOZTTDIR '$MOZTTDIR' isn't a valid directory])
fi
@ -7472,6 +7454,29 @@ if test -n "$MOZ_DISABLE_STARTUPCACHE"; then
fi
AC_SUBST(MOZ_DISABLE_STARTUPCACHE)
dnl ========================================================
dnl = Enable packaging Gaia with B2G desktop
dnl ========================================================
if test x"$MOZ_WIDGET_TOOLKIT" != x"gonk"; then
if test -n "$GAIADIR" -a ! -d "$GAIADIR" ; then
AC_MSG_ERROR([GAIADIR '$GAIADIR' isn't a valid directory])
fi
AC_SUBST(GAIADIR)
if test -n "$GAIADIR" ; then
AC_DEFINE(PACKAGE_GAIA)
fi
if test -n "$FXOS_SIMULATOR" -a -z "$GAIADIR" ; then
AC_MSG_ERROR([FXOS_SIMULATOR=1 requires GAIADIR to be defined])
fi
if test -n "$FXOS_SIMULATOR" ; then
AC_DEFINE(FXOS_SIMULATOR)
AC_SUBST(FXOS_SIMULATOR)
fi
fi
dnl ========================================================
dnl = Enable Radio Interface for B2G (Gonk usually)
dnl ========================================================