configure.in | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
New commits:
commit 5a7ebc5cb8600cc0d436ce81f58e7555cd026cd6
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jul 9 19:40:14 2012 +0200
configure: remove silly un-terminated s[dw]ext msg
Change-Id: If9a8d5ee1ddb113df4ce8a4a5b6e3e95b71e3f77
diff --git a/configure.in b/configure.in
index 90d326e..541ab7e 100644
--- a/configure.in
+++ b/configure.in
@@ -9151,14 +9151,12 @@ AC_SUBST(POPPLER_LIBS)
if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o
"$ENABLE_PDFIMPORT" = "YES"; then
- AC_MSG_CHECKING([for sdext module])
BUILD_TYPE="$BUILD_TYPE SDEXT"
fi
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
if test "x$enable_ext_wiki_publisher" = "xyes" -a
"x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then
AC_MSG_RESULT([yes])
- AC_MSG_CHECKING([for swext module])
ENABLE_MEDIAWIKI=YES
BUILD_TYPE="$BUILD_TYPE SWEXT"
if test "x$with_java" = "xno"; then
commit 32aa5e6aa0e0e976a16204b23699031192b9bb34
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jul 9 19:37:12 2012 +0200
configure: don't fail if ant home contains space
Change-Id: I70ee8a557cb0e9aee393939e886cf82d8a9fc79c
diff --git a/configure.in b/configure.in
index 2873cd2..90d326e 100644
--- a/configure.in
+++ b/configure.in
@@ -11102,17 +11102,15 @@ EOF
oldJAVA_HOME=$JAVA_HOME
if test "$JAVACISGCJ" = "yes"; then
JAVA_HOME=; export JAVA_HOME
- ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
- else
- ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+ ant_gcj="-Dbuild.compiler=gcj"
fi
- AC_TRY_EVAL(ant_cmd)
+ AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2)
if test $? = 0 -a -f ./conftest.class; then
AC_MSG_RESULT([Ant works])
if test -z "$WITH_ANT_HOME"; then
- ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e
"s#ant.home : ##g"`
+ ANT_HOME=`"$ANT" -diagnostics | $EGREP "ant.home :" | $SED -e
"s#ant.home : ##g"`
if test -z "$ANT_HOME"; then
- ANT_HOME=`echo $ANT | $SED -n "s/\/bin\/ant.*\$//p"`
+ ANT_HOME=`echo "$ANT" | $SED -n "s/\/bin\/ant.*\$//p"`
fi
else
ANT_HOME="$WITH_ANT_HOME"
@@ -11177,7 +11175,7 @@ EOF
ant_minminor1=`echo $ant_minver | cut -d"." -f2`
AC_MSG_CHECKING([whether Ant is >= $ant_minver])
- ant_version=`$ANT -version | $AWK '{ print $4; }'`
+ ant_version=`"$ANT" -version | $AWK '{ print $4; }'`
ant_version_major=`echo $ant_version | cut -d. -f1`
ant_version_minor=`echo $ant_version | cut -d. -f2`
echo "configure: ant_version $ant_version " >&5
@@ -11221,11 +11219,9 @@ EOF
if test "$JAVACISGCJ" = "yes"; then
JAVA_HOME=; export JAVA_HOME
- ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
- else
- ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+ ant_gcj="-Dbuild.compiler=gcj"
fi
- AC_TRY_EVAL(ant_cmd)
+ AC_TRY_COMMAND("$ANT" $ant_gcj -buildfile conftest.xml 1>&2)
if test $? = 0 -a -f ./conftest.class; then
AC_MSG_RESULT([yes])
rm -rf confdir
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
