configure.in | 54 +++++++++++++++++------------------- dbaccess/Module_dbaccess.mk | 4 ++ reportdesign/Module_reportdesign.mk | 4 ++ svx/prj/build.lst | 2 - sw/prj/build.lst | 2 - tail_build/prj/build.lst | 2 - 6 files changed, 37 insertions(+), 31 deletions(-)
New commits: commit f8d30ec82d55f85a80ceda798a9e1a7ce0750035 Author: Tor Lillqvist <t...@iki.fi> Date: Mon Feb 6 14:29:18 2012 +0200 Attempt to disable database connectivity for iOS for now diff --git a/configure.in b/configure.in index 33facd8..f14d675 100644 --- a/configure.in +++ b/configure.in @@ -389,6 +389,11 @@ AC_ARG_ENABLE(ext-barcode, [Enable the Barcode extension.]) ) +AC_ARG_ENABLE(database-connectivity, + AS_HELP_STRING([--disable-database-connectivity], + [Disable various database connectivity.]) +) + AC_ARG_ENABLE(ext-diagram, AS_HELP_STRING([--enable-ext-diagram], [Enable the SmART Gallery (Diagram) extension.]) @@ -1996,6 +2001,22 @@ if test $_os != iOS -a $_os != Android; then BUILD_TYPE="$BUILD_TYPE DESKTOP" fi +dnl Decide whether to build database connectivity stuff (including +dnl Base) or not. We probably don't want to on non-desktop OSes. + +if test -z "$enable_database_connectivity"; then + # Do enable database connectivity for Android for now as otherwise + # we presumably will get linking errors... We are not as far in + # the work for iOS, so we might as well disable it for iOS already. + if test $_os != iOS; then + enable_database_connectivity=yes + fi +fi + +if test "$enable_database_connectivity" = yes; then + BUILD_TYPE="$BUILD_TYPE DBCONNECTIVITY" +fi + dnl =================================================================== dnl Extra check for Windows. Cygwin builds need gcc to build dmake dnl although MSVC is used to build other build-time tools and @@ -6737,6 +6758,8 @@ if test "$with_system_odbc" = "yes"; then AC_CHECK_HEADER(sqlext.h, [], [AC_MSG_ERROR(odbc not found. install odbc)], []) +elif test "$enable_database_connectivity" != yes; then + AC_MSG_RESULT([none]) else AC_MSG_RESULT([internal]) SYSTEM_ODBC_HEADERS=NO diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index b7788c1..88760ae 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Module_Module,dbaccess)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,dbaccess,\ AllLangResTarget_dba \ AllLangResTarget_dbmm \ @@ -48,4 +50,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ JunitTest_dbaccess_unoapi \ )) +endif + # vim: set noet sw=4 ts=4: diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk index e72e430..854a822 100644 --- a/reportdesign/Module_reportdesign.mk +++ b/reportdesign/Module_reportdesign.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Module_Module,reportdesign)) +ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,reportdesign,\ AllLangResTarget_rpt \ AllLangResTarget_rptui \ @@ -42,4 +44,6 @@ $(eval $(call gb_Module_add_targets,reportdesign,\ JunitTest_reportdesign_complex \ )) +endif + # vim: set noet sw=4 ts=4: diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 6bdebb6..915bcc5 100644 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,2 +1,2 @@ -sx svx : sfx2 TRANSLATIONS:translations oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL +sx svx : sfx2 TRANSLATIONS:translations oovbaapi DBCONNECTIVITY:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt officecfg NULL sx svx\prj nmake - all sx_prj NULL diff --git a/sw/prj/build.lst b/sw/prj/build.lst index 42986b8..0ff450f 100644 --- a/sw/prj/build.lst +++ b/sw/prj/build.lst @@ -1,2 +1,2 @@ -sw sw : filter TRANSLATIONS:translations configmgr connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL +sw sw : filter TRANSLATIONS:translations configmgr DBCONNECTIVITY:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DBCONNECTIVITY:dbaccess comphelper LIBXSLT:libxslt test DESKTOP:xmlhelp NULL sw sw\prj nmake - all sw_prj NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index ea551d5..5861359 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl DESKTOP:xmlhelp xmlscript xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr DBCONNECTIVITY:connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl DESKTOP:xmlhelp xmlscript xsltml NULL tb tail_build\prj nmake - all tb_prj NULL commit 3a8a275d74ea8e2147e59d2578539b6bbc60927b Author: Tor Lillqvist <t...@iki.fi> Date: Mon Feb 6 12:05:04 2012 +0200 Clarify and simplify a bit as we don't have any X11 option on Mac OS X anyway diff --git a/configure.in b/configure.in index eeda25e..33facd8 100644 --- a/configure.in +++ b/configure.in @@ -2714,6 +2714,7 @@ cygwin*) darwin*) COM=GCC GUI=UNX + # Not sure if "Aqua" is the right term to use? GUIBASE="aqua" OS=MACOSX P_SEP=: @@ -7246,30 +7247,7 @@ AC_SUBST(SYSTEM_SAMPLEICC) AC_SUBST(SAMPLEICC_LIBS) AC_SUBST(SAMPLEICC_CFLAGS) -dnl =================================================================== -dnl Checks for libraries. -dnl =================================================================== -dnl Check for Mac OS X native GUI, which may is now required; the X11 build is no longer supported -dnl See if we have the AppKit framework for building with Quartz graphics. - -if test "$_os" = "Darwin"; then - if test "x$with_x" = "xyes"; then - AC_MSG_ERROR([X11 build is no longer supported on MacOSX, please use the native aqua build]) - else - AC_MSG_CHECKING([for /System/Library/Frameworks/AppKit.framework]) - if test -d "/System/Library/Frameworks/AppKit.framework/"; then - AC_MSG_RESULT([yes]) - x_includes="no_x_includes" - x_libraries="no_x_libraries" - dnl disable some things used on other Unix versions but not on the aqua build - enable_gtk=no - else - AC_MSG_ERROR([No AppKit.framewrok found]) - fi - fi -fi - -if test $_os = iOS -o $_os = Android; then +if test $_os = Darwin -o $_os = iOS -o $_os = Android; then enable_gtk=no fi @@ -7293,10 +7271,7 @@ AC_SUBST(ENABLE_NSPLUGIN) dnl *************************************** dnl testing for X libraries and includes... dnl *************************************** -if test "$_os" = "Darwin" -a "x$x_includes" = "xno_x_includes"; then - dnl Mac OS X using Aqua graphics. Don't check for X11. - : -elif test "$_os" != "WINNT" -a "$_os" != "Android" -a "$_os" != "iOS"; then +if test $_os != Darwin -a $_os != WINNT -a $_os != Android -a $_os != iOS; then AC_PATH_X AC_PATH_XTRA CPPFLAGS="$CPPFLAGS $X_CFLAGS" _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits