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
3961c286
Kaydet (Commit)
3961c286
authored
Agu 03, 2013
tarafından
Norbert Thiebaud
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
configure: openCl does not build on 10.6 mac default no in that case
Change-Id: I84b74cb9e9893996179b4b0229853903e29fe28d
üst
ac004124
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
56 additions
and
52 deletions
+56
-52
configure.ac
configure.ac
+56
-52
No files found.
configure.ac
Dosyayı görüntüle @
3961c286
...
@@ -9995,13 +9995,17 @@ OPENCL_LIBS=
...
@@ -9995,13 +9995,17 @@ OPENCL_LIBS=
OPENCL_CFLAGS=
OPENCL_CFLAGS=
ENABLE_OPENCL=
ENABLE_OPENCL=
AC_MSG_CHECKING([OpenCL])
AC_MSG_CHECKING([OpenCL])
if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin; then
if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin ; then
# OS X
# OS X
AC_MSG_RESULT([yes, always on OS X])
if test "$with_open_sdk" = yes -o "$with_macosx_sdk" != "10.6" ; then
ENABLE_OPENCL=TRUE
AC_MSG_RESULT([yes, always on OS X])
OPENCL_CFLAGS=
ENABLE_OPENCL=TRUE
OPENCL_LIBS="-framework OpenCL"
OPENCL_CFLAGS=
AC_DEFINE(HAVE_FEATURE_OPENCL)
OPENCL_LIBS="-framework OpenCL"
AC_DEFINE(HAVE_FEATURE_OPENCL)
else
AC_MSG_RESULT([no])
fi
elif test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then
elif test -z "$with_opencl_sdk" -o "$with_opencl_sdk" = no; then
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
else
else
...
@@ -10028,49 +10032,49 @@ AC_SUBST(ENABLE_OPENCL)
...
@@ -10028,49 +10032,49 @@ AC_SUBST(ENABLE_OPENCL)
# presenter minimizer extension?
# presenter minimizer extension?
AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then
if test "x$enable_ext_presenter_minimizer" != "xno" -a "x$enable_extension_integration" != "xno"; then
AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes])
ENABLE_MINIMIZER=YES
ENABLE_MINIMIZER=YES
else
else
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
ENABLE_MINIMIZER=NO
ENABLE_MINIMIZER=NO
SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
fi
fi
AC_SUBST(ENABLE_MINIMIZER)
AC_SUBST(ENABLE_MINIMIZER)
# pdf import?
# pdf import?
AC_MSG_CHECKING([whether to build the PDF import])
AC_MSG_CHECKING([whether to build the PDF import])
if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then
if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then
AC_MSG_RESULT([yes])
AC_MSG_RESULT([yes])
ENABLE_PDFIMPORT=TRUE
ENABLE_PDFIMPORT=TRUE
dnl ===================================================================
dnl ===================================================================
dnl Check for system poppler
dnl Check for system poppler
dnl ===================================================================
dnl ===================================================================
AC_MSG_CHECKING([which pdf backend to use])
AC_MSG_CHECKING([which pdf backend to use])
if test "$with_system_poppler" = "yes"; then
if test "$with_system_poppler" = "yes"; then
AC_MSG_RESULT([external])
AC_MSG_RESULT([external])
SYSTEM_POPPLER=YES
SYSTEM_POPPLER=YES
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
AC_LANG_PUSH([C++])
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
save_CXXFLAGS=$CXXFLAGS
save_CPPFLAGS=$CPPFLAGS
save_CPPFLAGS=$CPPFLAGS
CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
AC_CHECK_HEADER([cpp/poppler-version.h], [],
AC_CHECK_HEADER([cpp/poppler-version.h], [],
[AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
[AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
CXXFLAGS=$save_CXXFLAGS
CXXFLAGS=$save_CXXFLAGS
CPPFLAGS=$save_CPPFLAGS
CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++])
AC_LANG_POP([C++])
libo_MINGW_CHECK_DLL([libpoppler])
libo_MINGW_CHECK_DLL([libpoppler])
POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else
else
AC_MSG_RESULT([internal])
AC_MSG_RESULT([internal])
SYSTEM_POPPLER=NO
SYSTEM_POPPLER=NO
BUILD_TYPE="$BUILD_TYPE POPPLER"
BUILD_TYPE="$BUILD_TYPE POPPLER"
fi
fi
else
else
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
ENABLE_PDFIMPORT=FALSE
ENABLE_PDFIMPORT=FALSE
fi
fi
AC_SUBST(ENABLE_PDFIMPORT)
AC_SUBST(ENABLE_PDFIMPORT)
AC_SUBST(SYSTEM_POPPLER)
AC_SUBST(SYSTEM_POPPLER)
...
@@ -10079,16 +10083,16 @@ AC_SUBST(POPPLER_LIBS)
...
@@ -10079,16 +10083,16 @@ AC_SUBST(POPPLER_LIBS)
AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
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
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_RESULT([yes])
ENABLE_MEDIAWIKI=YES
ENABLE_MEDIAWIKI=YES
BUILD_TYPE="$BUILD_TYPE XSLTML"
BUILD_TYPE="$BUILD_TYPE XSLTML"
if test "x$with_java" = "xno"; then
if test "x$with_java" = "xno"; then
AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
AC_MSG_ERROR([Wiki Publisher requires Java! Enable Java if you want to build it.])
fi
fi
else
else
AC_MSG_RESULT([no])
AC_MSG_RESULT([no])
ENABLE_MEDIAWIKI=NO
ENABLE_MEDIAWIKI=NO
SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
fi
fi
AC_SUBST(ENABLE_MEDIAWIKI)
AC_SUBST(ENABLE_MEDIAWIKI)
...
...
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