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
39558767
Kaydet (Commit)
39558767
authored
Eki 19, 2012
tarafından
Peter Foley
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
use prefered name configure.ac to scilence aclocal 1.12 warning
Change-Id: I5875d3fface19bdce2948c6a2979b1b5e4e0735f
üst
1a6a3a12
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Makefile
Makefile
+1
-1
configure.ac
configure.ac
+5
-5
No files found.
Makefile
Dosyayı görüntüle @
39558767
...
...
@@ -26,7 +26,7 @@ $(SRCDIR)/config_host.mk : \
$(SRCDIR)/config_host.mk.in
\
$(SRCDIR)/bin/repo-list.in
\
$(SRCDIR)/ooo.lst.in
\
$(SRCDIR)/configure.
in
\
$(SRCDIR)/configure.
ac
\
$(SRCDIR)/autogen.lastrun
./autogen.sh
...
...
configure.
in
→
configure.
ac
Dosyayı görüntüle @
39558767
dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*-
dnl configure.
in
serves as input for the GNU autoconf package
dnl configure.
ac
serves as input for the GNU autoconf package
dnl in order to create a configure script.
AC_INIT([LibreOffice],[3.7],[],[],[http://documentfoundation.org/])
...
...
@@ -259,7 +259,7 @@ test_cairo=yes
# differently below just for Mac OSX,but at least better than
# hardcoding these as we used to do. Much of this is duplicated also
# in solenv for old build system and for gbuild, ideally we should
# perhaps define stuff like this only here in configure.
in
?
# perhaps define stuff like this only here in configure.
ac
?
LINKFLAGSSHL="-shared"
PICSWITCH="-fpic"
...
...
@@ -5861,7 +5861,7 @@ if test "$SOLAR_JAVA" != ""; then
if test -n "$JAVAINTERPRETER"; then
dnl java -version sends output to stderr!
if test `$JAVAINTERPRETER -version 2>&1 | $GREP -c "Kaffe"` -gt 0; then
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.
in
])
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.
ac
])
elif test `$JAVAINTERPRETER --version 2>&1 | $GREP -c "GNU libgcj"` -gt 0; then
JDK=gcj
AC_MSG_RESULT([checked (gcj)])
...
...
@@ -5869,7 +5869,7 @@ if test "$SOLAR_JAVA" != ""; then
_gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "BEA"` -gt 0; then
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.
in
])
AC_MSG_ERROR([No valid check available. Please check the block for your desired java in configure.
ac
])
elif test `$JAVAINTERPRETER -version 2>&1 | $AWK '{ print }' | $GREP -c "IBM"` -gt 0; then
JDK=ibm
...
...
@@ -12881,7 +12881,7 @@ chmod +x ./config.guess
dnl Setting up the post_download check script
dnl Using autoconf here, so that the migration from the previous state
dnl (checks for the additional Windows downloads were directly in
dnl configure.
in
) is as easy as possible
dnl configure.
ac
) is as easy as possible
echo "setting up the post_download check script"
autoconf post_download.in > post_download
chmod +x post_download
...
...
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