ooo-build r12526 - in trunk: . distro-configs

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue May 13 00:18:31 2008
New Revision: 12526
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12526&view=rev

Log:
2008.05-12  Rene Engelhard  <rene debian org>

        * configure.in: set OOO_VERSION / OOO_MAJOR to 3.0. set binsuffix to
          the value of OOO_MAJOR per default if not specified
        * distro-configs/Common.conf.in: remove --disable-pdfimport


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/distro-configs/Common.conf.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue May 13 00:18:31 2008
@@ -950,8 +950,8 @@
 AC_SUBST(DRINK)
 
 AC_MSG_CHECKING([for ooo-version])
-OOO_MAJOR=2.4
-OOO_VERSION=2.4
+OOO_MAJOR=3.0
+OOO_VERSION=3.0
 AC_MSG_RESULT([$OOO_VERSION])
 AC_SUBST(OOO_VERSION)
 
@@ -962,7 +962,7 @@
 elif test "z$with_binsuffix" != "z"; then
     OOO_BINSUFFIX=$with_binsuffix
 else
-    OOO_BINSUFFIX=2.0
+    OOO_BINSUFFIX=$OOO_MAJOR
 fi
 AC_MSG_RESULT([$OOO_BINSUFFIX])
 AC_SUBST(OOO_BINSUFFIX)

Modified: trunk/distro-configs/Common.conf.in
==============================================================================
--- trunk/distro-configs/Common.conf.in	(original)
+++ trunk/distro-configs/Common.conf.in	Tue May 13 00:18:31 2008
@@ -4,4 +4,3 @@
 --with-use-shell=bash
 --without-gpc
 --without-agg
---disable-pdfimport