Quantcast

[PATCH] configure.in: Cluster all extension related options at one place

classic Classic list List threaded Threaded
22 messages Options
12
spaetz spaetz
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] configure.in: Cluster all extension related options at one place

- Pulled together all extension related options in one place in the
  configure, they were cluttered all around the place. We do want to
  present extensions together in ./configure --help.

- Add an -ext- to these configure options to clarify they are
  extensions:
  --enable-ext-presenter-ui, enable-ext-presenter-minimizer,
  --enable-ext-presenter-console, enable-ext-pdfimport,
  --enable-ext-wiki-publisher
  (Similar changes should still be done to the rest of the extensions)

- Quit with explicit error message when using conflicting --without-java
  and --enable-ext-wiki-publisher.

- Remove some minor things.

Signed-off-by: Sebastian Spaeth <[hidden email]>
---
 configure.in |  185 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 93 insertions(+), 92 deletions(-)

diff --git a/configure.in b/configure.in
index 94c1ba8..18e19c0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,20 +1,8 @@
-dnl /******************************************************************
-dnl *
-dnl *
-dnl * Name: configure.in
-dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2008-09-08 07:38:40 $
-dnl *
-dnl * Desc: This file serves as input for the GNU autoconf package
-dnl *       in order to create a configure script.
-dnl *       In this stage configure just checks the pre-requisites
-dnl *       necessary to build LibreOffice
-dnl *
-dnl *
-dnl ******************************************************************/
-AC_REVISION( $Revision: 1.290 $ )
+dnl configure.in serves as input for the GNU autoconf package
+dnl in order to create a configure script.
+
+AC_INIT([LibreOffice], [3.3],,, [http://documentfoundation.org/])
 AC_PREREQ(2.50)
-AC_INIT()
 echo "$@" >config.parms
 
 dnl ===================================================================
@@ -329,44 +319,6 @@ AC_ARG_ENABLE(gstreamer,
         [Disable building the gstreamer avmedia backend.]),
 ,enable_gstreamer=yes)
 
-AC_ARG_ENABLE(mysql-connector,
-    AS_HELP_STRING([--enable-mysql-connector],
-        [Enables the build of the MySQL Connector/LibO extension. This requires
-         access to the MySQL Connector/C (aka libmysql) to be given, too, with
-         either the --with-system-mysql or --with-libmysql-path option.]),
-,)
-
-AC_ARG_ENABLE(presenter-extra-ui,
-    AS_HELP_STRING([--enable-presenter-extra-ui],
-        [Enables extra functionality during slideshow, e.g. selecting pen color,
-         erasing drawings etc.]),
-,enable_presenter_extra_ui=no)
-
-AC_ARG_ENABLE(minimizer,
-    AS_HELP_STRING([--enable-minimizer],
-        [Enables the build of the Presentation Minimizer extension.]),
-,)
-
-AC_ARG_ENABLE(presenter-console,
-    AS_HELP_STRING([--enable-presenter-console],
-        [Enables the build of the Presenter Console extension.]),
-,)
-
-AC_ARG_ENABLE(pdfimport,
-    AS_HELP_STRING([--enable-pdfimport],
-        [Enables the build of the PDF Import extension and xpdf.]),
-,)
-
-AC_ARG_ENABLE(wiki-publisher,
-    AS_HELP_STRING([--enable-wiki-publisher],
-        [Enables the build of the Wiki Publisher extension.]),
-,)
-
-AC_ARG_ENABLE(report-builder,
-    AS_HELP_STRING([--enable-report-builder],
-        [Enables the build of the Report Builder extension.]),
-,)
-
 AC_ARG_ENABLE(neon,
     AS_HELP_STRING([--disable-neon],
         [Disable neon and the compilation of webdav binding.]),
@@ -642,7 +594,7 @@ AC_ARG_WITH(system-icu,
 
 AC_ARG_WITH(system-poppler,
     AS_HELP_STRING([--with-system-poppler],
-        [Use poppler already on system.]),
+        [Use system poppler. (only needed for pdfimport extension)]),
 ,)
 
 AC_ARG_WITH(system-db,
@@ -1256,6 +1208,61 @@ AC_ARG_WITH(sun-templates,
         [Integrate Sun template packages.]),
 ,)
 
+AC_ARG_WITH(num-cpus,
+    AS_HELP_STRING([--with-num-cpus],
+        [Number of build processes/cpus to use (number of projects that will build at the same time).
+         Multi-process/multi-cpu builds can save a lot of time on multi-cpu machines.
+         Defaults to the number of CPUs on the machine.]),
+,)
+
+AC_ARG_WITH(max-jobs,
+    AS_HELP_STRING([--with-max-jobs],
+        [Maximum number of jobs per one CPU that will be issued at the same time my dmake.
+         The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs.
+         Defaults to 1, unless you configure --enable-icecream - then to 10.]),
+,)
+
+dnl ===================================================================
+dnl Enable/disable extensions
+dnl ===================================================================
+
+AC_ARG_ENABLE(ext-presenter-ui,
+    AS_HELP_STRING([--enable-ext-presenter-ui],
+        [Enables extra functionality during slideshows, e.g. selecting pen color.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-minimizer,
+    AS_HELP_STRING([--enable-ext-presenter-minimizer],
+        [Enables the Presentation Minimizer.]),
+,)
+
+AC_ARG_ENABLE(ext-presenter-console,
+    AS_HELP_STRING([--enable-ext-presenter-console],
+        [Enables the Presenter Console extension.]),
+,)
+
+AC_ARG_ENABLE(ext-pdfimport,
+    AS_HELP_STRING([--enable-ext-pdfimport],
+        [Enables the PDF Import extension and xpdf.]),
+,)
+
+AC_ARG_ENABLE(ext-wiki-publisher,
+    AS_HELP_STRING([--enable-ext-wiki-publisher],
+        [Enables the Wiki Publisher extension.]),
+,)
+
+AC_ARG_ENABLE(report-builder,
+    AS_HELP_STRING([--enable-report-builder],
+        [Enables the build of the Report Builder extension.]),
+,)
+
+AC_ARG_ENABLE(mysql-connector,
+    AS_HELP_STRING([--enable-mysql-connector],
+        [Enables the build of the MySQL Connector/LibO extension. This requires
+         access to the MySQL Connector/C (aka libmysql) to be given, too, with
+         either the --with-system-mysql or --with-libmysql-path option.]),
+,)
+
 AC_ARG_WITH(lightproof,
     AS_HELP_STRING([--with-lightproof],
         [Integrate Lightproof extension.]),
@@ -1311,20 +1318,6 @@ AC_ARG_WITH(oooblogger,
         [Download and integrate oooblogger extension.]),
 ,)
 
-AC_ARG_WITH(num-cpus,
-    AS_HELP_STRING([--with-num-cpus],
-        [Number of build processes/cpus to use (number of projects that will build at the same time).
-         Multi-process/multi-cpu builds can save a lot of time on multi-cpu machines.
-         Defaults to the number of CPUs on the machine.]),
-,)
-
-AC_ARG_WITH(max-jobs,
-    AS_HELP_STRING([--with-max-jobs],
-        [Maximum number of jobs per one CPU that will be issued at the same time my dmake.
-         The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs.
-         Defaults to 1, unless you configure --enable-icecream - then to 10.]),
-,)
-
 BUILD_TYPE="LibO"
 
 dnl ===================================================================
@@ -6410,40 +6403,44 @@ fi
 
 AC_SUBST(ENABLE_OPENGL)
 
+# presenter extra ui extension?
 AC_MSG_CHECKING([whether to build extra presenter ui])
-if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then
+AS_IF([test "x$enable_ext_presenter_ui" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_PRESENTER_EXTRA_UI=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_PRESENTER_EXTRA_UI=NO
-fi
+])
 AC_SUBST(ENABLE_PRESENTER_EXTRA_UI)
 
+# presenter minimizer extension?
 AC_MSG_CHECKING([whether to build the Presentation Minimizer extension])
-if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then
+AS_IF([test "x$enable_ext_presenter_minimizer" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_MINIMIZER=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_MINIMIZER=NO
    SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MINIMIZER"
-fi
+])
 AC_SUBST(ENABLE_MINIMIZER)
 
-AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
+# presenter console extension?
+AC_MSG_CHECKING([whether to build the Presenter Console extension])
+AS_IF([test "x$enable_ext_presenter_console" = "xyes"], [
    AC_MSG_RESULT([yes])
    ENABLE_PRESENTER_SCREEN=YES
-else
+],[
    AC_MSG_RESULT([no])
    ENABLE_PRESENTER_SCREEN=NO
    SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PRESENTER_SCREEN"
-fi
+])
 AC_SUBST(ENABLE_PRESENTER_SCREEN)
 
+# pdf import extension?
 AC_MSG_CHECKING([whether to build the PDF Import extension])
-if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
+AS_IF([test "x$enable_ext_pdfimport" = "xyes"], [
   AC_MSG_RESULT([yes])
   ENABLE_PDFIMPORT=YES
 
@@ -6460,23 +6457,24 @@ if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO
       BUILD_TYPE="$BUILD_TYPE XPDF"
-      AC_MSG_CHECKING([for xpdf module])
+      AC_MSG_CHECKING([for internal xpdf module])
       if test -d ./xpdf; then
-       AC_MSG_RESULT([OK])
+        AC_MSG_RESULT([OK])
       else
-        AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
+        AC_MSG_ERROR([not existing! (Did you get the -extensions tarball?)])
       fi
   fi
-else
-   AC_MSG_RESULT([no])
-   ENABLE_PDFIMPORT=NO
-   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
-fi
+],[
+  AC_MSG_RESULT([no])
+  ENABLE_PDFIMPORT=NO
+  SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_PDFIMPORT"
+])
 AC_SUBST(ENABLE_PDFIMPORT)
 AC_SUBST(SYSTEM_POPPLER)
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
 
+
 if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
   AC_MSG_CHECKING([for sdext module])
   if test -d ./sdext; then
@@ -6488,7 +6486,7 @@ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$E
 fi
 
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
-if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
+AS_IF([test "x$enable_ext_wiki_publisher" = "xyes"], [
   AC_MSG_RESULT([yes])
   AC_MSG_CHECKING([for swext module])
   if test -d ./swext; then
@@ -6498,11 +6496,14 @@ if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test
   fi
   ENABLE_MEDIAWIKI=YES
   BUILD_TYPE="$BUILD_TYPE SWEXT"
-else
+  if test  "x$WITH_JAVA" = "xno"; then
+    AC_MSG_ERROR([wiki publisher requires Java! Enable java if you want to build it.])
+  fi
+],[
   AC_MSG_RESULT([no])
   ENABLE_MEDIAWIKI=NO
   SCPDEFS="$SCPDEFS -DWITHOUT_EXTENSION_MEDIAWIKI"
-fi
+])
 AC_SUBST(ENABLE_MEDIAWIKI)
 
 if test "$ENABLE_MEDIAWIKI" = "YES"; then
--
1.7.1

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
cbosdonnat cbosdonnat
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] [PUSHED] configure.in: Cluster all extension related options at one place

Hi Sebastian,

Thanks for the patch. I needed to massage it a bit to make it apply, but
it works fine. I pushed it in master branch.

Regards,
--
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
spaetz spaetz
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] distro_config: adapt to new confgure options for extensions

In reply to this post by spaetz
Some extensions options for configure were renamed to --enable-ext-*
Adapt all distro configs to reflect that. Sorry for the churn.

Signed-off-by: Sebastian Spaeth <[hidden email]>
---
 distro-configs/GoOoLinux.conf.in             |   10 +++++-----
 distro-configs/GoOoMacOSX.conf.in            |   10 +++++-----
 distro-configs/LibreOfficeLinux.conf.in      |    6 +++---
 distro-configs/LibreOfficeLinuxDevel.conf.in |    6 +++---
 distro-configs/LibreOfficeMacOSX.conf.in     |    6 +++---
 distro-configs/LibreOfficeOpenBSD.conf.in    |    6 +++---
 distro-configs/OOo4Kids.conf.in              |    2 +-
 distro-configs/OxygenOfficeLinux.conf.in     |    6 +++---
 distro-configs/OxygenOfficeWindows.conf.in   |    6 +++---
 distro-configs/SUSE-10.3.conf.in             |    4 ++--
 distro-configs/SUSE-11.0.conf.in             |    6 +++---
 distro-configs/SUSE-11.1.conf.in             |    6 +++---
 distro-configs/SUSE-11.2.conf.in             |    6 +++---
 distro-configs/SUSE.conf.in                  |    6 +++---
 14 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/distro-configs/GoOoLinux.conf.in b/distro-configs/GoOoLinux.conf.in
index 473f1ab..fb78eaf 100644
--- a/distro-configs/GoOoLinux.conf.in
+++ b/distro-configs/GoOoLinux.conf.in
@@ -38,12 +38,12 @@
 --without-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-minimizer
---enable-presenter-console
---enable-pdfimport
+--enable-ext-presenter-minimizer
+--enable-presenter-console
+--enable-ext-pdfimport
 --without-system-poppler
---enable-wiki-publisher
---enable-report-builder
+--enable-ext-wiki-publisher
+--enable-report-builder
 --with-extension-integration
 --with-linker-hash-style=both
 --with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/distro-configs/GoOoMacOSX.conf.in b/distro-configs/GoOoMacOSX.conf.in
index a38c562..ba03e81 100644
--- a/distro-configs/GoOoMacOSX.conf.in
+++ b/distro-configs/GoOoMacOSX.conf.in
@@ -2,9 +2,9 @@
 --with-about-bitmaps=\"$TOOLSDIR/src/openabout_go-oo.bmp\"
 --with-vendor=\"Go-oo Project\"
 --enable-hids
---enable-minimizer
---enable-presenter-console
---enable-pdfimport
---enable-wiki-publisher
---enable-report-builder
+--enable-ext-presenter-minimizer
+--enable-presenter-console
+--enable-ext-pdfimport
+--enable-ext-wiki-publisher
+--enable-report-builder
 --with-extension-integration
diff --git a/distro-configs/LibreOfficeLinux.conf.in b/distro-configs/LibreOfficeLinux.conf.in
index 7f2cb4b..cbc4339 100644
--- a/distro-configs/LibreOfficeLinux.conf.in
+++ b/distro-configs/LibreOfficeLinux.conf.in
@@ -33,11 +33,11 @@
 --without-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-presenter-console
---enable-pdfimport
+--enable-ext-pdfimport
 --without-system-poppler
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --enable-report-builder
 --with-extension-integration
 --with-linker-hash-style=both
diff --git a/distro-configs/LibreOfficeLinuxDevel.conf.in b/distro-configs/LibreOfficeLinuxDevel.conf.in
index 58b9e8d..704e43d 100644
--- a/distro-configs/LibreOfficeLinuxDevel.conf.in
+++ b/distro-configs/LibreOfficeLinuxDevel.conf.in
@@ -30,11 +30,11 @@
 --without-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-presenter-console
---enable-pdfimport
+--enable-ext-pdfimport
 --without-system-poppler
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --enable-report-builder
 --with-extension-integration
 --with-ant-home=$BUILDDIR/$APACHE_ANT
diff --git a/distro-configs/LibreOfficeMacOSX.conf.in b/distro-configs/LibreOfficeMacOSX.conf.in
index 40259cc..1ebbf3a 100644
--- a/distro-configs/LibreOfficeMacOSX.conf.in
+++ b/distro-configs/LibreOfficeMacOSX.conf.in
@@ -1,9 +1,9 @@
 --with-vendor=\"The Document Foundation\"
 --enable-hids
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-presenter-console
---enable-pdfimport
---enable-wiki-publisher
+--enable-ext-pdfimport
+--enable-ext-wiki-publisher
 --enable-report-builder
 --with-extension-integration
 --enable-broffice
diff --git a/distro-configs/LibreOfficeOpenBSD.conf.in b/distro-configs/LibreOfficeOpenBSD.conf.in
index cf2556c..541954c 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf.in
+++ b/distro-configs/LibreOfficeOpenBSD.conf.in
@@ -34,11 +34,11 @@
 --with-system-mesa-headers
 --without-unix-wrapper
 --with-fonts
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-presenter-console
---enable-pdfimport
+--enable-ext-pdfimport
 --with-system-poppler
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --enable-report-builder
 --with-extension-integration
 --with-ant-home=/usr/local/ant/lib
diff --git a/distro-configs/OOo4Kids.conf.in b/distro-configs/OOo4Kids.conf.in
index d82a286..cc1adf7 100644
--- a/distro-configs/OOo4Kids.conf.in
+++ b/distro-configs/OOo4Kids.conf.in
@@ -1,4 +1,4 @@
---enable-presenter-extra-ui
+--enable-ext-presenter-ui
 --enable-cups
 --disable-neon
 --disable-crashdump
diff --git a/distro-configs/OxygenOfficeLinux.conf.in b/distro-configs/OxygenOfficeLinux.conf.in
index a012c4c..2a97bc9 100644
--- a/distro-configs/OxygenOfficeLinux.conf.in
+++ b/distro-configs/OxygenOfficeLinux.conf.in
@@ -30,11 +30,11 @@
 --enable-dbus
 --enable-gnome-vfs
 --enable-mono
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-presenter-console
---enable-pdfimport
+--enable-ext-pdfimport
 --without-system-poppler
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --enable-ogltrans
 --enable-report-builder
 --enable-neon
diff --git a/distro-configs/OxygenOfficeWindows.conf.in b/distro-configs/OxygenOfficeWindows.conf.in
index c7206ce..ce4d64e 100644
--- a/distro-configs/OxygenOfficeWindows.conf.in
+++ b/distro-configs/OxygenOfficeWindows.conf.in
@@ -14,10 +14,10 @@
 --with-extra-font
 --with-extra-accessory
 --with-lang=\"hu de fr it tr ka fi pl nl pt-BR es ja zh-CN sv cs-CZ ko sl\"
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-presenter-console
---enable-pdfimport
---enable-wiki-publisher
+--enable-ext-pdfimport
+--enable-ext-wiki-publisher
 --enable-ogltrans
 --enable-report-builder
 --disable-cairo
diff --git a/distro-configs/SUSE-10.3.conf.in b/distro-configs/SUSE-10.3.conf.in
index 3feda2b..c99c7af 100644
--- a/distro-configs/SUSE-10.3.conf.in
+++ b/distro-configs/SUSE-10.3.conf.in
@@ -5,13 +5,13 @@
 --disable-qadevooo
 --enable-hids
 --enable-lockdown
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-mono
 --enable-opengl
 --enable-ogltrans
 --enable-presenter-console
 --enable-report-builder
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --with-ant-home=/usr/share/ant
 --with-external-dict-dir=/usr/share/myspell
 --with-external-hyph-dir=/usr/share/ooo/hyphen
diff --git a/distro-configs/SUSE-11.0.conf.in b/distro-configs/SUSE-11.0.conf.in
index 6fb422d..3208fbc 100644
--- a/distro-configs/SUSE-11.0.conf.in
+++ b/distro-configs/SUSE-11.0.conf.in
@@ -5,14 +5,14 @@
 --disable-qadevooo
 --enable-hids
 --enable-lockdown
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-mono
 --enable-opengl
 --enable-ogltrans
---enable-pdfimport
+--enable-ext-pdfimport
 --enable-presenter-console
 --enable-report-builder
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
 --with-external-dict-dir=/usr/share/myspell
diff --git a/distro-configs/SUSE-11.1.conf.in b/distro-configs/SUSE-11.1.conf.in
index 9a88b8d..f935385 100644
--- a/distro-configs/SUSE-11.1.conf.in
+++ b/distro-configs/SUSE-11.1.conf.in
@@ -5,14 +5,14 @@
 --disable-qadevooo
 --enable-hids
 --enable-lockdown
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-mono
 --enable-opengl
 --enable-ogltrans
---enable-pdfimport
+--enable-ext-pdfimport
 --enable-presenter-console
 --enable-report-builder
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
 --with-external-dict-dir=/usr/share/myspell
diff --git a/distro-configs/SUSE-11.2.conf.in b/distro-configs/SUSE-11.2.conf.in
index c36f132..fcf1e0a 100644
--- a/distro-configs/SUSE-11.2.conf.in
+++ b/distro-configs/SUSE-11.2.conf.in
@@ -4,14 +4,14 @@
 --disable-qadevooo
 --enable-hids
 --enable-lockdown
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-mono
 --enable-opengl
 --enable-ogltrans
---enable-pdfimport
+--enable-ext-pdfimport
 --enable-presenter-console
 --enable-report-builder
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
 --with-external-dict-dir=/usr/share/myspell
diff --git a/distro-configs/SUSE.conf.in b/distro-configs/SUSE.conf.in
index b9ff2f8..9377f8c 100644
--- a/distro-configs/SUSE.conf.in
+++ b/distro-configs/SUSE.conf.in
@@ -4,14 +4,14 @@
 --disable-qadevooo
 --enable-hids
 --enable-lockdown
---enable-minimizer
+--enable-ext-presenter-minimizer
 --enable-mono
 --enable-opengl
 --enable-ogltrans
---enable-pdfimport
+--enable-ext-pdfimport
 --enable-presenter-console
 --enable-report-builder
---enable-wiki-publisher
+--enable-ext-wiki-publisher
 --without-stlport
 --with-ant-home=/usr/share/ant
 --with-external-dict-dir=/usr/share/myspell
--
1.7.1

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
cbosdonnat cbosdonnat
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] [PUSHED] distro_config: adapt to new confgure options for extensions

On Thu, 2010-11-04 at 13:57 +0100, Sebastian Spaeth wrote:
> Some extensions options for configure were renamed to --enable-ext-*
> Adapt all distro configs to reflect that. Sorry for the churn.

Thanks for the patch, I just pushed it.

Regards,

--
Cédric Bosdonnat
LibreOffice hacker
http://documentfoundation.org
OOo Eclipse Integration developer
http://cedric.bosdonnat.free.fr



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
arranna arranna
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] Renaming extension options

In reply to this post by cbosdonnat

Renamed all extensions to --with-ext-*

If "we do want to present them together in ./configure --help",
then they all must be a same type of.
=> Changed all extensions to be AC_ARG_WITH

See: b765a28ea9d63b60a14786b1a5484227175d413e

Also: We don't want to break builders scripts (as Michael Meeks said) so
deprecated old options not removed but commented instead.


¡There are still extensions which are only in build/configure!
---
  configure.in |  311
++++++++++++++++++++++++++++++++++++++++++----------------
  1 files changed, 228 insertions(+), 83 deletions(-)



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Renaming-extension-options-bootstrap.patch (18K) Download Attachment
Thorsten Behrens Thorsten Behrens
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options

Niko Rönkkö wrote:
> Also: We don't want to break builders scripts (as Michael Meeks said) so
> deprecated old options not removed but commented instead.
>
Hm, since we've now branched off 3.3 - I wouldn't mind changing it
completely. I think it's better to get nice hard errors once,
instead of a potentially long period of deprecatedness.

Possibly this should be done along with build repo retirement -
Kendy?

Cheers,

-- Thorsten

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

attachment0 (205 bytes) Download Attachment
arranna arranna
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] Distro-configs: adapt to new configure options for extensions

In reply to this post by arranna

Some extensions options for configure were renamed to --with-ext-*
---
  distro-configs/GoOoLinux.conf.in             |   10 +++++-----
  distro-configs/GoOoMacOSX.conf.in            |   10 +++++-----
  distro-configs/LibreOfficeLinux.conf.in      |   10 +++++-----
  distro-configs/LibreOfficeLinuxDevel.conf.in |   12 ++++++------
  distro-configs/LibreOfficeMacOSX.conf.in     |   10 +++++-----
  distro-configs/LibreOfficeOpenBSD.conf.in    |   10 +++++-----
  distro-configs/OOo4Kids.conf.in              |    2 +-
  distro-configs/OxygenOfficeLinux.conf.in     |   10 +++++-----
  distro-configs/OxygenOfficeWindows.conf.in   |   10 +++++-----
  distro-configs/SUSE-10.3.conf.in             |    8 ++++----
  distro-configs/SUSE-11.0.conf.in             |   10 +++++-----
  distro-configs/SUSE-11.1.conf.in             |   10 +++++-----
  distro-configs/SUSE-11.2.conf.in             |   10 +++++-----
  distro-configs/SUSE.conf.in                  |   10 +++++-----
  14 files changed, 66 insertions(+), 66 deletions(-)



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Distro-configs-adapt-to-new-confgure-options-build.patch (9K) Download Attachment
arranna arranna
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] Fix typo

In reply to this post by arranna
---
  configure.in |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Fix-typo-bootstrap.patch (547 bytes) Download Attachment
spaetz spaetz
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options

In reply to this post by arranna
On Thu, 04 Nov 2010 21:26:43 +0200, Niko Rönkkö <[hidden email]> wrote:

> Renamed all extensions to --with-ext-*

Thanks, that makes sense, I just didn't get to it. I'd just still argue
for --enable rather than --with.

> If "we do want to present them together in ./configure --help",
> then they all must be a same type of.
> => Changed all extensions to be AC_ARG_WITH

--enable is being used to choose "optional features" which certainly
  applies here
  (http://www.delorie.com/gnu/docs/autoconf/autoconf_131.html)

--with is used if you require external software and decides which
  external software is being used. (http://www.delorie.com/gnu/docs/autoconf/autoconf_130.html)

So --enable is IMHO what we really want here. What I would prefer even
more is a grouping feature, ie present all extensions in a group,
present all Windows-specific options in a group etc. But I did not find
if that is possible. Does any auto-wizard know?

> Also: We don't want to break builders scripts (as Michael Meeks said) so
> deprecated old options not removed but commented instead.

While I agree for the 3.3 branch. I don't think that doubling the output
of ./configure --help is going to be helpful. It complains when being
invoked with an unknown option anyway. But we can deprecate it for a
while and remove it a bit later. shrug.

Sebastian
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Tor Lillqvist Tor Lillqvist
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options

> So --enable is IMHO what we really want here.

I agree.

Sure, enabling an extension means that the LO being built will come "with" the extension. So I guess that's the reasoning why the "with" type of options have been used. But it is wrong.

--tml


_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
arranna arranna
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] Renaming extension options consistently

In reply to this post by cbosdonnat

Renamed all extensions to --enable-ext-* because
"we do want to present them together in ./configure --help"

See: b765a28ea9d63b60a14786b1a5484227175d413e

Deprecated old options not removed but commented instead.

¡There are still extensions which are only in build/configure.in!

Changed BUILD_TYPE from OOo to LibO

See: Elide all "SO:" and "OOo:" build.lst prefixes
---
  configure.in |  335
++++++++++++++++++++++++++++++++++++++++++----------------
  1 files changed, 242 insertions(+), 93 deletions(-)



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Renaming-extension-options-consistently-bootstrap.patch (17K) Download Attachment
Wols Lists Wols Lists
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options consistently

On 05/11/10 17:13, Niko Rönkkö wrote:
> dnl ===================================================================
>  dnl Optional Packages (--with/without-)
>  dnl ===================================================================
> @@ -1214,103 +1369,97 @@ AC_ARG_WITH(max-jobs,
>           Defaults to 1, unless you configure --enable-icecream - then to 10.]),
>  ,)
>  
Two points here ...

1) if the user specifies max-cpus, do we want max-jobs to default to
max-cpus? Because that does make sense afaict.

2) why is the system so keen on ice-cream? Is it because it's a java
technology? I note it's incompatible with distcc (which is what I've
got, and which isn't much use without a pc farm).

I've noticed other people moaning about ice-cream so should we remove
all the "why haven't you got it?" stuff, or just disable it if distcc is
installed?

Cheers,
Wol
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
arranna arranna
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] Renaming extension options consistently

In reply to this post by arranna

Renamed all extensions to --enable-ext-* because
"we do want to present them together in ./configure --help"

Deprecated old options not removed but commented instead.

Fixed: --with-java
---
  configure.in |  296
++++++++++++++++++++++++++++++++++++++++------------------
  1 files changed, 205 insertions(+), 91 deletions(-)



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Renaming-extension-options-consistently-build.patch (15K) Download Attachment
Wols Lists Wols Lists
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options consistently

On 05/11/10 18:12, Niko Rönkkö wrote:
> +AC_ARG_WITH(java,
> +[
> +  --with-java             Build LibO with a JDK & Java support.],
> +,)
> +
There's a patch of mine waiting to fix this ...

And seeing as java is enabled by default, it seemed that it should be
"--without-java  Build LibO without a JDK and Java support."

Cheers,
Wol
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
arranna arranna
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] Distro-configs: adapt to new configure options for extensions

In reply to this post by arranna

Some extensions options for configure were renamed to --enable-ext-*
---
  distro-configs/GoOoLinux.conf.in             |    4 ++--
  distro-configs/GoOoMacOSX.conf.in            |    4 ++--
  distro-configs/LibreOfficeLinux.conf.in      |    4 ++--
  distro-configs/LibreOfficeLinuxDevel.conf.in |    6 +++---
  distro-configs/LibreOfficeMacOSX.conf.in     |    4 ++--
  distro-configs/LibreOfficeOpenBSD.conf.in    |   10 +++++-----
  distro-configs/OxygenOfficeLinux.conf.in     |    5 ++---
  distro-configs/OxygenOfficeWindows.conf.in   |    5 ++---
  distro-configs/SUSE-10.3.conf.in             |    4 ++--
  distro-configs/SUSE-11.0.conf.in             |    4 ++--
  distro-configs/SUSE-11.1.conf.in             |    4 ++--
  distro-configs/SUSE-11.2.conf.in             |    4 ++--
  distro-configs/SUSE.conf.in                  |    4 ++--
  13 files changed, 30 insertions(+), 32 deletions(-)



_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Distro-configs-adapt-to-new-configure-options-build.patch (7K) Download Attachment
arranna arranna
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

[PATCH] Renaming extension options consistently

In reply to this post by arranna

Renamed all extensions to --enable-ext-* because
"we do want to present them together in ./configure --help"

Deprecated old options not removed but commented instead.

Fixed: --without-java (from Wol)
---
  configure.in |  296
++++++++++++++++++++++++++++++++++++++++------------------
  1 files changed, 205 insertions(+), 91 deletions(-)

Patch updated after changes made by Andras Timar.

Remember to push also:
lists.freedesktop.org/archives/libreoffice/2010-November/002154.html
lists.freedesktop.org/archives/libreoffice/2010-November/002159.html


_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

0001-Renaming-extension-options-consistently-build.patch (15K) Download Attachment
Jan Holesovsky Jan Holesovsky
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options consistently

In reply to this post by Wols Lists
Hi Wol,

Wols Lists píše v Pá 05. 11. 2010 v 18:04 +0000:

> On 05/11/10 17:13, Niko Rönkkö wrote:
> > dnl
> ===================================================================
> >  dnl Optional Packages (--with/without-)
> >  dnl
> ===================================================================
> > @@ -1214,103 +1369,97 @@ AC_ARG_WITH(max-jobs,
> >           Defaults to 1, unless you configure --enable-icecream -
> then to 10.]),
> >  ,)
> >  
> Two points here ...
>
> 1) if the user specifies max-cpus, do we want max-jobs to default to
> max-cpus? Because that does make sense afaict.

The buildsystem is a bit strange in this regard ;-)  There are 2 levels
of what is done in parallel - one on the level of directories, and one
on what is done in the directory itself.  Ie. if you did what you
propose, you'd get max-cpus * max-jobs in the 'ideal' situation.

> 2) why is the system so keen on ice-cream? Is it because it's a java
> technology? I note it's incompatible with distcc (which is what I've
> got, and which isn't much use without a pc farm).
>
> I've noticed other people moaning about ice-cream so should we remove
> all the "why haven't you got it?" stuff, or just disable it if distcc
> is
> installed?

Icecream has the advantage that it has a scheduler, and chooses the
fastest and least loaded machines in the farm.  Of course, using distcc
is also an option, and you are right that it would be good to disable
the warnings if one already uses distcc.  Unfortunately I am using
icecream, so I am not a good candidate to do a patch for that ;-)

Regards,
Kendy

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
spaetz spaetz
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options consistently

On Wed, 10 Nov 2010 05:29:34 +0100, Jan Holesovsky wrote:
> > 1) if the user specifies max-cpus, do we want max-jobs to default to
> > max-cpus? Because that does make sense afaict.
>
> The buildsystem is a bit strange in this regard ;-)  There are 2 levels
> of what is done in parallel - one on the level of directories, and one
> on what is done in the directory itself.  Ie. if you did what you
> propose, you'd get max-cpus * max-jobs in the 'ideal' situation.


We might explain that a bit better in the configure help text. I always
forget which is the exquivalent to "make -j n". Perhaps in the brave gnu
(make) world, we can simplify that to one switch?
 
> > 2) why is the system so keen on ice-cream? Is it because it's a java
> > technology? I note it's incompatible with distcc (which is what I've
> > got, and which isn't much use without a pc farm).
> >
> > I've noticed other people moaning about ice-cream so should we remove
> > all the "why haven't you got it?" stuff, or just disable it if distcc
> > is installed?

+1 for quiet down the icecream advertisment a bit, we should rather put
instructions for that in our wiki. If someone configured to use distcc,
we should not output icecream related stuff at all. So who comes up with
a patch :-)?

Sebastian

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

attachment0 (203 bytes) Download Attachment
Kevin Hunter Kevin Hunter
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options consistently

At 2:05am -0500 Wed, 10 Nov 2010, Sebastian Spaeth wrote:
> +1 for quiet down the icecream advertisment a bit, we should rather
> put instructions for that in our wiki. If someone configured to use
> distcc, we should not output icecream related stuff at all. So who
> comes up with a patch :-)?

My only thought on putting this info in the wiki, as opposed to a
minimal mention of it in the output or a related README, is that that
begins to have two places of authority.  As we're all discovering, the
code base is *huge*, and having multiple places to maintain, without a
clear jurisdiction of who's "in charge" of each section, and without the
most comprehensive of test suites, suggests to me, that having it in a
single place where folks are guaranteed to see it, is better.  I
absolutely agree that the ... "vehemence" of the suggestion should be
toned down to something much more subtle, but I think the
advertisement's rightful place (in this case) is right where it is, or
relatively near there.

In my experience, Wiki's tend to fall victim to the commons, where
everyone takes ownership of not taking ownership.

2 cents,

Kevin
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Kevin Hunter Kevin Hunter
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate
star

Re: [PATCH] Renaming extension options consistently

In reply to this post by spaetz
At 2:05am -0500 Wed, 10 Nov 2010, Sebastian Spaeth wrote:
> +1 for quiet down the icecream advertisment a bit, we should rather
> put instructions for that in our wiki. If someone configured to use
> distcc, we should not output icecream related stuff at all. So who
> comes up with a patch :-)?

For the record, I *do* find that text annoying, and don't really mind
what happens to it.  I was just pointing out that icecream does provide
an advantage for those who are able to take advantage of it, and often
folks learn about new toys when they are presented "with the option."

Cheers,

Kevin
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
12
Loading...