summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2012-08-10 10:27:54 +0200
committerJan Holesovsky <kendy@suse.cz>2012-08-10 16:44:26 +0200
commit6a7b32b09e621364239bca6ec02c858b122e07b8 (patch)
tree7e9d6ffa47102cb2d14d115326c9da0dec69c916 /scp2/source
parent26310504c3c20385caf35f5a703f1d5f1682b4c7 (diff)
Implement --disable-liblangtag, to be able to build without that.
Change-Id: Ic38d0282dba99efe2ecc45142a927ba3d8fa167d
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/directory_ooo.scp2
-rw-r--r--scp2/source/ooo/file_extra_ooo.scp2
-rw-r--r--scp2/source/ooo/file_library_ooo.scp4
3 files changed, 4 insertions, 4 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index e001c38564e7..063d1fe92680 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -671,7 +671,7 @@ Directory gid_Dir_Share_Autocorr
Styles = (WORKSTATION, CREATE);
End
-#ifndef SYSTEM_LIBLANGTAG
+#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
Directory gid_Dir_Share_Liblangtag
ParentID = gid_Brand_Dir_Share;
DosName = "liblangtag";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 903d23f7af78..843d43b37a0f 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -144,7 +144,7 @@ File gid_File_Extra_Glas_Red_Zip
Name = "glas-red.zip";
End
-#ifndef SYSTEM_LIBLANGTAG
+#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
File gid_File_Extra_Liblangtag
Dir = gid_Dir_Share_Liblangtag;
USER_FILE_BODY;
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index eaeb58f29969..71979861dbc8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -758,7 +758,7 @@ End
#endif
-#ifndef SYSTEM_LIBLANGTAG
+#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
File gid_File_Lib_Langtag
LIB_FILE_BODY;
@@ -774,7 +774,7 @@ File gid_File_Lib_Langtag
#endif
End
-#endif // SYSTEM_LIBLANGTAG
+#endif // ENABLE_LIBLANGTAG
#ifdef SOLAR_JAVA