[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac connectivity/Library_postgresql-sdbc-impl.mk extensions/Library_ldapbe2.mk RepositoryExternal.mk

[Matúš Kukan]

 RepositoryExternal.mk                        |    2 +-
 config_host.mk.in                            |    1 -
 configure.ac                                 |    4 ----
 connectivity/Library_postgresql-sdbc-impl.mk |    2 +-
 extensions/Library_ldapbe2.mk                |    2 +-
 5 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit d6a020730e77de56d701fa5f566a4b8f421e064d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Mar 27 00:34:19 2013 +0100

    a little ldap cleaning
    
    Change-Id: Ib224484ef994312e78bac75c40421c7f6235326a

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 443e4a4..216dd4d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1917,7 +1917,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 
 endef
 
-else # !SYSTEM_OPENLDAP
+else ifeq ($(SYSTEM_OPENLDAP),NO)
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
 	ldap \
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 00832dd..d733f01 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -61,7 +61,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
 	boost_headers \
 	postgresql \
 	openssl \
-	$(if $(SYSTEM_OPENLDAP),openldap) \
+	openldap \
 	nss3 \
 	plc4 \
 	ssl3 \
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index bfed301..2b21a9d 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\
-	plc4,wldap32 \
+	wldap32 \
 ))
 else # 0S!=WNT
 $(eval $(call gb_Library_use_externals,ldapbe2,\
commit 1e14293ef7da3fe289bbf61afe84ce727319c839
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Mar 26 08:42:02 2013 +0100

    config_host.mk: L10N_MODULE is not used
    
    Change-Id: Iab125e0e0dfac70d630d15301aba511150692f39

diff --git a/config_host.mk.in b/config_host.mk.in
index 5f0267f..8457cb3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -278,7 +278,6 @@ export KDE_GLIB_LIBS=$(gb_SPACE)@KDE_GLIB_LIBS@
 export KDE_HAVE_GLIB=@KDE_HAVE_GLIB@
 export KDE_LIBS=$(gb_SPACE)@KDE_LIBS@
 export KRB5_LIBS=@KRB5_LIBS@
-export L10N_MODULE=@L10N_MODULE@
 export LCMS2_CFLAGS=$(gb_SPACE)@LCMS2_CFLAGS@
 export LCMS2_LIBS=$(gb_SPACE)@LCMS2_LIBS@
 @x_LDFLAGS@ export LDFLAGS=@LDFLAGS@
diff --git a/configure.ac b/configure.ac
index ff30a7d..4899b2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11369,9 +11369,6 @@ AC_SUBST(WITH_LANG)
 AC_SUBST(WITH_LANG_LIST)
 AC_SUBST(GIT_NEEDED_SUBMODULES)
 
-
-PathFormat "$SRC_ROOT/translations"
-L10N_MODULE="$formatted_path"
 WITH_POOR_HELP_LOCALIZATIONS=
 if test -d "$SRC_ROOT/translations/source"; then
     for l in `ls -1 $SRC_ROOT/translations/source`; do
@@ -11380,7 +11377,6 @@ if test -d "$SRC_ROOT/translations/source"; then
         fi
     done
 fi
-AC_SUBST(L10N_MODULE)
 AC_SUBST(WITH_POOR_HELP_LOCALIZATIONS)
 
 dnl git submodule update --reference