[Libreoffice-commits] .: Branch 'feature/gnumake4' - 2073 commits - acinclude.m4 aclocal.m4 autogen.sh bin/create_bootstrap_links bin/doubleNewlines.pl bin/find-german-comments bin/find-undocumented-classes bin/git-new-workdir bin/git-ps1 bin/lo-commit-stat bin/lo-pack-sources bin/mkworkdir bin/repo-list.in bin/text_cat bootstrap.1 config.sub configure configure.cmd configure.in COPYING COPYING.LGPL COPYING.MPL distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeDragonFly.conf distro-configs/LibreOfficeiOS.conf distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf dmake/configure dmake/configure.in dmake/dbug dmake/dmake.c dmake/dmake.h dmake/dmstring.c dmake/expand.c dmake/function.c dmake/getinp.c dmake/.gitignore dmake/mac dmake/make.c dmake/path.c dmake/quit.c dmake /rulparse.c dmake/startup dmake/sysintf.c dmake/unix dmake/win95 download fetch_tarballs.sh g .gitattributes git-hooks/commit-msg git-hooks/post-merge git-hooks/pre-commit .gitignore GNUmakefile GNUmakefile.mk guw/guw.cc instsetoo_native/inc_broffice instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure instsetoo_native/prj instsetoo_native/res instsetoo_native/util m4/mac Makefile.in makefile.rc Module_ooo.mk Module_tail_build.mk ooo.lst ooo.lst.in oowintool post_download.in README.cross RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk scp2/inc scp2/macros scp2/prj scp2/source scp2/util set_soenv.in soldep/bootstrp soldep/inc soldep/prj soldep/source soldep/util solenv/bin solenv/config solenv/doc solenv/gbuild solenv/inc solenv/prj solenv/src solenv/unxmacxp soltools/adjustvisibility soltools/checkdll soltools/cpp soltools/giparser soltools/inc soltools/javadep soltools/ ldump soltools/mkdepend soltools/prj soltools/support soltools/testhxx soltools/testSHL soltools/util soltools/winunistd splitbuild/common.lst splitbuild/extern.lst stlport/makefile.mk stlport/prj stlport/STLport-4.0.patch stlport/STLport-4.5-0119.patch stlport/STLport-4.5-cxx0x.patch stlport/STLport-4.5.patch stlport/systemstl stlport/systemstlguards tail_build/Makefile tail_build/prj tail_build/README TEMPLATE.SOURCECODE.HEADER
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Mon Jun 20 00:57:48 PDT 2011
.gitattributes | 2
.gitignore | 286
COPYING | 674
COPYING.LGPL | 165
COPYING.MPL | 470
GNUmakefile | 45
GNUmakefile.mk | 37
Makefile.in | 169
Module_ooo.mk | 67
Module_tail_build.mk | 45
README.cross | 237
Repository.mk | 73
RepositoryFixes.mk | 65
RepositoryModule_ooo.mk | 72
TEMPLATE.SOURCECODE.HEADER | 30
acinclude.m4 | 18
aclocal.m4 | 278
autogen.sh | 153
bin/create_bootstrap_links | 15
bin/doubleNewlines.pl | 63
bin/find-german-comments | 162
bin/find-undocumented-classes | 33
bin/git-new-workdir | 82
bin/git-ps1 | 52
bin/lo-commit-stat | 403
bin/lo-pack-sources | 655
bin/mkworkdir | 103
bin/repo-list.in | 1
bin/text_cat/COPYING | 504
bin/text_cat/Copyright | 21
bin/text_cat/LM/english.lm | 400
bin/text_cat/LM/german.lm | 400
bin/text_cat/text_cat | 229
bin/text_cat/version | 2
bootstrap.1 | 57
config.sub | 2
configure |25070 ----------
configure.cmd | 7
configure.in | 7628 +--
dev/null |binary
distro-configs/LibreOfficeAndroid.conf | 21
distro-configs/LibreOfficeDragonFly.conf | 24
distro-configs/LibreOfficeLinux.conf | 49
distro-configs/LibreOfficeMacOSX.conf | 14
distro-configs/LibreOfficeOpenBSD.conf | 57
distro-configs/LibreOfficeWin32.conf | 18
distro-configs/LibreOfficeWin64.conf | 9
distro-configs/LibreOfficeiOS.conf | 23
distro-configs/OxygenOfficeLinux.conf | 79
distro-configs/OxygenOfficeWin32.conf | 46
dmake/.gitignore | 11
dmake/configure | 2
dmake/configure.in | 2
dmake/dbug/dbug/dbug.c | 41
dmake/dbug/malloc/testmem.c | 28
dmake/dmake.c | 15
dmake/dmake.h | 3
dmake/dmstring.c | 2
dmake/expand.c | 10
dmake/function.c | 2
dmake/getinp.c | 12
dmake/mac/arlib.c | 56
dmake/mac/bogus.c | 99
dmake/mac/config.mk | 44
dmake/mac/dirbrk.c | 42
dmake/mac/directry.c | 264
dmake/mac/dompwmak | 67
dmake/mac/environ.c | 231
dmake/mac/eold.c | 119
dmake/mac/main.c | 43
dmake/mac/make.sh | 107
dmake/mac/make_mac.sh | 105
dmake/mac/public.h | 173
dmake/mac/rmprq.c | 38
dmake/mac/ruletab.c | 43
dmake/mac/startup.h | 28
dmake/mac/sysintf.h | 41
dmake/mac/template.mk | 7
dmake/mac/tempnam.c | 65
dmake/mac/tomacfil.c | 38
dmake/make.c | 13
dmake/path.c | 2
dmake/quit.c | 6
dmake/rulparse.c | 8
dmake/startup/mac/macros.mk | 41
dmake/sysintf.c | 2
dmake/unix/runargv.c | 3
dmake/win95/dchdir.c | 3
download | 314
fetch_tarballs.sh | 162
g | 306
git-hooks/commit-msg | 62
git-hooks/post-merge | 12
git-hooks/pre-commit | 236
guw/guw.cc | 12
instsetoo_native/inc_ooohelppack/windows/msi_templates/ActionTe.idt | 73
instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminExe.idt | 13
instsetoo_native/inc_ooohelppack/windows/msi_templates/AdminUIS.idt | 14
instsetoo_native/inc_ooohelppack/windows/msi_templates/AdvtExec.idt | 19
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary.idt | 20
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/caution.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/dontinstall.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/install.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installfirstuse.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installpartial.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/installstatemenu.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/networkinstall.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/newfolder.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/openfolder.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setup.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setupcomplete.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuppartial.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/setuprepair.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/trashcan.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/Binary/up.ico |binary
instsetoo_native/inc_ooohelppack/windows/msi_templates/CheckBox.idt | 4
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt | 380
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt | 70
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt | 138
instsetoo_native/inc_ooohelppack/windows/msi_templates/CustomAc.idt | 10
instsetoo_native/inc_ooohelppack/windows/msi_templates/Dialog.idt | 33
instsetoo_native/inc_ooohelppack/windows/msi_templates/Error.idt | 133
instsetoo_native/inc_ooohelppack/windows/msi_templates/EventMap.idt | 19
instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallE.idt | 74
instsetoo_native/inc_ooohelppack/windows/msi_templates/InstallU.idt | 30
instsetoo_native/inc_ooohelppack/windows/msi_templates/LaunchCo.idt | 4
instsetoo_native/inc_ooohelppack/windows/msi_templates/ListBox.idt | 3
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt | 56
instsetoo_native/inc_ooohelppack/windows/msi_templates/RadioBut.idt | 11
instsetoo_native/inc_ooohelppack/windows/msi_templates/TextStyl.idt | 25
instsetoo_native/inc_ooohelppack/windows/msi_templates/UIText.idt | 53
instsetoo_native/inc_ooohelppack/windows/msi_templates/_Validat.idt | 461
instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt | 3
instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt | 3
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt | 152
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt | 67
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt | 152
instsetoo_native/inc_ooohelppack/windows/msi_templates/ooo_patchcodes.txt | 3
instsetoo_native/inc_ooohelppack/windows/msi_templates/ooodev_patchcodes.txt | 3
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt | 298
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt | 298
instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh | 10
instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 7
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 2
instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf | 2
instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf | 6
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 14
instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt | 1
instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt | 8
instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt | 68
instsetoo_native/inc_openoffice/windows/msi_templates/codes_ooodev.txt | 68
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 8
instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt | 66
instsetoo_native/inc_ure/windows/msi_templates/codes.txt | 66
instsetoo_native/prj/build.lst | 2
instsetoo_native/prj/d.lst | 6
instsetoo_native/res/nologobanner.bmp |binary
instsetoo_native/res/nologoinstall.bmp |binary
instsetoo_native/util/makefile.mk | 166
instsetoo_native/util/openoffice.lst | 372
instsetoo_native/util/pack.lst | 24
instsetoo_native/util/update.xml | 2
m4/mac/pkg.m4 | 154
makefile.rc | 99
ooo.lst | 86
ooo.lst.in | 121
oowintool | 113
post_download.in | 115
scp2/inc/macros.inc | 35
scp2/macros/macro.pl | 53
scp2/macros/makefile.mk | 3
scp2/prj/build.lst | 6
scp2/prj/d.lst | 46
scp2/source/accessories/file_font_accessories.scp | 882
scp2/source/accessories/file_gallery_accessories.scp | 139
scp2/source/accessories/file_samples_accessories.scp | 81
scp2/source/accessories/file_templates_accessories.scp | 272
scp2/source/accessories/makefile.mk | 86
scp2/source/accessories/module_accessories.scp | 40
scp2/source/accessories/module_accessories.ulf | 33
scp2/source/accessories/module_font_accessories.scp | 205
scp2/source/accessories/module_font_accessories.ulf | 33
scp2/source/accessories/module_gallery_accessories.scp | 60
scp2/source/accessories/module_gallery_accessories.ulf | 33
scp2/source/accessories/module_samples_accessories.scp | 98
scp2/source/accessories/module_samples_accessories.ulf | 712
scp2/source/accessories/module_templates_accessories.scp | 99
scp2/source/accessories/module_templates_accessories.ulf | 707
scp2/source/activex/file_activex.scp | 3
scp2/source/activex/module_activex.scp | 4
scp2/source/base/file_base.scp | 2
scp2/source/base/module_base.scp | 12
scp2/source/calc/file_calc.scp | 4
scp2/source/calc/module_calc.scp | 11
scp2/source/calc/registryitem_calc.scp | 59
scp2/source/canvas/canvascommons.scp | 6
scp2/source/canvas/makefile.mk | 10
scp2/source/canvas/mtfrenderer.scp | 40
scp2/source/draw/file_draw.scp | 2
scp2/source/draw/module_draw.scp | 10
scp2/source/draw/registryitem_draw.scp | 59
scp2/source/extensions/directory_extensions.scp | 303
scp2/source/extensions/file_extensions.scp | 347
scp2/source/extensions/makefile.mk | 62
scp2/source/extensions/module_extensions.scp | 397
scp2/source/extensions/module_extensions.ulf | 178
scp2/source/extensions/module_extensions_lightproof.scp | 58
scp2/source/extensions/module_extensions_lightproof.ulf | 701
scp2/source/extensions/module_extensions_sun_templates.scp | 58
scp2/source/extensions/module_extensions_sun_templates.ulf | 701
scp2/source/gnome/file_gnome.scp | 9
scp2/source/gnome/makefile.mk | 8
scp2/source/gnome/module_gnome.scp | 11
scp2/source/graphicfilter/file_graphicfilter.scp | 3
scp2/source/graphicfilter/module_graphicfilter.scp | 2
scp2/source/impress/file_impress.scp | 3
scp2/source/impress/makefile.mk | 4
scp2/source/impress/module_impress.scp | 12
scp2/source/impress/registryitem_impress.scp | 59
scp2/source/math/file_math.scp | 2
scp2/source/math/module_math.scp | 11
scp2/source/math/registryitem_math.scp | 12
scp2/source/ooo/common_brand.scp | 281
scp2/source/ooo/common_brand_readme.scp | 88
scp2/source/ooo/datacarrier_ooo.scp | 34
scp2/source/ooo/directory_ooo.scp | 202
scp2/source/ooo/directory_ooo_macosx.scp | 2
scp2/source/ooo/file_extra_ooo.scp | 37
scp2/source/ooo/file_font_ooo.scp | 39
scp2/source/ooo/file_library_ooo.scp | 256
scp2/source/ooo/file_ooo.scp | 183
scp2/source/ooo/folderitem_ooo.ulf | 2
scp2/source/ooo/makefile.mk | 33
scp2/source/ooo/mergemodules_ooo.scp | 56
scp2/source/ooo/module_help_template.scp | 46
scp2/source/ooo/module_helppack.scp | 42
scp2/source/ooo/module_helppack.ulf | 848
scp2/source/ooo/module_hidden_ooo.scp | 104
scp2/source/ooo/module_lang_template.scp | 17
scp2/source/ooo/module_langpack.ulf | 390
scp2/source/ooo/module_ooo.scp | 352
scp2/source/ooo/module_ooo.ulf | 28
scp2/source/ooo/ooo_brand.scp | 6
scp2/source/ooo/registryitem_ooo.scp | 26
scp2/source/ooo/registryitem_ooo.ulf | 2
scp2/source/ooo/scpaction_ooo.scp | 63
scp2/source/ooo/shortcut_ooo.scp | 37
scp2/source/ooo/ure.scp | 293
scp2/source/ooo/ure_standalone.scp | 4
scp2/source/ooo/windowscustomaction_ooo.scp | 41
scp2/source/python/file_python.scp | 31
scp2/source/python/makefile.mk | 4
scp2/source/python/module_python.scp | 6
scp2/source/python/module_python_mailmerge.scp | 10
scp2/source/python/profileitem_python.scp | 4
scp2/source/quickstart/registryitem_quickstart.scp | 2
scp2/source/sdkoo/sdkoo.scp | 59
scp2/source/templates/makefile.mk | 8
scp2/source/templates/module_helppack.sct | 38
scp2/source/templates/module_helppack_root.sct | 37
scp2/source/templates/module_langpack_accessories_samples.sct | 64
scp2/source/templates/module_langpack_accessories_samples_root.sct | 55
scp2/source/templates/module_langpack_accessories_templates.sct | 42
scp2/source/templates/module_langpack_accessories_templates_root.sct | 39
scp2/source/templates/module_langpack_extensions_lightproof.sct | 55
scp2/source/templates/module_langpack_extensions_templates.sct | 55
scp2/source/templates/module_langpack_root.sct | 11
scp2/source/winexplorerext/file_winexplorerext.scp | 9
scp2/source/winexplorerext/makefile.mk | 4
scp2/source/winexplorerext/module_winexplorerext.scp | 1
scp2/source/writer/file_writer.scp | 6
scp2/source/writer/module_writer.scp | 16
scp2/source/writer/registryitem_writer.scp | 67
scp2/source/xsltfilter/file_xsltfilter.scp | 1
scp2/util/makefile.mk | 69
set_soenv.in | 1360
soldep/bootstrp/appdef.cxx | 165
soldep/bootstrp/build_list_converter.pl | 892
soldep/bootstrp/command.cxx | 14
soldep/bootstrp/dep.cxx | 116
soldep/bootstrp/hashtbl.cxx | 511
soldep/bootstrp/makefile.mk | 84
soldep/bootstrp/minormk.cxx | 187
soldep/bootstrp/prj.cxx | 2862 -
soldep/bootstrp/prodmap.cxx | 517
soldep/bootstrp/sstring.cxx | 314
soldep/inc/dep.hxx | 69
soldep/inc/dtsodcmp.hrc | 99
soldep/inc/minormk.hxx | 77
soldep/inc/prodmap.hxx | 84
soldep/inc/soldep/appdef.hxx | 161
soldep/inc/soldep/command.hxx | 3
soldep/inc/soldep/connctr.hxx | 84
soldep/inc/soldep/depper.hxx | 208
soldep/inc/soldep/depwin.hxx | 75
soldep/inc/soldep/graphwin.hxx | 54
soldep/inc/soldep/hashobj.hxx | 45
soldep/inc/soldep/hashtbl.hxx | 204
soldep/inc/soldep/listmacr.hxx | 60
soldep/inc/soldep/objwin.hxx | 160
soldep/inc/soldep/prj.hxx | 480
soldep/inc/soldep/sdtresid.hxx | 52
soldep/inc/soldep/soldep.hxx | 116
soldep/inc/soldep/soldlg.hrc | 79
soldep/inc/soldep/soldlg.hxx | 160
soldep/inc/soldep/sstring.hxx | 105
soldep/inc/soldep/tbox.hxx | 102
soldep/prj/build.lst | 5
soldep/prj/d.lst | 41
soldep/source/connctr.cxx | 272
soldep/source/depapp.cxx | 147
soldep/source/depapp.hxx | 109
soldep/source/depper.cxx | 687
soldep/source/depwin.cxx | 164
soldep/source/graphwin.cxx | 77
soldep/source/hashobj.cxx | 37
soldep/source/makefile.mk | 134
soldep/source/objwin.cxx | 821
soldep/source/sdtresid.cxx | 49
soldep/source/soldep.cxx | 1807
soldep/source/soldlg.cxx | 267
soldep/source/soldlg.src | 386
soldep/source/tbox.cxx | 596
soldep/util/perl.mk | 71
solenv/bin/add-modelines | 174
solenv/bin/addsym.awk | 4
solenv/bin/build.pl | 550
solenv/bin/build_client.pl | 9
solenv/bin/checkdll.sh | 15
solenv/bin/cleanzip.pl | 5
solenv/bin/clipatchconfig.pl | 2
solenv/bin/converttags.pl | 94
solenv/bin/create-ids | 8
solenv/bin/create-tags | 9
solenv/bin/createpdbrelocators.pl | 15
solenv/bin/cws | 6
solenv/bin/cws.btm | 11
solenv/bin/cws.pl | 2116
solenv/bin/cwsattach | 7
solenv/bin/cwsattach.btm | 11
solenv/bin/cwsattach.pl | 220
solenv/bin/cwscreate | 6
solenv/bin/cwstestresult | 7
solenv/bin/cwstestresult.btm | 11
solenv/bin/cwstestresult.pl | 192
solenv/bin/cwstouched | 6
solenv/bin/cwstouched.btm | 11
solenv/bin/cwstouched.pl | 151
solenv/bin/cwstouched.py | 111
solenv/bin/deliver.pl | 87
solenv/bin/fix_def_file.cmd | 52
solenv/bin/fix_def_ord.cmd | 19
solenv/bin/fix_dxp_file.cmd | 30
solenv/bin/fix_exp_file.cmd | 54
solenv/bin/fix_lin_file.cmd | 13
solenv/bin/fix_shl.cmd | 11
solenv/bin/gccinstlib.pl | 16
solenv/bin/gdb_cxa-atexit_trace-stdout | 8
solenv/bin/gdbtrycatchtrace | 21
solenv/bin/gdbtrycatchtrace-stdout | 14
solenv/bin/gen_userfeedback_VCL_names.pl | 5
solenv/bin/gsicheck | 11
solenv/bin/guw.pl | 8
solenv/bin/hicontrast-to-theme.pl | 125
solenv/bin/id-lang.map | 105
solenv/bin/image-sort.pl | 2
solenv/bin/linkoo | 186
solenv/bin/localize | 11
solenv/bin/localize_sl | 11
solenv/bin/macosx-change-install-names.pl | 5
solenv/bin/macosx-dylib-link-list.pl | 1
solenv/bin/make_download.pl | 3
solenv/bin/make_installer.pl | 117
solenv/bin/makemani.pl | 1
solenv/bin/mapgen.pl | 5
solenv/bin/mkdocs.sh | 130
solenv/bin/mkout.pl | 6
solenv/bin/modules/CreatePDBRelocators.pm | 5
solenv/bin/modules/Cws.pm | 2153
solenv/bin/modules/CwsConfig.pm | 541
solenv/bin/modules/GenInfoParser.pm | 3
solenv/bin/modules/RepositoryHelper.pm | 11
solenv/bin/modules/SourceConfig.pm | 26
solenv/bin/modules/installer/archivefiles.pm | 42
solenv/bin/modules/installer/configuration.pm | 9
solenv/bin/modules/installer/control.pm | 60
solenv/bin/modules/installer/converter.pm | 269
solenv/bin/modules/installer/copyproject.pm | 25
solenv/bin/modules/installer/download.pm | 267
solenv/bin/modules/installer/downloadsigner.pm | 8
solenv/bin/modules/installer/environment.pm | 3
solenv/bin/modules/installer/epmfile.pm | 307
solenv/bin/modules/installer/followme.pm | 10
solenv/bin/modules/installer/globals.pm | 16
solenv/bin/modules/installer/helppack.pm | 537
solenv/bin/modules/installer/javainstaller.pm | 1885
solenv/bin/modules/installer/languagepack.pm | 59
solenv/bin/modules/installer/languages.pm | 39
solenv/bin/modules/installer/mail.pm | 136
solenv/bin/modules/installer/packagelist.pm | 16
solenv/bin/modules/installer/packagepool.pm | 8
solenv/bin/modules/installer/parameter.pm | 35
solenv/bin/modules/installer/pathanalyzer.pm | 2
solenv/bin/modules/installer/remover.pm | 4
solenv/bin/modules/installer/scppatchsoname.pm | 5
solenv/bin/modules/installer/scpzipfiles.pm | 8
solenv/bin/modules/installer/scriptitems.pm | 171
solenv/bin/modules/installer/setupscript.pm | 140
solenv/bin/modules/installer/simplepackage.pm | 36
solenv/bin/modules/installer/substfilenamefiles.pm | 1
solenv/bin/modules/installer/systemactions.pm | 170
solenv/bin/modules/installer/windows/admin.pm | 17
solenv/bin/modules/installer/windows/assembly.pm | 7
solenv/bin/modules/installer/windows/component.pm | 9
solenv/bin/modules/installer/windows/createfolder.pm | 6
solenv/bin/modules/installer/windows/directory.pm | 91
solenv/bin/modules/installer/windows/feature.pm | 8
solenv/bin/modules/installer/windows/featurecomponent.pm | 70
solenv/bin/modules/installer/windows/file.pm | 5
solenv/bin/modules/installer/windows/font.pm | 1
solenv/bin/modules/installer/windows/idtglobal.pm | 47
solenv/bin/modules/installer/windows/language.pm | 2
solenv/bin/modules/installer/windows/media.pm | 3
solenv/bin/modules/installer/windows/mergemodule.pm | 70
solenv/bin/modules/installer/windows/msiglobal.pm | 94
solenv/bin/modules/installer/windows/msp.pm | 52
solenv/bin/modules/installer/windows/property.pm | 42
solenv/bin/modules/installer/windows/registry.pm | 23
solenv/bin/modules/installer/windows/shortcut.pm | 4
solenv/bin/modules/installer/windows/sign.pm | 11
solenv/bin/modules/installer/windows/update.pm | 3
solenv/bin/modules/installer/windows/upgrade.pm | 17
solenv/bin/modules/installer/worker.pm | 201
solenv/bin/modules/installer/xpdinstaller.pm | 32
solenv/bin/modules/installer/ziplist.pm | 19
solenv/bin/modules/osarch.pm | 195
solenv/bin/modules/packager/work.pm | 2
solenv/bin/modules/par2script/systemactions.pm | 2
solenv/bin/modules/par2script/work.pm | 147
solenv/bin/modules/pre2par/language.pm | 115
solenv/bin/modules/pre2par/systemactions.pm | 2
solenv/bin/ooinstall | 138
solenv/bin/packimages.pl | 10
solenv/bin/receditor | 2
solenv/bin/relocate | 119
solenv/bin/remangle32to64.pl | 327
solenv/bin/striplanguagetags.sh | 54
solenv/bin/subsequenttests | 200
solenv/bin/transform_description.pl | 2
solenv/bin/update_module_ignore_lists.pl | 255
solenv/bin/zipdep.pl | 11
solenv/config/sdev300.ini | 3483 -
solenv/config/ssolar.cmn | 336
solenv/doc/gbuild/solenv/gbuild/gbuild.mk | 1
solenv/gbuild/AllLangResTarget.mk | 258
solenv/gbuild/BuildDirs.mk | 6
solenv/gbuild/ComponentTarget.mk | 20
solenv/gbuild/CppunitTest.mk | 140
solenv/gbuild/CustomTarget.mk | 14
solenv/gbuild/Deliver.mk | 22
solenv/gbuild/Executable.mk | 64
solenv/gbuild/Helper.mk | 26
solenv/gbuild/JavaClassSet.mk | 14
solenv/gbuild/JunitTest.mk | 53
solenv/gbuild/Library.mk | 84
solenv/gbuild/LinkTarget.mk | 254
solenv/gbuild/Module.mk | 88
solenv/gbuild/Output.mk | 6
solenv/gbuild/Package.mk | 16
solenv/gbuild/PrecompiledHeaders.mk | 42
solenv/gbuild/RdbTarget.mk | 83
solenv/gbuild/SdiTarget.mk | 40
solenv/gbuild/StaticLibrary.mk | 66
solenv/gbuild/TargetLocations.mk | 70
solenv/gbuild/Tempfile.mk | 16
solenv/gbuild/WinResTarget.mk | 18
solenv/gbuild/extensions/final_ObjectOwner.mk | 47
solenv/gbuild/extensions/post_PackModule.mk | 10
solenv/gbuild/extensions/post_SetupLocal.mk | 42
solenv/gbuild/filter-showIncludes.pl | 62
solenv/gbuild/gbuild.mk | 244
solenv/gbuild/platform/android.mk | 38
solenv/gbuild/platform/dragonfly.mk | 44
solenv/gbuild/platform/freebsd.mk | 42
solenv/gbuild/platform/ios.mk | 411
solenv/gbuild/platform/linux-ARM.mk | 38
solenv/gbuild/platform/linux-AXP.mk | 39
solenv/gbuild/platform/linux-GODSON.mk | 36
solenv/gbuild/platform/linux-HPPA.mk | 36
solenv/gbuild/platform/linux-IA64.mk | 36
solenv/gbuild/platform/linux-INTEL.mk | 36
solenv/gbuild/platform/linux-M68K.mk | 38
solenv/gbuild/platform/linux-POWERPC.mk | 38
solenv/gbuild/platform/linux-POWERPC64.mk | 37
solenv/gbuild/platform/linux-S390.mk | 38
solenv/gbuild/platform/linux-S390X.mk | 35
solenv/gbuild/platform/linux-SPARC.mk | 36
solenv/gbuild/platform/linux-X86_64.mk | 36
solenv/gbuild/platform/linux.mk | 395
solenv/gbuild/platform/macosx.mk | 325
solenv/gbuild/platform/netbsd.mk | 44
solenv/gbuild/platform/openbsd.mk | 60
solenv/gbuild/platform/solaris.mk | 276
solenv/gbuild/platform/unxgcc.mk | 441
solenv/gbuild/platform/windows.mk | 667
solenv/gbuild/platform/winmingw.mk | 552
solenv/gbuild/templates/AllLangResTarget.mk | 4
solenv/gbuild/templates/CppunitTest.mk | 6
solenv/gbuild/templates/Executable.mk | 6
solenv/gbuild/templates/JunitTest.mk | 16
solenv/gbuild/templates/Library.mk | 12
solenv/gbuild/templates/Module.mk | 2
solenv/gbuild/templates/Package.mk | 2
solenv/gbuild/templates/StaticLibrary.mk | 2
solenv/gbuild/templates/makefile.mk | 2
solenv/inc/_tg_app.mk | 780
solenv/inc/_tg_def.mk | 1140
solenv/inc/_tg_lib.mk | 188
solenv/inc/_tg_rslb.mk | 180
solenv/inc/_tg_shl.mk | 1890
solenv/inc/_tg_zip.mk | 120
solenv/inc/ant.mk | 22
solenv/inc/antsettings.mk | 38
solenv/inc/doxygen.cfg | 1314
solenv/inc/extension_helplink.mk | 7
solenv/inc/extension_post.mk | 17
solenv/inc/extension_pre.mk | 8
solenv/inc/installationtest.mk | 18
solenv/inc/langlist.mk | 39
solenv/inc/layout.mk | 2
solenv/inc/libs.mk | 69
solenv/inc/minor.mk | 10
solenv/inc/os2.mk | 333
solenv/inc/os2gcci.mk | 288
solenv/inc/postmac.h | 4
solenv/inc/postset.mk | 2
solenv/inc/postwin.h | 252
solenv/inc/preinclude.h | 3
solenv/inc/premac.h | 4
solenv/inc/prewin.h | 74
solenv/inc/productversion.mk | 32
solenv/inc/pstrules.mk | 3
solenv/inc/rules.mk | 8
solenv/inc/sc.mk | 28
solenv/inc/scpre.mk | 50
solenv/inc/set_wntx64.mk | 18
solenv/inc/settings.mk | 219
solenv/inc/shlinfo.rc | 72
solenv/inc/startup/startup.mk | 8
solenv/inc/startup/wnt/macros.mk | 12
solenv/inc/target.mk | 55
solenv/inc/tg_app.mk | 78
solenv/inc/tg_compv.mk | 4
solenv/inc/tg_config.mk | 4
solenv/inc/tg_def.mk | 114
solenv/inc/tg_ext.mk | 45
solenv/inc/tg_jar.mk | 12
solenv/inc/tg_java.mk | 10
solenv/inc/tg_lib.mk | 19
solenv/inc/tg_merge.mk | 25
solenv/inc/tg_obj.mk | 19
solenv/inc/tg_res.mk | 9
solenv/inc/tg_rslb.mk | 18
solenv/inc/tg_shl.mk | 189
solenv/inc/tg_slo.mk | 14
solenv/inc/tg_wntx64.mk | 49
solenv/inc/tg_zip.mk | 12
solenv/inc/unitools.mk | 38
solenv/inc/unx.mk | 72
solenv/inc/unxaigppc.mk | 68
solenv/inc/unxaixp.mk | 4
solenv/inc/unxandr.mk | 33
solenv/inc/unxbsda.mk | 99
solenv/inc/unxbsdi.mk | 179
solenv/inc/unxbsdi2.mk | 198
solenv/inc/unxbsds.mk | 179
solenv/inc/unxdfly.mk | 45
solenv/inc/unxfbsd.mk | 35
solenv/inc/unxfbsdi.mk | 3
solenv/inc/unxfbsdx.mk | 2
solenv/inc/unxgcc.mk | 266
solenv/inc/unxhpgr.mk | 133
solenv/inc/unxhpxr.mk | 131
solenv/inc/unxiosr.mk | 76
solenv/inc/unxlng.mk | 244
solenv/inc/unxlnga.mk | 1
solenv/inc/unxlngaxp.mk | 2
solenv/inc/unxlnghppa.mk | 1
solenv/inc/unxlngi.mk | 5
solenv/inc/unxlngm68k.mk | 1
solenv/inc/unxlngmips.mk | 1
solenv/inc/unxlngppc.mk | 1
solenv/inc/unxlngr.mk | 1
solenv/inc/unxlngs.mk | 1
solenv/inc/unxlngs390.mk | 1
solenv/inc/unxlngx.mk | 1
solenv/inc/unxmacx.mk | 28
solenv/inc/unxmacxi.mk | 8
solenv/inc/unxmacxp.mk | 2
solenv/inc/unxnbsd.mk | 25
solenv/inc/unxobsd.mk | 85
solenv/inc/unxscoi.mk | 140
solenv/inc/unxsogi.mk | 11
solenv/inc/unxsogs.mk | 11
solenv/inc/unxsoli4.mk | 17
solenv/inc/unxsols4.mk | 17
solenv/inc/unxsolu4.mk | 19
solenv/inc/verinfo.hrc | 40
solenv/inc/version.hrc | 10
solenv/inc/version_so.hrc | 7
solenv/inc/win32/jni_md.h | 42
solenv/inc/wnt.mk | 13
solenv/inc/wntgcci.mk | 81
solenv/inc/wntmsc.mk | 376
solenv/inc/wntmsci10.mk | 343
solenv/inc/wntmsci11.mk | 390
solenv/prj/d.lst | 8
solenv/src/version.c | 20
solenv/unxmacxp/inc/poll.h | 3
soltools/adjustvisibility/adjustvisibility.cxx | 14
soltools/checkdll/checkdll.c | 5
soltools/checkdll/makefile.mk | 7
soltools/cpp/_cpp.c | 5
soltools/cpp/_eval.c | 9
soltools/cpp/_getopt.c | 3
soltools/cpp/_include.c | 8
soltools/cpp/_lex.c | 7
soltools/cpp/_macro.c | 43
soltools/cpp/_mcrvalid.c | 24
soltools/cpp/_nlist.c | 3
soltools/cpp/_tokens.c | 29
soltools/cpp/_unix.c | 47
soltools/cpp/cpp.h | 23
soltools/cpp/makefile.mk | 9
soltools/giparser/gen_info.cxx | 2
soltools/giparser/gi_list.cxx | 8
soltools/giparser/gi_parse.cxx | 13
soltools/giparser/makefile.mk | 9
soltools/giparser/st_gilrw.cxx | 74
soltools/inc/gen_info.hxx | 2
soltools/inc/gi_list.hxx | 2
soltools/inc/gi_parse.hxx | 2
soltools/inc/gilacces.hxx | 2
soltools/inc/pch/precompiled_soltools.cxx | 2
soltools/inc/pch/precompiled_soltools.hxx | 2
soltools/inc/simstr.hxx | 2
soltools/inc/st_gilrw.hxx | 2
soltools/inc/st_list.hxx | 8
soltools/inc/st_types.hxx | 2
soltools/javadep/javadep.c | 44
soltools/javadep/makefile.mk | 5
soltools/ldump/hashtbl.cxx | 16
soltools/ldump/hashtbl.hxx | 2
soltools/ldump/ldump.cxx | 28
soltools/ldump/ldump.hxx | 2
soltools/ldump/makefile.mk | 2
soltools/mkdepend/collectdircontent.cxx | 5
soltools/mkdepend/collectdircontent.hxx | 7
soltools/mkdepend/cppsetup.c | 2
soltools/mkdepend/def.h | 24
soltools/mkdepend/ifparser.c | 9
soltools/mkdepend/ifparser.h | 4
soltools/mkdepend/imakemdep.h | 54
soltools/mkdepend/include.c | 10
soltools/mkdepend/main.c | 17
soltools/mkdepend/makefile.mk | 18
soltools/mkdepend/parse.c | 7
soltools/mkdepend/pr.c | 7
soltools/prj/build.lst | 2
soltools/prj/d.lst | 22
soltools/support/makefile.mk | 5
soltools/support/simstr.cxx | 6
soltools/testSHL/inc/tlog.hxx | 7
soltools/testSHL/inc/tstMgr.hxx | 4
soltools/testSHL/inc/tutil.hxx | 3
soltools/testSHL/testshl.cxx | 8
soltools/testSHL/util/tlog.cxx | 9
soltools/testSHL/util/tstMgr.cxx | 11
soltools/testSHL/util/tutil.cxx | 4
soltools/testhxx/makefile.mk | 5
soltools/testhxx/testhxx.cxx | 3
soltools/util/makefile.pmk | 10
soltools/winunistd/unistd.h | 2
splitbuild/common.lst | 2
splitbuild/extern.lst | 2
stlport/STLport-4.0.patch | 17
stlport/STLport-4.5-0119.patch | 22
stlport/STLport-4.5-cxx0x.patch | 17
stlport/STLport-4.5.patch | 38
stlport/makefile.mk | 92
stlport/prj/build.lst | 2
stlport/prj/d.lst | 26
stlport/systemstl/functional | 62
stlport/systemstl/hash_map | 81
stlport/systemstl/hash_set | 52
stlport/systemstl/numeric | 53
stlport/systemstl/rope | 48
stlport/systemstl/slist | 45
stlport/systemstl/vector | 49
stlport/systemstlguards/postextstl.h | 36
stlport/systemstlguards/preextstl.h | 77
tail_build/Makefile | 45
tail_build/README | 17
tail_build/prj/build.lst | 2
tail_build/prj/makefile.mk | 40
711 files changed, 36370 insertions(+), 72716 deletions(-)
New commits:
commit 3ad912abd7c2106c4ba6cd35e2ead954759d5cc8
Merge: 3382453... 3e73f63...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jun 19 11:36:52 2011 +0200
Merge branch 'master' into feature/gnumake4
Conflicts:
Repository.mk
RepositoryFixes.mk
configure
configure.in
set_soenv.in
solenv/config/sdev300.ini
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/CustomTarget.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/Executable.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/StaticLibrary.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/gbuild/templates/Executable.mk
solenv/gbuild/templates/Library.mk
solenv/inc/libs.mk
solenv/inc/unxobsd.mk
diff --cc Repository.mk
index c60677f,f01ace1..d3f9928
mode 100755,100644..100644
--- a/Repository.mk
+++ b/Repository.mk
@@@ -43,51 -42,59 +42,70 @@@ $(eval $(call gb_Helper_register_execut
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ adabasui \
AppleRemote \
+ adabas \
+ adabasui \
+ agg \
avmedia \
+ basebmp \
basegfx \
basebmp \
- canvastools \
+ canvastools \
+ cppcanvas \
+ chartcontroller \
+ chartmodel \
+ charttools \
+ chartview \
+ cppcanvas \
cui \
- dba \
- dbaxml \
- dbmm \
- dbui \
- dbpool \
- dbtools \
+ dba \
+ dbaxml \
+ dbmm \
+ dbtools \
+ dbu \
++
desktop_detector \
+ doctok \
drawinglayer \
editeng \
- eggtray \
- file \
- for \
+ for \
- forui \
+ forui \
+ frm \
fwe \
fwi \
fwk \
fwl \
fwm \
+ hwp \
i18npaper \
+ i18nregexp \
lng \
+ lwpft \
msfilter \
msword \
- oox \
- ooxml \
+ odbc \
+ odbcbase \
+ oox \
++ ooxml \
qstart_gtk \
- rpt \
- rptui \
- rptxml \
+ resourcemodel \
+ rpt \
+ rptui \
+ rptxml \
sax \
sb \
+ sc \
+ scd \
+ sdbc \
+ sdbt \
+ scfilt \
+ scui \
+ sd \
+ sdbt \
+ sdd \
+ sdfilt \
+ sdui \
sfx \
sm \
smd \
@@@ -103,11 -110,10 +121,11 @@@
textconversiondlgs \
tk \
tl \
- utl \
unordf \
unoxml \
+ utl \
vbahelper \
+ writerfilter \
vcl \
vclplug_gen \
vclplug_gtk \
@@@ -124,7 -132,19 +144,14 @@@ $(eval $(call gb_Helper_register_librar
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ test \
cppunit \
+ crypto \
+ fileacc \
+ icui18n \
+ icule \
- icuuc \
- icule \
+ graphite2_off \
- cppunit \
- rdf \
+ ssl \
- xslt \
))
@@@ -142,28 -161,18 +168,29 @@@ $(eval $(call gb_Helper_register_librar
salhelper \
))
- $(eval $(call gb_Helper_register_libraries,STLLIBS, \
- stl \
- ))
-
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ cairocanvas \
+ canvasfactory \
+ directx5canvas \
+ directx9canvas \
+ expwrap \
+ fastsax \
fsstorage \
+ gdipluscanvas \
hatchwindowfactory \
- msforms \
+ lomenubar \
- msforms \
++ msforms \
+ nullcanvas \
+ OGLTrans \
passwordcontainer \
productregistration \
+ simplecanvas \
+ slideshow \
+ vbaobj \
vbaswobj \
+ vclcanvas \
+ writerfilter_uno \
+ writerfilter_debug \
))
@@@ -174,10 -183,17 +201,16 @@@ $(eval $(call gb_Helper_register_librar
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ basegfx_s \
+ crypto \
+ graphite2_off \
+ libeay32 \
+ ssleay32 \
- jpeglib \
ooopathutils \
salcpprt \
+ ssl \
+ toolshelpers \
- vclmain \
- zlib \
+ vclmain \
))
# vim: set noet sw=4 ts=4:
diff --cc RepositoryFixes.mk
index 695c55e,a57b612..2b33705
mode 100755,100644..100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@@ -37,45 -37,22 +37,34 @@@ gb_Library_FILENAMES := $(patsubst jvmf
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
- endif
-endif
+endif # ifeq ($(OS),LINUX)
+ifeq ($(OS),SOLARIS)
-ifeq ($(OS),MACOSX)
gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+#$(info libnames: $(gb_Library_FILENAMES))
endif
+ifeq ($(OS),MACOSX)
+
+gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
- endif
-
+endif # ifeq ($(OS),MACOSX)
ifeq ($(OS),WNT)
+
ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
@@@ -86,41 -62,24 +74,35 @@@ gb_Library_FILENAMES := $(patsubst sfx:
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
- ifeq ($(gb_PRODUCT),$(true))
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
- else
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
- endif
+
+# handle libraries in msvc format that don't use an "i" prefix for their import library
+# these are libraries built by OOo, but only a few of them
+# all other libraries built by OOo and all platform libraries (exceptions see below) are used without an import library
+# we link against their dlls in gcc format directly
gb_Library_NOILIBFILENAMES:=\
- icuuc \
- sot \
- uwinapi \
+ icuuc \
+ uwinapi \
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+# some Windows platform libraries are missing in mingw library set
+# we have to use them from the PSDK by linking against their ilibs
gb_Library_ILIBFILENAMES:=\
- unicows \
- uuid \
+ unicows \
+ uuid \
+ winmm \
gb_Library_DLLFILENAMES := $(filter-out $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):%),$(gb_Library_DLLFILENAMES))
- gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
+ gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(WINDOWS_SDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst cppunit:cppunit%,cppunit:cygcppunit-1-12-1%,$(gb_Library_DLLFILENAMES))
@@@ -128,40 -89,49 +112,35 @@@ gb_Library_DLLFILENAMES := $(patsubst s
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_FILENAMES := $(patsubst stl:%,stl:$(gb_Library_IARCSYSPRE)stdc++_s$(gb_Library_IARCSYSPRE),$(gb_Library_FILENAMES))
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
- endif
-else
+else #ifneq ($(USE_MINGW),)
+
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
+ gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
- gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst z:iz%,z:zlib%,$(gb_Library_FILENAMES))
-gb_Library_NOILIBFILENAMES:=\
- advapi32 \
- gdi32 \
- gdiplus \
+gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+
- ifeq ($(gb_PRODUCT),$(true))
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71%,$(gb_Library_FILENAMES))
- else
- gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stlport_vc71_stldebug%,$(gb_Library_FILENAMES))
- endif
+
+# change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
+gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
- gb_Library_NOILIBFILENAMES += icule icuuc
++gb_Library_NOILIBFILENAMES += icule icuuc \
+ graphite2_off \
- gnu_getopt \
- icuuc \
- icule \
- imm32\
- kernel32 \
- msimg32 \
- msvcrt \
+ msvcprt \
- mpr \
- oldnames \
- ole32 \
- oleaut32 \
- shell32 \
+ shlwapi \
- sot \
- unicows \
- user32 \
- uuid \
- uwinapi \
+ version \
- winspool \
gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@@ -176,14 -144,53 +155,28 @@@ gb_Library_DLLFILENAMES := $(patsubst i
gb_Library_DLLFILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbhelper4%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
-endif
+endif # ifneq ($(USE_MINGW),)
-endif
-
-ifeq ($(OS),SOLARIS)
-gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
-#$(info libnames: $(gb_Library_FILENAMES))
-
-endif
+endif # ifeq ($(OS),WNT)
+ gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilter_uno:writerfilter%,$(gb_Library_FILENAMES))
+
# we do not require a known rule for these, when using system libs
-
-ifeq ($(SYSTEM_LIBXML),YES)
-gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_LIBXSLT),YES)
-gb_Library_TARGETS := $(filter-out xslt,$(gb_Library_TARGETS))
-endif
-
+ ifeq ($(SYSTEM_OPENSSL),YES)
+ gb_Library_TARGETS := $(filter-out crypto,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out ssl,$(gb_Library_TARGETS))
+ endif
+
-ifeq ($(SYSTEM_REDLAND),YES)
-gb_Library_TARGETS := $(filter-out rdf,$(gb_Library_TARGETS))
-endif
-
-ifeq ($(SYSTEM_ICU),YES)
+ gb_Library_TARGETS := $(filter-out icudata,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icui18n,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icuio,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icule,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out iculx,$(gb_Library_TARGETS))
+ gb_Library_TARGETS := $(filter-out icutu,$(gb_Library_TARGETS))
-gb_Library_TARGETS := $(filter-out icuuc,$(gb_Library_TARGETS))
+ endif
- ifeq ($(USE_SYSTEM_STL),YES)
- gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
+ ifeq ($(SYSTEM_CPPUNIT),YES)
+ gb_Library_TARGETS := $(filter-out cppunit,$(gb_Library_TARGETS))
endif
# vim: set noet sw=4 ts=4:
diff --cc bootstrap.1
index 2a475bf,9db4b23..db3dbb7
mode 100644,100755..100755
--- a/bootstrap.1
+++ b/bootstrap.1
@@@ -1,24 -1,7 +1,24 @@@
+if test -z "${SOLARENV}"; then
+ if test -f ./source_soenv.sh; then . ./source_soenv.sh; fi
+fi
+if test -z "${SOLARENV}"; then
+ echo "bootstrap: No environment set!"
+ exit 1
+fi
+
+# remove aliases set by *Env.Set.sh
+unalias mkout
+unalias deliver
+unalias build
+unalias build_client
+unalias zipdep
+unalias nmake
+unalias gunzip
+
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
# Use spawn instead of fork when building dmake on cygwin.
- if test "$GUI" = "WNT"; then
+ if test "$GUI_FOR_BUILD" = "WNT"; then
EXEEXT=".exe"
DMAKE_CONF="--enable-spawn"
else
diff --cc configure.in
index 34af2af,58dfaab..5241c6e
mode 100644,100755..100755
--- a/configure.in
+++ b/configure.in
@@@ -1,883 -1,1319 +1,1323 @@@
- dnl /******************************************************************
- dnl * vi:set sw=3 ts=3 et:
- dnl *
- dnl * Name: configure.in
- dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
- dnl * Date: $Date: 2008-09-08 07:38:40 $
- dnl *
- dnl * Desc: This file serves as input for the GNU autoconf package
- dnl * in order to create a configure script.
- dnl * In this stage configure just checks the pre-requisites
- dnl * necessary to build OpenOffice.org
- dnl *
- dnl *
- dnl ******************************************************************/
- AC_REVISION( $Revision: 1.290 $ )
+ dnl -*- Mode: Autoconf; tab-width: 8; indent-tabs-mode: nil -*-
+ dnl configure.in serves as input for the GNU autoconf package
+ dnl in order to create a configure script.
+
+ AC_INIT([LibreOffice], [3.5],,, [http://documentfoundation.org/])
AC_PREREQ(2.50)
- AC_INIT()
echo "$@" >config.parms
- AC_ARG_WITH(gnu-patch,
- [ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD
- ],,)
- AC_ARG_WITH(agg,
- [ --without-agg Disable the use of agg altogether
- ],,with_agg=yes)
- AC_ARG_WITH(gnu-cp,
- [ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD
- ],,)
+
+ dnl ===================================================================
+ dnl Optional Features (--enable/disable-)
+ dnl ===================================================================
+
+ dnl ---------- Extensions ----------
+
+ AC_ARG_ENABLE(ext-barcode,
+ AS_HELP_STRING([--enable-ext-barcode],
+ [Enables the Barcode extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-diagram,
+ AS_HELP_STRING([--enable-ext-diagram],
+ [Enables the Diagram extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-google-docs,
+ AS_HELP_STRING([--enable-ext-google-docs],
+ [Download and enables the Google Documents extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-hunart,
+ AS_HELP_STRING([--enable-ext-hunart],
+ [Enables the Hungarian Cross-reference Toolbar extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-lightproof,
+ AS_HELP_STRING([--enable-ext-lightproof],
+ [Enables the Lightproof extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-mysql-connector,
+ AS_HELP_STRING([--enable-ext-mysql-connector],
+ [Enables the build of the MySQL Connector/LibreOffice extension. This requires
+ access to the MySQL Connector/C (aka libmysql) to be given, too, with
+ either the --with-system-mysql or --with-libmysql-path option.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-nlpsolver,
+ AS_HELP_STRING([--enable-ext-nlpsolver],
+ [Download and enables the NLPSolver extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-ct2n,
+ AS_HELP_STRING([--enable-ext-ct2n],
+ [Enables the ConvertTextToNumber extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-numbertext,
+ AS_HELP_STRING([--enable-ext-numbertext],
+ [Enables the Numbertext extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-oooblogger,
+ AS_HELP_STRING([--enable-ext-oooblogger],
+ [Download and enables the OOo Blogger extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-pdfimport,
+ AS_HELP_STRING([--enable-ext-pdfimport],
+ [Enables the PDF Import extension and xpdf.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-presenter-console,
+ AS_HELP_STRING([--enable-ext-presenter-console],
+ [Enables the Presenter Console extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-presenter-minimizer,
+ AS_HELP_STRING([--enable-ext-presenter-minimizer],
+ [Enables the Presentation Minimizer extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-report-builder,
+ AS_HELP_STRING([--enable-ext-report-builder],
+ [Enables the build of the Report Builder extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-scripting-beanshell,
+ AS_HELP_STRING([--enable-ext-scripting-beanshell],
+ [Enables support for scripts in BeanShell.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-scripting-javascript,
+ AS_HELP_STRING([--enable-ext-scripting-javascript],
+ [Enables support for scripts in JavaScript.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-typo,
+ AS_HELP_STRING([--enable-ext-typo],
+ [Enables the Typography Toolbar extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-validator,
+ AS_HELP_STRING([--enable-ext-validator],
+ [Enables the Validator extension.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-watch-window,
+ AS_HELP_STRING([--enable-ext-watch-window],
+ [Enables the Watch Window extension to Calc.]),
+ ,)
+
+ AC_ARG_ENABLE(ext-wiki-publisher,
+ AS_HELP_STRING([--enable-ext-wiki-publisher],
+ [Enables the Wiki Publisher extension.]),
+ ,)
+
+ dnl ---------- *** ----------
+
AC_ARG_ENABLE(graphite,
- [ --enable-graphite Enables the compilation of Graphite smart font rendering
- ],,)
- AC_ARG_WITH(system-graphite,
- [ --with-system-graphite use graphite library already installed on system
- ],,)
+ AS_HELP_STRING([--enable-graphite],
+ [Enables the compilation of Graphite smart font rendering.]),
+ ,)
+
AC_ARG_ENABLE(ldap,
- [ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
- or OpenLDAP LDAP SDK
- ],,)
+ AS_HELP_STRING([--disable-ldap],
+ [Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK]),
+ ,)
+
AC_ARG_ENABLE(fetch-external,
- [ --disable-fetch-external Disables fetching external tarballs from web sources.
- ],,)
- AC_ARG_WITH(external-tar,
- [ --with-external-tar=<TARFILE PATH> Specify path to tarfiles manually ],
- [ TARFILE_LOCATION="$withval"
- ])
- AC_ARG_WITH(openldap,
- [ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead
- of the Netscape/Mozilla one
- ],,)
+ AS_HELP_STRING([--disable-fetch-external],
+ [Disables fetching external tarballs from web sources.]),
+ ,)
+
AC_ARG_ENABLE(lockdown,
- [ --enable-lockdown Enables the gconf integration work in OOo
- ],,)
+ AS_HELP_STRING([--disable-lockdown],
+ [Disables the gconf integration work in LibreOffice.]),
+ ,enable_lockdown=yes)
+
AC_ARG_ENABLE(vba,
- [ --disable-vba disables the vba compatibility feature
- ],,)
- AC_ARG_WITH(vba-package-format,
- [ --with-vba-package-format specify package format for vba compatibility api.
- Specifying "builtin" means the api component and
- associated type library are part of the installation set.
- Specifying "extn" creates an uno extension that is
- part of the installation set ( located in the program
- directory ) that MUST be optionly registered using
- either the unopkg executeable or the extension manager
- gui.
-
- Note: "builtin" is the default, "extn" can cause
- problems.
- Usage: --with-vba-package-format="builtin" or
- --with-vba-package-format="extn"
- ],,)
+ AS_HELP_STRING([--disable-vba],
+ [Disables the vba compatibility feature.]),
+ ,)
+
AC_ARG_ENABLE(pch,
- [ --enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
- ],,)
+ AS_HELP_STRING([--enable-pch],
+ [EXPERIMENTAL: Enables precompiled header support for C++.]),
+ ,)
+
AC_ARG_ENABLE(mozilla,
- [ --disable-mozilla OO.o usually includes a strangely hacked up mozilla
- binary for your platform, to build without this
- version, use this option.
- ],,enable_mozilla="yes")
- AC_ARG_WITH(fonts,
- [ --without-fonts OOo includes some third-party fonts to provide a reliable
- basis for help content, templates, samples, etc.
- When these fonts are already known to be available on the
- system then you should use this option.
- ],,)
- AC_ARG_WITH(ppds,
- [ --without-ppds Removes Postscript Printer definition files from
- openoffice.org installation set, for people building
- for specific distributions where PPDs are known to be
- already available (every recent distro with CUPS
- backend)
- ],,)
- AC_ARG_WITH(afms,
- [ --without-afms Removes bitmap font files from openoffice.org
- installation set, for people building for specific
- distributions where AFM files or TrueType Fonts
- are known to be available.
- ],,)
+ AS_HELP_STRING([--disable-mozilla],
+ [LibreOffice usually includes a strangely hacked up Mozilla binary for your
+ platform, to build without this version, use this option.]),
+ ,enable_mozilla=yes)
+
AC_ARG_ENABLE(epm,
- [ --disable-epm OO.o includes self-packaging code, that requires
- epm, however epm is useless for large scale
- package building.
- ],,enable_epm="yes")
- AC_ARG_WITH(epm,
- [ --with-epm Decides which epm to use. Default is to use
- the one from the system if one is built. When
- either this is not there or you say =internal
- epm will be built.
- ],,)
- AC_ARG_WITH(package-format,
- [ --with-package-format specify package format(s) for OOo installsets.
- Default is "normal" one of the OS/Distribution.
+ AS_HELP_STRING([--enable-epm],
+ [LibreOffice includes self-packaging code, that requires epm, however epm is
+ useless for large scale package building.]),
+ ,enable_epm=no)
+
+ AC_ARG_ENABLE(activex_component,
+ AS_HELP_STRING([--disable-activex-component],
+ [Remove support for ActiveX embedding of LibreOffice.]),
+ ,enable_activex_component=yes)
- Usage: --with-package-format="foo bar"
- ],,)
AC_ARG_ENABLE(odk,
- [ --disable-odk OO.o includes an ODK, office development kit
- which some packagers may with to build without
- ],,enable_odk="yes")
+ AS_HELP_STRING([--disable-odk],
+ [LibreOffice includes an ODK, office development kit which some packagers may
+ wish to build without.]),
+ ,enable_odk=yes)
+
AC_ARG_ENABLE(mathmldtd,
- [ --disable-mathmldtd disable mathmldtd
- (useful for distributions that want to avoid packaging
- it)
- ],,enable_mathmldtd="yes")
+ AS_HELP_STRING([--disable-mathmldtd],
+ [Disable mathmldtd (useful for distributions that want to avoid
+ packaging it).]),
+ ,enable_mathmldtd=yes)
+
AC_ARG_ENABLE(evolution2,
- [ --enable-evolution2 Allows the built-in evolution 2 addressbook
- connectivity build to be enabled.
- ],,)
- AC_ARG_WITH(system-stdlibs,
- [ --with-system-stdlibs use libstdc++/libgcc_s already on system
- ],,)
+ AS_HELP_STRING([--enable-evolution2],
+ [Allows the built-in evolution 2 addressbook connectivity build to be
+ enabled.]))
+
AC_ARG_ENABLE(cups,
- [ --disable-cups disable cups support in the psprint project
- ],,enable_cups=yes)
+ AS_HELP_STRING([--disable-cups],
+ [Disable cups support in the psprint project.]))
+
AC_ARG_ENABLE(fontconfig,
- [ --disable-fontconfig disable support for the fontconfig library
- ],,enable_fontconfig=yes)
+ AS_HELP_STRING([--disable-fontconfig],
+ [Disable support for the fontconfig library.]),
+ ,enable_fontconfig=yes)
+
AC_ARG_ENABLE(directx,
- [ --disable-directx Remove DirectX implementation for the new XCanvas
- interface. The DirectX support requires more stuff
- installed on Windows to compile.
- (DirectX SDK, GDI+ libs)
- ],,enable_directx=yes)
+ AS_HELP_STRING([--disable-directx],
+ [Remove DirectX implementation for the new XCanvas interface.
+ The DirectX support requires more stuff installed on Windows to
+ compile. (DirectX SDK, GDI+ libs)]),
+ ,enable_directx=yes)
+
AC_ARG_ENABLE(activex,
- [ --disable-activex Disable the use of ActiveX for windows build.
- This switch is mandatory when using VC++ 2005/2008 Express.
- ],,)
+ AS_HELP_STRING([--disable-activex],
+ [Disable the use of ActiveX for a Windows build.])
+ [
+ This switch is mandatory when using VC++ 2008 Express.
+ ],
+ ,)
AC_ARG_ENABLE(atl,
- [ --disable-atl Disable the use of ATL for windows build.
- This switch is mandatory when using VC++ 2005/2008 Express.
- ],,)
+ AS_HELP_STRING([--disable-atl],
+ [Disable the use of ATL for a Windows build.])
+ [
+ This switch is mandatory when using VC++ 2008 Express.
+ ],
+ ,)
AC_ARG_ENABLE(symbols,
- [ --enable-symbols Include debugging symbols in output.
- WARNING - a complete build needs 8 Gb of space and
- takes much longer. (enables -g compiler flag)
-
- --enable-symbols=SMALL sets the gcc -g1 setting
- which is smaller.
-
+ AS_HELP_STRING([--enable-symbols],
+ [Include debugging symbols in output. WARNING - a complete build needs
+ 8 Gb of space and takes much longer (enables -g compiler flag).])
+ [
Enabling symbols disables the stripping of the solver
(--disable-strip-solver).
- ],,)
- AC_ARG_ENABLE(strip-solver,
- [ --disable-strip-solver Disable the stripping of the solver.
- By default the solver is stripped unless a build with
- debugging symbols (--enable-symbols) is requested.
+ ],
+ ,)
+ AC_ARG_ENABLE(strip-solver,
+ AS_HELP_STRING([--disable-strip-solver],
+ [Disable the stripping of the solver. By default the solver is stripped
+ unless a build with debugging symbols (--enable-symbols) is requested.])
+ [
This switch allows to override this setting.
- ],,)
+ ],
+ ,)
+
AC_ARG_ENABLE(werror,
- [ --enable-werror Turn warnings to errors. (Has no effect in modules
- where the treating of warnings as errors is disabled
- explicitely)
- ],,)
+ AS_HELP_STRING([--enable-werror],
+ [Turn warnings to errors. (Has no effect in modules where the treating
+ of warnings as errors is disabled explicitly.)]),
+ ,)
+
AC_ARG_ENABLE(debug,
- [ --enable-debug Include debugging symbols from --enable-symbols
- plus extra debugging code. Extra large build!
- (enables -g compiler flag and dmake debug=true)
- ],,)
+ AS_HELP_STRING([--enable-debug],
+ [Include debugging symbols from --enable-symbols plus extra debugging
+ code. Extra large build! (enables -g compiler flag and dmake debug=true)
+ If you need even more verbose output, build a module with
+ "build -- debug=true dbglevel=2".]))
+
AC_ARG_ENABLE(dbgutil,
- [ --enable-dbgutil Include additional debugging utilities, such as
- assertions, object counting, etc. Larger build.
- Independent from --enable-debug
- ],,)
+ AS_HELP_STRING([--enable-dbgutil],
+ [Include additional debugging utilities, such as assertions, object
+ counting, etc. Larger build. Independent from --enable-debug]))
+
AC_ARG_ENABLE(crashdump,
- [ --enable-crashdump Enable the crashdump feature code.
- ],,)
- AC_ARG_ENABLE(cl-standard,
- [ --enable-cl-standard For Microsoft C/C++ compiler users, use non-optimizing
- standard compiler. ( This just disavles optimization
- options and therefore removes a lot of warnings when
- using the cheaper standard compiler. )
- ],,)
+ AS_HELP_STRING([--enable-crashdump],
+ [Enable the crashdump feature.]))
+
+ AC_ARG_ENABLE(python,
+ AS_HELP_STRING([--enable-python=<no/auto/system/internal>],
+ [Enables or disables Python support at run-time and build-time.
+ Also specifies what Python to use. 'auto' is the
+ default. Note that Python can be disabled with
+ --disable-python or --enable-python=no only if no
+ translations are required.]))
+
AC_ARG_ENABLE(gtk,
- [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms
- where Gtk+ is available.
- ],,enable_gtk=yes)
- AC_ARG_ENABLE(gstreamer,
- [ --disable-gstreamer Determines whether to use the GStreamer media
- backend on platforms where GStreamer is available.
- ],,enable_gstreamer=yes)
+ AS_HELP_STRING([--disable-gtk],
+ [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]),
+ ,enable_gtk=yes)
+
+ AC_ARG_ENABLE(gtk3,
+ AS_HELP_STRING([--disable-gtk3],
+ [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
+ ,enable_gtk3=no)
+
AC_ARG_ENABLE(systray,
- [ --disable-systray Determines whether to build the systray quickstarter.
- ],,enable_systray=yes)
- AC_ARG_ENABLE(cairo,
- [ --enable-cairo Determines whether to use Cairo library on
- platforms where Cairo is available.
- ],,enable_cairo=no)
- AC_ARG_WITH(system-cairo,
- [ --with-system-cairo Use Cairo libraries already on system
- ],,)
+ AS_HELP_STRING([--disable-systray],
+ [Determines whether to build the systray quickstarter.]),
+ ,enable_systray=yes)
+
+AC_ARG_ENABLE(cairo-canvas,
+[ --disable-cairo-canvas Determines whether to build the Cairo canvas on
+ platforms where Cairo is available.
+],,enable_cairo_canvas=yes)
AC_ARG_ENABLE(librsvg,
- [ --enable-librsvg Determines whether to use librsvg library on
- platforms where librsvg is available.
- (actually, it is possible to build with
- --disable-librsvg and to still have SVG support
- within a running soffice instance, since this
- dependency is a runtime only dependency.
- To have SVG suppport at runtime, the librsvg, the cairo
- and the gobject library - and all depending libraries
- as well - need to be accessible by the running soffice
- instance.
- The intention of defaulting this flag to yes is to
- indicate this fact to the build maintainer)
- ],,enable_librsvg=yes)
+ AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal>],
+ [Enables or disables use of librsvg to render SVG at run-time.
+ Also specificed what librsvg to use. 'auto' is the default.]))
+
AC_ARG_ENABLE(opengl,
- [ --enable-opengl Determines whether to build the OpenGL 3D slide
- transitions component
- ],,enable_opengl=no)
+ AS_HELP_STRING([--disable-opengl],
+ [Determines whether to build the OpenGL 3D slide transitions component.]),
+ ,enable_opengl=yes)
+
AC_ARG_ENABLE(dbus,
- [ --enable-dbus Determines whether to enable presentation mode
- screensaver control under GNOME via DBUS
- ],,enable_dbus=no)
+ AS_HELP_STRING([--enable-dbus],
+ [Determines whether to enable presentation mode screensaver control
+ under GNOME via DBUS.]),
+ ,enable_dbus=no)
+
AC_ARG_ENABLE(gconf,
- [ --disable-gconf Determines whether to use the GConf support
- ],,enable_gconf=yes)
+ AS_HELP_STRING([--disable-gconf],
+ [Determines whether to use the GConf support.]),
+ ,enable_gconf=yes)
+
AC_ARG_ENABLE(gnome-vfs,
- [ --disable-gnome-vfs Determines whether to use the Gnome Virtual Filing
- System on platforms where that VFS is available
- ],,enable_gnome_vfs=yes)
+ AS_HELP_STRING([--disable-gnome-vfs],
+ [Determines whether to use the Gnome Virtual Filing System on platforms
+ where that VFS is available.]),
+ ,enable_gnome_vfs=yes)
+
AC_ARG_ENABLE(gio,
- [ --enable-gio Determines whether to use the GIO support
- ],,enable_gio=no)
+ AS_HELP_STRING([--enable-gio],
+ [Determines whether to use the GIO support.]),
+ ,enable_gio=no)
+
AC_ARG_ENABLE(static-gtk,
- [ --enable-static-gtk Modules that are linked against gtk libraries use
- the static libraries instead of the dynamic ones.
- (enables -Bstatic linker flag for gtk libraries)
- ],,)
+ AS_HELP_STRING([--enable-static-gtk],
+ [Modules that are linked against GTK+ libraries use the static libraries
+ instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ libraries.)]),
+ ,)
+
AC_ARG_ENABLE(layout,
- [ --enable-layout Enable the compilation and use of layout dialogs
- ],,)
+ AS_HELP_STRING([--enable-layout],
+ [Enable the compilation and use of layout dialogs.]),
+ ,)
+
AC_ARG_ENABLE(build-mozilla,
- [ --disable-build-mozilla Use this option if you do not want to build the
- mozilla components from the mozilla source code but
- take precompiled zips
- ],,)
- AC_ARG_WITH(mozilla-version,
- [ --with-mozilla-version Choose which version of mozilla to use while building
- mozilla. Default: 1.7.5.
- Note that not all versions are supported.
- ],,)
- AC_ARG_WITH(mozilla-toolkit,
- [ --with-mozilla-toolkit Choose which GUI toolkit to use while building mozilla
- components. Default: gtk2
- ],,)
- AC_ARG_ENABLE(nss_module,
- [ --disable-nss-module Whether to use provided NSS module
- ],,enable_nss_module=yes)
+ AS_HELP_STRING([--disable-build-mozilla],
+ [Use this option if you do not want to build the Mozilla components from
+ the Mozilla source code but take precompiled zips.]),
+ ,)
+
+ AC_ARG_ENABLE(nss-module,
+ AS_HELP_STRING([--disable-nss-module],
+ [Whether to use provided NSS module.]),
+ ,enable_nss_module=yes)
+
AC_ARG_ENABLE(kde,
- [ --enable-kde Determines whether to use Qt/KDE vclplug on platforms
- where Qt and KDE are available.
- ],,)
+ AS_HELP_STRING([--enable-kde],
+ [Determines whether to use Qt3/KDE3 vclplug on platforms where Qt3 and
+ KDE3 are available.]),
+ ,)
+
AC_ARG_ENABLE(kdeab,
- [ --disable-kdeab Disable the KDE address book support
- ],,if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi)
+ AS_HELP_STRING([--disable-kdeab],
+ [Disable the KDE3 address book support.]),
+ ,
+ if test "$enable_kde" = "yes"; then
+ enable_kdeab=yes;
+ fi
+ )
+
AC_ARG_ENABLE(kde4,
- [ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms
- where Qt4 and KDE4 are available. May be used with --enable-kde
- if you want to support both KDE3 and KDE4.
- ],,)
+ AS_HELP_STRING([--enable-kde4],
+ [Determines whether to use Qt4/KDE4 vclplug on platforms where Qt4 and
+ KDE4 are available. May be used with --enable-kde if you want to support
+ both KDE3 and KDE4.]),
+ ,)
+
+ AC_ARG_ENABLE(unix-qstart-libpng,
+ AS_HELP_STRING([--disable-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)
+
AC_ARG_ENABLE(binfilter,
- [ --disable-binfilter Disable legacy binary file formats filters
- ],,if ! test -d ./binfilter; then enable_binfilter=no; fi)
+ AS_HELP_STRING([--enable-binfilter],
+ [Enable legacy binary file formats filters build.]),
+ ,enable_binfilter=no
+ )
+
+ AC_ARG_ENABLE(ugly,
+ AS_HELP_STRING([--enable-ugly],
+ [Enables ugly pieces of functionality.]),
+ ,enable_ugly=no
+ )
+
AC_ARG_ENABLE(rpath,
- [ --disable-rpath Disable the use of relative paths in shared libraries
- ],,)
- AC_ARG_ENABLE(pam,
- [ --disable-pam Disable pam support.
- ],,)
- AC_ARG_ENABLE(pam-link,
- [ --enable-pam-link link with libpam instead of dynamically open it
- ],,)
- AC_ARG_ENABLE(crypt-link,
- [ --disable-crypt-link disable linking with libcrypt instead of dynamically
- open it (needed for ancient GNU/Linux distributions
- without crypt()/libcrypt)
- ],,enable_crypt_link=yes)
+ AS_HELP_STRING([--disable-rpath],
+ [Disable the use of relative paths in shared libraries.]),
+ ,)
+
AC_ARG_ENABLE(xrender-link,
- [ --enable-xrender-link link with libXrender instead of dynamically open it
- ],,)
+ AS_HELP_STRING([--enable-xrender-link],
+ [Link with libXrender instead of dynamically open it.]),
+ ,)
+
AC_ARG_ENABLE(randr,
- [ --disable-randr disable RandR support in the vcl project
- ],,enable_randr=yes)
+ AS_HELP_STRING([--disable-randr],
+ [Disable RandR support in the vcl project.]),
+ ,enable_randr=yes)
+
AC_ARG_ENABLE(randr-link,
- [ --disable-randr-link disable linking with libXrandr, instead dynamically
- open it at runtime
- ],,enable_randr_link=yes)
+ AS_HELP_STRING([--disable-randr-link],
+ [Disable linking with libXrandr, instead dynamically open it at runtime.]),
+ ,enable_randr_link=yes)
+
+ AC_ARG_ENABLE(gstreamer,
+ AS_HELP_STRING([--disable-gstreamer],
+ [Disable building the gstreamer avmedia backend.]),
+ ,enable_gstreamer=yes)
+
+ AC_ARG_ENABLE(neon,
+ AS_HELP_STRING([--disable-neon],
+ [Disable neon and the compilation of webdav binding.]),
+ ,)
+
+ AC_ARG_ENABLE(build-unowinreg,
+ AS_HELP_STRING([--enable-build-unowinreg],
+ [Do not use the prebuilt unowinreg.dll. Build it instead. The MinGW C++
+ compiler is needed on Linux.])
+ [
+ Usage: --enable-build-unowinreg
+ ],
+ ,)
+
+ AC_ARG_ENABLE(verbose,
+ AS_HELP_STRING([--enable-verbose],
+ [Increase build verbosity.])[
+ --disable-verbose Decrease build verbosity.],
+ ,)
+
+ AC_ARG_ENABLE(dependency-tracking,
+ AS_HELP_STRING([--enable-dependency-tracking],
+ [Do not reject slow dependency extractors.])[
+ --disable-dependency-tracking
+ Disables generation of dependency information.
+ Speed up one-time builds.],
+ ,)
+
+ AC_ARG_ENABLE(icecream,
+ AS_HELP_STRING([--enable-icecream],
+ [Use the 'icecream' distributed compiling tool to speedup the compilation.
+ It defaults to /opt/icecream for the location of the icecream gcc/g++
+ wrappers, you can override that using --with-gcc-home=/the/path switch.]),
+ ,)
+
+ AC_ARG_ENABLE(zenity,
+ AS_HELP_STRING([--disable-zenity],
+ [Do not display a build icon in the notification area (on unix) during build.]),
+ ,enable_zenity=yes)
+
+ AC_ARG_ENABLE(cl-x64,
+ AS_HELP_STRING([--enable-cl-x64],
+ [Build a 64-bit LibreOffice using the Microsoft C/C++ x64 compiler.]),
+ ,)
+
+ AC_ARG_ENABLE(extra-gallery,
+ AS_HELP_STRING([--enable-extra-gallery],
+ [Add extra gallery content.]),
+ ,)
+
+ AC_ARG_ENABLE(extra-template,
+ AS_HELP_STRING([--enable-extra-template],
+ [Add extra template content.]),
+ ,)
+
+ AC_ARG_ENABLE(extra-sample,
+ AS_HELP_STRING([--enable-extra-sample],
+ [Add extra sample content.]),
+ ,)
+
+ AC_ARG_ENABLE(extra-font,
+ AS_HELP_STRING([--enable-extra-font],
+ [Add extra font content.]),
+ ,)
+
+ AC_ARG_ENABLE(lomenubar,
+ AS_HELP_STRING([--enable-lomenubar],
+ [Enable global menu support.]),
+ ,)
+
+ AC_ARG_ENABLE(release-build,
+ AS_HELP_STRING([--enable-release-build],
+ [Enable release build.
+ See http://wiki.documentfoundation.org/DevBuild]),
+ ,)
+
+ dnl ===================================================================
+ dnl Optional Packages (--with/without-)
+ dnl ===================================================================
+ AC_ARG_WITH(gnu-patch,
+ AS_HELP_STRING([--with-gnu-patch],
+ [Specify location of GNU patch on Solaris or FreeBSD.]),
+ ,)
+
+ AC_ARG_WITH(gnu-cp,
+ AS_HELP_STRING([--with-gnu-cp],
+ [Specify location of GNU cp on Solaris or FreeBSD.]),
+ ,)
+
+ AC_ARG_WITH(system-graphite,
+ AS_HELP_STRING([--with-system-graphite],
+ [Use graphite library already installed on system.]),
+ ,)
+
+ AC_ARG_WITH(external-tar,
+ AS_HELP_STRING([--with-external-tar=<TARFILE PATH>],
+ [Specify path to tarfiles manually.]),
+ TARFILE_LOCATION=$withval ,
+ )
+
+ AC_ARG_WITH(linked-git,
+ AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
+ [Specify another checkout's clonedir to re-use. This makes use of
+ git-new-workdir, and saves a lot of diskspace when having multiple
+ trees side-by-side.]),
+ GIT_LINK_SRC=$withval ,
+ )
+
+ AC_ARG_WITH(openldap,
+ AS_HELP_STRING([--with-openldap],
+ [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
+ ,)
+
+ AC_ARG_WITH(vba-package-format,
+ AS_HELP_STRING([--with-vba-package-format],
+ [Specify package format for vba compatibility api. Specifying "builtin"
+ means the api component and associated type library are part of the
+ installation set. Specifying "extn" creates an uno extension that is
+ part of the installation set (located in the program directory) that
+ MUST be optionly registered using either the unopkg executeable or the
+ extension manager gui.])
+ [
+ Note: "builtin" is the default, "extn" can cause
+ problems.
+
+ Usage: --with-vba-package-format="builtin" or
+ --with-vba-package-format="extn"
+ ],
+ ,)
+
+ AC_ARG_WITH(theme,
+ AS_HELP_STRING([--with-theme="theme1 theme2..."],
+ [Choose which themes to include. By default those themes with an '*' are included.
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+ ,)
+
+ AC_ARG_WITH(theme,
+ AS_HELP_STRING([--with-theme="theme1 theme2..."],
+ [Choose which themes to include. By default those themes with an '*' are included.
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+ ,)
+
+ AC_ARG_WITH(extension-integration,
+ AS_HELP_STRING([--with-extension-integration],
+ [It will integrate the builded extensions to the installer of the product.
+ Please use this switch to include any extension.]),
+ ,)
+
+ AC_ARG_WITH(helppack-integration,
+ [
+ --without-helppack-integration It will not integrate the helppacks to the installer
+ of the product.
+ Please use this switch to use the online help or separate help packages.],
+ ,)
+
+ AC_ARG_WITH(fonts,
+ AS_HELP_STRING([--without-fonts],
+ [LibreOffice includes some third-party fonts to provide a reliable basis for
+ help content, templates, samples, etc. When these fonts are already
+ known to be available on the system then you should use this option.]),
+ ,)
+
+ AC_ARG_WITH(ppds,
+ AS_HELP_STRING([--without-ppds],
+ [Removes Postscript Printer definition files from LibreOffice
+ installation set, for people building for specific distributions where
+ PPDs are known to be already available (every recent distro with CUPS backend).]),
+ ,)
+
+ AC_ARG_WITH(afms,
+ AS_HELP_STRING([--without-afms],
+ [Removes bitmap font files from LibreOffice installation set, for people
+ building for specific distributions where AFM files or TrueType Fonts
+ are known to be available.]),
+ ,)
+
+ AC_ARG_WITH(agfa-monotype-fonts,
+ AS_HELP_STRING([--with-agfa-monotype-fonts],
+ [Do not include the proprietary Agfa Monotype fonts
+ (even if present) in the LibreOffice installation
+ set.])
+ ,)
+
+ AC_ARG_WITH(epm,
+ AS_HELP_STRING([--with-epm],
+ [Decides which epm to use. Default is to use the one from the system if
+ one is built. When either this is not there or you say =internal epm
+ will be built.]),
+ ,)
+
+ AC_ARG_WITH(package-format,
+ AS_HELP_STRING([--with-package-format],
+ [Specify package format(s) for LibreOffice installsets. Default is the
+ "normal" one of the OS/Distribution. Possible values: aix, bsd, deb,
+ inst, tardist, osx, pkg, rpm, setld, native, portable, archive, dmg,
+ installed, msi. Example: --with-package-format="deb dmg"]),
+ ,)
+
+ AC_ARG_WITH(system-stdlibs,
+ AS_HELP_STRING([--with-system-stdlibs],
+ [Use libstdc++/libgcc_s already on system.]),
+ ,)
+
+ AC_ARG_WITH(system-cairo,
+ AS_HELP_STRING([--with-system-cairo],
+ [Use Cairo libraries already on system.]),
+ ,)
+
+ AC_ARG_WITH(mozilla-version,
+ AS_HELP_STRING([--with-mozilla-version],
+ [Choose which version of Mozilla to use while building Mozilla.
+ (default=1.7.5) Note that not all versions are supported.]),
+ ,)
+
+ AC_ARG_WITH(mozilla-toolkit,
+ AS_HELP_STRING([--with-mozilla-toolkit],
+ [Choose which GUI toolkit to use while building Mozilla components. (default=gtk2)]),
+ ,)
+
AC_ARG_WITH(myspell-dicts,
- [ --without-myspell-dicts Removes myspell dictionaries from openoffice.org
- installation set, for people building for specific
- distributions where the myspell dictionaries are
- installed from other sources
- ],,)
+ AS_HELP_STRING([--without-myspell-dicts],
+ [Removes myspell dictionaries from LibreOffice installation set, for
+ people building for specific distributions where the myspell dictionaries
+ are installed from other sources.]),
+ ,)
+
AC_ARG_WITH(system-dicts,
- [ --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([--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.]),
+ ,)
+
AC_ARG_WITH(external-dict-dir,
- [ --with-external-dict-dir Specify external dictionary dir
- ],,)
+ AS_HELP_STRING([--with-external-dict-dir],
+ [Specify external dictionary dir.]),
+ ,)
+
AC_ARG_WITH(external-hyph-dir,
- [ --with-external-hyph-dir Specify external hyphenation pattern dir
- ],,)
+ AS_HELP_STRING([--with-external-hyph-dir],
+ [Specify external hyphenation pattern dir.]),
+ ,)
+
AC_ARG_WITH(external-thes-dir,
- [ --with-external-thes-dir Specify external thesaurus dir
- ],,)
+ AS_HELP_STRING([--with-external-thes-dir],
+ [Specify external thesaurus dir.]),
+ ,)
+
AC_ARG_WITH(system-libs,
- [ --with-system-libs Use libs already on system -- enables all
- --with-system-* flags except mozilla and
- odbc/sane/xrender-header(s)
- ],,)
+ AS_HELP_STRING([--with-system-libs],
+ [Use libs already on system -- enables all --with-system-* flags except
+ mozilla and odbc/sane/xrender-header(s).]),
+ ,)
+
AC_ARG_WITH(system-headers,
- [ --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/xrender-header(s)
- ],,)
+ 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/xrender-header(s).]),
+ ,)
+
AC_ARG_WITH(system-jars,
- [ --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)
- ],,)
+ 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).]),
+ ,)
+
AC_ARG_WITH(system-zlib,
- [ --with-system-zlib Use zlib already on system
- ],,)
+ AS_HELP_STRING([--with-system-zlib],
+ [Use zlib already on system.]),
+ ,)
+
AC_ARG_WITH(system-openssl,
- [ --with-system-openssl Use OpenSSL already on system
- ],,)
+ AS_HELP_STRING([--with-system-openssl],
+ [Use OpenSSL already on system.]),
+ ,)
+
AC_ARG_WITH(system-jpeg,
- [ --with-system-jpeg Use jpeg already on system
- ],,)
+ AS_HELP_STRING([--with-system-jpeg],
+ [Use jpeg already on system.]),
+ ,)
+
AC_ARG_WITH(system-expat,
- [ --with-system-expat Use expat already on system
- ],,)
+ AS_HELP_STRING([--with-system-expat],
+ [Use expat already on system.]),
+ ,)
+
+ AC_ARG_WITH(system-libvisio,
+ AS_HELP_STRING([--with-system-libvisio],
+ [Use libvisio already on system.]),
+ ,)
+
AC_ARG_WITH(system-libwpd,
- [ --with-system-libwpd Use libwpd already on system
- ],,)
+ AS_HELP_STRING([--with-system-libwpd],
+ [Use libwpd already on system.]),
+ ,)
+
+ AC_ARG_WITH(system-libwps,
+ AS_HELP_STRING([--with-system-libwps],
+ [Use libwps already on system.]),
+ ,)
+
+ AC_ARG_WITH(system-libwpg,
+ AS_HELP_STRING([--with-system-libwpg],
+ [Use libwpg already on system.]),
+ ,)
+
AC_ARG_WITH(system-libxml,
- [ --with-system-libxml Use libxml already on system
- ],,)
- AC_ARG_WITH(system-python,
- [ --with-system-python Use python already on system
- ],,)
+ AS_HELP_STRING([--with-system-libxml],
+ [Use libxml already on system.]),
+ ,)
+
+ AC_ARG_WITH(system-translate-toolkit,
+ AS_HELP_STRING([--with-system-translate-toolkit],
+ [Use translate-toolkit already on system.]))
+
AC_ARG_WITH(system-icu,
- [ --with-system-icu Use icu already on system
- ],,)
+ AS_HELP_STRING([--with-system-icu],
+ [Use icu already on system.]))
+
AC_ARG_WITH(system-poppler,
- [ --with-system-poppler Use poppler already on system
- ],,)
+ AS_HELP_STRING([--with-system-poppler],
+ [Use system poppler. (only needed for pdfimport extension)]))
+
AC_ARG_WITH(system-db,
- [ --with-system-db Use berkeley db already on system
- ],,)
+ AS_HELP_STRING([--with-system-db],
+ [Use Berkeley db already on system.]))
+
AC_ARG_WITH(system-lucene,
- [ --with-system-lucene Use lucene already on system
- ],,)
+ AS_HELP_STRING([--with-system-lucene],
+ [Use Lucene already on system.]))
+
+ AC_ARG_WITH(system-apache-commons,
+ AS_HELP_STRING([--with-system-apache-commons],
+ [Use Apache commons libraries already on system.]))
+
AC_ARG_WITH(lucene-core-jar,
- [ --with-lucene-core-jar=JARFILE Specify path to jarfile manually ],
- [ LUCENE_CORE_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-lucene-core-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LUCENE_CORE_JAR=$withval)
+
AC_ARG_WITH(lucene-analyzers-jar,
- [ --with-lucene-analyzers-jar=JARFILE Specify path to jarfile manually ],
- [ LUCENE_ANALYZERS_JAR="$withval"
- ])
- AC_ARG_ENABLE(mysql-connector,
- [ --enable-mysql-connector enables the build of the MySQL Connector/OOo extension.
- This requires access to the MySQL Connector/C (aka libmysql) to be given, too, with
- either the --with-system-mysql or --with-libmysql-path option.
- ],,)
+ AS_HELP_STRING([--with-lucene-analyzers-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LUCENE_ANALYZERS_JAR=$withval ,)
+
AC_ARG_WITH(system-mysql,
- [ --with-system-mysql Use MySQL libraries already on system, for building the MySQL Connector/OOo extension.
- Requires MYSQLCONFIG to point to the mysql_config executable.
- ],,)
+ 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.]))
+
AC_ARG_WITH(libmysql-path,
- [ --with-libmysql-path Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
+ AS_HELP_STRING([--with-libmysql-path],
+ [Use Connector/C (libmysql) installation for building the MySQL
+ Connector/LibreOffice extension.])
+ [
+ Usage: --with-libmysql-path=<absolute path to
+ your Connector/C installation>
+ ],
+ ,)
- Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
- ],,)
AC_ARG_WITH(system-mysql-cppconn,
- [ --with-system-mysql-cppconn Use MySQL C++ Connector libraries already on system
- ],,)
+ AS_HELP_STRING([--with-system-mysql-cppconn],
+ [Use MySQL C++ Connector libraries already on system.]))
+
AC_ARG_WITH(system-hsqldb,
- [ --with-system-hsqldb Use hsqldb already on system
- ],,)
+ AS_HELP_STRING([--with-system-hsqldb],
+ [Use hsqldb already on system.]))
+
AC_ARG_WITH(hsqldb-jar,
- [ --with-hsqldb-jar=JARFILE Specify path to jarfile manually ],
- [ HSQLDB_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-hsqldb-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ HSQLDB_JAR=$withval)
+
AC_ARG_WITH(system-beanshell,
- [ --with-system-beanshell Use beanshell already on system
- ],,)
+ AS_HELP_STRING([--with-system-beanshell],
+ [Use beanshell already on system.]))
+
AC_ARG_WITH(beanshell-jar,
- [ --with-beanshell-jar=JARFILE Specify path to jarfile manually ],
- [ BSH_JAR="$withval"
- ])
- AC_ARG_ENABLE(presenter-extra-ui,
- [ --enable-presenter-extra-ui enables extra functionality during slideshow,
- e.g. selecting pen color, erasing drawings etc.
- ],,enable_presenter_extra_ui=no)
- AC_ARG_ENABLE(minimizer,
- [ --enable-minimizer enables the build of the Presentation Minimizer extension
- ],,)
- AC_ARG_ENABLE(presenter-console,
- [ --enable-presenter-console enables the build of the Presenter Console extension
- ],,)
- AC_ARG_ENABLE(pdfimport,
- [ --enable-pdfimport enables the build of the PDF Import extension and xpdf
- ],,)
- AC_ARG_ENABLE(wiki-publisher,
- [ --enable-wiki-publisher enables the build of the Wiki Publisher extension
- ],,)
+ AS_HELP_STRING([--with-beanshell-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ BSH_JAR=$withval)
+
AC_ARG_WITH(commons-codec-jar,
- [ --with-commons-codec-jar=JARFILE Specify path to jarfile manually ],
- [ COMMONS_CODEC_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-commons-codec-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_CODEC_JAR=$withval)
+
AC_ARG_WITH(commons-lang-jar,
- [ --with-commons-lang-jar=JARFILE Specify path to jarfile manually ],
- [ COMMONS_LANG_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-commons-lang-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_LANG_JAR=$withval)
+
AC_ARG_WITH(commons-httpclient-jar,
- [ --with-commons-httpclient-jar=JARFILE Specify path to jarfile manually ],
- [ COMMONS_HTTPCLIENT_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-commons-httpclient-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_HTTPCLIENT_JAR=$withval)
+
AC_ARG_WITH(commons-logging-jar,
- [ --with-commons-logging-jar=JARFILE Specify path to jarfile manually ],
- [ COMMONS_LOGGING_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-commons-logging-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ COMMONS_LOGGING_JAR=$withval)
+
AC_ARG_WITH(servlet-api-jar,
- [ --servlet-api-jar=JARFILE Specify path to jarfile manually ],
- [ SERVLETAPI_JAR="$withval"
- ])
- AC_ARG_ENABLE(report-builder,
- [ --enable-report-builder enables the build of the Report Builder extension
- ],,)
+ AS_HELP_STRING([--with-servlet-api-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ SERVLETAPI_JAR=$withval)
+
AC_ARG_WITH(system-jfreereport,
- [ --with-system-jfreereport Use JFreeReport already on system
- ],,)
+ AS_HELP_STRING([--with-system-jfreereport],
+ [Use JFreeReport already on system.]))
+
AC_ARG_WITH(sac-jar,
- [ --with-sac-jar=JARFILE Specify path to jarfile manually ],
- [ SAC_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-sac-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ SAC_JAR=$withval)
+
AC_ARG_WITH(libxml-jar,
- [ --with-libxml-jar=JARFILE Specify path to jarfile manually ],
- [ LIBXML_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-libxml-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBXML_JAR=$withval)
+
AC_ARG_WITH(flute-jar,
- [ --with-flute-jar=JARFILE Specify path to jarfile manually ],
- [ FLUTE_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-flute-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ FLUTE_JAR=$withval)
+
AC_ARG_WITH(jfreereport-jar,
- [ --with-jfreereport-jar=JARFILE Specify path to jarfile manually ],
- [ JFREEREPORT_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-jfreereport-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ JFREEREPORT_JAR=$withval)
+
AC_ARG_WITH(liblayout-jar,
- [ --with-liblayout-jar=JARFILE Specify path to jarfile manually ],
- [ LIBLAYOUT_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-liblayout-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBLAYOUT_JAR=$withval)
+
AC_ARG_WITH(libloader-jar,
- [ --with-libloader-jar=JARFILE Specify path to jarfile manually ],
- [ LIBLOADER_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-libloader-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBLOADER_JAR=$withval)
+
AC_ARG_WITH(libloader-jar,
- [ --with-libloader-jar=JARFILE Specify path to jarfile manually ],
- [ LIBLOADER_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-libloader-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBLOADER_JAR=$withval)
+
AC_ARG_WITH(libformula-jar,
- [ --with-libformula-jar=JARFILE Specify path to jarfile manually ],
- [ LIBFORMULA_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-libformula-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBFORMULA_JAR=$withval)
+
AC_ARG_WITH(librepository-jar,
- [ --with-librepository-jar=JARFILE Specify path to jarfile manually ],
- [ LIBREPOSITORY_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-librepository-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBREPOSITORY_JAR=$withval)
+
AC_ARG_WITH(libfonts-jar,
- [ --with-libfonts-jar=JARFILE Specify path to jarfile manually ],
- [ LIBFONTS_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-libfonts-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBFONTS_JAR=$withval)
+
AC_ARG_WITH(libserializer-jar,
- [ --with-libserializer-jar=JARFILE Specify path to jarfile manually ],
- [ LIBSERIALIZER_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-libserializer-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBSERIALIZER_JAR=$withval)
+
AC_ARG_WITH(libbase-jar,
- [ --with-libbase-jar=JARFILE Specify path to jarfile manually ],
- [ LIBBASE_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-libbase-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ LIBBASE_JAR=$withval)
+
AC_ARG_WITH(system-saxon,
- [ --with-system-saxon Use saxon already on system
- ],,)
+ AS_HELP_STRING([--with-system-saxon],
+ [Use saxon already on system.]))
+
AC_ARG_WITH(saxon-jar,
- [ --with-saxon-jar=JARFILE Specify path to jarfile manually ],
- [ SAXON_JAR="$withval"
- ])
+ AS_HELP_STRING([--with-saxon-jar=JARFILE],
+ [Specify path to jarfile manually.]),
+ SAXON_JAR=$withval)
+
AC_ARG_WITH(system-libxslt,
- [ --with-system-libxslt Use libxslt already on system
- ],,)
+ AS_HELP_STRING([--with-system-libxslt],
+ [Use libxslt already on system.]))
+
AC_ARG_WITH(system-odbc,
- [ --with-system-odbc-headers Use the odbc headers already on system
- ],,)
+ AS_HELP_STRING([--with-system-odbc],
+ [Use the odbc headers already on system.]))
+
AC_ARG_WITH(system-sane,
- [ --with-system-sane-header Use sane.h already on system
- ],,)
- AC_ARG_WITH(system-xrender,
- [ --with-system-xrender-headers Use XRender headers already on system
- ],,)
+ AS_HELP_STRING([--with-system-sane-header],
+ [Use sane.h already on system.]))
+
+ AC_ARG_WITH(system-xrender-headers,
+ AS_HELP_STRING([--with-system-xrender-headers],
+ [Use XRender headers already on system.]))
+
+ AC_ARG_WITH(system-mesa-headers,
+ AS_HELP_STRING([--with-system-mesa-headers],
+ [Use Mesa headers already on system.]))
+
AC_ARG_WITH(system-curl,
- [ --with-system-curl Use curl already on system
- ],,)
+ AS_HELP_STRING([--with-system-curl],
+ [Use curl already on system.]))
+
AC_ARG_WITH(system-boost,
- [ --with-system-boost Use boost already on system
- ],,)
+ AS_HELP_STRING([--with-system-boost],
+ [Use boost already on system.]))
+
AC_ARG_WITH(system-mdds,
- [ --with-system-mdds Use mdds already on system
- ],,)
+ AS_HELP_STRING([--with-system-mdds],
+ [Use mdds already on system.]))
+
AC_ARG_WITH(system-vigra,
- [ --with-system-vigra Use vigra already on system
- ],,)
- AC_ARG_ENABLE(neon,
- [ --disable-neon Disable neon and the compilation of webdav binding
- ],,)
- AC_ARG_ENABLE(Xaw,
- [ --disable-Xaw Disables the use of Xaw for the Netscape/Mozilla
- plugin
- ],,)
+ AS_HELP_STRING([--with-system-vigra],
+ [Use vigra already on system.]))
+
AC_ARG_WITH(system-neon,
- [ --with-system-neon Use neon already on system
- ],,)
- AC_ARG_WITH(system-agg,
- [ --with-system-agg Use AGG already on system
- ],,)
+ AS_HELP_STRING([--with-system-neon],
+ [Use neon already on system.]))
+
AC_ARG_WITH(system-hunspell,
- [ --with-system-hunspell Use libhunspell already on system
- ],,)
+ AS_HELP_STRING([--with-system-hunspell],
+ [Use libhunspell already on system.]))
+
AC_ARG_WITH(system-mythes,
- [ --with-system-mythes Use mythes already on system
- ],,)
+ AS_HELP_STRING([--with-system-mythes],
+ [Use mythes already on system.]))
+
AC_ARG_WITH(system-altlinuxhyph,
- [ --with-system-altlinuxhyph Use ALTLinuxhyph already on system
- ],,)
+ AS_HELP_STRING([--with-system-altlinuxhyph],
+ [Use ALTLinuxhyph already on system.]))
+
AC_ARG_WITH(system-lpsolve,
- [ --with-system-lpsolve Use lpsolve already on system
- ],,)
+ AS_HELP_STRING([--with-system-lpsolve],
+ [Use lpsolve already on system.]))
+
AC_ARG_WITH(system-libtextcat,
- [ --with-system-libtextcat Use libtextcat already on system
- ],,)
+ AS_HELP_STRING([--with-system-libtextcat],
+ [Use libtextcat already on system.]))
+
AC_ARG_WITH(external-libtextcat-data,
- [ --with-system-libtextcat-data Use libtextcat data already on system
- ],,)
+ AS_HELP_STRING([--with-external-libtextcat-data],
+ [Use libtextcat data already on system.]))
+
AC_ARG_WITH(system-cppunit,
- [ --with-system-cppunit Use cppunit already on system
- ],,)
+ AS_HELP_STRING([--with-system-cppunit],
+ [Use cppunit already on system.]))
+
AC_ARG_WITH(system-redland,
- [ --with-system-redland Use redland library already on system
- ],,)
+ AS_HELP_STRING([--with-system-redland],
+ [Use redland library already on system.]))
+
AC_ARG_WITH(system-mozilla,
- [ --with-system-mozilla Use mozilla already on system. Note that some
- components cannot be built against a contemporary
- mozilla. The flavour used can be specified by
- --with-system-mozilla=<flavour>. Supported are:
- libxul (default), xulrunner, firefox, seamonkey,
- mozilla
- ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
- AC_ARG_WITH(stlport,
- [ --with-stlport The location that STLport is installed in. The STL
- header files are assumed to be in
- stlport-home/stlport and the STLPort library in
- stlport-home/lib.
+ AS_HELP_STRING([--with-system-mozilla],
+ [Use Mozilla already on system. Note that some components cannot be built
+ against a contemporary Mozilla. The flavour used can be specified by
+ --with-system-mozilla=<flavour>. Supported are: libxul (default),
+ xulrunner, firefox, seamonkey, mozilla.]),
+ WITH_SYSTEM_MOZILLA=$withval ,
+ WITH_SYSTEM_MOZILLA=no)
+
+ AC_ARG_WITH(system-gettext,
+ AS_HELP_STRING([--with-system-gettext],
+ [Use gettext runtime library already on system.]))
+
+ AC_ARG_WITH(system-libpng,
+ AS_HELP_STRING([--with-system-libpng],
+ [Use libpng already on system.]))
+
+ AC_ARG_WITH(linker-hash-style,
+ AS_HELP_STRING([--with-linker-hash-style],
+ [Use linker with --hash-style=<style> when linking shared objects.
+ Possible values: "sysv", "gnu", "both". The default value is "gnu"
+ if supported on the build system, and "sysv" otherwise.]))
- Usage: --with-stlport=<absolute path to stlport home>
+ AC_ARG_WITH(stlport,
+ AS_HELP_STRING([--with-stlport],
+ [Build the STLPort library for compatibility with old extensions for
+ architectures where STLPort used to be used.]),
+ with_stlport=$withval ,
+ with_stlport=auto)
- Warning!!, disabling using --without-stlport or
- enabling using --with-stlport on a platform that
- defaults to the opposite will break ABI compatability
- ], WITH_STLPORT=$withval , WITH_STLPORT=auto)
AC_ARG_WITH(jdk-home,
- [ --with-jdk-home if you have installed JDK 1.3 or later on your system
- please supply the path here.
- Note that this is not the location of the Java binary
- but the location of the entire distribution.
-
- Usage: --with-jdk-home=<absolute path to JDK home>
- ],,)
+ AS_HELP_STRING([--with-jdk-home],
+ [If you have installed JDK 1.3 or later on your system please supply the
+ path here. Note that this is not the location of the java command but the
+ location of the entire distribution.])
+ [
+ Usage: --with-jdk-home=<absolute path to JDK home>
+ ],
+ ,)
+
AC_ARG_WITH(gxx_include_path,
- [ --with-gxx-include-path if you want to override the autodetected g++ include
- path.
-
- Usage: --with-gxx-include-path=<absolute path to g++ include dir>
- ],,)
+ AS_HELP_STRING([--with-gxx-include-path],
+ [If you want to override the autodetected g++ include path.])
+ [
+ Usage: --with-gxx-include-path=<absolute path to
+ g++ include dir>
+ ],
+ ,)
+
AC_ARG_WITH(java,
- [ --with-java Build with[[out]] Java support. If you use
- --without-java/--with-java=no then the build will have
- no support for Java components, applets, accessibility
- or XML filters.
- ], if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi, WITH_JAVA=java)
- AC_ARG_ENABLE(gcjaot,
- [ --enable-gcjaot Build with[[out]] using Ahead of Time java compilation
- support to speed up buildsi by compiling the jars also
- to native code..
- --enable-gcjaot is only known to work with bytecode
- created with gcj or ecj
- ],,)
+ AS_HELP_STRING([--with-java],
+ [Specify the name of the Java interpreter command. Typically "java"
+ which is the default.
+
+ To build without support for Java components, applets, accessibility
+ or the XML filters written in Java, use --without-java or --with-java=no.])
+ [
+ Usage: --with-java==<java command>
+ --without-java
+ ],
+ [ test -z "$with_java" -o "$with_java" = "yes" && with_java=java ],
+ [ with_java=java ]
+ )
+
+ AC_ARG_WITH(java_target_version,
+ AS_HELP_STRING([--with-java-target-version],
+ [Generate class files that will work on JVMs with the specified version.
+ For example, use --with-java-target-version=1.4 to make sure that the
+ application will work with JVM 1.4 even when compiled with JDK 1.5.])
+ [
+ This option is ignored when you compile with gcj/gij.
+
+ Usage: --with-java-target-version=<jvm version>
+ ],
+ ,)
+
+ AC_ARG_WITH(jvm-path,
+ AS_HELP_STRING([--with-jvm-path],
+ [Use a specific JVM search path at runtime.])
+ [
+ Usage: --with-jvm-path=<absolute path to parent of jvm home>
+
+ e. g.: --with-jvm-path=/usr/lib/
+ to find JRE/JDK in /usr/lib/jvm/
+ ],
+ ,)
+
AC_ARG_WITH(ant-home,
- [ --with-ant-home If you have installed Jakarta Ant on your system,
- please supply the path here.
- Note that this is not the location of the Ant binary
- but the location of the entire distribution.
-
- Usage: --with-ant-home=<absolute path to Ant home>
- ],,)
+ AS_HELP_STRING([--with-ant-home],
+ [If you have installed Jakarta Ant on your system, please supply the path here.
+ Note that this is not the location of the Ant binary but the location
+ of the entire distribution.])
+ [
+ Usage: --with-ant-home=<absolute path to Ant home>
+ ],
+ ,)
+
AC_ARG_WITH(junit,
- [ --with-junit Specifies the JUnit 4 jar file to use for JUnit-based
- tests. --without-junit disables those tests. Not
- relevant in the --without-java case.
+ AS_HELP_STRING([--with-junit],
+ [Specifies the JUnit 4 jar file to use for JUnit-based tests.
+ --without-junit disables those tests. Not relevant in the --without-java case.])
+ [
+ Usage: --with-junit=<absolute path to JUnit 4 jar>
+ ],
+ ,with_junit=yes)
- Usage: --with-junit=<absolute path to JUnit 4 jar>
- ],,with_junit=yes)
AC_ARG_WITH(perl-home,
- [ --with-perl-home If you have installed the Perl 5 Distribution, on your
- system, please supply the path here.
- Note that this is not the location of the Perl binary
- but the location of the entire distribution.
-
- Usage: --with-perl-home=<absolute path to Perl 5 home>
- ],,)
+ AS_HELP_STRING([--with-perl-home],
+ [If you have installed Perl 5 Distribution, on your system, please
+ supply the path here. Note that this is not the location of the Perl
+ binary but the location of the entire distribution.])
+ [
+ Usage: --with-perl-home=<abs. path to Perl 5 home>
+ ],
+ ,)
+
AC_ARG_WITH(cl-home,
- [ --with-cl-home For Windows NT users, please supply the path
- for the Microsoft C/C++ compiler.
- Note that this is not the location of the compiler
- binary but the location of the entire distribution.
-
- Usage: --with-cl-home=<absolute path to Microsoft C/C++ compiler home>
- ],,)
+ AS_HELP_STRING([--with-cl-home],
+ [For Windows NT users, please supply the path for the Microsoft C/C++
+ compiler. Note that this is not the location of the compiler binary but
+ the location of the entire distribution.])
+ [
+ Usage: --with-cl-home=<absolute path to Microsoft
+ C/C++ compiler home>
+ ],
+ ,)
+
AC_ARG_WITH(mspdb-path,
- [ --with-mspdb-path For Microsoft C/C++ compiler users, please supply the
- path pointing to the mspdb71.dll (.NET 2003).
-
- Usage: --with-mspdb-path=<absolute path to mspdb71.dll>
- ],,)
+ AS_HELP_STRING([--with-mspdb-path],
+ [For Microsoft C/C++ compiler users, please supply the path pointing to
+ the mspdb80.dll (if using Visual Studio 2008) or mspdb100.dl (if using
+ Visual Studio 2010).])
+ [
+ Usage: --with-mspdb-path=<path to
+ mspdb80.dll/mspdb100.dll>
+ ],
+ ,)
+
AC_ARG_WITH(midl-path,
- [ --with-midl-path For Microsoft C/C++ .NET compiler users, please supply
- the path pointing to the midl.exe.
-
- Usage: --with-midl-path=<absolute path to midl.exe>
- ],,)
+ AS_HELP_STRING([--with-midl-path],
+ [For Microsoft compiler users, please supply the path pointing to the midl.exe.])
+ [
+ Usage: --with-midl-path=<abs. path to midl.exe>
+ ],
+ ,)
+
AC_ARG_WITH(csc-path,
- [ --with-csc-path For Microsoft C/C++ .NET compiler users, please supply
- the path pointing to the csc.exe.
-
- Usage: --with-csc-path=<absolute path to csc.exe>
- ],,)
+ AS_HELP_STRING([--with-csc-path],
+ [For Windows builds, please supply the path pointing to the csc.exe.
+ Usually found automatically when building on Windows.])
+ [
+ Usage: --with-csc-path=<abs. path to csc.exe>
+ ],
+ ,)
+
AC_ARG_WITH(nsis-path,
- [ --with-nsis-path For Windows users, please supply the path to the
- "Nullsoft Scriptable Install System" (NSIS). If NSIS
- is found in the path or this option is supplied a self
- contained executable installer for OpenOffice.org will
- be created.
+ AS_HELP_STRING([--with-nsis-path],
+ [For Windows builds, please supply the directory where makensis
+ is located. If makensis is found in PATH or this option is
+ properly supplied a self-contained executable installer for
+ LibreOffice will be created.])
+ [
+ Usage: --with-nsis-path=<path to directory containing makensis>
+ ],
+ ,)
+
+ AC_ARG_WITH(dotnet-framework-home,
+ AS_HELP_STRING([--with-dotnet-framework-home],
+ [For Microsoft compiler users, please supply the path pointing to
+ lib/mscoree.lib, usually something like:
+ "/cygdrive/c/Program Files/Windows SDKs/Windows/v7.0"])
+ [
+ Note that in most cases it will be automatically
+ found, though.
+
+ Usage: --with-dotnet-framework-home=<absolute path to .NET
+ Framework>
+ ],
+ ,)
+
+ AC_ARG_WITH(windows-sdk-home,
+ AS_HELP_STRING([--with-windows-sdk-home],
+ [For Windows builds, please supply the path to the Windows SDK.
+ Usually found automatically when building on Windows.])
+ [
+ Usage: --with-windows-sdk-home=<absolute path to Windows SDK>
+ ],
+ ,)
- Usage: --with-nsis-path=<absolute path to nsis.exe>
- ],,)
- AC_ARG_WITH(frame-home,
- [ --with-frame-home For Microsoft C/C++ .NET compiler users, please supply
- the path pointing to lib/mscoree.lib, usually
- something like:
- "/cygdrive/c/Program Files/Microsoft Visual Studio .NET/FrameworkSDK"
-
- MS Visual Toolkit compiler users, please supply the
- path pointing to lib/msvcrt.lib, usually something
- like:
- "/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7"
-
- Usage: --with-frame-home=<absolute path to Framework SDK [[home]]>
- ],,)
- AC_ARG_WITH(psdk-home,
- [ --with-psdk-home For Windows users, please supply the path to the
- Microsoft Platform SDK.
-
- Usage: --with-psdk-home=<absolute path to Microsoft Platform SDK>
- ],,)
AC_ARG_WITH(directx-home,
- [ --with-directx-home For Windows users, please supply the path to the
- Microsoft DirectX SDK.
-
- Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
- ],,)
+ AS_HELP_STRING([--with-directx-home],
+ [For Windows users, please supply the path to the Microsoft DirectX SDK.])
+ [
+ Usage: --with-directx-home=<absolute path to
+ Microsoft DirectX SDK>
+ ],
+ ,)
+
AC_ARG_WITH(mozilla-build,
- [ --with-mozilla-build For Windows users, please supply the path to the
- mozilla build tools.
-
- Usage: --with-mozilla-build=<absolute path to mozilla build tools>
-
- At the moment of this writing, an installer for the mozilla build tools
- can be obtained from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
- ],[MOZILLABUILD=$withval],)
- AC_ARG_WITH(local-solenv,
- [ --with-local-solenv If you have solenv in a location other than ./solenv,
- please supply the path here.
-
- Usage: --with-local-solenv=<absolute path to solenv>
- ],,)
+ AS_HELP_STRING([--with-mozilla-build],
+ [For Windows users, please supply the path to the Mozilla build tools.])
+ [
+ Usage: --with-mozilla-build=<absolute path to
+ Mozilla build tools>
+
+ At the moment of this writing, an installer for the
+ mozilla build tools can be obtained from http://ftp.
+ mozilla.org/pub/mozilla.org/mozilla/libraries/win32.
+ ],
+ MOZILLABUILD=$withval ,
+ )
+
AC_ARG_WITH(local-solver,
- [ --with-local-solver if you have solver in a location other than ./solver,
- please supply the path here.
-
- Usage: --with-local-solver=<absolute path to solver>
- ],,)
- AC_ARG_ENABLE(check-only,
- [ --enable-check-only Use this option option if you just want to check your
- environment. This option stops the generation of an
- ????env.set
-
- Usage: --enable-check-only=yes
- ],,)
- AC_ARG_ENABLE(ccache-skip,
- [[ --enable-ccache-skip [default=auto] allow the use of --ccache-skip to
- escape compiler flags that would otherwise prevent
- caching of the result (currently used on Mac only)
- NOTE: requires patched version because of a bug in
- ccache (see issue 104567 for details and patch)
- explicitly enable if your version of ccache doesn't
- identify as version 2.4_OOo
- ]],,enable_ccache_skip=auto)
- AC_ARG_WITH(lang,
- [ --with-lang Use this option to build OpenOffice.org with
- additional language support. English (US) is always
- included by default. Separate multiple languages with
- space. For all languages, use --with-lang=ALL.
+ 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=<abs. path to solver>
+ ],
+ ,)
- Usage: --with-lang="es sw tu cs sk"
+ AC_ARG_WITH(lang,
+ AS_HELP_STRING([--with-lang],
+ [Use this option to build LibreOffice with additional language support.
+ English (US) is always included by default.
+ Separate multiple languages with space.
+ For all languages, use --with-lang=ALL.])
+ [
+ Usage: --with-lang="es sw tu cs sk"
+ ],
+ ,)
+
+ AC_ARG_WITH(intro-bitmap,
+ [ --with-intro-bitmap Prefer the specified intro bitmap over the
+ the default one.
+
+ Usage: --with-intro-bitmap=/path/my_ooo_intro.png
],,)
- AC_ARG_WITH(poor-help-localizations,
- [ --with-poor-help-localizations
- Use this option to specify which languages have
- unusable help localizations. Separate multiple
- languages with space.
- Usage: --with-poor-help-localizations="af ar be-BY ca"
- ],,)
- AC_ARG_WITH(dict,
- [ --with-dict Use this option to build OpenOffice.org with
- dictionary support. ALL dictionaries are always
- included by default unless overridden with
- this option. Separate multiple dictionaries with
- commas. For all dictionaries, use --with-dict=ALL.
-
- Usage: --with-dict=ENGB,ENUS,ITIT
- ],,)
- AC_ARG_WITH(intro-bitmaps,
- [ --with-intro-bitmaps Prefer the specified intro bitmaps over the
- the default one. Can be more than one (separated by
- commas), the order means priority of fallback if the
- first does not exist (in the installed tree).
+ AC_ARG_WITH(about-bitmap,
+ [ --with-about-bitmap Similarly to --with-intro-bitmap, this allows
+ specification of bitmap for the About box.
- Usage: --with-intro-bitmaps=/path/my_ooo_intro.bmp
+ Usage: --with-about-bitmap=/path/my_ooo_about.png
],,)
- AC_ARG_WITH(about-bitmaps,
- [ --with-about-bitmaps Similarly to --with-intro-bitmaps, this allows
- specification of bitmaps for the About box.
- Usage: --with-about-bitmaps=/path/my_ooo_about.bmp
- ],,)
AC_ARG_WITH(vendor,
- [ --with-vendor Set vendor of the build.
+ AS_HELP_STRING([--with-vendor],
+ [Set vendor of the build.])
+ [
+ Usage: --with-vendor="John the Builder"
+ ],
+ ,)
- Usage: --with-vendor="John the Builder"
- ],,)
AC_ARG_WITH(unix-wrapper,
- [ --with-unix-wrapper Redefines the name of the UNIX wrapper that will be used
- in the desktop files and in the desktop-integration RPMs.
+ AS_HELP_STRING([--with-unix-wrapper],
+ [Redefines the name of the UNIX wrapper that will be used in the desktop
+ files and in the desktop-integration RPMs.])
+ [
+ Usage: --with-unix-wrapper=ooffice
+ ],
+ ,)
- Usage: --with-unix-wrapper=ooffice
- ],,)
AC_ARG_WITH(asm-home,
- [ --with-asm-home For Windows users, please supply the path for the
- ml.exe assembler.
+ AS_HELP_STRING([--with-asm-home],
+ [For Windows, please supply the path for the ml.exe or ml64.exe assembler.])
+ [
+ Usage: --with-asm-home=<path to assembler directory>
+ ],
+ ,)
- Usage: --with-asm-home=<path to ml.exe directory>
- ],,)
AC_ARG_WITH(os-version,
- [ --with-os-version For FreeBSD users, use this option option to override
- the detected OSVERSION.
-
- Usage: --with-os-version=<OSVERSION>
- ],,)
- AC_ARG_WITH(unzip-home,
- [ --with-unzip-home Deprecated: use --with-zip-home instead],,)
- AC_ARG_WITH(zip-home,
- [ --with-zip-home If you use a non standard zip, for example windows
- please supply the path for zip
-
- Usage: --with-zip-home=<path to zip executable>
- ],,)
- AC_ARG_WITH(mingwin,
- [ --with-mingwin For Windows users, use the mingwin32 compiler within
- cygwin environment
-
- Usage: --with-mingwin=yes
+ AS_HELP_STRING([--with-os-version],
+ [For FreeBSD users, use this option option to override the detected OSVERSION.])
+ [
+ Usage: --with-os-version=<OSVERSION>
+ ],
+ ,)
+
+ AC_ARG_WITH(mingw-cross-compiler,
+ AS_HELP_STRING([--with-mingw-cross-compiler],
+ [Specify the MinGW cross-compiler to use.])
+ [
+ Usage: --with-mingw-cross-compiler=<mingw32-g++ command>
+
+ When building on the ODK on Unix and building unowinreg.dll,
+ specify the MinGW C++ cross-compiler.
+ ],
+ ,)
- For !Windows use, use the mingw32 C++ compiler to
- (re-) build unowinreg.dll. Specify the MinGW C++
- Compilers name.
-
- Usage: --with-mingwin=i586-mingw32msvc-g++
- ],WITH_MINGWIN=$withval,WITH_MINGWIN=0)
AC_ARG_WITH(build-version,
- [ --with-build-version Allows the builder to add a custom version tag
- that will appear in the Help/About box for QA
- purposes.
+ AS_HELP_STRING([--with-build-version],
+ [Allows the builder to add a custom version tag that will appear in the
+ Help/About box for QA purposes.])
+ [
+ Usage: --with-build-version="Built by Jim"
+ ],
+ with_build_version=$withval ,
+ )
- Usage: --with-build-version="Built by Jim"
- ],with_build_version=$withval)
AC_ARG_WITH(alloc,
- [ --with-alloc Define which allocator to build with
- (choices are oo, system, tcmalloc, jemalloc)
-
- Note that on FreeBSD/NetBSD system==jemalloc
- ],,)
- AC_ARG_ENABLE(verbose,
- [ --enable-verbose Increase build verbosity.
- --disable-verbose Decrease build verbosity.
- ],,)
- AC_ARG_ENABLE(dependency-tracking,
- [ --disable-dependency-tracking Disables generation of dependency information.
- ],,)
-
- BUILD_TYPE="OOo"
+ AS_HELP_STRING([--with-alloc],
+ [Define which allocator to build with (choices are oo, system, tcmalloc, jemalloc).
+ Note that on FreeBSD/NetBSD system==jemalloc]),
+ ,)
+
+ AC_ARG_WITH(sun-templates,
+ AS_HELP_STRING([--with-sun-templates],
+ [Integrate Sun template packages.]),
+ ,)
+
+ AC_ARG_WITH(num-cpus,
+ AS_HELP_STRING([--with-num-cpus],
+ [Number of build processes/cpus to use (number of projects that will build at the same time).
+ Multi-process/multi-cpu builds can save a lot of time on multi-cpu machines.
+ Defaults to the number of CPUs on the machine.]),
+ ,)
+
+ AC_ARG_WITH(max-jobs,
+ AS_HELP_STRING([--with-max-jobs],
+ [Maximum number of jobs per one CPU that will be issued at the same time my dmake.
+ The real number of the jobs is affected by the --with-num-cpus too, it can get up to CPUS*max_jobs.
+ Defaults to 1, unless you configure --enable-icecream - then to 10.]),
+ ,)
+
+ BUILD_TYPE="LibO"
+ SCPDEFS=""
- dnl ===================================================================
- dnl Message.
- dnl ===================================================================
echo "********************************************************************"
- echo "* *"
- echo "* OpenOffice.org build configuration. *"
- echo "* *"
- echo "* The configure process checks your platform to see whether *"
- echo "* you can build OpenOffice.org on it. *"
- echo "* This process checks all pre-requisites and generates a file *"
- echo "* containing the necessary environment variables. *"
- echo "* Source this file after configure has ended successfully. *"
- echo "* *"
- echo "* Any warning that is generated during the configure process *"
- echo "* must be taken into account since it can be a reason for *"
- echo "* an unsuccessful build of OpenOffice.org *"
- echo "* *"
- echo "********************************************************************"
- echo ""
- echo "********************************************************************"
- echo "* *"
- echo "* Checking the platform pre-requisites. *"
- echo "* *"
+ echo "*"
+ echo "* Running ${PACKAGE_NAME} build configuration."
+ echo "*"
echo "********************************************************************"
echo ""
+
dnl ===================================================================
- dnl Configure pre-requisites.
+ dnl checks build and host OSes
+ dnl ===================================================================
+ AC_CANONICAL_SYSTEM
+
+ if test "$cross_compiling" = "yes"; then
+ CROSS_COMPILING=YES
+ else
+ CROSS_COMPILING=
+ fi
+ AC_SUBST(CROSS_COMPILING)
+
+ if test "$build_os" = "cygwin"; then
+ EXEEXT_FOR_BUILD=.exe
+ else
+ EXEEXT_FOR_BUILD=
+ fi
+ AC_SUBST(EXEEXT_FOR_BUILD)
+
+ dnl ===================================================================
+ dnl check for required programs (grep, awk, sed, bash)
dnl ===================================================================
cat /dev/null > warn
+
+ if test "$EUID" -eq "0" -a "z`uname -o 2>/dev/null`" = "zCygwin" ; then
+ AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
+ fi
+
+ save_CC=$CC
+ save_CXX=$CXX
+
AC_PROG_EGREP
AC_PROG_AWK
AC_PATH_PROG( AWK, $AWK)
@@@ -5456,37 -6323,14 +6226,17 @@@ els
fi
ASM_HOME="$with_asm_home"
AC_SUBST(ASM_HOME)
-
- dnl ===================================================================
- dnl testing handle deprecated unzip switch
- dnl ===================================================================
- if test -z "$with_zip_home"; then
- with_zip_home="$with_unzip_home"
- fi
- dnl ===================================================================
- dnl Zip will be found where you tell me to find it
- dnl ===================================================================
- if test -n "$with_zip_home" ; then
- if test "$_os" = "WINNT"; then
- with_zip_home=`cygpath -u "$with_zip_home"`
- fi
- ZIP="$with_zip_home/zip"
- UNZIP="$with_zip_home/unzip"
- ZIP_HOME="$with_zip_home"
- else
- AC_PATH_PROG(ZIP, zip)
- AC_PATH_PROG(UNZIP, unzip)
- ZIP_HOME=`dirname "$ZIP"`
- fi
+
dnl ===================================================================
- dnl Zip must be available or else it is an error, all platforms
+ dnl We need zip and unzip
dnl ===================================================================
- if test -z "$ZIP" -o -z "$UNZIP"; then
- AC_MSG_ERROR([Zip/Unzip are required to build, please install or use --with-zip-home],,)
- fi
+ AC_PATH_PROG(ZIP, zip)
+ test -z "$ZIP" && AC_MSG_ERROR([zip is required])
+ AC_PATH_PROG(UNZIP, unzip)
+ test -z "$ZIP" && AC_MSG_ERROR([unzip is required])
+if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
+ AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please install or use --with-zip-home],,)
+fi
dnl ===================================================================
dnl Zip must be a specific type for different build types.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list