[Libreoffice-commits] core.git: config_host.mk.in configure.ac

David Tardon dtardon at redhat.com
Mon Mar 3 07:55:56 PST 2014


 config_host.mk.in |    1 -
 configure.ac      |   13 -------------
 2 files changed, 14 deletions(-)

New commits:
commit ab587570a2aac453cc1259379221668b94775e69
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Mar 3 16:50:11 2014 +0100

    drop unused configure test
    
    Change-Id: If079720cec600a2a8c5acf1c3a4fa752d288b36e

diff --git a/config_host.mk.in b/config_host.mk.in
index 4477ebc..2bf9dd4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -370,7 +370,6 @@ export LIBMARIADB_PATH=@LIBMARIADB_PATH@
 export BUNDLE_MARIADB=@BUNDLE_MARIADB@
 export MD5SUM=@MD5SUM@
 export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
-export MDDS_CPPFLAGS=$(gb_SPACE)@MDDS_CPPFLAGS@
 export MERGELIBS=@MERGELIBS@
 export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@
diff --git a/configure.ac b/configure.ac
index e2198dc..0149b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8593,19 +8593,6 @@ dnl ===================================================================
 libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.10.2], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===================================================================
-dnl Determine which hash container mdds shall use
-dnl ===================================================================
-AC_MSG_CHECKING([which hash container mdds shall use])
-if test "x$HAVE_CXX11" = "xTRUE" -a "x$SYSTEM_MDDS" = "xTRUE"; then
-    MDDS_CPPFLAGS=$CXXFLAGS_CXX11
-    AC_MSG_RESULT([std::unordered_map])
-else
-    MDDS_CPPFLAGS="-DMDDS_HASH_CONTAINER_BOOST"
-    AC_MSG_RESULT([boost::unordered_map])
-fi
-AC_SUBST([MDDS_CPPFLAGS])
-
-dnl ===================================================================
 dnl Check for system glm
 dnl ===================================================================
 AC_MSG_CHECKING([which glm to use])


More information about the Libreoffice-commits mailing list