[Libreoffice-commits] core.git: Library_merged.mk

[Andrzej J.R. Hunt]

 Library_merged.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a9bf62c4cb7e1238bd383e1e4dd0582b26846f1
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Tue Jul 16 17:07:07 2013 +0200

    Fix firebird with libmerged.
    
    Change-Id: I2784700686981c3eb487daae00b9f537658771bd

diff --git a/Library_merged.mk b/Library_merged.mk
index 439f437..7f605ab 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -47,8 +47,8 @@ $(eval $(call gb_Library_use_externals,merged,\
 	icuuc \
 	jpeg \
 	lcms2 \
-	libatomic_ops \
-	libfbembed \
+	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
+	$(call gb_Helper_optional,FIREBIRD,libfbembed) \
 	liblangtag \
 	libxml2 \
 	libxslt \