subject:"\[Libreoffice\-commits\] .\: configure.in"

[Libreoffice-commits] .: configure.in

2012-04-25 Thread Tor Lillqvist

 configure.in |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d6b2189fee1df979dfee53ac3824f101278facdf
Author: Tor Lillqvist 
Date:   Wed Apr 25 10:25:29 2012 +0300

Fix test syntax error: integer expression expected

diff --git a/configure.in b/configure.in
index 9fcc1f8..0b0ceda 100644
--- a/configure.in
+++ b/configure.in
@@ -2574,7 +2574,7 @@ HAVE_GCC_FINLINE_LIMIT=
 HAVE_GCC_FNO_INLINE=
 if test "$GCC" = "yes"; then
 AC_MSG_CHECKING([whether $CC supports -ggdb2])
-if test -n "$CLANGVER" -a "$CLANGVER" -le 30100; then
+if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then
 # Option just ignored and silly warning that isn't a real
 # warning printed
 :
@@ -2591,7 +2591,7 @@ if test "$GCC" = "yes"; then
 fi
 
 AC_MSG_CHECKING([whether $CC supports -finline-limit=0])
-if test -n "$CLANGVER" -a "$CLANGVER" -le 30100; then
+if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then
 # As above
 :
 else
@@ -2607,7 +2607,7 @@ if test "$GCC" = "yes"; then
 fi
 
 AC_MSG_CHECKING([whether $CC supports -fno-inline])
-if test -n "$CLANGVER" -a "$CLANGVER" -le 30100; then
+if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then
 # Ditto
 :
 else
@@ -4784,7 +4784,7 @@ HAVE_GCC_FNO_DEFAULT_INLINE=
 HAVE_GCC_FNO_ENFORCE_EH_SPECS=
 if test "$GCC" = "yes"; then
 AC_MSG_CHECKING([whether $CXX supports -fno-default-inline])
-if test -n "$CLANGVER" -a "$CLANGVER" -le 30100; then
+if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then
 # Option just ignored and silly warning that isn't a real
 # warning printed
 :
@@ -4803,7 +4803,7 @@ if test "$GCC" = "yes"; then
 fi
 
 AC_MSG_CHECKING([whether $CXX supports -fno-enforce-eh-specs])
-if test -n "$CLANGVER" -a "$CLANGVER" -le 30100; then
+if test -n "$CLANGVER" -a 0"$CLANGVER" -le 30100; then
 # As above
 :
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-24 Thread Tor Lillqvist

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49907807572a23c30db3ae02b6f3254dc44e393c
Author: Tor Lillqvist 
Date:   Tue Apr 24 12:43:41 2012 +0300

AC_MSG_ERROR is better than WARN here

diff --git a/configure.in b/configure.in
index 8a726ee..de31aec 100644
--- a/configure.in
+++ b/configure.in
@@ -8673,7 +8673,7 @@ AC_SUBST(SPLIT_OPT_FEATURES)
 
 if test $_os = Darwin -o $_os = WINNT; then
 if test "$enable_cairo_canvas" = yes; then
-AC_MSG_WARN([Overriding with -disable-cairo-canvas for this platform])
+AC_MSG_ERROR([The cairo canvas should not be used for this platform])
 fi
 enable_cairo_canvas=no
 elif test -z "$enable_cairo_canvas"; then
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-23 Thread Lubos Lunak

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4645790b7312bae05a73f0e039feecbede5ff5da
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Mon Apr 23 22:30:27 2012 +0200

fix CLucene configure check

CLucene apparently does not bother with self-contained headers

diff --git a/configure.in b/configure.in
index 50e15a3..eb300c9 100644
--- a/configure.in
+++ b/configure.in
@@ -5973,7 +5973,7 @@ if test "$with_system_clucene" = "yes"; then
 dnl 
http://sourceforge.net/tracker/index.php?func=detail&aid=3392466&group_id=80013&atid=558446
 dnl https://bugzilla.redhat.com/show_bug.cgi?id=794795
 AC_CHECK_HEADER([CLucene/analysis/cjk/CJKAnalyzer.h], [],
- [AC_MSG_ERROR([Your version of libclucene has contribs-lib 
missing.])], [])
+ [AC_MSG_ERROR([Your version of libclucene has contribs-lib 
missing.])], [#include ])
 CXXFLAGS=$save_CXXFLAGS
 CPPFLAGS=$save_CPPFLAGS
 AC_LANG_POP([C++])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-23 Thread Tomáš Chvátal

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 62a318eea86feb9340970c71eac835d09b78
Author: Tomas Chvatal 
Date:   Mon Apr 23 13:23:57 2012 +0200

Add all the available themes to the list.

diff --git a/configure.in b/configure.in
index 15d8ce6..e6d8844 100644
--- a/configure.in
+++ b/configure.in
@@ -9472,13 +9472,13 @@ dnl 
===
 AC_MSG_CHECKING([which themes to include])
 # if none given, use all available themes
 if test "x$with_theme" = "x" -o "x$with_theme" = "xyes"; then
-with_theme="default crystal hicontrast oxygen tango"
+with_theme="crystal hicontrast human oxygen tango"
 fi
 
 WITH_THEMES=""
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango|human) : ;;
+classic|crystal|galaxy|hicontrast|human|industrial|oxygen|tango) : ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES="$WITH_THEMES $theme"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-19 Thread Lubos Lunak

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8a2fc6e40fe6c33c2b8f893079e009e430450515
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Apr 19 14:37:10 2012 +0200

do not refer to a variable that has not been set yet

Especially if it will be set as a result of the code that now tries
to use it (alternatively, it comes from the Qt3 check, which is not
right either).

diff --git a/configure.in b/configure.in
index 801199c..c3847c1 100644
--- a/configure.in
+++ b/configure.in
@@ -9295,10 +9295,10 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = 
"TRUE"; then
 fi
 
 dnl Check for qmake
-AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname 
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname 
$qt_header_dir`/bin:$QT4DIR/bin:$PATH] )
 QMAKE4="$QMAKEQT4"
 if test "$QMAKE4" = "no" ; then
-AC_PATH_PROG( QMAKE4, qmake, no, [`dirname 
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+AC_PATH_PROG( QMAKE4, qmake, no, [`dirname 
$qt_header_dir`/bin:$QT4DIR/bin:$PATH] )
 if test "$QMAKE4" = "no" ; then
 AC_MSG_ERROR([Qmake not found.  Please specify
 the root of your Qt installation by exporting QT4DIR before running 
"configure".])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in filter/Configuration_filter.mk filter/source writerperfect/Library_cdrimport.mk writerperfect/source

2012-04-19 Thread Fridrich Strba

 configure.in  |
2 
 filter/Configuration_filter.mk|
2 
 filter/source/config/fragments/filters/CorelPresentationExchange.xcu  |   
13 
 filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu |   
12 
 writerperfect/Library_cdrimport.mk|
1 
 writerperfect/source/cdrimp/CDRImportFilter.cxx   |
1 
 writerperfect/source/cdrimp/CDRImportFilter.hxx   |   
13 
 writerperfect/source/cdrimp/CMXImportFilter.cxx   |  
276 ++
 writerperfect/source/cdrimp/CMXImportFilter.hxx   |  
110 +++
 writerperfect/source/cdrimp/cdrimport_genericfilter.cxx   |   
14 
 writerperfect/source/vsdimp/VisioImportFilter.cxx |
1 
 writerperfect/source/vsdimp/VisioImportFilter.hxx |
4 
 writerperfect/source/wpdimp/WordPerfectImportFilter.cxx   |
1 
 writerperfect/source/wpdimp/WordPerfectImportFilter.hxx   |
4 
 writerperfect/source/wpgimp/WPGImportFilter.cxx   |
1 
 writerperfect/source/wpgimp/WPGImportFilter.hxx   |
4 
 writerperfect/source/wpsimp/MSWorksImportFilter.cxx   |
1 
 writerperfect/source/wpsimp/MSWorksImportFilter.hxx   |
8 
 18 files changed, 435 insertions(+), 33 deletions(-)

New commits:
commit 858c8620d910055dcf37f1d82599e768da641e56
Author: Fridrich Å trba 
Date:   Thu Apr 19 11:02:31 2012 +0200

Stub CMX importer

diff --git a/configure.in b/configure.in
index 4f981fc..801199c 100644
--- a/configure.in
+++ b/configure.in
@@ -5931,7 +5931,7 @@ AC_MSG_CHECKING([which libcdr to use])
 if test "$with_system_libcdr" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCDR=YES
-PKG_CHECK_MODULES( CDR, libcdr-0.0 )
+PKG_CHECK_MODULES( CDR, libcdr-0.0 >= 0.0.5 )
 elif test $_os = iOS; then
 # libcdr depends on libwpd and libwpg and those are LGPL
 AC_MSG_RESULT([none])
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index 8a4eba9..ef2204a 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -546,6 +546,7 @@ $(call 
filter_Configuration_add_types,fcfg_langpack,fcfg_draw_types.xcu,filter/s
draw_WordPerfect_Graphics \
draw_Visio_Document \
draw_CorelDraw_Document \
+   draw_Corel_Presentation_Exchange \
 )
 
 $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filter/source/config/fragments/filters,\
@@ -557,6 +558,7 @@ $(call 
filter_Configuration_add_filters,fcfg_langpack,fcfg_draw_filters.xcu,filt
WordPerfectGraphics \
VisioDocument \
CorelDrawDocument \
+   CorelPresentationExchange \
 )
 
 $(call 
filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
diff --git 
a/filter/source/config/fragments/filters/CorelPresentationExchange.xcu 
b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu
new file mode 100644
index 000..09c3e15
--- /dev/null
+++ b/filter/source/config/fragments/filters/CorelPresentationExchange.xcu
@@ -0,0 +1,13 @@
+
+IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER 
PREFERRED
+
+com.sun.star.comp.Draw.CMXImportFilter
+
+
+Corel Presentation Exchange
+
+0
+draw_Corel_Presentation_Exchange
+
+com.sun.star.drawing.DrawingDocument
+
diff --git 
a/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu 
b/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu
new file mode 100644
index 000..7f002b0
--- /dev/null
+++ b/filter/source/config/fragments/types/draw_Corel_Presentation_Exchange.xcu
@@ -0,0 +1,12 @@
+
+com.sun.star.comp.Draw.CMXImportFilter
+
+cmx
+image/x-cmx
+true
+Corel Presentation 
Exchange
+
+Corel Presentation Exchange
+
+
+
diff --git a/writerperfect/Library_cdrimport.mk 
b/writerperfect/Library_cdrimport.mk
index a6b05b0..257757c 100644
--- a/writerperfect/Library_cdrimport.mk
+++ b/writerperfect/Library_cdrimport.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_externals,cdrimport,\
 
 $(eval $(call gb_Library_add_exception_objects,cdrimport,\
writerperfect/source/cdrimp/CDRImportFilter \
+   writerperfect/source/cdrimp/CMXImportFilter \
writerperfect/source/cdrimp/cdrimport_genericfilter \
 ))
 
diff --git a/writerperfect/source/cdrimp/CDRImportFilter.cxx 
b/writerperfect/source/cdrimp/CDRImportFilter.cxx
index 9187689..2476a55 100644
--- a/writerperfect/source/cdrimp/CDRImportFilter.cxx
+++ b

[Libreoffice-commits] .: configure.in

2012-04-17 Thread René Engelhard

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68fc62667c23cd8cbab01c91667186356a4ef031
Author: Rene Engelhard 
Date:   Tue Apr 17 17:46:03 2012 +0200

add 5.3 into the db check for-loop

diff --git a/configure.in b/configure.in
index ed16f92..fc6fdb1 100644
--- a/configure.in
+++ b/configure.in
@@ -6383,7 +6383,7 @@ if test "$with_system_db" = "yes"; then
 AC_MSG_RESULT([external])
 
 db_header=
-for dbver in 5.1 5.0 5 4.8 4.7 4; do
+for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do
 for dash in - ''; do
 AC_CHECK_HEADER([db$dash$dbver/db.h],
 [ db_header="db$dash$dbver/db.h"; break 2 ])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-17 Thread Miklos Vajna

 configure.in |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit b42ac1ffe55ad3b3445478a35453108cd639929a
Author: Miklos Vajna 
Date:   Tue Apr 17 11:16:32 2012 +0200

configure: make --with-system-dicts the default

Also, if /usr/share/hunspell doesn't exist, look for /usr/share/myspell
as well.

diff --git a/configure.in b/configure.in
index b108b79..ed16f92 100644
--- a/configure.in
+++ b/configure.in
@@ -1095,9 +1095,8 @@ AC_ARG_WITH(myspell-dicts,
 ,)
 
 AC_ARG_WITH(system-dicts,
-AS_HELP_STRING([--with-system-dicts],
-[Use dictionaries from system paths- Specify them via
- --with-{dict,hyph,thes}-path=/path if you want to override the 
default ones.]),
+AS_HELP_STRING([--without-system-dicts],
+[Do not use dictionaries from system paths.]),
 ,)
 
 AC_ARG_WITH(external-dict-dir,
@@ -3593,7 +3592,7 @@ fi
 AC_SUBST(WITH_MYSPELL_DICTS)
 
 AC_MSG_CHECKING([whether to use dicts from external paths])
-if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then
+if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then
 AC_MSG_RESULT([yes])
 SYSTEM_DICTS=YES
 AC_MSG_CHECKING([for spelling dictionary directory])
@@ -3601,6 +3600,9 @@ if test -n "$with_system_dicts" -a "$with_system_dicts" = 
"yes"; then
 DICT_SYSTEM_DIR=file://$with_external_dict_dir
 else
 DICT_SYSTEM_DIR=file:///usr/share/hunspell
+if test ! -d /usr/share/hunspell -a -d /usr/share/myspell; then
+DICT_SYSTEM_DIR=file:///usr/share/myspell
+fi
 fi
 AC_MSG_RESULT([$DICT_SYSTEM_DIR])
 AC_MSG_CHECKING([for hyphenation patterns directory])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-17 Thread Tomáš Chvátal

 configure.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 81c20913cdeb0c819b3b74115902da1c51d280fa
Author: Tomas Chvatal 
Date:   Tue Apr 17 10:05:50 2012 +0200

Add the system-clucene under the with-system-libs

As the distros already had enough time to pick up the required patch and 
most did.

diff --git a/configure.in b/configure.in
index e71aaa9..b108b79 100644
--- a/configure.in
+++ b/configure.in
@@ -1140,7 +1140,8 @@ AC_ARG_WITH(system-jpeg,
 
 AC_ARG_WITH(system-clucene,
 AS_HELP_STRING([--with-system-clucene],
-[Use clucene already on system.]),,)
+[Use clucene already on system.]),,
+[with_system_clucene="$with_system_libs"])
 
 AC_ARG_WITH(system-expat,
 AS_HELP_STRING([--with-system-expat],
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-17 Thread Tomáš Chvátal

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b3fa15b05f5fab3d62f10a5419ea56cd8d87e629
Author: Tomas Chvatal 
Date:   Tue Apr 17 10:01:13 2012 +0200

Fix help string in --with-flat-logo.

diff --git a/configure.in b/configure.in
index 13cc862..e71aaa9 100644
--- a/configure.in
+++ b/configure.in
@@ -1766,7 +1766,7 @@ AC_ARG_WITH(intro-progressbar-frame-color,
 AC_ARG_WITH(flat-logo-svg,
 [  --with-flat-logo-svgAllows specification of the flat Logo SVG.
 
-  Usage: 
--with-about-background-svg=/path/my_flat_logo.svg
+  Usage: 
--with-flat-logo-svg=/path/my_flat_logo.svg
 ],,)
 
 AC_ARG_WITH(about-background-svg,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-16 Thread David Tardon

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2c86edd6a15150d4b6ab8f5d22126f129db86fe
Author: David Tardon 
Date:   Mon Apr 16 20:42:34 2012 +0200

make that warning, not error

diff --git a/configure.in b/configure.in
index 1792d2b..eb4e746 100644
--- a/configure.in
+++ b/configure.in
@@ -8166,7 +8166,7 @@ if test "$_os" = "WINNT"; then
 if test "$WITH_MINGW" = "yes"; then
 AC_PATH_PROG([UUIDGEN], [uuid])
 if test -z "$UUIDGEN"; then
-AC_MSG_ERROR([uuid is needed for dev-install])
+AC_MSG_WARN([uuid is needed for dev-install])
 fi
 else
 # presence is already tested above in the WINDOWS_SDK_HOME check
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-16 Thread René Engelhard

 configure.in |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 8fd72efca9564b94e0c9974ac1bbfbd0115b0027
Author: Rene Engelhard 
Date:   Mon Apr 16 14:07:24 2012 +0200

configure.in: fix Qt detection in Debian/Ubuntu multiarch

diff --git a/configure.in b/configure.in
index e75f81c..624464a 100644
--- a/configure.in
+++ b/configure.in
@@ -9202,6 +9202,7 @@ dnl 
===
 
 KDE4_CFLAGS=""
 KDE4_LIBS=""
+QMAKE4="qmake"
 MOC4="moc"
 KDE_GLIB_CFLAGS=""
 KDE_GLIB_LIBS=""
@@ -9271,6 +9272,18 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE"; 
then
 AC_MSG_ERROR([Qt4 headers not found.  Please specify the root of your 
Qt4 installation by exporting QT4DIR before running "configure".])
 fi
 
+dnl Check for qmake
+AC_PATH_PROG( QMAKEQT4, qmake-qt4, no, [`dirname 
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+QMAKE4="$QMAKEQT4"
+if test "$QMAKE4" = "no" ; then
+AC_PATH_PROG( QMAKE4, qmake, no, [`dirname 
$qt_lib_dir`/bin:$QT4DIR/bin:$PATH] )
+if test "$QMAKE4" = "no" ; then
+AC_MSG_ERROR([Qmake not found.  Please specify
+the root of your Qt installation by exporting QT4DIR before running 
"configure".])
+fi
+fi
+
+qt_libdirs="`$QMAKE4 -query QT_INSTALL_LIBS` $qt_libdirs"
 AC_MSG_CHECKING([for Qt4 libraries])
 qt_lib_dir="no"
 for lib_dir in $qt_libdirs; do
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-15 Thread Tor Lillqvist

 configure.in |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 10acafe29e02a4fc307c085f7b550bd2281f482c
Author: Tor Lillqvist 
Date:   Sun Apr 15 15:38:47 2012 +0200

Guard against lack of pkg-config in one more place

diff --git a/configure.in b/configure.in
index bac6866..01b86c2 100644
--- a/configure.in
+++ b/configure.in
@@ -6294,7 +6294,10 @@ if test $enable_python = system; then
 python_version=`$PYTHON -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('VERSION'));"`
 python_libs=`$PYTHON -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('LIBS'));"`
 python_libdir=`$PYTHON -c "import distutils.sysconfig; 
print(distutils.sysconfig.get_config_var('LIBDIR'));"`
-if $PKG_CONFIG --exists python-$python_version; then
+if test -z "$PKG_CONFIG"; then
+PYTHON_CFLAGS="-I$python_include"
+PYTHON_LIBS="-L$python_libdir -lpython$python_version $python_libs"
+elif $PKG_CONFIG --exists python-$python_version; then
 PYTHON_CFLAGS="`$PKG_CONFIG --cflags python-$python_version`"
 PYTHON_LIBS="`$PKG_CONFIG --libs python-$python_version` 
$python_libs"
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-08 Thread Kalman "" Szalai

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39d8a541e623fd3ae91e28dc6dfc34411bf23b57
Author: Kalman Szalai - KAMI 
Date:   Sun Apr 8 11:20:44 2012 +0200

Add Barcode 1.3.5.0 extension

Barcode 1.3.5.0 release:

* LibreOffice 3.4.x-3.5.x support
* Resizeable barcodes
* CODE128 fix

diff --git a/configure.in b/configure.in
index a7841e6..090c4eb 100644
--- a/configure.in
+++ b/configure.in
@@ -9509,7 +9509,7 @@ AC_MSG_CHECKING([for Barcode extension integration])
 BARCODE_EXTENSION_PACK=
 if test "x$enable_ext_barcode" = "xyes" -a "x$enable_extension_integration" != 
"xno"; then
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_BARCODE"
-
BARCODE_EXTENSION_PACK="7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt"
+
BARCODE_EXTENSION_PACK="3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt"
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-02 Thread Stephan Bergmann

 configure.in |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 844b4520a9f0879d7b756654cef8fdbaa03a9000
Author: Stephan Bergmann 
Date:   Tue Apr 3 08:58:05 2012 +0200

--enable-ext-languagetool requires --with-java

diff --git a/configure.in b/configure.in
index 067fa4f..2158d03 100644
--- a/configure.in
+++ b/configure.in
@@ -435,7 +435,7 @@ AC_ARG_ENABLE(ext-hunart,
 
 AC_ARG_ENABLE(ext-languagetool,
 AS_HELP_STRING([--enable-ext-languagetool],
-[Enable the LanguageTool extension.])
+[Enable the LanguageTool extension. Does not work --without-java.])
 )
 
 AC_ARG_ENABLE(ext-mysql-connector,
@@ -9604,6 +9604,9 @@ dnl Test whether to include LanguageTool extension
 dnl ===
 AC_MSG_CHECKING([for LanguageTool extension integration])
 if test "x$enable_ext_languagetool" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
+if test -z "$SOLAR_JAVA"; then
+AC_MSG_ERROR([--enable_ext_languagetool requires --with-java])
+fi
 BUILD_TYPE="$BUILD_TYPE LANGUAGETOOL"
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LANGUAGETOOL"
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-04-02 Thread Tor Lillqvist

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d3208f2342f57863654562d0f3cffb6ce7b57daa
Author: Tor Lillqvist 
Date:   Mon Apr 2 20:36:06 2012 +0300

Fix copy/paste error

diff --git a/configure.in b/configure.in
index e150c89..0100f97 100644
--- a/configure.in
+++ b/configure.in
@@ -2325,7 +2325,7 @@ if test "$_os" = "Darwin"; then
   MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk"
 fi
 if test ! -d "$MACOSX_SDK_PATH"; then
-  MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk"
+  MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.5.sdk"
 fi
 macosx_sdk_value="1050"
 AC_MSG_WARN([Building with a SDK > 10.4 is experimental])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-30 Thread Norbert Thiebaud

 configure.in |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit df72f234c296ae7b3d708a435419f93f817f36c6
Author: Norbert Thiebaud 
Date:   Fri Mar 30 01:59:36 2012 -0500

don't force dependecy on shasum when it is not needed

shasum is only needed to detect a bug in some version of gnumkae
do not burden platform with a non-impacted gnu make with
that requirement

diff --git a/configure.in b/configure.in
index face6c2..e150c89 100644
--- a/configure.in
+++ b/configure.in
@@ -3614,14 +3614,6 @@ AC_MSG_CHECKING([whether to enable pch feature])
 AC_MSG_RESULT([no, obsolete])
 
 dnl ===
-dnl Search all the common names for sha1sum
-dnl ===
-AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum)
-if test -z "$SHA1SUM"; then
-AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this 
OS])
-fi
-
-dnl ===
 dnl Search all the common names for GNU make
 dnl ===
 AC_MSG_CHECKING([for GNU make])
@@ -3653,6 +3645,14 @@ if test "$_make_longver" -ge "038200"; then
 
 elif test "$_make_longver" -ge "038100"; then
 AC_MSG_RESULT([$GNUMAKE $_make_version])
+
+dnl ===
+dnl Search all the common names for sha1sum
+dnl ===
+AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum)
+if test -z "$SHA1SUM"; then
+AC_MSG_ERROR([install the approproate SHA-1 checksumming program for 
this OS])
+fi
 AC_MSG_CHECKING([for GNU make bug 20033])
 TESTGMAKEBUG20033=`mktemp -d tmp.XX`
 cat > $TESTGMAKEBUG20033/Makefile << EOF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-29 Thread Lubos Lunak

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e20fa170160e1bb1953ad171e092edfb3de531af
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Fri Mar 30 07:25:07 2012 +0200

do not make using system cairo depend on cairo canvas feature

Cairo canvas is a LO feature, it doesn't make sense to use system cairo
only if the feature is enabled. Fixes mingw build (where our cairo copy
does not build for whatever reason).

diff --git a/configure.in b/configure.in
index fc743c8..bed0180 100644
--- a/configure.in
+++ b/configure.in
@@ -10069,7 +10069,7 @@ SYSTEM_CAIRO=""
 
 AC_MSG_CHECKING([whether to use the system cairo])
 
-if test "$enable_cairo_canvas" = "yes" -a "$with_system_cairo" = "yes"; then
+if test "$with_system_cairo" = "yes"; then
 SYSTEM_CAIRO=YES
 AC_MSG_RESULT([yes])
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-23 Thread Norbert Thiebaud

 configure.in |   84 ---
 1 file changed, 41 insertions(+), 43 deletions(-)

New commits:
commit c0a99301f5d854cad8baeaca798549424937598d
Author: Norbert Thiebaud 
Date:   Fri Mar 23 02:02:53 2012 -0500

allow for the use of --enable-ccache on Windows

diff --git a/configure.in b/configure.in
index ef42ca9..3f084e6 100644
--- a/configure.in
+++ b/configure.in
@@ -2139,7 +2139,7 @@ AC_SUBST(SYSBASE)
 dnl ===
 dnl  Checks if ccache is available
 dnl ===
-if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a 
"$enable_icecream" != "yes" \); then
+if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a 
"$enable_icecream" != "yes" -a "$build_os" != "cygwin" \); then
 case "%$CC%$CXX%" in
 # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some 
verison number etc),
 # assume that's good then
@@ -2519,31 +2519,6 @@ if test "$GCC" = "yes"; then
 fi
 AC_SUBST(COM_GCC_IS_CLANG)
 
-#
-# prefix C with ccache if needed
-#
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-if test "$CCACHE" != ""; then
-AC_MSG_CHECKING([whether $CC is already ccached])
-
-AC_LANG_PUSH([C])
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS --ccache-skip -O2"
-dnl an empty program will do, we're checking the compiler flags
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
-  [use_ccache=yes], [use_ccache=no])
-if test $use_ccache = yes; then
-AC_MSG_RESULT([yes])
-else
-CC="$CCACHE $CC"
-AC_MSG_RESULT([no])
-fi
-CFLAGS=$save_CFLAGS
-AC_LANG_POP([C])
-fi
-
-fi
-
 HAVE_LD_BSYMBOLIC_FUNCTIONS=
 if test "$GCC" = "yes"; then
 AC_MSG_CHECKING( for -Bsymbolic-functions linker support )
@@ -2798,6 +2773,31 @@ MSPDB_PATH="$formatted_path"
 AC_SUBST(SHOWINCLUDES_PREFIX)
 
 #
+# prefix C with ccache if needed
+#
+if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
+if test "$CCACHE" != ""; then
+AC_MSG_CHECKING([whether $CC is already ccached])
+
+AC_LANG_PUSH([C])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS --ccache-skip -O2"
+dnl an empty program will do, we're checking the compiler flags
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
+  [use_ccache=yes], [use_ccache=no])
+if test $use_ccache = yes; then
+AC_MSG_RESULT([yes])
+else
+CC="$CCACHE $CC"
+AC_MSG_RESULT([no])
+fi
+CFLAGS=$save_CFLAGS
+AC_LANG_POP([C])
+fi
+
+fi
+
+#
 # determine CPU, CPUNAME, GUI, GUIBASE, ...
 #
 LIB64="lib"
@@ -3980,24 +3980,22 @@ fi
 #
 # prefx CXX with ccache if needed
 #
-if test "$_os" != "WINNT" -o "$WITH_MINGW" = "yes"; then
-if test "$CCACHE" != ""; then
-AC_MSG_CHECKING([whether $CXX is already ccached])
-AC_LANG_PUSH([C++])
-save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
-dnl an empty program will do, we're checking the compiler flags
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
-  [use_ccache=yes], [use_ccache=no])
-if test $use_ccache = yes; then
-AC_MSG_RESULT([yes])
-else
-CXX="$CCACHE $CXX"
-AC_MSG_RESULT([no])
-fi
-CXXFLAGS=$save_CXXFLAGS
-AC_LANG_POP([C++])
+if test "$CCACHE" != ""; then
+AC_MSG_CHECKING([whether $CXX is already ccached])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS --ccache-skip -O2"
+dnl an empty program will do, we're checking the compiler flags
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],
+  [use_ccache=yes], [use_ccache=no])
+if test $use_ccache = yes; then
+AC_MSG_RESULT([yes])
+else
+CXX="$CCACHE $CXX"
+AC_MSG_RESULT([no])
 fi
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
 fi
 
 dnl ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-22 Thread Christian Lohmaier

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c4da6d5191bbd7ceb299dc422f62987683d743c
Author: Christian Lohmaier 
Date:   Thu Mar 22 14:11:01 2012 +0100

Revert "AC_PROG_GREP (I'm pedantic, am I not?)" - XCode 2.5.x doesn't know 
it

This reverts commit 4762788eb4ab7f2278861aaf9b9d6d665db61310.

diff --git a/configure.in b/configure.in
index c6df5f1..cdd4b42 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ AC_SUBST(CROSS_COMPILING)
 
 AC_PROG_EGREP
 # AC_PROG_EGREP doesn't set GREP on all systems as well
-AC_PROG_GREP
+AC_PATH_PROG(GREP, grep)
 
 if test "$build_os" = "cygwin"; then
 EXEEXT_FOR_BUILD=.exe
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-21 Thread Lubos Lunak

 configure.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d6e96d0a4e03bb722b9aa62ccd26b25c64c07a45
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Mar 21 21:45:06 2012 +0100

add missing AC_MSG_RESULT() else branch

diff --git a/configure.in b/configure.in
index 08cd362..c6df5f1 100644
--- a/configure.in
+++ b/configure.in
@@ -7686,6 +7686,8 @@ if test "$WANT_X11" = "yes" -a  "$test_xrender" = "yes"; 
then
 else
 AC_MSG_RESULT([internal])
 fi
+else
+AC_MSG_RESULT([no])
 fi
 
 dnl ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-21 Thread Lubos Lunak

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4762788eb4ab7f2278861aaf9b9d6d665db61310
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Mar 21 20:20:49 2012 +0100

AC_PROG_GREP (I'm pedantic, am I not?)

diff --git a/configure.in b/configure.in
index 66dcf18..08cd362 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,7 @@ AC_SUBST(CROSS_COMPILING)
 
 AC_PROG_EGREP
 # AC_PROG_EGREP doesn't set GREP on all systems as well
-AC_PATH_PROG(GREP, grep)
+AC_PROG_GREP
 
 if test "$build_os" = "cygwin"; then
 EXEEXT_FOR_BUILD=.exe
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-21 Thread Christian Lohmaier

 configure.in |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e065cfc6746161f8ee43c9f32abc728987696043
Author: Christian Lohmaier 
Date:   Wed Mar 21 18:27:26 2012 +0100

checking for egrep doesn't necessarily set GREP as well

diff --git a/configure.in b/configure.in
index 0c5093e..66dcf18 100644
--- a/configure.in
+++ b/configure.in
@@ -62,6 +62,8 @@ fi
 AC_SUBST(CROSS_COMPILING)
 
 AC_PROG_EGREP
+# AC_PROG_EGREP doesn't set GREP on all systems as well
+AC_PATH_PROG(GREP, grep)
 
 if test "$build_os" = "cygwin"; then
 EXEEXT_FOR_BUILD=.exe
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-19 Thread Stephan Bergmann

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 54fb699f0fae7c9f49d23a1b3f36bb12a3178503
Author: Stephan Bergmann 
Date:   Mon Mar 19 20:22:54 2012 +0100

Typo

diff --git a/configure.in b/configure.in
index 694b32e..70d7b7f 100644
--- a/configure.in
+++ b/configure.in
@@ -7479,7 +7479,7 @@ You can use --with-system-icu-for-build=force to use it 
anyway.])
 fi
 
 libo_MINGW_CHECK_DLL([ICUDATA], [icudata][$ICU_MAJOR][$ICU_MINOR])
-libo_MINGW_CHECK_DLL([ICU18N], [icui18n][$ICU_MAJOR][$ICU_MINOR])
+libo_MINGW_CHECK_DLL([ICUI18N], [icui18n][$ICU_MAJOR][$ICU_MINOR])
 libo_MINGW_CHECK_DLL([ICUUC], [icuuc][$ICU_MAJOR][$ICU_MINOR])
 else
 AC_MSG_RESULT([internal])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-19 Thread Tor Lillqvist

 configure.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4fa48a11902791a7dbcae947b172ca3bb3e82b33
Author: Tor Lillqvist 
Date:   Mon Mar 19 10:50:27 2012 +0200

Do AC_PROG_EGREP before using $GREP

diff --git a/configure.in b/configure.in
index 055e061..694b32e 100644
--- a/configure.in
+++ b/configure.in
@@ -61,6 +61,8 @@ else
 fi
 AC_SUBST(CROSS_COMPILING)
 
+AC_PROG_EGREP
+
 if test "$build_os" = "cygwin"; then
 EXEEXT_FOR_BUILD=.exe
 SRC_ROOT=`pwd`
@@ -1976,7 +1978,6 @@ AC_ARG_WITH(system-libxml-for-build,
 dnl ===
 dnl check for required programs (grep, awk, sed, bash)
 dnl ===
-AC_PROG_EGREP
 
 pathmunge ()
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-18 Thread Tomáš Chvátal

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86793aeed94d839251e1b1098d4c8389ab7a72ae
Author: Tomas Chvatal 
Date:   Sun Mar 18 12:28:44 2012 +0100

Add check for hamcrest even if it is not first in classpath.

diff --git a/configure.in b/configure.in
index 27b1813..b7c2276 100644
--- a/configure.in
+++ b/configure.in
@@ -10424,7 +10424,7 @@ if test "$SOLAR_JAVA" != "" -a "$with_junit" != "no"; 
then
 # check if either class-path entry is available for hamcrest or
 # it's bundled
 if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \
-"$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP -q 
'Class-Path: hamcrest'; then
+"$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP 
'Class-Path:' | $GREP -q 'hamcrest'; then
 AC_MSG_RESULT([$OOO_JUNIT_JAR])
 else
 AC_MSG_ERROR([your junit jar neither sets a classpath nor includes 
hamcrest; please
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-17 Thread Lubos Lunak

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c231e4b7a07f9d59699301190341c823c59a3be
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Sat Mar 17 10:52:43 2012 +0100

fix wrong libpng check result text

diff --git a/configure.in b/configure.in
index e44f014..27b1813 100644
--- a/configure.in
+++ b/configure.in
@@ -10156,7 +10156,7 @@ else
 ;;
 *)
 SYSTEM_LIBPNG=YES
-AC_MSG_RESULT([no])
+AC_MSG_RESULT([yes])
 ;;
 esac
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-16 Thread Lubos Lunak

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9fea5d3c26c61f83eca26cc14c435eeda34c68bc
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Fri Mar 16 17:16:40 2012 +0100

fix gcc bug 26905 detection with clang

it uses GOT instead of PLT on i386 with -02

diff --git a/configure.in b/configure.in
index 72b45b9..4fc314a 100644
--- a/configure.in
+++ b/configure.in
@@ -4532,7 +4532,7 @@ _ACEOF
 if test "$_os" = "Darwin"; then
 gccvisbroken=no
 else
-if $EGREP -q '@PLT' visibility.s; then
+if $EGREP -q '@PLT|@GOT' visibility.s; then
 gccvisbroken=no
 else
 gccvisbroken=yes
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-15 Thread Lubos Lunak

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c5489e31b625e08fa2427108d5e710aba4468a27
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Mar 14 14:34:22 2012 +0100

need to be afraid of empty quoted strings as test arguments

At least 07a841bc1acde95229ece2a0da4e2a70be5df624 says so.

diff --git a/configure.in b/configure.in
index e0bc4dd..f71014d 100644
--- a/configure.in
+++ b/configure.in
@@ -79,7 +79,7 @@ AC_SUBST(x_Cygwin)
 
 cat /dev/null > warn
 
-if test "$EUID" = "0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then
+if test "z$EUID" = "z0" -a "`uname -o 2>/dev/null`" = "Cygwin"; then
 AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an 
administrative account])
 fi
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-05 Thread Michael Meeks

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0be7432f3b5210808438ab2ab2bae09a81b06ae8
Author: Michael Meeks 
Date:   Mon Mar 5 20:56:51 2012 +

fix icecream check to not break on SUSE

diff --git a/configure.in b/configure.in
index f0ac6a0..49ce97f 100644
--- a/configure.in
+++ b/configure.in
@@ -2179,7 +2179,7 @@ GCC_HOME_SET="true"
 AC_MSG_CHECKING([gcc home])
 if test -z "$with_gcc_home"; then
 if test "$enable_icecream" = "yes" ; then
-if test -d "/usr/lib/icecc/" ; then
+if test -d "/usr/lib/icecc/bin" ; then
 GCC_HOME="/usr/lib/icecc/"
 else
 GCC_HOME="/opt/icecream/"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-03-02 Thread Tor Lillqvist

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 62025f7446989c1a29596a2c4cb5ef597808f15e
Author: Tor Lillqvist 
Date:   Fri Mar 2 16:29:28 2012 +0200

Hide a potential error message which we aren't interested in seeing

diff --git a/configure.in b/configure.in
index 958d4bc..3df3a8f 100644
--- a/configure.in
+++ b/configure.in
@@ -4117,7 +4117,7 @@ dnl 
===
 if test "$GXX" = "yes"; then
 AC_MSG_CHECKING([for g++ include path])
 if test -z "$with_gxx_include_path"; then
-with_gxx_include_path=`echo "#include " | $CXX -E -xc++ - | 
$SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
+with_gxx_include_path=`echo "#include " | $CXX -E -xc++ - 
2>/dev/null | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
 if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then
 with_gxx_include_path="/usr/include"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-29 Thread Tor Lillqvist

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9b8ae8a484471ce067ad09dc96cad0d87285a6f
Author: Tor Lillqvist 
Date:   Tue Feb 28 21:39:27 2012 +0200

Don't generate Thumb code to avoid ld bug in NDK r7b

diff --git a/configure.in b/configure.in
index 739ec3e..b0e9ce8 100644
--- a/configure.in
+++ b/configure.in
@@ -108,7 +108,7 @@ if test -n "$with_android_ndk"; then
test -z "$RANLIB" && 
RANLIB=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ranlib
test -z "$STRIP" && 
STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip
 
-   ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
+   ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
 
test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
$ANDROIDCFLAGS"
test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in glib/makefile.mk glib/prj

2012-02-29 Thread Stephan Bergmann

 configure.in |   51 +++
 glib/makefile.mk |   24 +++-
 glib/prj/d.lst   |   10 ++
 3 files changed, 64 insertions(+), 21 deletions(-)

New commits:
commit 372199d4f1cf223f167bdaa5e6d55ce0268c0970
Author: Stephan Bergmann 
Date:   Wed Feb 29 15:33:15 2012 +0100

Make some --without-system-XXX available on Linux, too

...in case that should ever become uesful.

diff --git a/configure.in b/configure.in
index e6e1205..739ec3e 100644
--- a/configure.in
+++ b/configure.in
@@ -685,9 +685,12 @@ AC_ARG_ENABLE(cairo-canvas,
 ],,enable_cairo_canvas=yes)
 
 AC_ARG_ENABLE(librsvg,
-AS_HELP_STRING([--enable-librsvg=],
+AS_HELP_STRING([--enable-librsvg=],
 [Enables or disables use of librsvg to render SVG at run-time.
- Also specificed what librsvg to use. 'auto' is the default.]))
+ Also specificed what librsvg to use. 'auto' is the default.
+ 'fully-internal' also forces internal versions of libraries (only)
+ librsvg depends on (currently GLib, gdk-pixbuf, libcroco, libgsf,
+ pango).]))
 
 AC_ARG_ENABLE(opengl,
 AS_HELP_STRING([--disable-opengl],
@@ -9740,6 +9743,10 @@ internal)
 AC_MSG_RESULT([internal])
 ;;
 
+fully-internal)
+AC_MSG_RESULT([fully internal])
+;;
+
 system)
 if test $_os = WINNT -a "$WITH_MINGW" != yes; then
 AC_MSG_ERROR([Must use internal librsvg when building with MSVC])
@@ -9753,14 +9760,15 @@ system)
 ;;
 esac
 
-dnl By now enable_librsvg should be "system", "internal" or "no"
+dnl By now enable_librsvg should be "system", "internal", "fully-internal", or
+dnl "no":
 case $enable_librsvg in
 system)
 ENABLE_LIBRSVG=SYSTEM
 SYSTEM_LIBRSVG=YES
 ;;
 
-internal)
+internal|fully-internal)
 ENABLE_LIBRSVG=INTERNAL
 SYSTEM_LIBRSVG=NO
 BUILD_TYPE="$BUILD_TYPE LIBRSVG"
@@ -9845,6 +9853,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
 SYSTEM_GDKPIXBUF=YES
 AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+SYSTEM_GDKPIXBUF=NO
+AC_MSG_RESULT([no])
 else
 case "$_os" in
 WINNT|Darwin|iOS|Android)
@@ -9872,6 +9883,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
 SYSTEM_GLIB=YES
 AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+SYSTEM_GLIB=NO
+AC_MSG_RESULT([no])
 else
 case "$_os" in
 WINNT|Darwin|iOS|Android)
@@ -9893,21 +9907,25 @@ dnl 
===
 
 AC_MSG_CHECKING([whether to use the system gettext runtime])
 
-if test "$with_system_gettext" = yes; then
-SYSTEM_GETTEXT=YES
-AC_MSG_RESULT([yes])
-else
+if test -z "$with_system_gettext"; then
 case "$_os" in
 WINNT|Darwin|iOS|Android)
-SYSTEM_GETTEXT=NO
-AC_MSG_RESULT([no])
+with_system_gettext=no
 ;;
 *)
-SYSTEM_GETTEXT=YES
-AC_MSG_RESULT([yes])
+with_system_gettext=yes
 ;;
 esac
 fi
+if test "$with_system_gettext" = yes; then
+SYSTEM_GETTEXT=YES
+AC_MSG_RESULT([yes])
+elif test "$with_system_gettext" = no; then
+SYSTEM_GETTEXT=NO
+AC_MSG_RESULT([yes])
+else
+AC_MSG_ERROR([bad --with-system-gettext=$with_system_gettext])
+fi
 AC_SUBST(SYSTEM_GETTEXT)
 
 dnl ===
@@ -9923,6 +9941,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
 SYSTEM_LIBCROCO=YES
 AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+SYSTEM_LIBCROCO=NO
+AC_MSG_RESULT([no])
 else
 case "$_os" in
 WINNT|Darwin|iOS|Android)
@@ -9950,6 +9971,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
 SYSTEM_PANGO=YES
 AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+SYSTEM_PANGO=NO
+AC_MSG_RESULT([no])
 else
 case "$_os" in
 WINNT|Darwin|iOS|Android)
@@ -9977,6 +10001,9 @@ dnl --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
 SYSTEM_LIBGSF=YES
 AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+SYSTEM_LIBGSF=NO
+AC_MSG_RESULT([no])
 else
 case "$_os" in
 WINNT|Darwin|iOS|Android)
diff --git a/glib/makefile.mk b/glib/makefile.mk
index 1b31d39..0efb7ec 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -48,7 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(GLIBVERSION)
 TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e
 
 
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
+.IF "$(OS)"!="WNT"
 PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch
 
 .IF "$(OS)"=="IOS"
@@ -91,21 +91,27 @@ VFLAG=V=1
 
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS)
 
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"!="IOS"
 
 EXTRPATH=LOADER
 
-OUT2LIB+=gio/.libs/libgio-2.0.0.dylib
-OUT2

[Libreoffice-commits] .: configure.in

2012-02-27 Thread Michael Meeks

 configure.in |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 207dbaaf83a9955f0b02978551340080ddac10cc
Author: Fernando Governatore 
Date:   Sat Feb 25 15:22:08 2012 -0200

fix icecc compile in ubuntu

  In ubuntu the GCC_HOME of icecc is in /usr/lib/icecc

diff --git a/configure.in b/configure.in
index fe35ab3..8271431 100644
--- a/configure.in
+++ b/configure.in
@@ -2167,7 +2167,11 @@ GCC_HOME_SET="true"
 AC_MSG_CHECKING([gcc home])
 if test -z "$with_gcc_home"; then
 if test "$enable_icecream" = "yes" ; then
-GCC_HOME="/opt/icecream"
+if test -d "/usr/lib/icecc/" ; then
+GCC_HOME="/usr/lib/icecc/"
+else
+GCC_HOME="/opt/icecream/"
+fi
 else
 GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,`
 GCC_HOME_SET="false"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-27 Thread Tor Lillqvist

 configure.in |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b55381672262f7d14a5b66ddd6a2dd1007ee8e3b
Author: Tor Lillqvist 
Date:   Mon Feb 27 17:54:28 2012 +0200

libcdr depends on libwpd and libwpg so don't use it either on iOS then

diff --git a/configure.in b/configure.in
index 884d1c8..fe35ab3 100644
--- a/configure.in
+++ b/configure.in
@@ -5724,6 +5724,9 @@ if test "$with_system_libcdr" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBCDR=YES
 PKG_CHECK_MODULES( CDR, libcdr-0.0 )
+elif test $_os = iOS; then
+# libcdr depends on libwpd and libwpg and those are LGPL
+AC_MSG_RESULT([none])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBCDR=NO
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-27 Thread Tor Lillqvist

 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 143974d637283b884b2b2c5b108248e353c2e734
Author: Tor Lillqvist 
Date:   Mon Feb 27 17:15:52 2012 +0200

$_os is "iOS" for iOS, not "IOS"

diff --git a/configure.in b/configure.in
index 86db768..884d1c8 100644
--- a/configure.in
+++ b/configure.in
@@ -5776,7 +5776,7 @@ if test "$with_system_libwpd" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBWPD=YES
 PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 )
-elif test $_os = IOS; then
+elif test $_os = iOS; then
 AC_MSG_RESULT([none])
 else
 AC_MSG_RESULT([internal])
@@ -5829,7 +5829,7 @@ if test "$with_system_libwps" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBWPS=YES
 PKG_CHECK_MODULES( WPS, libwps-0.2 )
-elif test $_os = IOS; then
+elif test $_os = iOS; then
 AC_MSG_RESULT([none])
 else
 AC_MSG_RESULT([internal])
@@ -5848,7 +5848,7 @@ if test "$with_system_libwpg" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBWPG=YES
 PKG_CHECK_MODULES( WPG, libwpg-0.2 )
-elif test $_os = IOS; then
+elif test $_os = iOS; then
 AC_MSG_RESULT([none])
 else
 AC_MSG_RESULT([internal])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in scp2/source solenv/gbuild vcl/inc vcl/null vcl/unx

2012-02-21 Thread Tor Lillqvist

 configure.in  |2 +-
 scp2/source/ooo/common_brand.scp  |2 +-
 scp2/source/ooo/file_library_ooo.scp  |   12 ++--
 scp2/source/ooo/file_ooo.scp  |2 +-
 scp2/source/ooo/file_resource_ooo.scp |2 +-
 scp2/source/ooo/module_hidden_ooo.scp |2 +-
 solenv/gbuild/gbuild.mk   |2 +-
 vcl/inc/svsys.h   |2 +-
 vcl/null/printerinfomanager.cxx   |2 +-
 vcl/unx/generic/plugadapt/salplug.cxx |4 ++--
 vcl/unx/generic/printer/ppdparser.cxx |2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit e125c8fa82beca36791e1bdeae116824f4bc7a7b
Author: Riccardo Magliocchetti 
Date:   Tue Feb 21 11:29:42 2012 +0100

Put HEADLESS definition under LIBO namespace

tml reminds us that use a generic and potentially clash-prone word
like HEADLESS as preprocessor defintion is pretty lame.
He suggests to put it under the already used LIBO namespace.
To sum it up let's do a s/HEADLESS/LIBO_HEADLESS/g.

diff --git a/configure.in b/configure.in
index 0d320e7..303b5c8 100644
--- a/configure.in
+++ b/configure.in
@@ -8106,7 +8106,7 @@ AC_SUBST(ENABLE_KDE4)
 ENABLE_HEADLESS=""
 if test "x$enable_headless" = "xyes"; then
 ENABLE_HEADLESS="TRUE"
-SCPDEFS="$SCPDEFS -DHEADLESS"
+SCPDEFS="$SCPDEFS -DLIBO_HEADLESS"
 R="headless"
 fi
 AC_SUBST(ENABLE_HEADLESS)
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 301d63d..789f826 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -522,7 +522,7 @@ File gid_Brand_File_Bin_Soffice
 #endif
 End
 
-#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS)
+#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS)
 File gid_Brand_File_Bin_Spadmin
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 5bfe685..59aa150 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -548,7 +548,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, 
fps_office.uno )
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 
 
-#ifndef HEADLESS
+#ifndef LIBO_HEADLESS
 
 #ifndef SYSTEM_CAIRO
 
@@ -934,7 +934,7 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #endif
 
-#if defined(UNX) && ! defined(QUARTZ) && ! defined(HEADLESS)
+#if defined(UNX) && ! defined(QUARTZ) && ! defined(LIBO_HEADLESS)
 File gid_File_Lib_Desktop_Detector
 Name = LIBNAME(desktop_detector);
 LIB_FILE_BODY;
@@ -1160,7 +1160,7 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Sot, sot )
 
-#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS)
+#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS)
 
 File gid_File_Lib_Spa
 Name = LIBNAME(spa);
@@ -1178,11 +1178,11 @@ File gid_File_Lib_Spell
 Dir = SCP2_OOO_BIN_DIR;
 End
 
-#if !defined HEADLESS
+#if !defined LIBO_HEADLESS
 STD_LIB_FILE( gid_File_Lib_Spl, spl)
 #endif
 
-#if defined UNX && !defined MACOSX && !defined HEADLESS
+#if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS
 STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
 #endif
 
@@ -1703,7 +1703,7 @@ File gid_File_Lib_Libcroco
 End
 #endif
 
-#if ! defined HEADLESS
+#if ! defined LIBO_HEADLESS
 #if ! defined SYSTEM_PANGO
 File gid_File_Lib_Libpango
 LIB_FILE_BODY;
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index c181a0f..3fd19c5 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -223,7 +223,7 @@ File gid_File_Bin_Senddoc
   #endif
 End
 
-#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS)
+#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS)
 
 File gid_File_Bin_Spadmin_Bin
 BIN_FILE_BODY;
diff --git a/scp2/source/ooo/file_resource_ooo.scp 
b/scp2/source/ooo/file_resource_ooo.scp
index 05353f1..2f26dd7 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -76,7 +76,7 @@ STD_RES_FILE( gid_File_Res_Sd, sd )
 
 STD_RES_FILE( gid_File_Res_Sfx, sfx )
 
-#if defined(UNX) && !defined(QUARTZ) && !defined(HEADLESS)
+#if defined(UNX) && !defined(QUARTZ) && !defined(LIBO_HEADLESS)
 
 STD_RES_FILE( gid_File_Res_Spa, spa )
 
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 90ec4ea..5636523 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -689,7 +689,7 @@ Module gid_Module_Root_Files_7
  gid_File_Mozilla_Runtime);
 End
 
-#ifndef HEADLESS
+#ifndef LIBO_HEADLESS
 Module gid_Module_Root_Files_Images
 PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root;
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 26eecbc..005d81b 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -238,7 +238,7 @@ gb_GLOBALDEF

[Libreoffice-commits] .: configure.in

2012-02-20 Thread Stephan Bergmann

 configure.in |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit f78cb7da33a9f69e865b28b55a212bf1d11b1d7d
Author: Stephan Bergmann 
Date:   Mon Feb 20 14:30:13 2012 +0100

Improve check for broken -fthreadsafe-statics

diff --git a/configure.in b/configure.in
index 50a9b97..39fe207 100644
--- a/configure.in
+++ b/configure.in
@@ -4282,8 +4282,14 @@ if test "$GCC" = "yes"; then
 dnl return n;
 dnl   }
 dnl
-dnl Mac OS X up to at least 10.7.1 is known to have this problem:
-if test "$_os" = "Darwin"; then
+dnl Mac OS X up to at least 10.7.1 is known to have this problem, as is
+dnl at least one instance of GCC 4.2.4 (used on a "Linux
+dnl ooobuild1.osuosl.org 2.6.9-101.plus.c4smp #1 SMP Thu Jul 21 
19:08:15
+dnl EDT 2011 i686 i686 i386 GNU/Linux" machine); see the definition of
+dnl __cxa_guard_acquire in GCC's libstdc++-v3/libsupc++/guard.cc for
+dnl what #ifdefs actually make a difference there.  Conservative advice
+dnl from Jakub Jelinek is to assume it working in GCC >= 4.3:
+if test "$_os" = "Darwin" -o "${GCCVER?}" -lt 040300; then
 unset HAVE_THREADSAFE_STATICS
 AC_MSG_RESULT([broken (i.e., no)])
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-19 Thread Matus Kukan

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee7f6aaa95c39ce062cc6c2aff6416442f5ebd90
Author: MatÃºÅ¡ Kukan 
Date:   Sun Feb 19 20:31:56 2012 +0100

Add missing $

diff --git a/configure.in b/configure.in
index d9a75ca..50a9b97 100644
--- a/configure.in
+++ b/configure.in
@@ -1977,7 +1977,7 @@ pathmunge ()
 else
 new_path="$1"
 fi
-if ! echo LO_PATH | $EGREP -q "(^|:)$1($|:)" ; then
+if ! echo "$LO_PATH" | $EGREP -q "(^|:)$1($|:)" ; then
 if test "$2" = "after" ; then
 LO_PATH="$LO_PATH:$new_path"
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-19 Thread Miklos Vajna

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e34e95aef33262c7aad006883e02cb76e5bb9947
Author: Miklos Vajna 
Date:   Sun Feb 19 15:05:51 2012 +0100

configure: also, --with-lang=en-US should not trigger TRANSLATIONS build 
type

diff --git a/configure.in b/configure.in
index 00e1060..d9a75ca 100644
--- a/configure.in
+++ b/configure.in
@@ -10345,7 +10345,7 @@ WITH_LANG_LIST=`echo $WITH_LANG | sed 
"s/ALL/$ALL_LANGS/"`
 # this variable is used only by bin/distro-install-* helper scripts
 # they need a real list of languages
 test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
-test -z "$WITH_LANG" || BUILD_TYPE="$BUILD_TYPE TRANSLATIONS"
+test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US" || BUILD_TYPE="$BUILD_TYPE 
TRANSLATIONS"
 AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)
 AC_SUBST(WITH_LANG_LIST)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-19 Thread Miklos Vajna

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb7cb5b61c43ba7c78cb0a8d4aef3780df0151cd
Author: Miklos Vajna 
Date:   Sun Feb 19 14:34:10 2012 +0100

configure: no need to fetch the translations repo for --with-lang=en-US

diff --git a/configure.in b/configure.in
index 5d408ff..00e1060 100644
--- a/configure.in
+++ b/configure.in
@@ -10321,7 +10321,7 @@ AC_MSG_CHECKING([which languages to be built])
 ALL_LANGS="en-US $completelangiso"
 # check the configured localizations
 WITH_LANG="$with_lang"
-if test -z "$WITH_LANG"; then
+if test -z "$WITH_LANG" -o "$WITH_LANG" = "en-US"; then
 AC_MSG_RESULT([en-US])
 else
 AC_MSG_RESULT([$WITH_LANG])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-17 Thread Caolán McNamara

 configure.in |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit af75ceb873e55fc2f252c4b02ea3d536470cfb87
Author: CaolÃ¡n McNamara 
Date:   Fri Feb 17 20:11:34 2012 +

fix build, WANT_X11 is a variable

diff --git a/configure.in b/configure.in
index e424560..413dec0 100644
--- a/configure.in
+++ b/configure.in
@@ -7345,7 +7345,7 @@ fi
 dnl ===
 dnl Check for nsplugin
 dnl ===
-AC_MSG_CHECKING([wether to build nsplugin extension])
+AC_MSG_CHECKING([whether to build nsplugin extension])
 ENABLE_NSPLUGIN=NO
 if test "$enable_nsplugin" != "no"; then
 if test "$enable_gtk" != "no"; then
@@ -7359,6 +7359,7 @@ else
 fi
 AC_SUBST(ENABLE_NSPLUGIN)
 
+AC_MSG_CHECKING([whether to use X11])
 dnl ***
 dnl testing for X libraries and includes...
 dnl ***
@@ -7366,8 +7367,9 @@ WANT_X11="no"
 if test $_os != Darwin -a $_os != WINNT -a $_os != Android -a $_os != iOS -a 
"$enable_headless" != "yes"; then
 WANT_X11="yes"
 fi
+AC_MSG_RESULT([$WANT_X11])
 
-if test WANT_X11 = "yes"; then
+if test "$WANT_X11" = "yes"; then
 AC_PATH_X
 AC_PATH_XTRA
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -7420,7 +7422,7 @@ if test "$XINC" != "no_x_includes" -a "$XINC" != 
"/usr/include" ; then
 fi
 AC_SUBST(XLIB)
 
-if test WANT_X11 = "yes"; then
+if test "$WANT_X11" = "yes"; then
 dnl ===
 dnl Check for Composite.h for Mozilla plugin
 dnl ===
@@ -7440,7 +7442,7 @@ dnl 
===
 dnl Check for system Xrender
 dnl ===
 AC_MSG_CHECKING([whether to use Xrender])
-if test WANT_X11 = "yes" -a  "$test_xrender" = "yes"; then
+if test "$WANT_X11" = "yes" -a  "$test_xrender" = "yes"; then
 AC_MSG_RESULT([yes])
 AC_CHECK_LIB([Xrender], [XRenderQueryVersion], [:],
   [AC_MSG_ERROR(libXrender not found or functional)], [])
@@ -7458,7 +7460,7 @@ dnl 
===
 dnl Check for XRandr
 dnl ===
 AC_MSG_CHECKING([whether to enable RandR support])
-if test WANT_X11 = "yes" -a "$test_randr" = "yes" -a \( "$enable_randr" = 
"yes" -o "$enable_randr" = "TRUE" \) ; then
+if test "$WANT_X11" = "yes" -a "$test_randr" = "yes" -a \( "$enable_randr" = 
"yes" -o "$enable_randr" = "TRUE" \) ; then
 if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then
 XRANDR_DLOPEN="TRUE"
 AC_MSG_RESULT([configured to dlopen libXrandr at runtime])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-17 Thread Tor Lillqvist

 configure.in |1 -
 1 file changed, 1 deletion(-)

New commits:
commit f8e3ec289216fcf68b4083497a7e0ac04f07ce23
Author: Tor Lillqvist 
Date:   Fri Feb 17 14:40:53 2012 +0200

Bin obsolete comment

diff --git a/configure.in b/configure.in
index 18adc1b..5f6a4f2 100644
--- a/configure.in
+++ b/configure.in
@@ -110,7 +110,6 @@ if test -n "$with_android_ndk"; then
 
ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon 
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm 
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
 
-   # Note that letting this set CC and CXX means ccache won't be used
test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc 
$ANDROIDCFLAGS"
test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ 
$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include 
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include 
-fexceptions -frtti"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-15 Thread Tor Lillqvist

 configure.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit de9c3dcb769bc2df9abaefbae4f8ed90131176e0
Author: Tor Lillqvist 
Date:   Wed Feb 15 17:01:14 2012 +0200

Set SOLARLIB for Android

diff --git a/configure.in b/configure.in
index 437da5f..18adc1b 100644
--- a/configure.in
+++ b/configure.in
@@ -2967,6 +2967,7 @@ linux-androideabi*)
 ;;
 esac
 SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH"
+SOLARLIB="-L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib"
 ;;
 
 mingw*)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-15 Thread Tor Lillqvist

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 402fcdbdde71e679c08e7b2bf4a5030c120dbffe
Author: Tor Lillqvist 
Date:   Wed Feb 15 13:32:56 2012 +0200

Fix recognition of ccache in $CC and/or $CXX

diff --git a/configure.in b/configure.in
index 752f761..437da5f 100644
--- a/configure.in
+++ b/configure.in
@@ -2035,7 +2035,7 @@ if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = 
"" -a "$enable_icecrea
 case "%$CC%$CXX%" in
 # If $CC and/or $CXX already contain "ccache" (possibly suffixed with some 
verison number etc),
 # assume that's good then
-ccache[[-_' ']]*|*/ccache[[-_' ']]*)
+*%ccache[[-_' ']]*|*/ccache[[-_' ']]*)
 AC_MSG_NOTICE([ccache seems to be included in a pre-defined CC and/or 
CXX])
 ;;
 *)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-15 Thread Tor Lillqvist

 configure.in |   53 +
 1 file changed, 25 insertions(+), 28 deletions(-)

New commits:
commit c1f5475bd626849fe7a98cb8986219990a526ce3
Author: Tor Lillqvist 
Date:   Wed Feb 15 13:06:04 2012 +0200

Do try to use ccache even if CC/CXX are set

For Android, they could have been set earlier in the configure script
even. We do want to use ccache also for Android cross-compilation.

diff --git a/configure.in b/configure.in
index b96b081..752f761 100644
--- a/configure.in
+++ b/configure.in
@@ -2032,37 +2032,34 @@ dnl 
===
 dnl  Checks if ccache is available
 dnl ===
 if test "$enable_ccache" = "yes" -o \( "$enable_ccache" = "" -a 
"$enable_icecream" != "yes" \) ; then
-if test -z "$CC" ; then
-if test -z "$CXX" ; then
-AC_PATH_PROG([CCACHE],[ccache],[not found])
-if test "$CCACHE" = "not found" ; then
-CCACHE=""
-else
-CCACHE="ccache"
-# need to check for ccache version: otherwise prevents
-# caching of the results (like "-x objective-c++" for Mac)
-if test $_os = Darwin -o $_os = iOS; then
-# check ccache version
-AC_MSG_CHECKING([whether version of ccache is suitable])
-CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache 
version/{print $3}'`
-CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print 
\$1*1+\$2*100+\$3 }'`
-if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" 
-ge "030100"; then
-AC_MSG_RESULT([yes])
-else
-AC_MSG_RESULT([no])
-AC_MSG_NOTICE([ccache version $CCACHE_VERSION not 
accepted. ccache will not be used.])
-CCACHE=""
-fi
+case "%$CC%$CXX%" in
+# If $CC and/or $CXX already contain "ccache" (possibly suffixed with some 
verison number etc),
+# assume that's good then
+ccache[[-_' ']]*|*/ccache[[-_' ']]*)
+AC_MSG_NOTICE([ccache seems to be included in a pre-defined CC and/or 
CXX])
+;;
+*)
+AC_PATH_PROG([CCACHE],[ccache],[not found])
+if test "$CCACHE" = "not found" ; then
+CCACHE=""
+else
+# Need to check for ccache version: otherwise prevents
+# caching of the results (like "-x objective-c++" for Mac)
+if test $_os = Darwin -o $_os = iOS; then
+# Check ccache version
+AC_MSG_CHECKING([whether version of ccache is suitable])
+CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print 
$3}'`
+CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print 
\$1*1+\$2*100+\$3 }'`
+if test "$CCACHE_VERSION" = "2.4_OOo" -o "$CCACHE_NUMVER" -ge 
"030100"; then
+AC_MSG_RESULT([yes, $CCACHE_VERSION])
+else
+AC_MSG_RESULT([no, $CCACHE_VERSION])
+CCACHE=""
 fi
 fi
-else
-AC_MSG_NOTICE([Automatic ccache detection ignored: CXX is 
pre-defined])
-CCACHE=""
 fi
-else
-AC_MSG_NOTICE([Automatic ccache detection ignored: CC is pre-defined])
-CCACHE=""
-fi
+;;
+esac
 else
 CCACHE=""
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-13 Thread Caolán McNamara

 configure.in |   11 ---
 1 file changed, 11 deletions(-)

New commits:
commit 3d1f1c43a0cb6efb5bee3490ce90c63debf2d27b
Author: CaolÃ¡n McNamara 
Date:   Mon Feb 13 11:44:00 2012 +

allow java 1.7, or any future version

diff --git a/configure.in b/configure.in
index 2dbdd4e..b7c8d1d 100644
--- a/configure.in
+++ b/configure.in
@@ -4679,17 +4679,6 @@ if test "$SOLAR_JAVA" != ""; then
 fi
 fi
 
-if ! test -z "$_java_target_ver" -o \
-"$_java_target_ver" = "1.1" -o \
-"$_java_target_ver" = "1.2" -o \
-"$_java_target_ver" = "1.3" -o \
-"$_java_target_ver" = "1.4" -o \
-"$_java_target_ver" = "1.5" -o \
-"$_java_target_ver" = "1.6" -o \
-"$_java_target_ver" = "5" ; then
-AC_MSG_ERROR([$_java_target_ver is not a supported Java bytecode 
version!])
-fi
-
 JAVA_SOURCE_VER="$_java_target_ver"
 JAVA_TARGET_VER="$_java_target_ver"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-10 Thread Norbert Thiebaud

 configure.in |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 90d1c9ff829c41c8384d66dfd2f6e90660517088
Author: Norbert Thiebaud 
Date:   Fri Feb 10 10:17:54 2012 -0600

the PATH must be set properly, even with java disabled ...

diff --git a/configure.in b/configure.in
index a744fa8..927326e 100644
--- a/configure.in
+++ b/configure.in
@@ -10859,18 +10859,18 @@ else
 ;;
 
 cygwin*)
+pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+pathmunge "$ASM_HOME" "before"
+pathmunge "$WINDOWS_SDK_HOME/bin" "before"
+pathmunge "$CSC_PATH" "before"
+pathmunge "$MIDL_PATH" "before"
+pathmunge "$MSPDB_PATH" "before"
+if test "$CL_X64" = "TRUE" ; then
+pathmunge "$COMPATH/bin/amd64" "before"
+else
+pathmunge "$COMPATH/bin" "before"
+fi
 if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
-pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
-pathmunge "$ASM_HOME" "before"
-pathmunge "$WINDOWS_SDK_HOME/bin" "before"
-pathmunge "$CSC_PATH" "before"
-pathmunge "$MIDL_PATH" "before"
-pathmunge "$MSPDB_PATH" "before"
-if test "$CL_X64" = "TRUE" ; then
-pathmunge "$COMPATH/bin/amd64" "before"
-else
-pathmunge "$COMPATH/bin" "before"
-fi
 if test -d "$JAVA_HOME/jre/bin/client" ; then
 pathmunge "$JAVA_HOME/jre/bin/client" "before"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-10 Thread Petr Mladek

 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 739100d0abcf6025835028b9d503bf3e11cd77db
Author: Petr Mladek 
Date:   Fri Feb 10 15:26:57 2012 +0100

use system stdlibs by default (fdo#45074, fdo#45696)

this is second part of the fix for the two bugs

diff --git a/configure.in b/configure.in
index edc3e99..a744fa8 100644
--- a/configure.in
+++ b/configure.in
@@ -1026,8 +1026,8 @@ AC_ARG_WITH(system-jars,
 [with_system_jars="$with_system_libs"])
 
 AC_ARG_WITH(system-stdlibs,
-AS_HELP_STRING([--with-system-stdlibs],
-[Use libstdc++/libgcc_s already on system.]),,
+AS_HELP_STRING([--without-system-stdlibs],
+[Bundle the used libstdc++/libgcc_s into the installation set.]),,
 [with_system_stdlibs="$with_system_libs"])
 
 AC_ARG_WITH(system-cairo,
@@ -,7 +,7 @@ dnl 
===
 dnl Check for system stdlibs
 dnl ===
 AC_MSG_CHECKING([whether to provide libstdc++/libgcc_s in the installset])
-if test "$with_system_stdlibs" = "yes"; then
+if test "$with_system_stdlibs" != "no"; then
 AC_MSG_RESULT([no])
 SYSTEM_STDLIBS=YES
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-06 Thread David Tardon

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bca5b92d45288b380c4f1ebc11a7e5de923fd9a
Author: David Tardon 
Date:   Mon Feb 6 19:01:45 2012 +0100

fix typo

diff --git a/configure.in b/configure.in
index f14d675..7102f10 100644
--- a/configure.in
+++ b/configure.in
@@ -3088,7 +3088,7 @@ WORKDIR="$SRC_ROOT/workdir/$INPATH"
 AC_SUBST(COM)
 AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
-AC_SUBST(EMP_FLAGS)
+AC_SUBST(EPM_FLAGS)
 AC_SUBST(GUI)
 AC_SUBST(GUIBASE)
 AC_SUBST(INPATH)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-06 Thread Tor Lillqvist

 configure.in |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 04f6c5e4d277c038c69e06eaf5fa2d0bc0faeeda
Author: Tor Lillqvist 
Date:   Mon Feb 6 14:03:28 2012 +0200

No set_soenv.in any more

diff --git a/configure.in b/configure.in
index a44f2d7..eeda25e 100644
--- a/configure.in
+++ b/configure.in
@@ -3099,7 +3099,6 @@ if test "$cross_compiling" = "yes"; then
 ooo.lst.in \
 oowintool \
 post_download.in \
-set_soenv.in \
 solenv/inc/langlist.mk \
 solenv/inc/postset.mk \
 | (cd CONF-FOR-BUILD && tar xf -)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-05 Thread Norbert Thiebaud

 configure.in |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 015713cd664b905b7090816db0e67b1b17df183e
Author: Norbert Thiebaud 
Date:   Mon Feb 6 00:37:01 2012 -0600

typo in the export of WIN_* variables

diff --git a/configure.in b/configure.in
index 8341d6c..a44f2d7 100644
--- a/configure.in
+++ b/configure.in
@@ -10753,10 +10753,10 @@ AC_SUBST(ATL_INCLUDE)
 AC_SUBST(ATL_LIB)
 AC_SUBST(MFC_INCLUDE)
 AC_SUBST(MFC_LIB)
-AC_SUBST(WIND_FIND)
-AC_SUBST(WIND_GREP)
-AC_SUBST(WIND_LS)
-AC_SUBST(WIND_TOUCH)
+AC_SUBST(WIN_FIND)
+AC_SUBST(WIN_GREP)
+AC_SUBST(WIN_LS)
+AC_SUBST(WIN_TOUCH)
 
 AC_SUBST(BUILD_TYPE)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-03 Thread Stephan Bergmann

 configure.in |   49 +
 1 file changed, 33 insertions(+), 16 deletions(-)

New commits:
commit e612f026de6ca1153c57fb10f0fa75725425a301
Author: Stephan Bergmann 
Date:   Fri Feb 3 16:12:00 2012 +0100

Ensure AC_CHECK_LIB/AC_SEARCH_LIBS do not poison LIBS

... as that would interfere with subsequent such checks, esp. on Linunx 
versions
that do not yet incorporate
 and 
would
e.g. not notice they need -lkrb5 in "AC_SEARCH_LIBS(krb5_sendauth,[krb5..." 
if
they earlied did "AC_CHECK_LIB([cups],..." (where libcups.so links against
libkrb5.so).

diff --git a/configure.in b/configure.in
index 6c255bb..4d89df0 100644
--- a/configure.in
+++ b/configure.in
@@ -3169,7 +3169,7 @@ dnl check for cups support
 dnl ===
 if test "$test_cups" = "yes"; then
 AC_MSG_CHECKING([whether cups support is present])
-AC_CHECK_LIB(cups, cupsPrintFiles)
+AC_CHECK_LIB([cups], [cupsPrintFiles], [:])
 AC_CHECK_HEADER(cups/cups.h, AC_DEFINE(HAVE_CUPS_H))
 if test "$ac_cv_lib_cups_cupsPrintFiles" != "yes" -a 
"$ac_cv_header_cups_cups_h" != "yes"; then
 AC_MSG_ERROR([Could not find CUPS. Install libcupsys2-dev or 
cups???-devel.])
@@ -4301,7 +4301,7 @@ if test "$with_alloc" = "tcmalloc"; then
 if ! echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
 AC_MSG_ERROR([tcmalloc only available/usable on ix86])
 fi
-AC_CHECK_LIB(tcmalloc, malloc, [],
+AC_CHECK_LIB([tcmalloc], [malloc], [:],
 [AC_MSG_ERROR(tcmalloc not found or functional. Install the Google 
Profiling Tools)], [])
 ALLOC="TCMALLOC";
 fi
@@ -4310,7 +4310,7 @@ if test "$with_alloc" = "jemalloc"; then
 AC_MSG_RESULT(jemalloc)
 save_CFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -pthread"
-AC_CHECK_LIB(jemalloc, malloc, [],
+AC_CHECK_LIB([jemalloc], [malloc], [:],
 [AC_MSG_ERROR(jemalloc not found or functional. Install the 
jemalloc allocator.)], [])
 ALLOC="JEMALLOC";
 CFLAGS=$save_CFLAGS
@@ -5416,7 +5416,7 @@ if test "$with_system_expat" = "yes"; then
 SYSTEM_EXPAT=YES
 AC_CHECK_HEADER(expat.h, [],
 [AC_MSG_ERROR(expat.h not found. install expat)], [])
-AC_CHECK_LIB(expat, XML_ParserCreate, [],
+AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
 [AC_MSG_RESULT(expat library not found or functional.)], [])
 MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS libexpat-1.dll"
 else
@@ -6044,7 +6044,7 @@ if test "$ENABLE_MYSQLC" = "YES"; then
 AC_LANG_PUSH([C++])
 AC_CHECK_HEADER(mysql_driver.h, [],
 [AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ 
Connectivity)], [])
-AC_CHECK_LIB(mysqlcppconn, main, [],
+AC_CHECK_LIB([mysqlcppconn], [main], [:],
 [AC_MSG_ERROR(MySQL C++ Connectivity lib not found or 
functional)], [])
 AC_MSG_CHECKING([version])
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
@@ -6143,15 +6143,20 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
 # MacOS X has system MIT Kerberos 5 since 10.4
 if test "$with_krb5" != "no"; then
 WITH_KRB5=YES
+save_LIBS=$LIBS
 AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 
'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
 [AC_MSG_ERROR([could not find function 'com_err' required for 
Kerberos 5])])
+LIBS=$save_LIBS
 AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
 [AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+LIBS=$save_LIBS
 fi
 if test "$with_gssapi" != "no"; then
   WITH_GSSAPI=YES
+  save_LIBS=$LIBS
   AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
 [AC_MSG_ERROR([could not find function 'gss_init_sec_context' 
required for GSSAPI])])
+  LIBS=$save_LIBS
 fi
 ;;
 WINNT)
@@ -6162,29 +6167,39 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
 Linux|GNU|*BSD|DragonFly)
 if test "$with_krb5" != "no"; then
 WITH_KRB5=YES
+save_LIBS=$LIBS
 AC_SEARCH_LIBS(com_err, [com_err 'com_err -lssl -lcrypto' krb5 
'krb5 -lcrypto -ldes -lasn1 -lroken'], [],
 [AC_MSG_ERROR([could not find function 'com_err' required for 
Kerberos 5])])
+LIBS=$save_LIBS
 AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
 [AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+LIBS=$save_LIBS
 fi
 if test "$with_gssapi" != "no"; then
 WITH_GSSAPI=YES
+save_LIBS=$LIBS
 AC_SEARCH_LIB

[Libreoffice-commits] .: configure.in

2012-02-03 Thread Jani Monoses

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 40991706e4343789015432331d5be93fd7abe373
Author: Jani Monoses 
Date:   Fri Feb 3 12:09:02 2012 +0200

Fix configure step on various arm linux targets.

Use arm* wildcard to match armel|armv7l|arm etc.

diff --git a/configure.in b/configure.in
index ce50406..d9979e2 100644
--- a/configure.in
+++ b/configure.in
@@ -2732,7 +2732,7 @@ linux-gnu*)
 CPUNAME=AXP
 OUTPATH=unxlngaxp
 ;;
-armel)
+arm*)
 CPU=R
 CPUNAME=ARM
 OUTPATH=unxlngr
@@ -4872,7 +4872,7 @@ linux-gnu*)
 JAVA_ARCH="alpha"
 JAVA_TOOLKIT="server"
 ;;
-arm)
+arm*)
 JAVA_ARCH="arm"
 JAVA_TOOLKIT="server"
 ;;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-03 Thread Jani Monoses

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b3aabdb9a12b550c0c3a537adf4517d5676dec69
Author: Jani Monoses 
Date:   Fri Feb 3 11:58:25 2012 +0200

Fix typo in configure message

diff --git a/configure.in b/configure.in
index 6009518..ce50406 100644
--- a/configure.in
+++ b/configure.in
@@ -4951,7 +4951,7 @@ linux-gnu*)
 JAVA_TOOLKIT="server"
 ;;
 *)
-AC_MSG_ERROR([No JAVALIB defintion host_cpu $host_cpu for host_os 
$host_os])
+AC_MSG_ERROR([No JAVALIB definition host_cpu $host_cpu for host_os 
$host_os])
 ;;
 esac
 ;;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-02 Thread Lionel Elie Mamane

 configure.in |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 4cb33a7db765f8ad06e65d24a2396f2857a9cf0d
Author: Lionel Elie Mamane 
Date:   Thu Feb 2 22:49:28 2012 +0100

make --with-system-libs behave as documented

make it enable --with-system-headers and --with-system-jars
also fixup lucene-analyzers.jar search path

diff --git a/configure.in b/configure.in
index 61d9bfa..6009518 100644
--- a/configure.in
+++ b/configure.in
@@ -998,15 +998,15 @@ AC_ARG_WITH(system-headers,
 AS_HELP_STRING([--with-system-headers],
 [Use headers already on system -- enables all --with-system-* flags for
  external packages whose headers are the only entities used i.e.
- boost/vigra/odbc/sane-header(s).]),
-,)
+ boost/vigra/odbc/sane-header(s).]),,
+[with_system_headers="$with_system_libs"])
 
 AC_ARG_WITH(system-jars,
 AS_HELP_STRING([--without-system-jars],
 [When building with --with-system-libs, also the needed jars are 
expected
  on the system. Use this to disable that (except for the db case where
- --with-system-db *has to* imply using the db.jar from there, too).]),
-,)
+ --with-system-db *has to* imply using the db.jar from there, too).]),,
+[with_system_jars="$with_system_libs"])
 
 AC_ARG_WITH(system-stdlibs,
 AS_HELP_STRING([--with-system-stdlibs],
@@ -1107,8 +1107,8 @@ AC_ARG_WITH(system-libcmis,
 
 AC_ARG_WITH(system-libcdr,
 AS_HELP_STRING([--with-system-libcdr],
-[Use libvisio already on system.]),,
-[with_system_libcdr="no"])
+[Use libcdr already on system.]),,
+[with_system_libcdr="$with_system_libs"])
 
 AC_ARG_WITH(system-libvisio,
 AS_HELP_STRING([--with-system-libvisio],
@@ -5930,7 +5930,11 @@ if test "$with_system_lucene" = "yes"; then
 [
   
AC_CHECK_FILE(/usr/share/java/lucene-contrib/lucene-analyzers.jar,
 [ 
LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar ],
-[ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)]
+[ AC_CHECK_FILE(/usr/share/java/lucene-analyzers.jar,
+   [ LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers.jar 
],
+   [ AC_MSG_ERROR(lucene-analyzers.jar replacement not found.)]
+  )
+]
   )
 ]
 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-02 Thread Lionel Elie Mamane

 configure.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41a3c8f14a4a8d3bbdc1fde31536e76f78003cd0
Author: Lionel Elie Mamane 
Date:   Thu Feb 2 15:52:39 2012 +0100

configure.in: properly close case

diff --git a/configure.in b/configure.in
index 9335fdd..2fb8d28 100644
--- a/configure.in
+++ b/configure.in
@@ -6162,6 +6162,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
 AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi 
-lkrb5 -lcrypto'], [],
 [AC_MSG_ERROR([could not find function 'gss_init_sec_context' 
required for GSSAPI])])
 fi
+;;
 *)
 if test "$with_krb5" = "yes"; then
 WITH_KRB5=YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-02-02 Thread Lionel Elie Mamane

 configure.in |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 0c064e0303ed5e2f4961cc590f62bcb2151b
Author: Lionel Elie Mamane 
Date:   Thu Feb 2 15:47:12 2012 +0100

postgresql: enable Kerberos&GSSAPI on GNU/Linux and *BSD

It is part of the default/core install of (the major distributions of) 
these OSs

diff --git a/configure.in b/configure.in
index a1b2c09..9335fdd 100644
--- a/configure.in
+++ b/configure.in
@@ -1669,10 +1669,6 @@ AC_ARG_WITH(krb5,
  By default automatically enabled on platforms
  where a good system Kerberos 5 is available.]),
 ,)
-#AC_ARG_WITH(system-redland,
-#AS_HELP_STRING([--with-system-redland],
-#[Use redland library already on system.]),,
-#[with_system_redland="$with_system_libs"])
 
 AC_ARG_WITH(gssapi,
 AS_HELP_STRING([--with-gssapi],
@@ -6153,6 +6149,19 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
 AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on 
Microsoft Windows.])
 fi
 ;;
+Linux|GNU|*BSD)
+if test "$with_krb5" != "no"; then
+WITH_KRB5=YES
+AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'com_err' required for 
Kerberos 5])])
+AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+fi
+if test "$with_gssapi" != "no"; then
+WITH_GSSAPI=YES
+AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi 
-lkrb5 -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'gss_init_sec_context' 
required for GSSAPI])])
+fi
 *)
 if test "$with_krb5" = "yes"; then
 WITH_KRB5=YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2012-01-24 Thread Tor Lillqvist

 configure.in |   88 +--
 1 file changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 066283f43b792234ab2833ef8d1052b02517d55b
Author: Tor Lillqvist 
Date:   Tue Jan 24 11:15:46 2012 +0200

Indent the postgresql stuff consistently like the rest of the file

diff --git a/configure.in b/configure.in
index 2f7bd61..ac986f6 100644
--- a/configure.in
+++ b/configure.in
@@ -6121,59 +6121,59 @@ dnl 
===
 if test "x$enable_postgresql_sdbc" != "xno"; then
 SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
 
-# if/when anything else than PostgreSQL uses Kerberos,
-# move this out of `test "x$enable_postgresql_sdbc" != "xno"'
-WITH_KRB5=NO
-WITH_GSSAPI=no
-case "$_os" in
-  Darwin)
-# MacOS X has system MIT Kerberos 5 since 10.4
-if test "$with_krb5" != "no"; then
-  WITH_KRB5=YES
-  AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
-[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5])])
-  AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
-[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
-fi
-if test "$with_gssapi" != "no"; then
-  WITH_GSSAPI=YES
-  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
- [AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
-fi
-   ;;
-  WINNT)
-   if test "$with_krb5" = "yes" || "$with_gssapi" = "yes"; then
-  AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft 
Windows.])
-   fi
-  ;;
-  *)
-if test "$with_krb5" = "yes"; then
-  WITH_KRB5=YES
-  AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
-[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5])])
-  AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
-[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
-fi
-if test "$with_gssapi" = "yes"; then
-  WITH_GSSAPI=YES
-  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
- [AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
-fi
-esac
+# if/when anything else than PostgreSQL uses Kerberos,
+# move this out of `test "x$enable_postgresql_sdbc" != "xno"'
+WITH_KRB5=NO
+WITH_GSSAPI=no
+case "$_os" in
+Darwin)
+# MacOS X has system MIT Kerberos 5 since 10.4
+if test "$with_krb5" != "no"; then
+WITH_KRB5=YES
+AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'com_err' required for 
Kerberos 5])])
+AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+fi
+if test "$with_gssapi" != "no"; then
+  WITH_GSSAPI=YES
+  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'gss_init_sec_context' 
required for GSSAPI])])
+fi
+;;
+WINNT)
+if test "$with_krb5" = "yes" || "$with_gssapi" = "yes"; then
+AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on 
Microsoft Windows.])
+fi
+;;
+*)
+if test "$with_krb5" = "yes"; then
+WITH_KRB5=YES
+AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'com_err' required for 
Kerberos 5])])
+AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+fi
+if test "$with_gssapi" = "yes"; then
+WITH_GSSAPI=YES
+AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi 
-lkrb5 -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'gss_init_sec_context' 
required for GSSAPI])])
+fi
+esac
 
 AC_MSG_CHECKING([PostgreSQL C interface])
 if test "$with_system_postgresql" = "yes"; then
 AC_MSG_RESULT([external PostgreSQL])
 SYSTEM_POSTGRESQL=YES
 if test "$_os" = Darwin; then
-   supp_path=''
-   for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin 
/opt/local/lib/postgresql9*/bin; do
-pg

[Libreoffice-commits] .: configure.in connectivity/prj connectivity/source distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf postprocess/p

2012-01-23 Thread Stephan Bergmann

 configure.in |   
20 +-
 connectivity/prj/d.lst   |
6 
 connectivity/source/drivers/postgresql/description.xml   |   
17 --
 connectivity/source/drivers/postgresql/description/description_en-US.txt |
1 
 connectivity/source/drivers/postgresql/makefile.mk   |   
81 +++---
 connectivity/source/drivers/postgresql/manifest.xml  |   
10 -
 connectivity/source/drivers/postgresql/postgresql-sdbc-impl.component|   
35 
 connectivity/source/drivers/postgresql/postgresql-sdbc.component |   
35 
 connectivity/source/drivers/postgresql/postgresql-sdbc.ini   |
2 
 connectivity/source/drivers/postgresql/postgresql-sdbc.uno   |
2 
 connectivity/source/drivers/postgresql/pq_connection.cxx |   
15 -
 connectivity/source/drivers/postgresql/pq_driver.cxx |   
13 -
 distro-configs/LibreOfficeLinux.conf |
1 
 distro-configs/LibreOfficeMacOSX.conf|
1 
 distro-configs/LibreOfficeWin32.conf |
1 
 postprocess/packregistry/makefile.mk |
6 
 scp2/source/base/makefile.mk |
6 
 scp2/source/base/postgresqlsdbc.scp  |   
75 +
 scp2/source/base/postgresqlsdbc.ulf  |   
36 
 scp2/source/extensions/directory_extensions.scp  |   
11 -
 scp2/source/extensions/file_extensions.scp   |   
13 -
 scp2/source/extensions/module_extensions.scp |   
15 -
 scp2/source/extensions/module_extensions.ulf |
6 
 scp2/util/makefile.mk|
3 
 setup_native/source/packinfo/packinfo_extensions.txt |   
15 -
 setup_native/source/packinfo/packinfo_office.txt |   
15 +
 26 files changed, 252 insertions(+), 189 deletions(-)

New commits:
commit c97d74b5f0608866bad3f7ae943811bdff4f7986
Author: Stephan Bergmann 
Date:   Mon Jan 23 15:08:36 2012 +0100

fdo#45090: Changed postgresql-sdbc from bundled oxt to proper optional part.

Replaced --enable-ext-postgresql-sdbc with --disable-postgresql-sdbc.
Renamed postgresql-sdbc.uno{.ini,rc} to consistent postgresql-sdbc.ini
(which made the code a little easier).

Signed-off-by: Fridrich Å trba 

(cherry picked from commit 3a7ae48b6f610899200ae2800706533f7c4c9f80)
Conflicts:
configure.in
connectivity/source/drivers/postgresql/makefile.mk

diff --git a/configure.in b/configure.in
index 84beec3..2f7bd61 100644
--- a/configure.in
+++ b/configure.in
@@ -427,11 +427,6 @@ AC_ARG_ENABLE(ext-pdfimport,
 [Disable the PDF Import extension.])
 )
 
-AC_ARG_ENABLE(ext-postgresql-sdbc,
-AS_HELP_STRING([--enable-ext-postgresql-sdbc],
-[Enable the build of the PostgreSQL-SDBC extension.])
-)
-
 AC_ARG_ENABLE(ext-presenter-console,
 AS_HELP_STRING([--disable-ext-presenter-console],
 [Disable the Presenter Console extension.])
@@ -873,6 +868,11 @@ AC_ARG_ENABLE(silent-msi,
 [Enable MSI with LIMITUI=1 (silent install).]),
 ,)
 
+AC_ARG_ENABLE(postgresql-sdbc,
+AS_HELP_STRING([--disable-postgresql-sdbc],
+[Disable the build of the PostgreSQL-SDBC driver.])
+)
+
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
@@ -1199,7 +1199,7 @@ AC_ARG_WITH(system-mysql-cppconn,
 AC_ARG_WITH(system-postgresql,
 AS_HELP_STRING([--with-system-postgresql],
 [Use PostgreSQL libraries already on system, for building the 
PostgreSQL-SDBC
- extension. If pg_config is not in PATH, use PGCONFIG to point to 
it.]),,
+ driver. If pg_config is not in PATH, use PGCONFIG to point to it.]),,
 [with_system_postgresql="$with_system_libs"])
 
 AC_ARG_WITH(libpq-path,
@@ -6118,13 +6118,11 @@ fi
 dnl ===
 dnl Check for PostgreSQL stuff
 dnl ===
-if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
-if test "x$enable_extension_integration" = "xyes"; then
-  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
-fi
+if test "x$enable_postgresql_sdbc" != "xno"; then
+SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
 
 # if/when anything else than PostgreSQL uses Kerberos,
-# move this out of `test "x$enable_ext_postgresql_sdbc" = "xyes"'
+# move this out of `test "x$enable_postgresql_sdbc" != "xno"'
 WITH_KRB5=NO
 WITH_GSSAPI=no

[Libreoffice-commits] .: configure.in scp2/inc scp2/source

2012-01-18 Thread Fridrich Strba

 configure.in |1 +
 scp2/inc/macros.inc  |2 +-
 scp2/source/ooo/common_brand.scp |2 +-
 scp2/source/ooo/file_library_ooo.scp |6 +++---
 scp2/source/ooo/makefile.mk  |4 
 scp2/source/ooo/ure.scp  |   28 ++--
 6 files changed, 20 insertions(+), 23 deletions(-)

New commits:
commit d3f17ac97d1d90069fd66ccc63caab0f0472dc7d
Author: Fridrich Å trba 
Date:   Wed Jan 18 16:19:23 2012 +0100

_MSC_VER is compiler define and cpp.lcc needs to be taught about it

diff --git a/configure.in b/configure.in
index 251cfa8..bb8abe6 100644
--- a/configure.in
+++ b/configure.in
@@ -2582,6 +2582,7 @@ cygwin*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
+   SCPDEFS="$SCPDEFS -D_MSC_VER"
 ;;
 
 darwin*)
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c0f2eff..820a9e2 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -516,7 +516,7 @@ End
 #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
 #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
 #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
-#if defined _MSC
+#if defined _MSC_VER
 #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
 #if defined _DEBUG_RUNTIME
 #define SCP2_STDLP_DEBUG "d"
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 474d537..6c6fb66 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -554,7 +554,7 @@ End
 #endif
 
 // use this for high detail file open dialog >= 5.1 windows
-#if defined(WNT) && defined( _MSC )
+#if defined( _MSC_VER )
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 2565973..3d46339 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -97,7 +97,7 @@ STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
 STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
 
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
@@ -114,7 +114,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 File gid_File_Lib_Policy_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
@@ -130,7 +130,7 @@ End
 
 #endif
 
-#if defined WNT && defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Policy_Cli_Oootypes_Config
 TXT_FILE_BODY;
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 87cc67c..ccba4f8 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -35,10 +35,6 @@ TARGETTYPE=CUI
 .INCLUDE :  settings.mk
 .INCLUDE :  i18npool/version.mk
 
-.IF "$(COM)" == "MSC"
-SCPDEFS+=-D_MSC
-.ENDIF
-
 .IF "$(ENABLE_ONLINE_UPDATE)"!=""
 SCPDEFS+=-DENABLE_ONLINE_UPDATE
 .ENDIF
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index d17c0b7..be2418f 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno
 Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
-#if defined _MSC
+#if defined _MSC_VER
 File gid_File_Dl_Cli_Uno
 LIB_FILE_BODY;
 Dir = SCP2_URE_DL_DIR;
@@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno
 End
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -466,7 +466,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Ure_Assembly
 TXT_FILE_BODY;
@@ -483,7 +483,7 @@ End
 
 #endif
 
-#if defined _MSC 
+#if defined _MSC_VER 
 
 File gid_File_Dl_Policy_Cli_Ure_Config
 TXT_FILE_BODY;
@@ -495,7 +495,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -512,7 +512,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 TXT_FILE_BODY;
@@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
 End
 
 #endif
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Basetypes_Config
 TXT_FILE_BODY;
@@ -541,7 +541,7 @@ End
 #endif
 
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -558,7 +558,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Dl_Policy_Cli_Uretypes_Assembly
 TXT_FILE_BODY;
@@ -575,7 +575,7 @@ End
 
 #endif
 
-#if defined _MSC 
+#if defined _MSC_VER 
 
 File gid_File_Dl_Policy_Cli_Uretypes_Config
 TXT_FILE_BODY;
@@ -587,7 +587,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
@@ -604,7 +604,7 @@ End
 
 #endif
 
-#if defined _MSC
+#if defined _MSC_VER
 
 File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
 TXT_FILE_BODY;
@@ -621,7

[Libreoffice-commits] .: configure.in desktop/scripts

2012-01-11 Thread David Tardon

 configure.in  |3 ++-
 desktop/scripts/soffice.sh.in |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit f5b96148cb9e489b2100e6a2fd6805bff637e113
Author: David Tardon 
Date:   Wed Jan 11 16:54:35 2012 +0100

we need a var. assignment here, not a value

diff --git a/configure.in b/configure.in
index 204065b..ab12cea 100644
--- a/configure.in
+++ b/configure.in
@@ -4313,8 +4313,9 @@ if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; 
then
 # IBMs JDK needs this...
 JITC_PROCESSOR_TYPE=6
 export JITC_PROCESSOR_TYPE
+JITC_PROCESSOR_TYPE_EXPORT="JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE"
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE])
+AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
 
 if test $_os = "WINNT"; then
 WITH_VC_REDIST="TRUE"
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index defd7b2..2014ab9 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -45,7 +45,7 @@ export SAL_ENABLE_FILE_LOCKING
 # uncomment line below if you encounter problems starting soffice on your 
system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
-@JITC_PROCESSOR_TYPE@
+@JITC_PROCESSOR_TYPE_EXPORT@
 
 # resolve installation directory
 sd_cwd=`pwd`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in set_soenv.in

2012-01-09 Thread Tor Lillqvist

 configure.in |   18 --
 set_soenv.in |8 ++--
 2 files changed, 2 insertions(+), 24 deletions(-)

New commits:
commit 0759e36f887f5612ecd84efe8f9397a35a10a7fd
Author: Tor Lillqvist 
Date:   Mon Jan 9 12:49:35 2012 +0200

Kill --with-local-solver

diff --git a/configure.in b/configure.in
index 59c51f2..204065b 100644
--- a/configure.in
+++ b/configure.in
@@ -1598,14 +1598,6 @@ AC_ARG_WITH(mozilla-build,
 MOZILLABUILD=$withval ,
 )
 
-AC_ARG_WITH(local-solver,
-AS_HELP_STRING([--with-local-solver],
-[If you have solver in a location other than ./solver, please supply 
the path here.])
-[
-  Usage: --with-local-solver=
-],
-,)
-
 AC_ARG_WITH(lang,
 AS_HELP_STRING([--with-lang],
 [Use this option to build LibreOffice with additional language support.
@@ -10395,16 +10387,6 @@ if test -z "$COMPATH"; then
 fi
 AC_SUBST(COMPATH)
 
-AC_MSG_CHECKING([solver path])
-if test -z "$with_local_solver"; then
-LOCAL_SOLVER="DEFAULT"
-AC_MSG_RESULT([default])
-else
-LOCAL_SOLVER=$with_local_solver
-AC_MSG_RESULT([$with_local_solver])
-fi
-AC_SUBST(LOCAL_SOLVER)
-
 AC_SUBST(BUILD_TYPE)
 
 if test "$WITH_MINGW" != "yes" ; then
diff --git a/set_soenv.in b/set_soenv.in
index 57ccb36..129d4f3 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -428,12 +428,8 @@ if ('@TARFILE_LOCATION@' eq "DEFAULT")
 #
 $SOLARENV = PathFormat($SRC_ROOT.$SOLENV);
 # Location of the solver tree.
-if ('@LOCAL_SOLVER@' eq "DEFAULT")
-{  $SOLARVER  = $SRC_ROOT.$SOLVER;
-}
-else
-{  $SOLARVER  = PathFormat('@LOCAL_SOLVER@');
-}
+$SOLARVER = $SRC_ROOT.$SOLVER;
+
 #Location of Solar version.
 $SOLARVERSION = '$SOLARVER';
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-31 Thread Norbert Thiebaud

 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9034973de5b7f62121a62c56757bf20e490de654
Author: Norbert Thiebaud 
Date:   Sat Dec 31 10:39:55 2011 -0600

fix PathFormat, use build_os not host_os

diff --git a/configure.in b/configure.in
index 1f8c5d0..ab10538 100644
--- a/configure.in
+++ b/configure.in
@@ -16,7 +16,7 @@ MINGW_EXTERNAL_DLLS=""
 PathFormat()
 {
 formatted_path="$1"
-if test "$host_os" = "cygwin" ; then
+if test "$build_os" = "cygwin" ; then
 pf_part1=
 pf_conv_to_dos=
 for pf_part in $formatted_path ; do
@@ -29,8 +29,8 @@ PathFormat()
 if test "$pf_conv_to_dos" = "yes" ; then
 formatted_path=`cygpath -d "$formatted_path"`
 fi
-fp_count_colon=`cat "$formatted_path" | grep -c "[:]"`
-fp_count_slash=`cat "$formatted_path" | grep -c "[/]"`
+fp_count_colon=`echo "$formatted_path" | grep -c "[:]"`
+fp_count_slash=`echo "$formatted_path" | grep -c "[/]"`
 if test "$fp_count_slash$fp_count_colon" != "00" ; then
 if test "$fp_count_colon" = "0" ; then
 formatted_path=`realpath "$formatted_path"`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-31 Thread Norbert Thiebaud

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d1a26ef6542a68854d61aa62156e3aab61e0e68b
Author: Norbert Thiebaud 
Date:   Sat Dec 31 07:41:31 2011 -0600

fix 64 bits build detection for cygwin

diff --git a/configure.in b/configure.in
index 6d3d3aa..b26aa2c 100644
--- a/configure.in
+++ b/configure.in
@@ -2561,7 +2561,7 @@ cygwin*)
 
 case "$host_cpu" in
 i*86|x86_64)
-if test "$CL_X64" = ""; then
+if test "$CL_X64" != ""; then
 CPU=X
 CPUNAME=X86_64
 OUTPATH=wntmscx$COMEX
@@ -2770,7 +2770,7 @@ mingw*)
 
 case "$host_cpu" in
 i*86|x86_64)
-if test "$CL_X64" = ""; then
+if test "$CL_X64" != ""; then
 CPU=X
 CPUNAME=X86_64
 OUTPATH=wntgccx$COMEX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-31 Thread Norbert Thiebaud

 configure.in |   31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

New commits:
commit cd1b89a23a3c0c8ee8cdc7f36d23255a642e46a2
Author: Norbert Thiebaud 
Date:   Sat Dec 31 06:59:29 2011 -0600

Path format issue with cygwin... try to restore the original behavior

diff --git a/configure.in b/configure.in
index 8263c66..6d3d3aa 100644
--- a/configure.in
+++ b/configure.in
@@ -13,6 +13,33 @@ SCPDEFS=""
 GIT_REPO_NAMES=""
 MINGW_EXTERNAL_DLLS=""
 
+PathFormat()
+{
+formatted_path="$1"
+if test "$host_os" = "cygwin" ; then
+pf_part1=
+pf_conv_to_dos=
+for pf_part in $formated_path ; do
+if test -z "$pf_part1" ; then
+pf_part1="$pf_part"
+else
+pf_conv_to_dos="yes"
+fi
+done
+if test "$pf_conv_to_dos" = "yes" ; then
+formatted_path=`cygpath -d "$formatted_path"`
+fi
+fp_count_colon=`cat "$formattted_path" | grep -c "[:]"`
+fp_count_slash=`cat "$formattted_path" | grep -c "[/]"`
+if test "$fp_count_slash$fp_count_colon" != "00" ; then
+if test "$fp_count_colon" = "0" ; then
+formatted_path=`realpath "$formatted_path"`
+fi
+formatted_path=`cygpath -m "$formatted_path"`
+fi
+fi
+}
+
 if test -n "$SOLARENV" ; then
 AC_MSG_ERROR([You have sourced Env.Host.sh in this shell.  This may lead 
to trouble, please run in a fresh (login) shell.])
 fi
@@ -41,8 +68,8 @@ AC_SUBST(CROSS_COMPILING)
 if test "$build_os" = "cygwin"; then
 EXEEXT_FOR_BUILD=.exe
 SRC_ROOT=`pwd`
-SRC_ROOT=`cygpath -d "$SRC_ROOT"`
-SRC_ROOT=`cygpath -u "$SRC_ROOT"`
+PathFormat "$SRC_ROOT"
+SRC_ROOT="$formatted_path"
 else
 EXEEXT_FOR_BUILD=
 SRC_ROOT=`pwd`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-30 Thread Norbert Thiebaud

 configure.in |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 36ff143909a1c5297080371cf0cb1a701e6c7f50
Author: Norbert Thiebaud 
Date:   Fri Dec 30 22:02:49 2011 -0600

type in COMEX handling

diff --git a/configure.in b/configure.in
index 1675108..8263c66 100644
--- a/configure.in
+++ b/configure.in
@@ -2537,11 +2537,11 @@ cygwin*)
 if test "$CL_X64" = ""; then
 CPU=X
 CPUNAME=X86_64
-OUTPATH=wntmscx$(COMEX)
+OUTPATH=wntmscx$COMEX
 else
 CPU=I
 CPUNAME=INTEL
-OUTPATH=wntmsci$(COMEX)
+OUTPATH=wntmsci$COMEX
 fi
 ;;
 *)
@@ -2746,11 +2746,11 @@ mingw*)
 if test "$CL_X64" = ""; then
 CPU=X
 CPUNAME=X86_64
-OUTPATH=wntgccx$(COMEX)
+OUTPATH=wntgccx$COMEX
 else
 CPU=I
 CPUNAME=INTEL
-OUTPATH=wntgcci$(COMEX)
+OUTPATH=wntgcci$COMEX
 fi
 ;;
 *)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in connectivity/prj dbaccess/prj forms/prj tail_build/prj toolkit/prj unotest/prj

2011-12-30 Thread René Engelhard

 configure.in   |3 +++
 connectivity/prj/build.lst |2 +-
 dbaccess/prj/build.lst |2 +-
 forms/prj/build.lst|2 +-
 tail_build/prj/build.lst   |2 +-
 toolkit/prj/build.lst  |2 +-
 unotest/prj/build.lst  |2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 36d7f011a35c282c6c5f219681502e85dd8b768c
Author: Rene Engelhard 
Date:   Fri Dec 30 16:31:23 2011 +0100

build qadevOOo only if  OOO_JUNIT_JAR are set (add BUILD_TYPE)

diff --git a/configure.in b/configure.in
index 405e64e..6842771 100644
--- a/configure.in
+++ b/configure.in
@@ -9213,6 +9213,9 @@ provide a full junit jar or use --without-junit])
 location (/usr/share/java), specify its pathname via
 --with-junit=..., or disable it via --without-junit])
 fi
+if test $OOO_JUNIT_JAR != ""; then
+   BUILD_TYPE="$BUILD_TYPE QADEVOOO"
+fi
 fi
 AC_SUBST(OOO_JUNIT_JAR)
 
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index fd358fa..f4851c5 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,4 +1,4 @@
-cn  connectivity:shell  TRANSLATIONS:translations comphelper MOZ:moz 
POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb 
qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
+cn  connectivity:shell  TRANSLATIONS:translations comphelper MOZ:moz 
POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb 
QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
 cn  connectivityusr1-   all cn_mkout 
NULL
 cn  connectivity\incnmake   -   all cn_inc NULL
 cn  connectivity\com\sun\star\sdbcx\comp\hsqldb nmake   -   all 
cn_jhsqldbdb cn_hsqldb cn_inc NULL
diff --git a/dbaccess/prj/build.lst b/dbaccess/prj/build.lst
index 45372a7..ce429ec 100644
--- a/dbaccess/prj/build.lst
+++ b/dbaccess/prj/build.lst
@@ -1,3 +1,3 @@
-ba  dbaccess:   TRANSLATIONS:translations BOOST:boost 
connectivity svx stoc qadevOOo xmlscript LIBXSLT:libxslt test NULL
+ba  dbaccess:   TRANSLATIONS:translations BOOST:boost 
connectivity svx stoc QADEVOOO:qadevOOo xmlscript LIBXSLT:libxslt test NULL
 ba dbaccess
usr1-   all ba_mkout NULL
 ba dbaccess\prjnmake   
-   all ba_prj NULL
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 819a57c..131e8e4 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -1,4 +1,4 @@
-fm forms   :TRANSLATIONS:translations oovbaapi svx sfx2 qadevOOo 
LIBXSLT:libxslt NULL
+fm forms   :TRANSLATIONS:translations oovbaapi svx sfx2 
QADEVOOO:qadevOOo LIBXSLT:libxslt NULL
 fm  forms   usr1-   all fm_mkofrm NULL
 fm  forms\prj  nmake   -   all fm_prj NULL
 
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 6ae2a1c..b00d683 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss 
OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon 
TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas 
comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker 
javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo 
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot 
stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools 
ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss 
OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon 
TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas 
comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker 
javaunohelper jurt jvmaccess offapi officecfg oovbaapi QADEVOOO:qadevOOo 
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot 
stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools 
ure vcl xmlhelp xmloff xmlscript xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst

[Libreoffice-commits] .: configure.in

2011-12-21 Thread Bjoern Michaelsen

 configure.in |   16 ++--
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit a308f9172f86349c324a8cb07979f7b051811321
Author: Bjoern Michaelsen 
Date:   Thu Dec 22 01:05:58 2011 +0100

Revert "Fix gmake detection for MacOSX"

This reverts commit cf33de27eb5e981d8a1fa76f6a9d72ce7174f10d.

This breaks make bug 20033 detection on Linux. If this can not be reliably
detected on OSX, just disable parallelism for GNU make 3.81 on OSX in 
general,
but leave the detection intact for Linux.

diff --git a/configure.in b/configure.in
index 897403a..8ef3cdb 100644
--- a/configure.in
+++ b/configure.in
@@ -2696,19 +2696,7 @@ if test "$_make_longver" -ge "038200" ; then
 elif test "$_make_longver" -ge "038100" ; then
 AC_MSG_RESULT([$GNUMAKE $_make_version])
 AC_MSG_CHECKING([for GNU make bug 20033])
-dnl
-dnl FIXME: mktemp takes different arguments on different platforms:
-dnl http://stackoverflow.com/questions/2792675/how-portable-is-mktemp1
-dnl
-dnl -t means either 'use $TMPDIR' (OK) or 'the following is a template'.
-dnl and without 'the following is a template', a following template
-dnl is allowed, so this *may* work on *most* platforms
-dnl
-TESTGMAKEBUG20033=`mktemp -d -t MakefileXX`
-SHA1SUM=sha1sum
-if test "$_os" = "Darwin"; then
-SHA1SUM=shasum
-fi
+TESTGMAKEBUG20033=`mktemp -d`
 cat > $TESTGMAKEBUG20033/Makefile << EOF
 A := \$(wildcard *.a)
 
@@ -2731,7 +2719,7 @@ define d2
 endef
 
 %.b : %.a
-   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
\$(call d1,\$(CHECKSUM)),\
\$(call d2,\$(CHECKSUM)))
 EOF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-20 Thread Norbert Thiebaud

 configure.in |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

New commits:
commit cf33de27eb5e981d8a1fa76f6a9d72ce7174f10d
Author: James C 
Date:   Tue Dec 20 02:15:08 2011 -0600

Fix gmake detection for MacOSX

diff --git a/configure.in b/configure.in
index 84d7b50..120ed1f 100644
--- a/configure.in
+++ b/configure.in
@@ -2705,7 +2705,19 @@ if test "$_make_longver" -ge "038200" ; then
 elif test "$_make_longver" -ge "038100" ; then
 AC_MSG_RESULT([$GNUMAKE $_make_version])
 AC_MSG_CHECKING([for GNU make bug 20033])
-TESTGMAKEBUG20033=`mktemp -d`
+dnl
+dnl FIXME: mktemp takes different arguments on different platforms:
+dnl http://stackoverflow.com/questions/2792675/how-portable-is-mktemp1
+dnl
+dnl -t means either 'use $TMPDIR' (OK) or 'the following is a template'.
+dnl and without 'the following is a template', a following template
+dnl is allowed, so this *may* work on *most* platforms
+dnl
+TESTGMAKEBUG20033=`mktemp -d -t MakefileXX`
+SHA1SUM=sha1sum
+if test "$_os" = "Darwin"; then
+SHA1SUM=shasum
+fi
 cat > $TESTGMAKEBUG20033/Makefile << EOF
 A := \$(wildcard *.a)
 
@@ -2728,7 +2740,7 @@ define d2
 endef
 
 %.b : %.a
-   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | $SHA1SUM))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
\$(call d1,\$(CHECKSUM)),\
\$(call d2,\$(CHECKSUM)))
 EOF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf download ooo.lst.in scp2/source scp2/util set_soenv.in setup_native/source

2011-12-18 Thread Andras Timar

 configure.in|   50 
 distro-configs/OxygenOfficeLinux.conf   |1 
 distro-configs/OxygenOfficeWin32.conf   |1 
 download|2 
 ooo.lst.in  |3 
 scp2/source/extensions/directory_extensions.scp |   14 
 scp2/source/extensions/file_extensions.scp  |   15 
 scp2/source/extensions/makefile.mk  |4 
 scp2/source/extensions/module_extensions.scp|   13 
 scp2/source/extensions/module_extensions.ulf|6 
 scp2/source/extensions/module_extensions_lightproof.scp |   52 
 scp2/source/extensions/module_extensions_lightproof.ulf |  695 
--
 scp2/source/templates/makefile.mk   |2 
 scp2/source/templates/module_langpack_extensions_lightproof.sct |   49 
 scp2/util/makefile.mk   |1 
 set_soenv.in|4 
 setup_native/source/packinfo/packinfo_extensions.txt|   16 
 setup_native/source/packinfo/packinfo_office_lang.txt   |   16 
 18 files changed, 3 insertions(+), 941 deletions(-)

New commits:
commit 058d872a2e07311c5c2e68ae0e3150fcea9ce468
Author: Andras Timar 
Date:   Sun Dec 18 19:22:02 2011 +0100

remove obsolete (OxygenOffice-style) Lightproof integration

diff --git a/configure.in b/configure.in
index 40cf257..84d7b50 100644
--- a/configure.in
+++ b/configure.in
@@ -327,14 +327,6 @@ AC_ARG_ENABLE(ext-languagetool,
 [Enable the LanguageTool extension.])
 )
 
-AC_ARG_ENABLE(ext-lightproof,
-AS_HELP_STRING([--enable-ext-lightproof],
-[Enable the Lightproof extension. The enable switch can contain only
- the desired languages: --enable-lightproof="en hu ru"]),
-[enable_ext_lightproof="$enableval"],
-[enable_ext_lightproof=no]
-)
-
 AC_ARG_ENABLE(ext-mysql-connector,
 AS_HELP_STRING([--enable-ext-mysql-connector],
 [Enable the build of the MySQL Connector extension.])
@@ -8124,48 +8116,6 @@ fi
 AC_SUBST(WITH_EXTENSION_INTEGRATION)
 
 dnl ===
-dnl Test whether to include Lightproof extensions
-dnl ===
-AC_MSG_CHECKING([for Lightproof extensions integration (only supported 
languages displayed)])
-LIGHTPROOF_LANG=
-LIGHTPROOF_HU_PACK=
-LIGHTPROOF_RU_PACK=
-LIGHTPROOF_EN_US_PACK=
-if test "x$enable_ext_lightproof" = "xno" -o "x$enable_extension_integration" 
= "xno"; then
-AC_MSG_RESULT([no integration])
-else
-SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
-if test "x$enable_ext_lightproof" = "xyes" -o "x$enable_ext_lightproof" = 
"x"; then
-wanted_lightproof="en-US hu ru"
-else
-for lang in $enable_ext_lightproof ; do
-case $lang in
-en-US|hu|ru)
-wanted_lightproof="$wanted_lightproof $lang"
-;;
-*)
-AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: 
$lang])
-;;
-esac
-done
-fi
-for lang in $wanted_lightproof ; do
-LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
-case $lang in
-en-US) 
LIGHTPROOF_EN_US_PACK="0ab55ac8e88f04258f1d3e79e984382f-lightproof-en_US-0.1.oxt"
 ;;
-hu) 
LIGHTPROOF_HU_PACK="76345f925e34fef2d29bade4f29108e9-lightproof-hu_1.3.oxt" ;;
-ru) 
LIGHTPROOF_RU_PACK="673860e8649cff2ebdc68bd46f2f7f1a-lightproof-ru_0.1.oxt" ;;
-*) AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: 
$lang]) ;;
-esac
-done
-AC_MSG_RESULT([$LIGHTPROOF_LANG])
-fi
-AC_SUBST(LIGHTPROOF_LANG)
-AC_SUBST(LIGHTPROOF_HU_PACK)
-AC_SUBST(LIGHTPROOF_RU_PACK)
-AC_SUBST(LIGHTPROOF_EN_US_PACK)
-
-dnl ===
 dnl Test whether to include Watch Window extension
 dnl ===
 AC_MSG_CHECKING([for Watch Window extension integration])
diff --git a/distro-configs/OxygenOfficeLinux.conf 
b/distro-configs/OxygenOfficeLinux.conf
index 16b065b..aacd3ba 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -36,7 +36,6 @@
 --enable-ext-scripting-javascript
 --enable-ext-google-docs
 --enable-ext-hunart
---enable-ext-lightproof
 --enable-ext-nlpsolver
 --enable-ext-numbertext
 --enable-ext-typo
diff --git a/distro-configs/OxygenOfficeWin32.conf 
b/distro-configs/OxygenOfficeWin32.conf
index c46bdde..04b92dd 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -23,7 +23,6 @@
 --enable-ext-scripting-javascript
 --enabl

[Libreoffice-commits] .: configure.in postgresql/makefile.mk set_soenv.in

2011-12-15 Thread Lionel Elie Mamane

 configure.in   |   62 -
 postgresql/makefile.mk |   12 -
 set_soenv.in   |2 +
 3 files changed, 74 insertions(+), 2 deletions(-)

New commits:
commit 227350eb5a9881f795e9ae499c732f0148e4ac38
Author: Lionel Elie Mamane 
Date:   Thu Dec 15 18:40:59 2011 +0100

Introduce optional krb5&gssapi support for internal PostgreSQL

Enable it by default on MacOS X

diff --git a/configure.in b/configure.in
index 354fa52..3dbbc4b 100644
--- a/configure.in
+++ b/configure.in
@@ -1592,6 +1592,25 @@ AC_ARG_WITH(lang,
 ],
 ,)
 
+# Kerberos and GSSAPI used only by PostgreSQL as of LibO 3.5
+AC_ARG_WITH(krb5,
+AS_HELP_STRING([--with-krb5],
+[Enable MIT Kerberos 5 support in modules that support it.
+ By default automatically enabled on platforms
+ where a good system Kerberos 5 is available.]),
+,)
+#AC_ARG_WITH(system-redland,
+#AS_HELP_STRING([--with-system-redland],
+#[Use redland library already on system.]),,
+#[with_system_redland="$with_system_libs"])
+
+AC_ARG_WITH(gssapi,
+AS_HELP_STRING([--with-gssapi],
+[Enable GSSAPI support in modules that support it.
+ By default automatically enabled on platforms
+ where a good system GSSAPI is available.]),
+,)
+
 dnl ===
 dnl Branding
 dnl ===
@@ -5413,12 +5432,51 @@ fi
 dnl ===
 dnl Check for PostgreSQL stuff
 dnl ===
-
 if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
 if test "x$enable_extension_integration" = "xyes"; then
   SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
 fi
 
+# if/when anything else than PostgreSQL uses Kerberos,
+# move this out of `test "x$enable_ext_postgresql_sdbc" = "xyes"'
+WITH_KRB5=NO
+WITH_GSSAPI=no
+case "$_os" in
+  Darwin)
+# MacOS X has system MIT Kerberos 5 since 10.4
+if test "$with_krb5" != "no"; then
+  WITH_KRB5=YES
+  AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5])])
+  AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+fi
+if test "$with_gssapi" != "no"; then
+  WITH_GSSAPI=YES
+  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
+ [AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
+fi
+   ;;
+  WINNT)
+   if test "$with_krb5" = "yes" || "$with_gssapi" = "yes"; then
+  AC_MSG_ERROR([Refusing to enable MIT Kerberos 5 or GSSAPI on Microsoft 
Windows.])
+   fi
+  ;;
+  *)
+if test "$with_krb5" = "yes"; then
+  WITH_KRB5=YES
+  AC_SEARCH_LIBS(com_err, [krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 
com_err 'com_err -lssl -lcrypto'], [],
+[AC_MSG_ERROR([could not find function 'com_err' required 
for Kerberos 5])])
+  AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -lcrypto -ldes -lasn1 
-lroken'], [],
+[AC_MSG_ERROR([could not find function 'krb5_sendauth' 
required for Kerberos 5])])
+fi
+if test "$with_gssapi" = "yes"; then
+  WITH_GSSAPI=YES
+  AC_SEARCH_LIBS(gss_init_sec_context, [gssapi_krb5 gss 'gssapi -lkrb5 
-lcrypto'], [],
+ [AC_MSG_ERROR([could not find function 
'gss_init_sec_context' required for GSSAPI])])
+fi
+esac
+
 AC_MSG_CHECKING([PostgreSQL C interface])
 if test "$with_system_postgresql" = "yes"; then
 AC_MSG_RESULT([external PostgreSQL])
@@ -5465,6 +5523,8 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
 fi
 BUILD_POSTGRESQL_SDBC=YES
 fi
+AC_SUBST(WITH_KRB5)
+AC_SUBST(WITH_GSSAPI)
 AC_SUBST(BUILD_POSTGRESQL_SDBC)
 AC_SUBST(SYSTEM_POSTGRESQL)
 AC_SUBST(POSTGRESQL_INC)
diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk
index e4e3969..1e1c4f4 100644
--- a/postgresql/makefile.mk
+++ b/postgresql/makefile.mk
@@ -60,15 +60,25 @@ CONFIGURE_DIR=.
 BUILD_DIR=src/interfaces/libpq
 
 CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" LDFLAGS="$(SOLARLIB)" ./configure 
--without-readline --disable-shared --with-openssl
+
 .IF "$(WITH_LDAP)" == "YES"
 CONFIGURE_ACTION += --with-ldap
 .IF "$(WITH_OPENLDAP)" != "YES"
 CONFIGURE_ACTION += 
--with-includes='$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap' --with-mozldap
 .ENDIF
+.ENDIF # "$(WITH_LDAP)" == "YES"
+
+.IF "$(WITH_KRB5)" == "YES"
+CONFIGURE_ACTION += --with-krb5
 .ENDIF
-BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib libpq-flags.mk
+.IF "$(WITH_GSSAPI)" == "YES"
+CONFIG

[Libreoffice-commits] .: configure.in set_soenv.in solenv/gbuild

2011-12-15 Thread Lubos Lunak

 configure.in|   18 --
 set_soenv.in|1 -
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |7 ---
 solenv/gbuild/platform/unxgcc.mk|7 ---
 4 files changed, 33 deletions(-)

New commits:
commit e87fc0bfde8bd48b449e123c1bdd28e1359e8c77
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Dec 15 16:59:17 2011 +0100

Revert "enable -gdwarf-4 by default if possible"

It turns out even quite recent gdb (7.1) reportedly does not
support DWARF4, moreover while the produced binaries are smaller,
faster and make gdb initially use less memory, this quickly ceases
to the case as soon as one actually does anything in gdb.
Presumably the DWARF4 handling in current gdb is very inefficient
(http://sourceware.org/bugzilla/show_bug.cgi?id=13498).

This reverts commit 5214f7843ca48f2207945fbfe32ba164afe7b3aa.

Conflicts:

solenv/gbuild/platform/WNT_INTEL_GCC.mk
solenv/gbuild/platform/unxgcc.mk

diff --git a/configure.in b/configure.in
index 59cb7fb..354fa52 100644
--- a/configure.in
+++ b/configure.in
@@ -3824,24 +3824,6 @@ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
 AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
 
 dnl ===
-dnl gcc DWARF-4 support (smaller debug info)
-dnl ===
-if test "$GCC" = "yes"; then
-AC_MSG_CHECKING([whether $CC supports -gdwarf-4])
-save_CFLAGS=$CFLAGS
-CFLAGS="$CFLAGS -Werror -gdwarf-4"
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_DWARF_4=TRUE ],[])
-CFLAGS=$save_CFLAGS
-if test "$HAVE_GCC_DWARF_4" = "TRUE"; then
-AC_MSG_RESULT([yes])
-else
-AC_MSG_RESULT([no])
-fi
-fi
-
-AC_SUBST(HAVE_GCC_DWARF_4)
-
-dnl ===
 dnl allocator
 dnl ===
 AC_MSG_CHECKING([which memory allocator to use])
diff --git a/set_soenv.in b/set_soenv.in
index 2150be5..1506366 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1700,7 +1700,6 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
 "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
-ToFile( "HAVE_GCC_DWARF_4","@HAVE_GCC_DWARF_4@","e" );
 ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
 ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
 ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 5b49bff..c7387e9 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -98,9 +98,6 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
 gb_DEBUG_CFLAGS := -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline
-ifeq ($(HAVE_GCC_DWARF_4),TRUE)
-gb_DEBUG_CFLAGS += -gdwarf-4
-endif
 
 gb_STDLIBS := \
mingwthrd \
@@ -154,10 +151,6 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) 
$(gb_CXXFLAGS_WERROR)
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CXXFLAGS += -ggdb2
 gb_LinkTarget_CFLAGS += -ggdb2
-ifeq ($(HAVE_GCC_DWARF_4),TRUE)
-gb_LinkTarget_CXXFLAGS += -gdwarf-4
-gb_LinkTarget_CFLAGS += -gdwarf-4
-endif
 endif
 
 gb_LinkTarget_INCLUDE +=\
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 851e020..4b80cee 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -162,9 +162,6 @@ gb_LINKEROPTFLAGS := -Wl,-O1
 endif
 
 gb_DEBUG_CFLAGS := -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline
-ifeq ($(HAVE_GCC_DWARF_4),TRUE)
-gb_DEBUG_CFLAGS += -gdwarf-4
-endif
 
 gb_COMPILERNOOPTFLAGS := -O0
 
@@ -209,10 +206,6 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) 
$(gb_CXXFLAGS_WERROR)
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CXXFLAGS += -ggdb2
 gb_LinkTarget_CFLAGS += -ggdb2
-ifeq ($(HAVE_GCC_DWARF_4),TRUE)
-gb_LinkTarget_CXXFLAGS += -gdwarf-4
-gb_LinkTarget_CFLAGS += -gdwarf-4
-endif
 endif
 
 # note that `cat $(extraobjectlist)` is needed to build with older gcc 
versions, e.g. 4.1.2 on SLED10
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in connectivity/source

2011-12-11 Thread Fridrich Strba

 configure.in   |6 +++-
 connectivity/source/drivers/postgresql/makefile.mk |   28 +
 2 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit d1a1585c30c31dec38d32571e9c2bbee4d03
Author: Fridrich Å trba 
Date:   Mon Dec 12 04:51:49 2011 +0100

Some more postgresql fixes

1. The --enable-extension-integration affects only packaging
2. OUTDIR_FOR_BUILD is for native build in case of crosscompiling

diff --git a/configure.in b/configure.in
index 26e2fd8..59cb7fb 100644
--- a/configure.in
+++ b/configure.in
@@ -5432,8 +5432,10 @@ dnl 
===
 dnl Check for PostgreSQL stuff
 dnl ===
 
-if test "x$enable_ext_postgresql_sdbc" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
-SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
+if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
+if test "x$enable_extension_integration" = "xyes"; then
+  SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
+fi
 
 AC_MSG_CHECKING([PostgreSQL C interface])
 if test "$with_system_postgresql" = "yes"; then
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 91184d8..29f2029 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -77,6 +77,18 @@ PQ_SDBC_MINOR=8
 PQ_SDBC_MICRO=2
 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO)
 
+.IF "$(SYSTEM_POSTGRESQL)"=="YES"
+LIBPQ_LINK=-lpq
+.ELSE #SYSTEM_POSTGRESQL==NO
+.IF "$(GUI)$(COM)"=="WNTMSC"
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib 
shell32.lib
+.ELSE
+LIBPQ_LINK=$(OUTDIR)/lib/libpq.a
+.ENDIF
+POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql
+POSTGRESQL_LIB=
+.ENDIF
+
 CFLAGS+=$(POSTGRESQL_INC) \
 -DPQ_SDBC_MAJOR=$(PQ_SDBC_MAJOR) \
 -DPQ_SDBC_MINOR=$(PQ_SDBC_MINOR) \
@@ -97,22 +109,6 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=  $(SHL1TARGET)
 SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 
-# use the static version on Windows?
-# LEM 17/11/2011: removed everything except libpq proper;
-#  as per instructions in libpq documentation.
-#  If it turns out the rest was needed, reenable it.
-.IF "$(SYSTEM_POSTGRESQL)"=="YES"
-LIBPQ_LINK=-lpq
-.ELSE #SYSTEM_POSTGRESQL==NO
-.IF "$(GUI)$(COM)"=="WNTMSC"
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib 
advapi32.lib shell32.lib
-.ELSE
-LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a
-.ENDIF
-POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql
-POSTGRESQL_LIB=
-.ENDIF
-
 SHL2TARGET=postgresql-sdbc-impl.uno
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
 LIB2OBJFILES= \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-10 Thread Lionel Elie Mamane

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 76fac398dd71364302a261a18d8015fd250543cd
Author: Korrawit Pruegsanusak 
Date:   Sat Dec 3 22:13:29 2011 +0700

--with-theme is without trailing s

Signed-off-by: Lionel Elie Mamane 

diff --git a/configure.in b/configure.in
index 951ab60..26e2fd8 100644
--- a/configure.in
+++ b/configure.in
@@ -8039,7 +8039,7 @@ WITH_THEMES=""
 for theme in $with_theme; do
 case $theme in
 default|crystal|hicontrast|oxygen|tango) : ;;
-*) AC_MSG_ERROR([Unknown value for --with-themes: $theme]) ;;
+*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES="$WITH_THEMES $theme"
 SCPDEFS="$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-10 Thread Tor Lillqvist

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78ceb50f27a7e148088411e7c2b0bcc67749b2f4
Author: Tor Lillqvist 
Date:   Sun Dec 11 03:42:07 2011 +0200

Fix typo

diff --git a/configure.in b/configure.in
index c91c2b1..951ab60 100644
--- a/configure.in
+++ b/configure.in
@@ -1922,11 +1922,11 @@ if test "$enable_ccache" = "yes" -o \( "$enable_ccache" 
= "" -a "$enable_icecrea
 fi
 fi
 else
-AC_MSG_NOTICE([Automatic ccache detection ingored: CXX is 
pre-defined])
+AC_MSG_NOTICE([Automatic ccache detection ignored: CXX is 
pre-defined])
 CCACHE=""
 fi
 else
-AC_MSG_NOTICE([Automatic ccache detection ingored: CC is pre-defined])
+AC_MSG_NOTICE([Automatic ccache detection ignored: CC is pre-defined])
 CCACHE=""
 fi
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in fontconfig/fontconfig-2.8.0.patch fontconfig/makefile.mk fontconfig/prj freetype/freetype-2.4.8.patch freetype/makefile.mk freetype/prj ooo.lst.in vcl/prj

2011-12-10 Thread Tor Lillqvist

 configure.in  |6 +++
 fontconfig/fontconfig-2.8.0.patch |   49 ++
 fontconfig/makefile.mk|   61 ++
 fontconfig/prj/build.lst  |3 +
 fontconfig/prj/d.lst  |4 ++
 freetype/freetype-2.4.8.patch |   11 ++
 freetype/makefile.mk  |   59 
 freetype/prj/build.lst|3 +
 freetype/prj/d.lst|8 
 ooo.lst.in|3 +
 vcl/prj/build.lst |2 -
 11 files changed, 207 insertions(+), 2 deletions(-)

New commits:
commit 75aacd87bbbddb860efb57f046c84e4f107a8839
Author: Tor Lillqvist 
Date:   Sun Dec 11 00:08:39 2011 +0200

Download and build FreeType and fontconfig for Android

It will probably be simplest to just use FreeType on Android,
too. (Android uses it itself, but doesn't provide its API publicly.)

Probably fontconfig, too, although there shouldn't be much
configuration per se that a LibreOffice-baed app would have to do at
run-time; it will have to bundle all fonts it is going to use anyway,
I think, so all font information is known a priori. But maybe in the
future there will be user-installable system fonts on Android, or
something.

diff --git a/configure.in b/configure.in
index 0228af5..71b644f 100644
--- a/configure.in
+++ b/configure.in
@@ -263,6 +263,10 @@ linux-androideabi*)
 AC_MSG_ERROR([You need to set the $var environment variable in a 
cross-compilation for Android. See README.cross for an example.])
 fi
 done
+
+BUILD_TYPE="$BUILD_TYPE FONTCONFIG FREETYPE"
+FREETYPE_TARBALL=dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
+FONTCONFIG_TARBALL=77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
 ;;
 
 *)
@@ -282,6 +286,8 @@ AC_SUBST(OSVERSION)
 AC_SUBST(PTHREAD_CFLAGS)
 AC_SUBST(PTHREAD_LIBS)
 
+AC_SUBST(FREETYPE_TARBALL)
+AC_SUBST(FONTCONFIG_TARBALL)
 
 ###
 # Extensions switches --enable/--disable
diff --git a/fontconfig/fontconfig-2.8.0.patch 
b/fontconfig/fontconfig-2.8.0.patch
new file mode 100644
index 000..5b5cdce
--- /dev/null
+++ b/fontconfig/fontconfig-2.8.0.patch
@@ -0,0 +1,49 @@
+--- misc/build/fontconfig-2.8.0/config.sub
 misc/build/fontconfig-2.8.0/config.sub
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-androideabi* | linux-gnu* | linux-dietlibc | linux-newlib* 
| linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -1272,7 +1272,7 @@
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++| -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | 
-aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/build/fontconfig-2.8.0/configure
 misc/build/fontconfig-2.8.0/configure
+@@ -14073,7 +14073,7 @@
+   no)
+   ;;
+   *)
+-  EXPAT_LIBS="-L$expat_lib -lexpat"
++  EXPAT_LIBS="-L$expat_lib -lexpat_xmlparse 
-lexpat_xmltok"
+   ;;
+   esac
+ 
+--- misc/build/fontconfig-2.8.0/src/fcxml.c
 misc/build/fontconfig-2.8.0/src/fcxml.c
+@@ -1123,6 +1123,7 @@
+  * Have to swap the decimal point to match the current locale
+  * if that locale doesn't use 0x2e
+  */
++#ifndef __ANDROID__
+ if ((dot = strchr (s, 0x2e)) &&
+   (locale_data = localeconv ()) &&
+   (locale_data->decimal_point[0] != 0x2e ||
+@@ -1158,6 +1158,7 @@
+   }
+ }
+ else
++#endif
+   v = strtod (s, end);
+ return v;
+ }
diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
new file mode 100644
index 000..55c561a
--- /dev/null
+++ b/fontconfig/makefile.mk
@@ -0,0 +1,61 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Gen

[Libreoffice-commits] .: configure.in

2011-12-08 Thread Lionel Elie Mamane

 configure.in |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 4097499989f4058b9c66ed6f7fe79eb8f5543c8c
Author: Lionel Elie Mamane 
Date:   Thu Dec 8 23:21:49 2011 +0100

Allow Xinerama to sit in another directory than other X libraries

diff --git a/configure.in b/configure.in
index 509ce03..0228af5 100644
--- a/configure.in
+++ b/configure.in
@@ -8563,7 +8563,15 @@ if test "$_os" = "Darwin"; then
 XINERAMA_LINK=dynamic
 AC_MSG_RESULT([yes])
 elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
-if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then
+if test "$x_libraries" = "default_x_libraries"; then
+XINERAMALIB=`$PKG_CONFIG --variable=libdir xinerama`
+if test "x$XINERAMALIB" = x; then
+   XINERAMALIB="/usr/lib"
+fi
+else
+XINERAMALIB="$x_libraries"
+fi
+if test -e "$XINERAMALIB/libXinerama.so" -a -e 
"$XINERAMALIB/libXinerama.a"; then
 # we have both versions, let the user decide but use the dynamic one
 # per default
 USE_XINERAMA=YES
@@ -8572,11 +8580,11 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
 else
 XINERAMA_LINK=static
 fi
-elif test -e "$XLIB/libXinerama.so" -a ! -e "$XLIB/libXinerama.a"; then
+elif test -e "$XINERAMALIB/libXinerama.so" -a ! -e 
"$XINERAMALIB/libXinerama.a"; then
 # we have only the dynamic version
 USE_XINERAMA=YES
 XINERAMA_LINK=dynamic
-elif test -e "$XLIB/libXinerama.a"; then
+elif test -e "$XINERAMALIB/libXinerama.a"; then
 # static version
 if echo $host_cpu | grep -E 'i[[3456]]86' 2>/dev/null >/dev/null; then
 USE_XINERAMA=YES
@@ -8594,7 +8602,11 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
 AC_MSG_RESULT([yes, with $XINERAMA_LINK linking])
 AC_CHECK_HEADER(X11/extensions/Xinerama.h, [],
 [AC_MSG_ERROR(Xinerama header not found.)], [])
-XINERAMA_EXTRA_LIBS="-L$XLIB -lXext"
+XEXTLIBS=`$PKG_CONFIG --variable=libs xext`
+if test "x$XEXTLIB" = x; then
+   XEXTLIBS="-L$XLIB -L$XINERAMALIB -lXext"
+fi
+XINERAMA_EXTRA_LIBS="$XEXTLIBS"
 if test "$_os" = "FreeBSD"; then
 XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -lXt"
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in set_soenv.in solenv/gbuild

2011-12-08 Thread Lubos Lunak

 configure.in|   18 ++
 set_soenv.in|1 +
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |7 +++
 solenv/gbuild/platform/unxgcc.mk|7 +++
 4 files changed, 33 insertions(+)

New commits:
commit 5214f7843ca48f2207945fbfe32ba164afe7b3aa
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Dec 8 16:38:23 2011 +0100

enable -gdwarf-4 by default if possible

http://lists.freedesktop.org/archives/libreoffice/2011-December/021638.html

diff --git a/configure.in b/configure.in
index 4cfeae0..0fe12fa 100644
--- a/configure.in
+++ b/configure.in
@@ -3821,6 +3821,24 @@ AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE)
 AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN)
 
 dnl ===
+dnl gcc DWARF-4 support (smaller debug info)
+dnl ===
+if test "$GCC" = "yes"; then
+AC_MSG_CHECKING([whether $CC supports -gdwarf-4])
+save_CFLAGS=$CFLAGS
+CFLAGS="$CFLAGS -Werror -gdwarf-4"
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ 
HAVE_GCC_DWARF_4=TRUE ],[])
+CFLAGS=$save_CFLAGS
+if test "$HAVE_GCC_DWARF_4" = "TRUE"; then
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
+fi
+fi
+
+AC_SUBST(HAVE_GCC_DWARF_4)
+
+dnl ===
 dnl allocator
 dnl ===
 AC_MSG_CHECKING([which memory allocator to use])
diff --git a/set_soenv.in b/set_soenv.in
index bef9405..3bb806a 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1779,6 +1779,7 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
 ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
 "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
+ToFile( "HAVE_GCC_DWARF_4","@HAVE_GCC_DWARF_4@","e" );
 ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
 ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
 ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index c0739f4..7363654 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -99,6 +99,9 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc
 endif
 
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_DEBUG_CFLAGS += -gdwarf-4
+endif
 
 gb_STDLIBS := \
mingwthrd \
@@ -152,6 +155,10 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) 
$(gb_CXXFLAGS_WERROR)
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CXXFLAGS += -ggdb2
 gb_LinkTarget_CFLAGS += -ggdb2
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_LinkTarget_CXXFLAGS += -gdwarf-4
+gb_LinkTarget_CFLAGS += -gdwarf-4
+endif
 endif
 
 gb_LinkTarget_INCLUDE +=\
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7403488..37c203f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -162,6 +162,9 @@ gb_LINKEROPTFLAGS := -Wl,-O1
 endif
 
 gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_DEBUG_CFLAGS += -gdwarf-4
+endif
 
 gb_COMPILERNOOPTFLAGS := -O0
 
@@ -206,6 +209,10 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) 
$(gb_CXXFLAGS_WERROR)
 ifeq ($(gb_SYMBOL),$(true))
 gb_LinkTarget_CXXFLAGS += -ggdb2
 gb_LinkTarget_CFLAGS += -ggdb2
+ifeq ($(HAVE_GCC_DWARF_4),TRUE)
+gb_LinkTarget_CXXFLAGS += -gdwarf-4
+gb_LinkTarget_CFLAGS += -gdwarf-4
+endif
 endif
 
 # note that `cat $(extraobjectlist)` is needed to build with older gcc 
versions, e.g. 4.1.2 on SLED10
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in set_soenv.in solenv/gbuild

2011-12-08 Thread Thorsten Behrens

 configure.in|6 ++
 set_soenv.in|1 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |   11 ---
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |   10 --
 solenv/gbuild/platform/com_GCC_defs.mk  |   29 +
 solenv/gbuild/platform/macosx.mk|   27 ---
 solenv/gbuild/platform/unxgcc.mk|   11 ---
 7 files changed, 36 insertions(+), 59 deletions(-)

New commits:
commit 456ec763d77a238967b866e2f90d1052626c2fdb
Author: Thorsten Behrens 
Date:   Thu Dec 8 12:03:38 2011 +0100

Rework yacc rule for gcc platforms.

Generalized the OSX ppc workaround for ancient bison versions,
factored out for all gcc platforms. Put bison version detection
into configure accordingly, to switch on that, and not on platform.

diff --git a/configure.in b/configure.in
index 9cd71ed..1c9a08d 100644
--- a/configure.in
+++ b/configure.in
@@ -6790,6 +6790,7 @@ dnl ***
 dnl Checking for bison and flex
 dnl ***
 AC_PATH_PROG(BISON, bison)
+ANCIENT_BISON="NO"
 if test -z "$BISON"; then
 AC_MSG_ERROR([no bison found in \$PATH, install it])
 else
@@ -6807,7 +6808,12 @@ else
 else
 AC_MSG_ERROR([failed ($BISON $_bison_version need 1.875+ (or 1.75 and 
older))])
 fi
+if test "$_bison_longver" -lt 2000; then
+ANCIENT_BISON="YES"
+fi
 fi
+AC_SUBST(ANCIENT_BISON)
+
 AC_PATH_PROG(FLEX, flex)
 if test -z "$FLEX"; then
 AC_MSG_ERROR([no flex found in \$PATH, install it])
diff --git a/set_soenv.in b/set_soenv.in
index 8248af8..d97560d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1657,6 +1657,7 @@ ToFile( "DPKG",  "@DPKG@",   "e" );
 ToFile( "PKGMK", "@PKGMK@",  "e" );
 ToFile( "GNUMAKE",   "@GNUMAKE@","e" );
 ToFile( "GNUTAR","@GNUTAR@", "e" );
+ToFile( "ANCIENT_BISON", "@ANCIENT_BISON@",  "e" );
 ToFile( "UPD",   $UPD,   "e" );
 ToFile( "WORK_STAMP",$WORK_STAMP,"e" );
 ToFile( "SOLARVER",  $SOLARVER,  "e" );
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index f8d4454..4a41bba 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -81,17 +81,6 @@ gb_LinkTarget_LDFLAGS := \
$(subst -L../lib , ,$(SOLARLIB)) \
 #man ld says: obsolete -Wl,-multiply_defined,suppress \
 
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
-
-endef
-
-
 # ObjCxxObject class
 
 define gb_ObjCxxObject__command
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 78ce3bd..c0739f4 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -124,16 +124,6 @@ define gb_Helper_convert_native
 $(1)
 endef
 
-# YaccTarget class
-
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
-   mkdir -p $(dir $(3)) && \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
-
-endef
-
 # AsmObject class
 
 gb_AsmObject_get_source = $(1)/$(2).s
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f91b58e..03ac2a8 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -25,6 +25,35 @@ gb_YACC := bison
 
 gb_CLASSPATHSEP := :
 
+# YaccTarget class
+
+ifeq ($(ANCIENT_BISON),YES)
+#
+# There are ancient versions of bison out there, which do not handle
+# well .cxx extensions, nor do they support --defines=. The
+# result is that the header is named .cxx.h instead of .hxx
+# so we queue a mv to rename the header accordingly.
+# One example is XCode versions 2.x, which are used on OSX ppc
+# machines.
+#
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(3)) && \
+   $(gb_YACC) $(T_YACCFLAGS) -d -o $(3) $(1) && mv $(3).h $(4) )
+
+endef
+
+else
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $(3)) && \
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+
+endef
+endif
+
 # use CC/CXX if they are nondefaults
 ifneq ($(origin CC),default)
 gb_CC := $(CC)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 3beb093..5be5001 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -101,33 +101,6 @@ endif
 
 gb_COMPILERNOOPTFLAGS := -O0
 
-# YaccTarget class
-
-ifeq ($(CPUNAME),POWERPC)
-#
-# PowerPC mac version of bison

[Libreoffice-commits] .: configure.in RepositoryExternal.mk set_soenv.in vcl/Library_vclplug_gtk3.mk vcl/unx

2011-12-06 Thread Thorsten Behrens

 RepositoryExternal.mk   |   23 ---
 configure.in|   12 
 set_soenv.in|3 ---
 vcl/Library_vclplug_gtk3.mk |   10 ++
 vcl/unx/gtk/app/gtkinst.cxx |4 ++--
 vcl/unx/gtk/inc/gtkprintwrapper.hxx |4 ++--
 6 files changed, 6 insertions(+), 50 deletions(-)

New commits:
commit 1a81ca45ea9192013b4e5bdb2eb769a75b56dea5
Author: Thorsten Behrens 
Date:   Tue Dec 6 18:08:18 2011 +0100

Revert "GdkPrinter seems optional on Gtk3, too"

This reverts commit 88a4a8d997921309a7886ed0d1dc383ee3c2f767.

Sorry, seemed to be an intermittent local problem.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 92d9aca..6da9253 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -660,29 +660,6 @@ endif
 
 endef
 
-define gb_LinkTarget__use_gtk3
-$(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
-   $(GTK3_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(GTK3_LIBS))
-
-ifeq ($(ENABLE_GTK3_PRINT),TRUE)
-
-$(call gb_LinkTarget_add_defs,$(1),-DENABLE_GTK3_PRINT)
-
-$(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
-   $(GTK3_PRINT_CFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),$(GTK3_PRINT_LIBS))
-
-endif
-
-endef
-
 define gb_LinkTarget__use_gthread
 $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
 
diff --git a/configure.in b/configure.in
index 1d2cde1..8b23b1f 100644
--- a/configure.in
+++ b/configure.in
@@ -7003,32 +7003,20 @@ R=""
 GTK3_CFLAGS=""
 GTK3_LIBS=""
 ENABLE_GTK3=""
-GTK3_PRINT_CFLAGS=""
-GTK3_PRINT_LIBS=""
-ENABLE_GTK3_PRINT=""
 if test "x$enable_gtk3" = "xyes"; then
 if test "$with_system_cairo" != yes; then
 echo "System cairo required for gtk3 support, please use 
--with-system-cairo"
 fi
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 cairo, 
ENABLE_GTK3="TRUE", ENABLE_GTK3="")
-
 if test "x$ENABLE_GTK3" = "xTRUE"; then
 R="gtk3"
 else
 AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
 fi
-
-AC_MSG_CHECKING([whether to enable Gtk3 print dialog support])
-PKG_CHECK_MODULES([GTK3_PRINT], [gtk+-unix-print-3.0 >= 3.2.0],
-  [ENABLE_GTK3_PRINT="TRUE"],
-  [ENABLE_GTK3_PRINT=""])
 fi
 AC_SUBST(GTK3_LIBS)
 AC_SUBST(GTK3_CFLAGS)
 AC_SUBST(ENABLE_GTK3)
-AC_SUBST(GTK3_PRINT_CFLAGS)
-AC_SUBST(GTK3_PRINT_LIBS)
-AC_SUBST(ENABLE_GTK3_PRINT)
 
 AC_MSG_CHECKING([which VCLplugs shall be built])
 ENABLE_GTK=""
diff --git a/set_soenv.in b/set_soenv.in
index 0df1f6b..6c6c200 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1548,9 +1548,6 @@ ToFile( "DBUS_LIBS", "@DBUS_LIBS@","e" );
 ToFile( "ENABLE_GTK_PRINT",  "@ENABLE_GTK_PRINT@",  "e" );
 ToFile( "GTK_PRINT_CFLAGS",  "@GTK_PRINT_CFLAGS@",  "e" );
 ToFile( "GTK_PRINT_LIBS","@GTK_PRINT_LIBS@","e" );
-ToFile( "ENABLE_GTK3_PRINT",  "@ENABLE_GTK3_PRINT@",  "e" );
-ToFile( "GTK3_PRINT_CFLAGS",  "@GTK3_PRINT_CFLAGS@",  "e" );
-ToFile( "GTK3_PRINT_LIBS","@GTK3_PRINT_LIBS@","e" );
 ToFile( "ENABLE_GCONF",  "@ENABLE_GCONF@", "e" );
 ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
 ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index fb76c69..ca50535 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -82,7 +82,6 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
 
 $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
dbus \
-   gtk3 \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
@@ -107,7 +106,9 @@ $(eval $(call 
gb_Library_add_exception_objects,vclplug_gtk3,\
 vcl/unx/gtk3/app/gtk3gtkinst \
 vcl/unx/gtk3/app/gtk3gtksys \
 vcl/unx/gtk3/app/gtk3fpicker \
+vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
+vcl/unx/gtk3/gdi/gtk3salprn-gtk \
 vcl/unx/gtk3/window/gtk3gtkframe \
 vcl/unx/gtk3/window/gtk3gtkobject \
 vcl/headless/svpbmp \
@@ -119,13 +120,6 @@ $(eval $(call 
gb_Library_add_exception_objects,vclplug_gtk3,\
 vcl/headless/svpvd \
 ))
 
-ifeq ($(ENABLE_GTK3_PRINT),TRUE)
-$(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
-vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
-vcl/unx/gtk3/gdi/gtk3salprn-gtk \
-))
-endif
-
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
 dl \
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index e9c2afa..b6eacc9 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -401,7 +401,7 @@ void GtkInstance::AddToRecentDocumentList(const 
rtl::OUString& rFileUrl, const r
 SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* 
pQueueInfo,
 ImplJobSetup* pSetupData )
 {
-#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT
+#if defined ENABLE_GTK_PRIN

[Libreoffice-commits] .: configure.in RepositoryExternal.mk set_soenv.in vcl/Library_vclplug_gtk3.mk vcl/unx

2011-12-06 Thread Thorsten Behrens

 RepositoryExternal.mk   |   23 +++
 configure.in|   12 
 set_soenv.in|3 +++
 vcl/Library_vclplug_gtk3.mk |   10 --
 vcl/unx/gtk/app/gtkinst.cxx |4 ++--
 vcl/unx/gtk/inc/gtkprintwrapper.hxx |4 ++--
 6 files changed, 50 insertions(+), 6 deletions(-)

New commits:
commit 88a4a8d997921309a7886ed0d1dc383ee3c2f767
Author: Thorsten Behrens 
Date:   Tue Dec 6 17:27:05 2011 +0100

GdkPrinter seems optional on Gtk3, too

Added necessary configure magic & conditional compiles for that.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6da9253..92d9aca 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -660,6 +660,29 @@ endif
 
 endef
 
+define gb_LinkTarget__use_gtk3
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(GTK3_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),$(GTK3_LIBS))
+
+ifeq ($(ENABLE_GTK3_PRINT),TRUE)
+
+$(call gb_LinkTarget_add_defs,$(1),-DENABLE_GTK3_PRINT)
+
+$(call gb_LinkTarget_set_include,$(1),\
+   $$(INCLUDE) \
+   $(GTK3_PRINT_CFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),$(GTK3_PRINT_LIBS))
+
+endif
+
+endef
+
 define gb_LinkTarget__use_gthread
 $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS))
 
diff --git a/configure.in b/configure.in
index 8b23b1f..1d2cde1 100644
--- a/configure.in
+++ b/configure.in
@@ -7003,20 +7003,32 @@ R=""
 GTK3_CFLAGS=""
 GTK3_LIBS=""
 ENABLE_GTK3=""
+GTK3_PRINT_CFLAGS=""
+GTK3_PRINT_LIBS=""
+ENABLE_GTK3_PRINT=""
 if test "x$enable_gtk3" = "xyes"; then
 if test "$with_system_cairo" != yes; then
 echo "System cairo required for gtk3 support, please use 
--with-system-cairo"
 fi
 PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 cairo, 
ENABLE_GTK3="TRUE", ENABLE_GTK3="")
+
 if test "x$ENABLE_GTK3" = "xTRUE"; then
 R="gtk3"
 else
 AC_MSG_ERROR([gtk3 libraries of the correct versions, not found])
 fi
+
+AC_MSG_CHECKING([whether to enable Gtk3 print dialog support])
+PKG_CHECK_MODULES([GTK3_PRINT], [gtk+-unix-print-3.0 >= 3.2.0],
+  [ENABLE_GTK3_PRINT="TRUE"],
+  [ENABLE_GTK3_PRINT=""])
 fi
 AC_SUBST(GTK3_LIBS)
 AC_SUBST(GTK3_CFLAGS)
 AC_SUBST(ENABLE_GTK3)
+AC_SUBST(GTK3_PRINT_CFLAGS)
+AC_SUBST(GTK3_PRINT_LIBS)
+AC_SUBST(ENABLE_GTK3_PRINT)
 
 AC_MSG_CHECKING([which VCLplugs shall be built])
 ENABLE_GTK=""
diff --git a/set_soenv.in b/set_soenv.in
index 6c6c200..0df1f6b 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1548,6 +1548,9 @@ ToFile( "DBUS_LIBS", "@DBUS_LIBS@","e" );
 ToFile( "ENABLE_GTK_PRINT",  "@ENABLE_GTK_PRINT@",  "e" );
 ToFile( "GTK_PRINT_CFLAGS",  "@GTK_PRINT_CFLAGS@",  "e" );
 ToFile( "GTK_PRINT_LIBS","@GTK_PRINT_LIBS@","e" );
+ToFile( "ENABLE_GTK3_PRINT",  "@ENABLE_GTK3_PRINT@",  "e" );
+ToFile( "GTK3_PRINT_CFLAGS",  "@GTK3_PRINT_CFLAGS@",  "e" );
+ToFile( "GTK3_PRINT_LIBS","@GTK3_PRINT_LIBS@","e" );
 ToFile( "ENABLE_GCONF",  "@ENABLE_GCONF@", "e" );
 ToFile( "ENABLE_GNOMEVFS",   "@ENABLE_GNOMEVFS@",  "e" );
 ToFile( "ENABLE_GSTREAMER",  "@ENABLE_GSTREAMER@", "e" );
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index ca50535..fb76c69 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -82,6 +82,7 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
 
 $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
dbus \
+   gtk3 \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
@@ -106,9 +107,7 @@ $(eval $(call 
gb_Library_add_exception_objects,vclplug_gtk3,\
 vcl/unx/gtk3/app/gtk3gtkinst \
 vcl/unx/gtk3/app/gtk3gtksys \
 vcl/unx/gtk3/app/gtk3fpicker \
-vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk \
-vcl/unx/gtk3/gdi/gtk3salprn-gtk \
 vcl/unx/gtk3/window/gtk3gtkframe \
 vcl/unx/gtk3/window/gtk3gtkobject \
 vcl/headless/svpbmp \
@@ -120,6 +119,13 @@ $(eval $(call 
gb_Library_add_exception_objects,vclplug_gtk3,\
 vcl/headless/svpvd \
 ))
 
+ifeq ($(ENABLE_GTK3_PRINT),TRUE)
+$(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
+vcl/unx/gtk3/gdi/gtk3gtkprintwrapper \
+vcl/unx/gtk3/gdi/gtk3salprn-gtk \
+))
+endif
+
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
 dl \
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index b6eacc9..e9c2afa 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -401,7 +401,7 @@ void GtkInstance::AddToRecentDocumentList(const 
rtl::OUString& rFileUrl, const r
 SalInfoPrinter* GtkInstance::CreateInfoPrinter( SalPrinterQueueInfo* 
pQueueInfo,
 ImplJobSetup* pSetupData )
 {
-#if defined ENABLE_GTK_PRINT || GTK_CHECK_VERSION(3,0,0)
+#if defined ENABLE_GTK_PRINT || defined ENABLE_GTK3_PRINT
 mbPrinterInit = true;
 // c

[Libreoffice-commits] .: configure.in

2011-12-06 Thread Petr Mladek

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 534475f2501d5af1fe5d102024c7eb404d850a4d
Author: Petr Mladek 
Date:   Tue Dec 6 15:03:01 2011 +0100

make --disable-unix-qstart-libpng really work (fdo#36497)

diff --git a/configure.in b/configure.in
index d50a9eb..8b23b1f 100644
--- a/configure.in
+++ b/configure.in
@@ -671,7 +671,7 @@ AC_ARG_ENABLE(unix-qstart-libpng,
 [On UNIX systems, we have a faster splash app, that can use libpng to
  render its splash, if we can safely link to the system libpng then
  enabling this is a good idea (ie. for Linux Distro packaging).]),
-,enable_unix_libpng=yes)
+,enable_unix_qstart_libpng=yes)
 
 AC_ARG_ENABLE(binfilter,
 AS_HELP_STRING([--enable-binfilter],
@@ -7144,7 +7144,7 @@ AC_SUBST(LIBPNG_LIBS)
 AC_SUBST(LIBPNG_CFLAGS)
 
 AC_MSG_CHECKING([whether to enable libpng linking in quickstarter])
-if test "x$unix_qstart_libpng" != "xno"; then
+if test "x$enable_unix_qstart_libpng" != "xno"; then
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-12-04 Thread Lionel Elie Mamane

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04f53f0714ed364177a740d9de52c497cda74064
Author: Lionel Elie Mamane 
Date:   Mon Dec 5 07:46:59 2011 +0100

configure.in: search for pg_config in default fink/MacPort locations

diff --git a/configure.in b/configure.in
index 5b2a01c..cf0d3cb 100644
--- a/configure.in
+++ b/configure.in
@@ -5409,7 +5409,7 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes" -a 
"x$enable_extension_integrati
 SYSTEM_POSTGRESQL=YES
 if test "$_os" = Darwin; then
supp_path=''
-   for d in /Library/PostgreSQL/9.*/bin; do
+   for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin 
/opt/local/lib/postgresql9*/bin; do
 pg_supp_path="$PATH_SEPARATOR$d$pg_supp_path"
done
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-30 Thread Lionel Elie Mamane

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 130028f2b4f27765ddf1b657f1f8e1d4a4005698
Author: Lionel Elie Mamane 
Date:   Wed Nov 30 22:54:42 2011 +0100

configure pgsql-sdbc: use PGCONFIG instead of relying on PATH

diff --git a/configure.in b/configure.in
index e2b9ea3..a9dac9d 100644
--- a/configure.in
+++ b/configure.in
@@ -5411,8 +5411,8 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes" -a 
"x$enable_extension_integrati
 if test -z "$PGCONFIG"; then
AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
 fi
-POSTGRESQL_INC=-I$(pg_config --includedir)
-POSTGRESQL_LIB="-L$(pg_config --libdir)"
+POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
+POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
 else
 SYSTEM_POSTGRESQL=NO
 if test -n "$with_libpq_path"; then
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in connectivity/source

2011-11-30 Thread Lionel Elie Mamane

 configure.in   |   10 +-
 connectivity/source/drivers/postgresql/makefile.mk |9 +
 2 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 05b53b1b8e500b31bef1db737303725a168379da
Author: Lionel Elie Mamane 
Date:   Wed Nov 30 21:09:43 2011 +0100

postgresql-sdbc: review build rules

diff --git a/configure.in b/configure.in
index a47725f..e2b9ea3 100644
--- a/configure.in
+++ b/configure.in
@@ -5400,7 +5400,7 @@ dnl 
===
 dnl Check for PostgreSQL stuff
 dnl ===
 
-if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
+if test "x$enable_ext_postgresql_sdbc" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
 
 AC_MSG_CHECKING([for PostgreSQL prerequisites])
@@ -5412,12 +5412,12 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
 fi
 POSTGRESQL_INC=-I$(pg_config --includedir)
-POSTGRESQL_LIB="-L$(pg_config --libdir) -lpq"
+POSTGRESQL_LIB="-L$(pg_config --libdir)"
 else
 SYSTEM_POSTGRESQL=NO
 if test -n "$with_libpq_path"; then
 AC_MSG_RESULT([external libpq])
-POSTGRESQL_LIB="-L${with_libpq_path}/lib/ -lpq"
+POSTGRESQL_LIB="-L${with_libpq_path}/lib/"
 POSTGRESQL_INC=-I"${with_libpq_path}/include/"
 else
 AC_MSG_ERROR([not given. Please specify either 
--with-system-postgresql or --with-libpq-path])
@@ -5427,8 +5427,8 @@ if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
 save_CFLAGS=$CFLAGS
 save_CPPFLAGS=$CPPFLAGS
 save_LIBS=$LIBS
-CPPFLAGS="${POSTGRESQL_INC}"
-LIBS="${POSTGRESQL_LIB}"
+CPPFLAGS="${CPPFLAGS} ${POSTGRESQL_INC}"
+LIBS="${LIBS} ${POSTGRESQL_LIB}"
 AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], 
[])
 AC_CHECK_LIB(pq, PQconnectdbParams, [],
 [AC_MSG_ERROR(libpq not found or too old. Need >= 9.0)], [])
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 4f2dffd..e498981 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -97,14 +97,14 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=  $(SHL1TARGET)
 SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 
-# use the static version
+# use the static version on Windows?
 # LEM 17/11/2011: removed everything except libpq proper;
 #  as per instructions in libpq documentation.
 #  If it turns out the rest was needed, reenable it.
 .IF "$(GUI)"=="WNT"
-POSTGRESQL_LIB=libpq.lib #wsock32.lib advapi32.lib
+LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib
 .ELSE
-POSTGRESQL_LIB=-lpq #-lcrypt
+LIBPQ_LINK=-lpq #-lcrypt
 .ENDIF
 SHL2TARGET=postgresql-sdbc-impl.uno
 LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
@@ -148,7 +148,8 @@ SHL2STDLIBS= \
 $(CPPUHELPERLIB)   \
 $(SALLIB)  \
 $(SALHELPERLIB)\
-$(POSTGRESQL_LIB)
+$(POSTGRESQL_LIB)  \
+$(LIBPQ_LINK)
 
 SHL2LIBS=  $(LIB2TARGET)
 SHL2DEF=   $(MISC)$/$(SHL2TARGET).def
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in connectivity/prj connectivity/source scp2/source setup_native/source

2011-11-30 Thread Michael Meeks

 configure.in |2 ++
 connectivity/prj/d.lst   |1 +
 connectivity/source/drivers/postgresql/makefile.mk   |2 +-
 scp2/source/extensions/directory_extensions.scp  |   11 +++
 scp2/source/extensions/file_extensions.scp   |   13 +
 scp2/source/extensions/module_extensions.scp |   15 +++
 scp2/source/extensions/module_extensions.ulf |6 ++
 setup_native/source/packinfo/packinfo_extensions.txt |   15 +++
 8 files changed, 64 insertions(+), 1 deletion(-)

New commits:
commit 51bd0803b34565ee68d8be62e4076cb581785b06
Author: Michael Meeks 
Date:   Wed Nov 30 12:39:32 2011 +

rename, and bundle the postgresql driver if it is enabled

diff --git a/configure.in b/configure.in
index 4c11c91..cafaf1f 100644
--- a/configure.in
+++ b/configure.in
@@ -5396,6 +5396,8 @@ dnl Check for PostgreSQL stuff
 dnl ===
 
 if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
+SCPDEFS="$SCPDEFS -DWITH_EXTENSION_POSTGRESQL"
+
 AC_MSG_CHECKING([for PostgreSQL prerequisites])
 if test "$with_system_postgresql" = "yes"; then
 AC_MSG_RESULT([external PostgreSQL])
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 1387da4..55099c2 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -7,6 +7,7 @@
 ..\%__SRC%\lib\*.a %_DEST%\lib\*.a
 ..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.*
 ..\%__SRC%\lib\idbt* %_DEST%\lib\idbt*
+..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt
 ..\source\cpool\*.xml %_DEST%\xml\*.xml
 ..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml
 ..\source\drivers\ado\*.xml %_DEST%\xml\*.xml
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index f0f184e..4f2dffd 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -159,7 +159,7 @@ SHL2VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
 SLOFILES=   $(LIB1OBJFILES) $(LIB2OBJFILES)
 
 
-DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_VERSION).oxt
+DRIVERNAME=postgresql-sdbc.oxt
 ALLTAR : $(DLLDEST)$/$(DRIVERNAME)
 
 .ENDIF # BUILD_POSTGRESQL_SDBC
diff --git a/scp2/source/extensions/directory_extensions.scp 
b/scp2/source/extensions/directory_extensions.scp
index a7295a7..69e5dc5 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -223,6 +223,17 @@ End
 
 #endif
 
+/* ** PostgreSQL Connector ** */
+
+#ifdef WITH_EXTENSION_POSTGRESQL
+
+Directory gid_Brand_Dir_Share_Extensions_PostgreSQL
+   ParentID = gid_Brand_Dir_Share_Extensions;
+   DosName = "postgresql-sdbc";
+End
+
+#endif
+
 /* ** MySQL Connector ** */
 
 #ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/file_extensions.scp 
b/scp2/source/extensions/file_extensions.scp
index 7c34871..48f9e42 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -256,6 +256,19 @@ End
 
 #endif
 
+/* ** PostgreSQL Connector ** */
+
+#ifdef WITH_EXTENSION_POSTGRESQL
+
+File gid_File_Oxt_PostgreSQL
+TXT_FILE_BODY;
+Styles = (PACKED, ARCHIVE);
+Dir = gid_Brand_Dir_Share_Extensions_PostgreSQL;
+Name = "postgresql-sdbc.oxt";
+End
+
+#endif
+
 /* ** MySQL Connector ** */
 
 #ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/module_extensions.scp 
b/scp2/source/extensions/module_extensions.scp
index e3514bc..91e6baf 100644
--- a/scp2/source/extensions/module_extensions.scp
+++ b/scp2/source/extensions/module_extensions.scp
@@ -295,6 +295,21 @@ Module gid_Module_Optional_Extensions_LanguageTool
 End
 #endif
 
+/* ** PostgreSQL Connector ** */
+
+#ifdef WITH_EXTENSION_POSTGRESQL
+Module gid_Module_Optional_Extensions_PostgreSQL
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_PostgreSQL );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
 /* ** MySQL Connector ** */
 
 #ifdef WITH_EXTENSION_MYSQLC
diff --git a/scp2/source/extensions/module_extensions.ulf 
b/scp2/source/extensions/module_extensions.ulf
index 4a7dbc5..3c7cb80 100644
--- a/scp2/source/extensions/module_extensions.ulf
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -141,6 +141,12 @@ en-US = "MySQL Connector"
 [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
 en-US = "MySQL Connector"
 
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL]
+en-US = "PostgreSQL Connector"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_POSTGRESQL]
+en-US = "PostgreSQL Connector"
+
 [STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
 en-US = "Metaweblog Support"
 
diff --git a/setup_native/source/packinfo/packinfo_extensions.txt 
b/setup_native/source/packinfo/packinfo_extensions.txt
index 225ab49..5d5c790 100644

[Libreoffice-commits] .: configure.in

2011-11-29 Thread Kalman "" Szalai

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e57e5b0c7f1a5ec6cd008226f126438d65cbd8d0
Author: Kalman Szalai - KAMI 
Date:   Wed Nov 30 06:58:15 2011 +0100

Use SmART Gallery 0.95

diff --git a/configure.in b/configure.in
index b9b3577..4c11c91 100644
--- a/configure.in
+++ b/configure.in
@@ -8118,7 +8118,7 @@ AC_MSG_CHECKING([for SmART Gallery (Diagram) extension 
integration])
 DIAGRAM_EXTENSION_PACK=
 if test "x$enable_ext_diagram" = "xyes" -a "x$enable_extension_integration" != 
"xno"; then
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_DIAGRAM"
-DIAGRAM_EXTENSION_PACK="4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt"
+DIAGRAM_EXTENSION_PACK="8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt"
 AC_MSG_RESULT([yes])
 else
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in download ooo.lst.in set_soenv.in

2011-11-29 Thread Kalman "" Szalai

 configure.in |   21 +
 download |6 ++
 ooo.lst.in   |1 +
 set_soenv.in |   10 ++
 4 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 8aa73a8f74cfcdc2fffdc16c8094bd257c8ade0d
Author: Kalman Szalai - KAMI 
Date:   Tue Nov 29 17:12:02 2011 +0100

Add enable-oxygenoffice configure switch

Now only handling brand downloading

diff --git a/configure.in b/configure.in
index 3e3671f..005a68e 100644
--- a/configure.in
+++ b/configure.in
@@ -784,6 +784,11 @@ AC_ARG_ENABLE(extra-font,
 [Add extra font content.]),
 ,)
 
+AC_ARG_ENABLE(oxygenoffice,
+AS_HELP_STRING([--enable-oxygenoffice],
+[Download OxygenOffice branding and set custom settings.]),
+,)
+
 AC_ARG_ENABLE(lomenubar,
 AS_HELP_STRING([--enable-lomenubar],
 [Enable global menu support.]),
@@ -8437,6 +8442,22 @@ AC_SUBST(WITH_EXTRA_FONT)
 AC_SUBST(OOOP_FONTS_PACK)
 
 dnl ===
+dnl Test whether to download OxygenOffice branding and set custom settings
+dnl ===
+AC_MSG_CHECKING([whether to download OxygenOffice branding and set custom 
settings])
+if test "z$enable_oxygenoffice" = "z" -o "z$enable_oxygenoffice" = "zno" ; then
+AC_MSG_RESULT([no])
+ENABLE_OXYGENOFFICE=NO
+else
+AC_MSG_RESULT([yes])
+ENABLE_OXYGENOFFICE=YES
+OXYGENOFFICE_PACK="18bf204479ff641d99a88cd71f6f25f7-oxygenoffice-001.zip"
+BUILD_TYPE="$BUILD_TYPE OXYGENOFFICE"
+fi
+AC_SUBST(ENABLE_OXYGENOFFICE)
+AC_SUBST(OXYGENOFFICE_PACK)
+
+dnl ===
 dnl Test whether to build global menu support
 dnl ===
 AC_MSG_CHECKING([whether to build global menu support])
diff --git a/download b/download
index ded21af..716bd53 100755
--- a/download
+++ b/download
@@ -278,6 +278,12 @@ for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK 
$OOOP_SAMPLES_PACK $OOOP_TEMPLAT
 unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source
 done
 
+if [ $OXYGENOFFICE_PACK = "YES" ] ; then
+check_file $TARFILE_LOCATION/$OXYGENOFFICE_PACK
+echo "Unpacking OxygenOffice '$OXYGENOFFICE_PACK' ..."
+unzip -o -q $TARFILE_LOCATION/$OXYGENOFFICE_PACK -d $SRC_ROOT/src
+fi
+
 # Extensions copy
 for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK 
$VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK 
$NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK 
$GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK 
$LIGHTPROOF_RU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK 
$SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK 
$SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
 check_file $TARFILE_LOCATION/$pack
diff --git a/ooo.lst.in b/ooo.lst.in
index 51695cf..991bca5 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -98,6 +98,7 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 @OOOP_TEMPLATES_PACK@
 @OOOP_FONTS_PACK@
 @OOOP_SAMPLES_PACK@
+@OXYGENOFFICE_PACK@
 @CT2N_EXTENSION_PACK@
 @BARCODE_EXTENSION_PACK@
 @DIAGRAM_EXTENSION_PACK@
diff --git a/set_soenv.in b/set_soenv.in
index 3011c09..b399531 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1942,10 +1942,12 @@ ToFile( "USE_FT_EMBOLDEN",   "@USE_FT_EMBOLDEN@",  "e" 
);
 ToFile( "LIBXML_CFLAGS", "@LIBXML_CFLAGS@","e" );
 ToFile( "LIBXML_LIBS",   "@LIBXML_LIBS@",  "e" );
 ToFile( "SYSTEM_EXPAT",  "@SYSTEM_EXPAT@", "e" );
-ToFile( "WITH_EXTRA_GALLERY",   "@WITH_EXTRA_GALLERY@",  "e" );
-ToFile( "WITH_EXTRA_TEMPLATE",   "@WITH_EXTRA_TEMPLATE@",  "e" );
-ToFile( "WITH_EXTRA_SAMPLE",   "@WITH_EXTRA_SAMPLE@",  "e" );
-ToFile( "WITH_EXTRA_FONT",   "@WITH_EXTRA_FONT@",  "e" );
+ToFile( "WITH_EXTRA_GALLERY","@WITH_EXTRA_GALLERY@",  "e" );
+ToFile( "WITH_EXTRA_TEMPLATE","@WITH_EXTRA_TEMPLATE@",  "e" );
+ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@",  "e" );
+ToFile( "WITH_EXTRA_FONT",   "@WITH_EXTRA_FONT@",  "e" );
+ToFile( "ENABLE_OXYGENOFFICE","@ENABLE_OXYGENOFFICE@","e" );
+ToFile( "OXYGENOFFICE_PACK","@OXYGENOFFICE_PACK@","e" );
 ToFile( "SYSTEM_DB", "@SYSTEM_DB@","e" );
 ToFile( "SYSTEM_DB_CFLAGS",  "@SYSTEM_DB_CFLAGS@", "e" );
 ToFile( "DB_LIB","@DB_LIB@",   "e" );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in set_soenv.in

2011-11-29 Thread Tomáš Chvátal

 configure.in |1 +
 set_soenv.in |1 +
 2 files changed, 2 insertions(+)

New commits:
commit b8a2970f24872ee1620f3cc2381055b14484dd63
Author: Tomas Chvatal 
Date:   Tue Nov 29 13:09:06 2011 +0100

Export DO_FETCH_TARBALLS in set_soenv.

diff --git a/configure.in b/configure.in
index d925ba4..3e3671f 100644
--- a/configure.in
+++ b/configure.in
@@ -2553,6 +2553,7 @@ if test "z$enable_fetch_external" != "zno" ; then
 DO_FETCH_TARBALLS="YES"
 else
 AC_MSG_RESULT([no])
+DO_FETCH_TARBALLS="NO"
 fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
diff --git a/set_soenv.in b/set_soenv.in
index b723e14..10a0937 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1484,6 +1484,7 @@ ToFile( "LIBDIR","@LIBDIR@", "e" );
 ToFile( "DATADIR",   "@DATADIR@","e" );
 ToFile( "MANDIR","@MANDIR@", "e" );
 ToFile( "DOCDIR","@DOCDIR@",  "e" );
+ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS", "e" );
 ToFile( "BUILD_MOZAB",   "@BUILD_MOZAB@","e" );
 ToFile( "PREBUILD_MOZAB",$PREBUILD_MOZAB,"e" );
 ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-29 Thread Tomáš Chvátal

 configure.in |4 
 1 file changed, 4 insertions(+)

New commits:
commit a43caa76d9da112f40a973911e779fc42c5af3c3
Author: Tomas Chvatal 
Date:   Tue Nov 29 11:04:16 2011 +0100

Add checking msg for tarball fetching so we know if it is on/off

diff --git a/configure.in b/configure.in
index 4bb2f1f..d925ba4 100644
--- a/configure.in
+++ b/configure.in
@@ -2547,8 +2547,12 @@ if test -z "$TARFILE_LOCATION"; then
 fi
 AC_SUBST(TARFILE_LOCATION)
 
+AC_MSG_CHECKING([whether we want to fetch tarballs])
 if test "z$enable_fetch_external" != "zno" ; then
+AC_MSG_RESULT([yes])
 DO_FETCH_TARBALLS="YES"
+else
+AC_MSG_RESULT([no])
 fi
 AC_SUBST(DO_FETCH_TARBALLS)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-28 Thread Thorsten Behrens

 configure.in |  111 ++-
 1 file changed, 80 insertions(+), 31 deletions(-)

New commits:
commit 9c31884d929f837695f3ed0a2ead8c5aea900ec7
Author: Thorsten Behrens 
Date:   Tue Nov 29 05:50:51 2011 +0100

Make branding bulk-configurable.

diff --git a/configure.in b/configure.in
index 3977d7f..4bb2f1f 100644
--- a/configure.in
+++ b/configure.in
@@ -1591,6 +1591,16 @@ dnl 
===
 dnl Branding
 dnl ===
 
+AC_ARG_WITH(branding,
+[  --with-brandingUse given path to retrieve all branding images.
+  Expects /path/intro.png ...
+  /path/backing_rtl_right.png to be there. Individual
+  images can be overridden via --with-intro-bitmap ...
+  --with-startcenter-rtl-left-bitmap switches.
+
+  Usage: --with-branding=/path/to/images
+],,)
+
 AC_ARG_WITH(intro-bitmap,
 [  --with-intro-bitmapPrefer the specified intro bitmap over the
   the default one.
@@ -9224,20 +9234,6 @@ if test -n "${GIT_LINK_SRC}"; then
 fi
 AC_SUBST(GIT_LINK_SRC)
 
-AC_MSG_CHECKING([for another 'intro' bitmap])
-INTRO_BITMAP=
-if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
-INTRO_BITMAP=
-AC_MSG_RESULT([none])
-else
-case "$with_intro_bitmap" in
-*.png) INTRO_BITMAP="$with_intro_bitmap" ;;
-*) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
-esac
-AC_MSG_RESULT([$INTRO_BITMAP])
-fi
-AC_SUBST(INTRO_BITMAP)
-
 AC_MSG_CHECKING([for custom 'intro' progress bar color])
 PROGRESSBARCOLOR=
 if test -z "$with_intro_progressbar_color" ; then
@@ -9282,10 +9278,58 @@ else
 fi
 AC_SUBST(PROGRESSFRAMECOLOR)
 
-AC_MSG_CHECKING([for another 'about' bitmap])
+AC_MSG_CHECKING([for alternative branding images directory])
+INTRO_BITMAP=
 ABOUT_BITMAP=
+STARTCENTER_LEFT_BITMAP=
+STARTCENTER_RIGHT_BITMAP=
+STARTCENTER_RTL_LEFT_BITMAP=
+STARTCENTER_RTL_RIGHT_BITMAP=
+STARTCENTER_SPACE_BITMAP=
+if test -z "$with_branding" -o "$with_branding" = "no" ; then
+AC_MSG_RESULT([none])
+else
+INTRO_BITMAP="$with_branding/intro.png"
+ABOUT_BITMAP="$with_branding/about.png"
+STARTCENTER_LEFT_BITMAP="$with_branding/backing_left.png"
+STARTCENTER_RIGHT_BITMAP="$with_branding/backing_right.png"
+STARTCENTER_RTL_LEFT_BITMAP="$with_branding/backing_rtl_left.png"
+STARTCENTER_RTL_RIGHT_BITMAP="$with_branding/backing_rtl_right.png"
+STARTCENTER_SPACE_BITMAP="$with_branding/backing_space.png"
+for i in $INTRO_BITMAP \
+ $ABOUT_BITMAP \
+ $STARTCENTER_LEFT_BITMAP \
+ $STARTCENTER_RIGHT_BITMAP \
+ $STARTCENTER_RTL_LEFT_BITMAP \
+ $STARTCENTER_RTL_RIGHT_BITMAP \
+ $STARTCENTER_SPACE_BITMAP; do
+if test ! -f $i; then
+AC_MSG_WARN([Required file $i does not exist!])
+fi
+done
+AC_MSG_RESULT([$with_branding])
+fi
+
+AC_MSG_CHECKING([for yet another 'intro' bitmap])
+if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then
+if test "$with_intro_bitmap" = "no" ; then
+INTRO_BITMAP=
+fi
+AC_MSG_RESULT([none])
+else
+case "$with_intro_bitmap" in
+*.png) INTRO_BITMAP="$with_intro_bitmap" ;;
+*) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;;
+esac
+AC_MSG_RESULT([$INTRO_BITMAP])
+fi
+AC_SUBST(INTRO_BITMAP)
+
+AC_MSG_CHECKING([for yet another 'about' bitmap])
 if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no" ; then
-ABOUT_BITMAP=
+if test "$with_about_bitmap" = "no" ; then
+ABOUT_BITMAP=
+fi
 AC_MSG_RESULT([none])
 else
case "$with_about_bitmap" in
@@ -9296,10 +9340,11 @@ else
 fi
 AC_SUBST(ABOUT_BITMAP)
 
-AC_MSG_CHECKING([for another 'start center left' bitmap])
-STARTCENTER_LEFT_BITMAP=
+AC_MSG_CHECKING([for yet another 'start center left' bitmap])
 if test -z "$with_startcenter_left_bitmap" -o "$with_startcenter_left_bitmap" 
= "no" ; then
-   STARTCENTER_LEFT_BITMAP=
+   if test "$with_startcenter_left_bitmap" = "no" ; then
+  STARTCENTER_LEFT_BITMAP=
+   fi
AC_MSG_RESULT([none])
 else
case "$with_startcenter_left_bitmap" in
@@ -9310,10 +9355,11 @@ else
 fi
 AC_SUBST(STARTCENTER_LEFT_BITMAP)
 
-AC_MSG_CHECKING([for another 'start center right' bitmap])
-STARTCENTER_RIGHT_BITMAP=
+AC_MSG_CHECKING([for yet another 'start center right' bitmap])
 if test -z "$with_startcenter_right_bitmap" -o 
"$with_startcenter_right_bitmap" = "no" ; then
-   STARTCENTER_RIGHT_BITMAP=
+   if test "$with_startcenter_right_bitmap" = "no" ; then
+  STARTCENTER_RIGHT_BITMAP=
+   fi
AC_MSG_RESULT([none])
 else
case "$with_startcenter_right_bitmap" in
@@ -9324,10 +9370,11 @@ else
 fi
 AC_SUBST(STARTCENTER_RIGHT_BITMAP)
 
-AC_MSG_CHECKING([for another '

[Libreoffice-commits] .: configure.in

2011-11-28 Thread Tor Lillqvist

 configure.in |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7c8c4f783101a427da5e1f44eede054595a72605
Author: Tor Lillqvist 
Date:   Sun Nov 27 00:20:38 2011 +0200

Add comment about SOLAR_JAVA's alleged "BUILD" value

diff --git a/configure.in b/configure.in
index 2f8cf7f..3977d7f 100644
--- a/configure.in
+++ b/configure.in
@@ -3875,7 +3875,12 @@ AC_SUBST(SOLAR_JAVA)
 dnl SOLAR_JAVA="YES" (yes, silly name, should rename) indicates whether we
 dnl want there to be *run-time* (and build-time) support for Java extensions 
in the
 dnl built LibreOffice.
-dnl SOLAR_JAVA="BUILD" indicate build-time only support (no runtime support)
+
+dnl SOLAR_JAVA="BUILD" is claimed to indicate build-time only support
+dnl (no runtime support). It doesn't seem to ever be set to this
+dnl value, though, and everywhere SOLAR_JAVA is only checked for being
+dnl empty or non-empty.
+
 dnl SOLAR_JAVA="" indicate no java support at all
 
 if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in icc/makefile.mk icc/prj icc/SampleICC-makefiles.patch icc/source set_soenv.in

2011-11-23 Thread Tomáš Chvátal

 configure.in   |   21 +
 icc/SampleICC-makefiles.patch  |2 
 icc/makefile.mk|   15 -
 icc/prj/build.lst  |5 
 icc/prj/d.lst  |4 
 icc/source/create_sRGB_profile/Makefile.am |   13 
 icc/source/create_sRGB_profile/Makefile.in |  378 -
 icc/source/create_sRGB_profile/makefile.mk |   35 +-
 set_soenv.in   |3 
 9 files changed, 58 insertions(+), 418 deletions(-)

New commits:
commit 07f2c05391f5cf8eed94c20787ab87cd0e09378f
Author: Tomas Chvatal 
Date:   Wed Nov 23 16:44:03 2011 +0100

Make SampleICC switchable between system and internal one.

diff --git a/configure.in b/configure.in
index 6abcc22..58a20d1 100644
--- a/configure.in
+++ b/configure.in
@@ -951,6 +951,11 @@ AC_ARG_WITH(system-nss,
 [Use NSS/nspr libraries already on system.]),,
 [with_system_nss="$with_system_libs"])
 
+AC_ARG_WITH(system-sampleicc,
+AS_HELP_STRING([--with-system-sampleicc],
+[Use SampleICC libraries already on system (used only during 
build).]),,
+[with_system_sampleicc="$with_system_libs"])
+
 AC_ARG_WITH(mozilla-version,
 AS_HELP_STRING([--with-mozilla-version],
 [Choose which version of Mozilla to use while building Mozilla.
@@ -6205,6 +6210,22 @@ AC_SUBST(GRAPHITE_LIBS)
 AC_SUBST(GRAPHITE_CFLAGS)
 
 dnl ===
+dnl SampleICC
+dnl ===
+AC_MSG_CHECKING([whether to use system SampleICC])
+if test "$with_system_sampleicc" = "yes"; then
+AC_MSG_RESULT([yes])
+SYSTEM_SAMPLEICC=YES
+PKG_CHECK_MODULES(SAMPLEICC, sampleicc)
+else
+AC_MSG_RESULT([no])
+SYSTEM_SAMPLEICC=NO
+fi
+AC_SUBST(SYSTEM_SAMPLEICC)
+AC_SUBST(SAMPLEICC_LIBS)
+AC_SUBST(SAMPLEICC_CFLAGS)
+
+dnl ===
 dnl Checks for libraries.
 dnl ===
 dnl Check for Mac OS X native GUI, which may is now required; the X11 build is 
no longer supported
diff --git a/icc/SampleICC-makefiles.patch b/icc/SampleICC-makefiles.patch
index 34a59ff..7a11866 100644
--- a/icc/SampleICC-makefiles.patch
+++ b/icc/SampleICC-makefiles.patch
@@ -46,7 +46,7 @@
 +ALLTAR: Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST)
 +
 +Contrib$/CmdLine$/create_sRGB_profile$/$(TARGET)$(EXECPOST) .PHONY:
-+cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake && cd 
..$/CmdLine$/create_sRGB_profile && dmake
++cd IccProfLib && dmake && cd ..$/Contrib$/ICC_utils && dmake
 +
 --- /dev/null  2011-10-28 11:24:51.341910850 +0100
 +++ misc/build/SampleICC-1.3.2/Contrib/ICC_utils/makefile.mk   2011-11-04 
08:50:20.0 +
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 8bf13c3..e885c53 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -30,6 +30,11 @@ PRJ=.
 PRJNAME=icc
 TARGET=icc
 
+.IF "$(SYSTEM_SAMPLEICC)" == "YES"
+all:
+@echo "Using system SampleICC, nothing to do here."
+.ELSE
+
 # --- Settings -
 
 .INCLUDE : settings.mk
@@ -49,14 +54,10 @@ CONVERTFILES= \
 Contrib$/ICC_utils$/Stubs.h \
 Contrib$/ICC_utils$/Vetters.cpp
 
-.IF "$(CROSS_COMPILING)"!="YES"
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile 
Contrib$/CmdLine
-BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && 
$(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
-.ELSE
-CONFIGURE_ACTION= 
-BUILD_ACTION = (cd $(BACK_PATH)../$(INPATH_FOR_BUILD)/misc/build/SampleICC* && 
tar cf - Contrib/CmdLine/create_sRGB_profile/sRGB*.hxx) | tar xvf -
-.ENDIF
+CONFIGURE_ACTION=
+BUILD_ACTION=dmake
 
+.ENDIF
 
 # --- Targets --
 
diff --git a/icc/prj/build.lst b/icc/prj/build.lst
index e9bf65b..45fbe5a 100644
--- a/icc/prj/build.lst
+++ b/icc/prj/build.lst
@@ -1,3 +1,4 @@
 ip icc :   solenv external sal NULL
-ip icc usr1-   all ip_mkout NULL
-ip icc nmake   -   all ip_icc  NULL
+ip icc usr1-   all ip_mkout
NULL
+ip icc nmake   -   all ip_icc  
NULL
+ip  icc/source/create_sRGB_profile nmake   -   all ip_profile 
ip_icc   NULL 
diff --git a/icc/prj/d.lst b/icc/prj/d.lst
index 553de38..e01dc0a 100644
--- a/icc/prj/d.lst
+++ b/icc/prj/d.lst
@@ -1,5 +1,3 @@
 mkdir: %_DEST%\inc\icc
-mkdir: %_DEST%\inc\external\icc
-
-..\%__SRC%\misc\build\SampleICC*\Contrib\CmdLine\create_sRGB_profile\sRGB*.hxx 
%_DEST%\inc\icc\sRGB*.hxx
 
+..\%__SRC%\bin\sRGB*.hxx %_DEST%\inc\icc\sRGB*.hxx
diff --git a/icc/source/create_sRGB_profile/Makefile.am 
b/icc/source/create_sRGB_profile/Makefile.am
deleted file mode 100644

[Libreoffice-commits] .: configure.in

2011-11-23 Thread Andras Timar

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff1b70c92aed555ecdbe424aac29373142c8fcb6
Author: Andras Timar 
Date:   Wed Nov 23 15:11:31 2011 +0100

don't enable java extensions without java - fixup

diff --git a/configure.in b/configure.in
index 0d1ca1b..6abcc22 100644
--- a/configure.in
+++ b/configure.in
@@ -8196,7 +8196,7 @@ dnl 
===
 dnl Test whether to include NLPSolver extension
 dnl ===
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno" -a "x$with_java" != "no"; then
+if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno" -a "x$with_java" != "xno"; then
 BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-23 Thread Andras Timar

 configure.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 06fe563b1a9a38b9c0057e90f934435125b89605
Author: Andras Timar 
Date:   Wed Nov 23 15:09:18 2011 +0100

don't enable java extensions without java

diff --git a/configure.in b/configure.in
index eebcc78..0d1ca1b 100644
--- a/configure.in
+++ b/configure.in
@@ -7565,7 +7565,7 @@ AC_SUBST(COMMONS_LOGGING_JAR)
 
 # scripting provider for BeanShell extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in 
BeanShell])
-if test "x$enable_ext_scripting_beanshell" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
+if test "x$enable_ext_scripting_beanshell" = "xyes" -a 
"x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_BEANSHELL=YES
 else
@@ -7577,7 +7577,7 @@ AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
 
 # scripting provider for JavaScript extension?
 AC_MSG_CHECKING([whether to build extension for support of scripts in 
JavaScript])
-if test "x$enable_ext_scripting_javascript" = "xyes" -a 
"x$enable_extension_integration" != "xno"; then
+if test "x$enable_ext_scripting_javascript" = "xyes" -a 
"x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_JAVASCRIPT=YES
 else
@@ -8196,7 +8196,7 @@ dnl 
===
 dnl Test whether to include NLPSolver extension
 dnl ===
 AC_MSG_CHECKING([for NLPSolver extension integration])
-if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno"; then
+if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" 
!= "xno" -a "x$with_java" != "no"; then
 BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
 SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
 AC_MSG_RESULT([yes])
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-19 Thread François Tigeot

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fd094baaf79e391f99da9c8259b13144e8de7847
Author: FranÃ§ois Tigeot 
Date:   Sat Nov 19 21:51:37 2011 +0100

Fix --with-max-jobs description

diff --git a/configure.in b/configure.in
index 0043bdb..49d3b8e 100644
--- a/configure.in
+++ b/configure.in
@@ -1744,7 +1744,7 @@ AC_ARG_WITH(num-cpus,
 
 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 by dmake.
+[Maximum number of jobs that will be issued at the same time per dmake 
or gbuild subproject.
  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.]),
 ,)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-11-18 Thread Tomáš Chvátal

 configure.in |5 -
 1 file changed, 5 deletions(-)

New commits:
commit a738b25f7caff2a5ed789668e1ab0bf29bf5082f
Author: Tomas Chvatal 
Date:   Sat Nov 19 00:00:47 2011 +0100

Remove layout from configure opts (does nothing now).

diff --git a/configure.in b/configure.in
index b50da2e..0043bdb 100644
--- a/configure.in
+++ b/configure.in
@@ -633,11 +633,6 @@ AC_ARG_ENABLE(static-gtk,
  instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ 
libraries.)]),
 ,)
 
-AC_ARG_ENABLE(layout,
-AS_HELP_STRING([--enable-layout],
-[Enable the compilation and use of layout dialogs.]),
-,)
-
 AC_ARG_ENABLE(build-mozilla,
 AS_HELP_STRING([--disable-build-mozilla],
 [Use this option if you do not want to build the Mozilla components 
from
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in set_soenv.in solenv/bin

2011-11-18 Thread Andras Timar

 configure.in |   18 ++
 set_soenv.in |1 +
 solenv/bin/modules/installer/windows/property.pm |   13 +
 3 files changed, 32 insertions(+)

New commits:
commit 949ee7c30806357a5e7fc678c7bbf53f991c71e8
Author: Andras Timar 
Date:   Fri Nov 18 23:40:08 2011 +0100

add --enable-silent-msi configure switch

On Windows it is now configurable to create an MSI installer
which installs LibreOffice without user interaction.

diff --git a/configure.in b/configure.in
index 995..b50da2e 100644
--- a/configure.in
+++ b/configure.in
@@ -806,6 +806,11 @@ AC_ARG_ENABLE(release-build,
  See http://wiki.documentfoundation.org/DevBuild]),
 ,)
 
+AC_ARG_ENABLE(silent-msi,
+AS_HELP_STRING([--enable-silent-msi],
+[Enable MSI with LIMITUI=1 (silent install).]),
+,)
+
 dnl ===
 dnl Optional Packages (--with/without-)
 dnl ===
@@ -8459,6 +8464,19 @@ fi
 AC_SUBST(ENABLE_RELEASE_BUILD)
 
 dnl ===
+dnl Test whether to create MSI with LIMITUI=1 (silent install)
+dnl ===
+AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)])
+if test "z$enable_silent_msi" = "z" -o "z$enable_silent_msi" = "zno" ; then
+AC_MSG_RESULT([no])
+ENABLE_SILENT_MSI="FALSE"
+else
+AC_MSG_RESULT([yes])
+ENABLE_SILENT_MSI="TRUE"
+fi
+AC_SUBST(ENABLE_SILENT_MSI)
+
+dnl ===
 dnl Test whether to enable ActiveX embedding
 dnl ===
 if test "$_os" = "WINNT"; then
diff --git a/set_soenv.in b/set_soenv.in
index 7a265eb..abf12db 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1869,6 +1869,7 @@ ToFile( "VERBOSE",   "@VERBOSE@",  "e" );
 ToFile( "ENABLE_ZENITY",   "@ENABLE_ZENITY@",  "e" );
 ToFile( "ENABLE_EVOAB2", "@ENABLE_EVOAB2@","e" );
 ToFile( "ENABLE_UGLY",   "@ENABLE_UGLY@",  "e" );
+ToFile( "ENABLE_SILENT_MSI", "@ENABLE_SILENT_MSI@", "e" );
 ToFile( "ENABLE_RELEASE_BUILD", "@ENABLE_RELEASE_BUILD@", "e" );
 ToFile( "GOBJECT_CFLAGS","@GOBJECT_CFLAGS@",   "e" );
 ToFile( "GOBJECT_LIBS",  "@GOBJECT_LIBS@", "e" );
diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index b7aa5ca..ee33596 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -480,6 +480,8 @@ sub update_property_table
 
 my $propertyfile = installer::files::read_file($properyfilename);
 
+my $hasarpnomodify = false;
+
 # Getting the new values
 # Some values (arpcomments, arpcontacts, ...) are inserted from the 
Property.mlf
 
@@ -504,6 +506,17 @@ sub update_property_table
 ${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/;
 ${$propertyfile}[$i] =~ s/\bPRODUCTVERSIONTEMPLATE\b/$productversion/;
 ${$propertyfile}[$i] =~ 
s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
+if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 
true; }
+}
+
+# Check if are building silent MSI
+if ( $ENV{ENABLE_SILENT_MSI} eq "TRUE" )
+{
+push(@{$propertyfile}, "LIMITUI" . "\t" . "1" . "\n");
+if ( !($hasarpnomodify) )
+{
+push(@{$propertyfile}, "ARPNOMODIFY" . "\t" . "1" . "\n");
+}
 }
 
 # Setting variables into propertytable
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in connectivity/source set_soenv.in

2011-11-17 Thread Lionel Elie Mamane

 configure.in |   52 ---
 connectivity/source/drivers/postgresql/makefile.mk   |   28 ++
 connectivity/source/drivers/postgresql/pq_driver.hxx |8 --
 set_soenv.in |2 
 4 files changed, 54 insertions(+), 36 deletions(-)

New commits:
commit 7bab4645ce08e9cb41b38a983c57a514358b71ec
Author: Lionel Elie Mamane 
Date:   Thu Nov 17 23:17:21 2011 +0100

Implement --with-sytem-postgreql and --with-libq-path; cleanup unused 
#define

diff --git a/configure.in b/configure.in
index a628175..995 100644
--- a/configure.in
+++ b/configure.in
@@ -1090,7 +1090,8 @@ AC_ARG_WITH(lucene-analyzers-jar,
 AC_ARG_WITH(system-mysql,
 AS_HELP_STRING([--with-system-mysql],
 [Use MySQL libraries already on system, for building the MySQL 
Connector/LibreOffice
- extension. Requires MYSQLCONFIG to point to the mysql_config 
executable.]),,
+ extension. If the the mysql_config executable is not in PATH, use 
MYSQLCONFIG to
+ point to it.]),,
 [with_system_mysql="$with_system_libs"])
 
 AC_ARG_WITH(libmysql-path,
@@ -1108,6 +1109,22 @@ AC_ARG_WITH(system-mysql-cppconn,
 [Use MySQL C++ Connector libraries already on system.]),,
 [with_system_mysql_cppconn="$with_system_libs"])
 
+AC_ARG_WITH(system-postgresql,
+AS_HELP_STRING([--with-system-postgresql],
+[Use PostgreSQL libraries already on system, for building the 
PostgreSQL-SDBC
+ extension. If pg_config is not in PATH, use PGCONFIG to point to 
it.]),,
+[with_system_postgresql="$with_system_libs"])
+
+AC_ARG_WITH(libpq-path,
+AS_HELP_STRING([--with-libpq-path],
+[Use this PostgreSQL C interface (libpq) installation for building
+ the PostgreSQL-SDBC extension.])
+[
+  Usage: --with-libpq-path=
+],
+,)
+
 AC_ARG_WITH(system-hsqldb,
 AS_HELP_STRING([--with-system-hsqldb],
 [Use hsqldb already on system.]),,
@@ -5218,7 +5235,7 @@ if test "$ENABLE_MYSQLC" = "YES"; then
 dnl ===
 dnl Check for system MySQL
 dnl ===
-AC_MSG_CHECKING([for mysql pre-requisites])
+AC_MSG_CHECKING([for MySQL prerequisites])
 if test "$with_system_mysql" = "yes"; then
 AC_MSG_RESULT([external MySQL])
 SYSTEM_MYSQL=YES
@@ -5365,23 +5382,44 @@ dnl Check for PostgreSQL stuff
 dnl ===
 
 if test "x$enable_ext_postgresql_sdbc" = "xyes"; then
-AC_PATH_PROG(PGCONFIG, pg_config)
-if test -z "$PGCONFIG"; then
-AC_MSG_ERROR([pg_config needed])
+AC_MSG_CHECKING([for PostgreSQL prerequisites])
+if test "$with_system_postgresql" = "yes"; then
+AC_MSG_RESULT([external PostgreSQL])
+SYSTEM_POSTGRESQL=YES
+AC_PATH_PROG(PGCONFIG, pg_config)
+if test -z "$PGCONFIG"; then
+   AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
+fi
+POSTGRESQL_INC=-I$(pg_config --includedir)
+POSTGRESQL_LIB="-L$(pg_config --libdir) -lpq"
+else
+SYSTEM_POSTGRESQL=NO
+if test -n "$with_libpq_path"; then
+AC_MSG_RESULT([external libpq])
+POSTGRESQL_LIB="-L${with_libpq_path}/lib/ -lpq"
+POSTGRESQL_INC=-I"${with_libpq_path}/include/"
+else
+AC_MSG_ERROR([not given. Please specify either 
--with-system-postgresql or --with-libpq-path])
+fi
 fi
+AC_MSG_CHECKING([for PostgreSQL C interface])
 save_CFLAGS=$CFLAGS
+save_CPPFLAGS=$CPPFLAGS
 save_LIBS=$LIBS
-CFLAGS="-I`pg_config --includedir`"
+CPPFLAGS="${POSTGRESQL_INC}"
+LIBS="${POSTGRESQL_LIB}"
 AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], 
[])
 AC_CHECK_LIB(pq, PQconnectdbParams, [],
 [AC_MSG_ERROR(libpq not found or too old. Need >= 9.0)], [])
 CFLAGS=$save_CFLAGS
+CPPFLAGS=$save_CPPFLAGS
 LIBS=$save_LIBS
 BUILD_POSTGRESQL_SDBC=YES
-SYSTEM_POSTGRESQL=YES # only option atm :-)
 fi
 AC_SUBST(BUILD_POSTGRESQL_SDBC)
 AC_SUBST(SYSTEM_POSTGRESQL)
+AC_SUBST(POSTGRESQL_INC)
+AC_SUBST(POSTGRESQL_LIB)
 
 dnl ===
 dnl Check for system beanshell
diff --git a/connectivity/source/drivers/postgresql/makefile.mk 
b/connectivity/source/drivers/postgresql/makefile.mk
index 8c8c022..8b02689 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -39,9 +39,6 @@ NO_DEFAULT_STL=TRUE
 
 .IF "$(BUILD_POSTGRESQL_SDBC)" == "YES"
 
-.IF "$(SYSTEM_POSTGRESQL)" != "YES"
-.INCLUDE :  $(SOLARINCDIR)$/postgresql/postgresql-version.mk
-.ENDIF
 #---
 
 # uno component naming scheme
@@

1 2 >

1 - 100 of 161 matches

Mail list logo