Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
32aa5e6a
Kaydet (Commit)
32aa5e6a
authored
Tem 09, 2012
tarafından
Michael Stahl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
configure: don't fail if ant home contains space
Change-Id: I70ee8a557cb0e9aee393939e886cf82d8a9fc79c
üst
30eb1d62
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
configure.in
configure.in
+7
-11
No files found.
configure.in
Dosyayı görüntüle @
32aa5e6a
...
@@ -11102,17 +11102,15 @@ EOF
...
@@ -11102,17 +11102,15 @@ EOF
oldJAVA_HOME=$JAVA_HOME
oldJAVA_HOME=$JAVA_HOME
if test "$JAVACISGCJ" = "yes"; then
if test "$JAVACISGCJ" = "yes"; then
JAVA_HOME=; export JAVA_HOME
JAVA_HOME=; export JAVA_HOME
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
ant_gcj="-Dbuild.compiler=gcj"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
fi
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
if test $? = 0 -a -f ./conftest.class; then
AC_MSG_RESULT([Ant works])
AC_MSG_RESULT([Ant works])
if test -z "$WITH_ANT_HOME"; then
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
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
fi
else
else
ANT_HOME="$WITH_ANT_HOME"
ANT_HOME="$WITH_ANT_HOME"
...
@@ -11177,7 +11175,7 @@ EOF
...
@@ -11177,7 +11175,7 @@ EOF
ant_minminor1=`echo $ant_minver | cut -d"." -f2`
ant_minminor1=`echo $ant_minver | cut -d"." -f2`
AC_MSG_CHECKING([whether Ant is >= $ant_minver])
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_major=`echo $ant_version | cut -d. -f1`
ant_version_minor=`echo $ant_version | cut -d. -f2`
ant_version_minor=`echo $ant_version | cut -d. -f2`
echo "configure: ant_version $ant_version " >&5
echo "configure: ant_version $ant_version " >&5
...
@@ -11221,11 +11219,9 @@ EOF
...
@@ -11221,11 +11219,9 @@ EOF
if test "$JAVACISGCJ" = "yes"; then
if test "$JAVACISGCJ" = "yes"; then
JAVA_HOME=; export JAVA_HOME
JAVA_HOME=; export JAVA_HOME
ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
ant_gcj="-Dbuild.compiler=gcj"
else
ant_cmd="$ANT -buildfile conftest.xml 1>&2"
fi
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
if test $? = 0 -a -f ./conftest.class; then
AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes])
rm -rf confdir
rm -rf confdir
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment