diff options
| -rw-r--r-- | configure.in | 22 | ||||
| -rw-r--r-- | ooo.lst | 1 | ||||
| -rw-r--r-- | set_soenv.in | 1 | ||||
| -rwxr-xr-x | solenv/config/sdev300.ini | 2 |
4 files changed, 25 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 6468f15cebfe..00a5d5dde8b5 100644 --- a/configure.in +++ b/configure.in @@ -515,6 +515,9 @@ AC_ARG_WITH(system-curl, AC_ARG_WITH(system-boost, [ --with-system-boost Use boost already on system ],,) +AC_ARG_WITH(system-mdds, +[ --with-system-mdds Use mdds already on system +],,) AC_ARG_WITH(system-vigra, [ --with-system-vigra Use vigra already on system ],,) @@ -4178,6 +4181,25 @@ AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) dnl =================================================================== +dnl Check for system mdds +dnl =================================================================== +AC_MSG_CHECKING([which mdds to use]) +if test -n "$with_system_mdds" -o -n "$with_system_headers" && \ + test "$with_system_mdds" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_MDDS=YES + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [], + [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], []) + AC_LANG_POP([C++]) +else + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE MDDS" + SYSTEM_MDDS=NO +fi +AC_SUBST(SYSTEM_MDDS) + +dnl =================================================================== dnl Check for system boost dnl =================================================================== AC_MSG_CHECKING([which boost to use]) @@ -72,3 +72,4 @@ fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz fe5b3e2b7c4577f30dc001054365653e-dejavu-fonts-ttf-2.30.zip 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz +cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2 diff --git a/set_soenv.in b/set_soenv.in index 71ad7085f759..e827c3cb3eef 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1897,6 +1897,7 @@ ToFile( "SYSTEM_CURL", "@SYSTEM_CURL@", "e" ); ToFile( "CURL_CFLAGS", "@CURL_CFLAGS@", "e" ); ToFile( "CURL_LIBS", "@CURL_LIBS@", "e" ); ToFile( "SYSTEM_BOOST", "@SYSTEM_BOOST@", "e" ); +ToFile( "SYSTEM_MDDS", "@SYSTEM_MDDS@", "e" ); ToFile( "SYSTEM_VIGRA", "@SYSTEM_VIGRA@", "e" ); ToFile( "SYSTEM_NEON", "@SYSTEM_NEON@", "e" ); ToFile( "NEON_VERSION", "@NEON_VERSION@", "e" ); diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 2b6526f9aa22..3e80e1460885 100755 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -8,7 +8,7 @@ common BIG_SVX TRUE BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT + BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office |