strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure25: #i93116# Allow to use the prebuilt stax

Browse source
This commit is contained in:
Rene Engelhard 2010-06-22 18:29:17 +02:00
parent 826a90d68a
commit 6f8ac23454
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure vendored
View file

@ -834,6 +834,7 @@ SYSTEM_STDLIBS
BUILD_UNOWINREG
MINGWSTRIP
MINGWCXX
BUILD_STAX
GPERF
RPM
PKGFORMAT
@ -11574,6 +11575,19 @@ else
as_fn_error "too old, you need at least 3.0.0" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the stax" >&5
$as_echo_n "checking whether to build the stax... " >&6; }
if test -f "../external/StAX/jsr173_1.0_api.jar"; then
BUILD_STAX=NO
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will use the prebuilt external/StAX/jsr173_1.0_api.jar" >&5
$as_echo "no, will use the prebuilt external/StAX/jsr173_1.0_api.jar" >&6; }
else
BUILD_STAX=YES
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5
$as_echo_n "checking whether to build the ODK... " >&6; }
if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then

13
configure.in
View file

@ -3421,6 +3421,19 @@ else
AC_MSG_ERROR([too old, you need at least 3.0.0])
fi
dnl ===================================================================
dnl Check for building stax
dnl ===================================================================
AC_MSG_CHECKING([whether to build the stax])
if test -f "../external/StAX/jsr173_1.0_api.jar"; then
BUILD_STAX=NO
AC_MSG_RESULT([no, will use the prebuilt external/StAX/jsr173_1.0_api.jar])
else
BUILD_STAX=YES
AC_MSG_RESULT([yes])
fi
AC_SUBST(BUILD_STAX)
dnl ===================================================================
dnl Check for building ODK
dnl ===================================================================

1
set_soenv.in
View file

@ -1907,6 +1907,7 @@ ToFile( "ENABLE_AGG", "@ENABLE_AGG@", "e" );
ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" );
ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" );
ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" );
ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" );
ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" );
ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );