Commit b151e466 authored by Tatiana Meshkova's avatar Tatiana Meshkova

Make it build with special obj-build path

parent 4e2eea05
......@@ -19,14 +19,35 @@ AM_PROG_LIBTOOL
AC_PROG_CPP
AC_HEADER_STDC
AC_ARG_WITH(engine-path,
AC_HELP_STRING([--with-engine-path[=path_to_obj_build_dir]],
[Specify engine path (default=)]
),
with_engine=$withval, with_engine=
)
OBJ_PATH=
AC_ARG_WITH(engine-path,
[ --with-engine-path[[=DIR]] use engine obj build in DIR],[
if test "$withval" != "no" -a "$withval" != "yes"; then
OBJ_PATH=$withval
fi
])
if test "$OBJ_PATH" != ""; then
SDK_DIR=$OBJ_PATH/dist
IDL_DIR=$OBJ_PATH/dist/idl
ENGINE_CFLAGS="-I$OBJ_PATH/dist/include -I$OBJ_PATH/dist/include/nspr -I$OBJ_PATH/dist/include/mozilla -I$OBJ_PATH/dist/include/dom"
ENGINE_LIBS="-L$OBJ_PATH/dist/sdk/lib -lxpcomglue_s -lxul -lxpcom -lmozalloc"
else
PKG_CHECK_MODULES(ENGINE, libxul nspr,
[
SDK_DIR=`pkg-config --variable=sdkdir libxul`
IDL_DIR=`pkg-config --variable=idldir libxul`
AC_SUBST(SDK_DIR)
AC_SUBST(IDL_DIR)
])
fi
AC_SUBST(SDK_DIR)
AC_SUBST(IDL_DIR)
CXXFLAGS="$CXXFLAGS -include mozilla-config.h -std=gnu++0x -fno-rtti "
CXXFLAGS="$CXXFLAGS -Wno-attributes -Wno-ignored-qualifiers -Wall "
......@@ -38,7 +59,6 @@ CXXFLAGS="$CXXFLAGS -Wno-variadic-macros -Wno-long-long -Wno-psabi "
AC_SUBST(ENGINE_CFLAGS)
AC_SUBST(ENGINE_LIBS)
AC_OUTPUT([
Makefile
history/Makefile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment