зеркало из https://github.com/mozilla/pjs.git
Remove vestiges of BUILD_XPIDL and USE_XPIDL from the build.
This commit is contained in:
Родитель
69a66cea6f
Коммит
b1809e14b2
|
@ -35,7 +35,6 @@ $MOZ_FULLCIRCLE = 0;
|
|||
# The following two options will delete all files, but leave the directory structure intact.
|
||||
$CLOBBER_DIST_ALL = 0; # turn on to clobber all files inside dist (headers, xsym and libs)
|
||||
$CLOBBER_DIST_LIBS = 0; # turn on to clobber the aliases to libraries and sym files in dist
|
||||
$USE_XPIDL = 1; # turn on to use the XPIDL plugin to generate files.
|
||||
|
||||
$pull{all} = 0;
|
||||
$pull{lizard} = 0;
|
||||
|
|
|
@ -35,7 +35,6 @@ $MOZ_FULLCIRCLE = 0;
|
|||
# The following two options will delete all files, but leave the directory structure intact.
|
||||
$CLOBBER_DIST_ALL = 0; # turn on to clobber all files inside dist (headers, xsym and libs)
|
||||
$CLOBBER_DIST_LIBS = 0; # turn on to clobber the aliases to libraries and sym files in dist
|
||||
$USE_XPIDL = 1; # turn on to use the XPIDL plugin to generate files.
|
||||
|
||||
$pull{all} = 1;
|
||||
$pull{lizard} = 0;
|
||||
|
|
|
@ -46,7 +46,6 @@ ENABLE_PICS = @ENABLE_PICS@
|
|||
DOM = @MOZ_DOM@
|
||||
MOZ_MAIL_COMPOSE = @MOZ_MAIL_COMPOSE@
|
||||
NO_UNIX_LDAP = @NO_UNIX_LDAP@
|
||||
BUILD_XPIDL = @BUILD_XPIDL@
|
||||
BUILD_IDLC = @BUILD_IDLC@
|
||||
MODULAR_NETLIB = @MODULAR_NETLIB@
|
||||
STANDALONE_IMAGE_LIB = @STANDALONE_IMAGE_LIB@
|
||||
|
@ -180,10 +179,8 @@ GTK_CONFIG = @GTK_CONFIG@
|
|||
TK_CFLAGS = @TK_CFLAGS@
|
||||
TK_LIBS = @TK_LIBS@
|
||||
|
||||
ifdef BUILD_XPIDL
|
||||
LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
|
||||
LIBIDL_LIBS = @LIBIDL_LIBS@
|
||||
endif
|
||||
|
||||
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
|
||||
|
||||
|
|
|
@ -652,7 +652,6 @@ then
|
|||
if test -x /usr/bin/orbit-config
|
||||
then
|
||||
SKIP_IDL_CHECK="yes"
|
||||
BUILD_XPIDL=1
|
||||
LIBIDL_CFLAGS="-I/usr/lib/glib/include"
|
||||
LIBIDL_LIBS="-lglib -lIDL"
|
||||
AC_SUBST(LIBIDL_CFLAGS)
|
||||
|
@ -663,7 +662,7 @@ fi
|
|||
|
||||
if test "$SKIP_IDL_CHECK" = "no"
|
||||
then
|
||||
AM_PATH_LIBIDL($LIBIDL_VERSION,BUILD_XPIDL=1,
|
||||
AM_PATH_LIBIDL($LIBIDL_VERSION,,
|
||||
[echo libIDL $LIBIDL_VERSION or higher is required.]
|
||||
[echo Get yourself a RPM or source package from ftp://ftp.mozilla.org/]
|
||||
[echo before your tree is HOSED.]
|
||||
|
@ -1800,7 +1799,6 @@ AC_SUBST(MOZ_DOM)
|
|||
AC_SUBST(MOZ_MAIL_COMPOSE)
|
||||
AC_SUBST(FULL_STATIC_BUILD)
|
||||
AC_SUBST(NO_UNIX_LDAP)
|
||||
AC_SUBST(BUILD_XPIDL)
|
||||
AC_SUBST(BUILD_IDLC)
|
||||
AC_SUBST(MOZ_ENABLE_GTK_MOZILLA)
|
||||
AC_SUBST(MOZ_BUILD_ROOT)
|
||||
|
|
|
@ -23,6 +23,4 @@ DIRS = xptinfo \
|
|||
xptcall \
|
||||
$(NULL)
|
||||
|
||||
# removed !ifdef BUILD_XPIDL above...
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
|
|
@ -23,6 +23,4 @@ DIRS = windows \
|
|||
registry \
|
||||
$(NULL)
|
||||
|
||||
# removed !ifdef BUILD_XPIDL above...
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
|
Загрузка…
Ссылка в новой задаче