[ooo-build-commit] Branch 'ooo/OOO320' - scp2/source

[Jan Holesovsky]

 scp2/source/ooo/file_library_ooo.scp |    2 ++
 scp2/source/ooo/makefile.mk          |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit 928060ae6bb38ea7bb6d5b9c06431fed0cab638d
Author: Oliver Bolte <obo at openoffice.org>
Date:   Wed Nov 11 11:35:34 2009 +0000

    #i106757# install fails on system-neon builds due to missing ifndef

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 718eed7..d4a0dde 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1547,8 +1547,10 @@ End
 
 #ifndef DISABLE_NEON
 SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+#ifndef SYSTEM_NEON
 SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
 #endif
+#endif
 
 SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
 
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0d85cc5..2402774 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -212,6 +212,9 @@ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
 .IF "$(DISABLE_NEON)" == "TRUE"
 SCPDEFS+=-DDISABLE_NEON
 .ENDIF
+.IF "$(SYSTEM_NEON)" == "YES"
+SCPDEFS+=-DSYSTEM_NEON
+.ENDIF
 
 # if yes or unset (neon not used) -> do not install openssl library!
 .IF $(SYSTEM_OPENSSL) != "YES"