[ooo-build-commit] .: patches/dev300

[Kalman "" Szalai]

 patches/dev300/extensions_configure.diff |    6 +++---
 patches/dev300/scp2_extensions.diff      |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b7d3e92e5b27a5e6fb5089e83940938d75770efa
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Tue Jul 27 23:01:46 2010 +0200

    Fix extension packing and make options same
    
    * patches/dev300/extensions_configure.diff:
    * patches/dev300/scp2_extensions.diff:

diff --git a/patches/dev300/extensions_configure.diff b/patches/dev300/extensions_configure.diff
index 21caa73..e80362b 100644
--- a/patches/dev300/extensions_configure.diff
+++ b/patches/dev300/extensions_configure.diff
@@ -195,9 +195,9 @@
 +AC_MSG_CHECKING([for Numbertext extension integration])
 +if test "z$with_numbertext" = "z" -o "z$with_numbertext" = "zno" ; then
 +  AC_MSG_RESULT([no])
-+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_NUMBERTEXT"
 +else
 +  AC_MSG_RESULT([yes])
++  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NUMBERTEXT"
 +fi
 +AC_SUBST(WITH_NUMBERTEXT_EXTENSION)
 +
@@ -207,9 +207,9 @@
 +AC_MSG_CHECKING([for Hungarian Cross-reference Toolbar extension integration])
 +if test "z$with_hunart" = "z" -o "z$with_hunart" = "zno" ; then
 +  AC_MSG_RESULT([no])
-+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_HUNART"
 +else
 +  AC_MSG_RESULT([yes])
++  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
 +fi
 +AC_SUBST(WITH_HUNART_EXTENSION)
 +
@@ -219,9 +219,9 @@
 +AC_MSG_CHECKING([for Typography Toolbar extension integration])
 +if test "z$with_typo" = "z" -o "z$with_typo" = "zno" ; then
 +  AC_MSG_RESULT([no])
-+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_TYPO"
 +else
 +  AC_MSG_RESULT([yes])
++  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
 +fi
 +AC_SUBST(WITH_TYPO_EXTENSION)
 +
diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 89ee4c8..8af9024 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -121,7 +121,7 @@
 +
 +/* ** Numbertext ** */
 +
-+#ifndef WITHOUT_EXTENSION_NUMBERTEXT
++#ifdef WITH_EXTENSION_NUMBERTEXT
 +
 +File gid_File_Oxt_NumberText
 +    TXT_FILE_BODY;
@@ -147,7 +147,7 @@
 +
 +/* ** Hungarian Cross-reference Toolbar** */
 +
-+#ifndef WITHOUT_EXTENSION_HUNART
++#ifdef WITH_EXTENSION_HUNART
 +
 +File gid_File_Oxt_HunArt
 +    TXT_FILE_BODY;
@@ -160,7 +160,7 @@
 +
 +/* ** Typography Toolbar** */
 +
-+#ifndef WITHOUT_EXTENSION_TYPO
++#ifdef WITH_EXTENSION_TYPO
 +
 +File gid_File_Oxt_Typo
 +    TXT_FILE_BODY;
@@ -468,7 +468,7 @@
 +                                        
 +/* ** Lightproof ** */
 +
-+#ifndef WITHOUT_EXTENSION_LIGHTPROOF
++#ifdef WITH_EXTENSION_LIGHTPROOF
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_LightProof
 +    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF);
@@ -482,7 +482,7 @@
 +                                        
 +/* ** Numbertext ** */
 +
-+#ifndef WITHOUT_EXTENSION_NUMBERTEXT
++#ifdef WITH_EXTENSION_NUMBERTEXT
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_NumberText
 +    PackageInfo = "packinfo_extensions.txt";
@@ -499,7 +499,7 @@
 +
 +/* ** Hungarian Cross-reference Toolbar ** */
 +
-+#ifndef WITHOUT_EXTENSION_HUNART
++#ifdef WITH_EXTENSION_HUNART
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_HunArt
 +    PackageInfo = "packinfo_extensions.txt";
@@ -516,7 +516,7 @@
 +
 +/* ** Typography Toolbar ** */
 +
-+#ifndef WITHOUT_EXTENSION_TYPO
++#ifdef WITH_EXTENSION_TYPO
 +#ifdef WITH_EXTENSION_INTEGRATION
 +Module gid_Module_Optional_Extensions_Typo
 +    PackageInfo = "packinfo_extensions.txt";