Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix name of qt5 version of library
  • Loading branch information
rojkov committed Jul 29, 2013
1 parent f735a4b commit 2620650
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
16 changes: 12 additions & 4 deletions configure.ac
Expand Up @@ -54,17 +54,25 @@ AS_IF([test "x$with_system_nspr" = "xyes"],
])
])

DEVEL_SUFFIX=
AC_ARG_WITH(devel-suffix,
[ --with-devel-suffix[[=DEVELSUFFIX]] append DEVELSUFFIX to .pc files],[
if test "x$withval" != "x"; then
DEVEL_SUFFIX=$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 -I/usr/include/nspr4"
ENGINE_LIBS="-L$OBJ_PATH/dist/sdk/lib -lxpcomglue_s -lxul -lmozalloc"
else
PKG_CHECK_MODULES(ENGINE, libxul $NSPR,
PKG_CHECK_MODULES(ENGINE, libxul$DEVEL_SUFFIX $NSPR,
[
SDK_DIR=`pkg-config --variable=sdkdir libxul`
IDL_DIR=`pkg-config --variable=idldir libxul`
INCLUDE_DIR=`pkg-config --variable=includedir libxul`
SDK_DIR=`pkg-config --variable=sdkdir libxul$DEVEL_SUFFIX`
IDL_DIR=`pkg-config --variable=idldir libxul$DEVEL_SUFFIX`
INCLUDE_DIR=`pkg-config --variable=includedir libxul$DEVEL_SUFFIX`
ENGINE_CFLAGS="$ENGINE_CFLAGS -I$INCLUDE_DIR/nspr"
])
fi
Expand Down
2 changes: 1 addition & 1 deletion rpm/embedlite-components-qt5.spec
Expand Up @@ -30,7 +30,7 @@ EmbedLite Components required for embeded browser UI
# << build pre

NO_CONFIGURE=yes ./autogen.sh
%configure --with-system-nspr
%configure --with-system-nspr --with-devel-suffix=-qt5

make %{?jobs:-j%jobs}

Expand Down

0 comments on commit 2620650

Please sign in to comment.