[ooo-build-commit] .: Branch 'ooo/OOO320' - 82 commits - configure configure.in dmake/Makefile.am dmake/Makefile.in guw/guw.cc instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/macosx instsetoo_native/res instsetoo_native/util makefile.rc scp2/inc scp2/macros scp2/source scp2/util set_soenv.in soldep/bootstrp soldep/inc soldep/source soldep/util solenv/bin solenv/config solenv/inc solenv/makefile.mk solenv/src soltools/adjustvisibility soltools/checkdll soltools/cpp soltools/giparser soltools/HIDCompiler soltools/inc soltools/javadep soltools/ldump soltools/mkdepend soltools/support soltools/testhxx soltools/testSHL soltools/util soltools/winunistd stlport/makefile.mk stlport/systemstl
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Apr 19 07:19:29 PDT 2010
configure |19169 ++++------
configure.in | 139
dmake/Makefile.am | 42
dmake/Makefile.in | 42
guw/guw.cc | 7
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_openoffice/unix/makefile.mk | 8
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 2
instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk | 8
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_sdkoo/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/macosx/application/PostInstall.applescript | 7
instsetoo_native/macosx/application/main.applescript | 7
instsetoo_native/macosx/make_versioned.sh | 8
instsetoo_native/macosx/makefile.mk | 8
instsetoo_native/res/DS_Store |binary
instsetoo_native/res/osxdndinstall.png |binary
instsetoo_native/util/makefile.mk | 8
instsetoo_native/util/openoffice.lst | 103
instsetoo_native/util/pack.lst | 19
makefile.rc | 7
scp2/inc/macros.inc | 25
scp2/macros/macro.pl | 8
scp2/macros/makefile.mk | 8
scp2/source/activex/file_activex.scp | 7
scp2/source/activex/makefile.mk | 8
scp2/source/activex/module_activex.scp | 7
scp2/source/activex/module_activex.ulf | 7
scp2/source/base/file_base.scp | 11
scp2/source/base/folderitem_base.scp | 7
scp2/source/base/folderitem_base.ulf | 7
scp2/source/base/makefile.mk | 8
scp2/source/base/module_base.scp | 7
scp2/source/base/module_base.ulf | 7
scp2/source/base/registryitem_base.scp | 7
scp2/source/base/registryitem_base.ulf | 7
scp2/source/binfilter/file_binfilter.scp | 7
scp2/source/binfilter/makefile.mk | 8
scp2/source/binfilter/module_binfilter.scp | 7
scp2/source/binfilter/module_binfilter.ulf | 7
scp2/source/binfilter/registryitem_binfilter.scp | 33
scp2/source/binfilter/registryitem_binfilter.ulf | 7
scp2/source/calc/file_calc.scp | 9
scp2/source/calc/folderitem_calc.scp | 7
scp2/source/calc/folderitem_calc.ulf | 7
scp2/source/calc/makefile.mk | 8
scp2/source/calc/module_calc.scp | 7
scp2/source/calc/module_calc.ulf | 7
scp2/source/calc/registryitem_calc.scp | 89
scp2/source/calc/registryitem_calc.ulf | 11
scp2/source/canvas/cairocanvas.scp | 7
scp2/source/canvas/canvascommons.scp | 9
scp2/source/canvas/directxcanvas.scp | 7
scp2/source/canvas/makefile.mk | 8
scp2/source/canvas/vclcanvas.scp | 7
scp2/source/crashrep/file_crashrep_dynamic.scp | 4
scp2/source/crashrep/file_crashrep_static.scp | 7
scp2/source/crashrep/makefile.mk | 8
scp2/source/draw/file_draw.scp | 7
scp2/source/draw/folderitem_draw.scp | 7
scp2/source/draw/folderitem_draw.ulf | 7
scp2/source/draw/makefile.mk | 8
scp2/source/draw/module_draw.scp | 7
scp2/source/draw/module_draw.ulf | 7
scp2/source/draw/registryitem_draw.scp | 31
scp2/source/draw/registryitem_draw.ulf | 11
scp2/source/gnome/file_gnome.scp | 7
scp2/source/gnome/makefile.mk | 8
scp2/source/gnome/module_gnome.scp | 7
scp2/source/gnome/module_gnome.ulf | 7
scp2/source/graphicfilter/file_graphicfilter.scp | 7
scp2/source/graphicfilter/makefile.mk | 8
scp2/source/graphicfilter/module_graphicfilter.scp | 7
scp2/source/graphicfilter/module_graphicfilter.ulf | 7
scp2/source/impress/file_impress.scp | 7
scp2/source/impress/folderitem_impress.scp | 7
scp2/source/impress/folderitem_impress.ulf | 7
scp2/source/impress/makefile.mk | 8
scp2/source/impress/module_impress.scp | 7
scp2/source/impress/module_impress.ulf | 7
scp2/source/impress/module_ogltrans.scp | 7
scp2/source/impress/module_ogltrans.ulf | 7
scp2/source/impress/registryitem_impress.scp | 46
scp2/source/impress/registryitem_impress.ulf | 11
scp2/source/javafilter/file_javafilter.scp | 7
scp2/source/javafilter/makefile.mk | 8
scp2/source/javafilter/module_javafilter.scp | 7
scp2/source/javafilter/module_javafilter.ulf | 7
scp2/source/javafilter/registryitem_javafilter.scp | 7
scp2/source/javafilter/registryitem_javafilter.ulf | 7
scp2/source/kde/file_kde.scp | 7
scp2/source/kde/makefile.mk | 8
scp2/source/kde/module_kde.scp | 7
scp2/source/kde/module_kde.ulf | 7
scp2/source/layout/layout.scp | 15
scp2/source/layout/makefile.mk | 8
scp2/source/math/file_math.scp | 9
scp2/source/math/folderitem_math.scp | 7
scp2/source/math/folderitem_math.ulf | 7
scp2/source/math/makefile.mk | 8
scp2/source/math/module_math.scp | 7
scp2/source/math/module_math.ulf | 7
scp2/source/math/registryitem_math.scp | 40
scp2/source/math/registryitem_math.ulf | 9
scp2/source/onlineupdate/file_onlineupdate.scp | 9
scp2/source/onlineupdate/makefile.mk | 8
scp2/source/onlineupdate/module_onlineupdate.scp | 7
scp2/source/onlineupdate/module_onlineupdate.ulf | 7
scp2/source/ooo/common_brand.scp | 28
scp2/source/ooo/common_brand_readme.scp | 7
scp2/source/ooo/datacarrier_ooo.scp | 7
scp2/source/ooo/directory_ooo.scp | 5
scp2/source/ooo/directory_ooo.ulf | 7
scp2/source/ooo/directory_ooo_macosx.scp | 5
scp2/source/ooo/file_extra_ooo.scp | 7
scp2/source/ooo/file_font_ooo.scp | 7
scp2/source/ooo/file_improvement.scp | 9
scp2/source/ooo/file_jre_ooo.scp | 7
scp2/source/ooo/file_library_ooo.scp | 118
scp2/source/ooo/file_ooo.scp | 29
scp2/source/ooo/file_resource_ooo.scp | 11
scp2/source/ooo/folder_ooo.scp | 7
scp2/source/ooo/folderitem_ooo.scp | 7
scp2/source/ooo/folderitem_ooo.ulf | 9
scp2/source/ooo/installation_ooo.scp | 8
scp2/source/ooo/makefile.mk | 8
scp2/source/ooo/mergemodules_ooo.scp | 7
scp2/source/ooo/module_headless.scp | 7
scp2/source/ooo/module_headless.ulf | 7
scp2/source/ooo/module_hidden_ooo.scp | 5
scp2/source/ooo/module_improvement.scp | 7
scp2/source/ooo/module_java.scp | 7
scp2/source/ooo/module_java.ulf | 7
scp2/source/ooo/module_lang_template.scp | 7
scp2/source/ooo/module_langpack.scp | 7
scp2/source/ooo/module_langpack.ulf | 7
scp2/source/ooo/module_ooo.scp | 7
scp2/source/ooo/module_ooo.ulf | 7
scp2/source/ooo/module_systemint.scp | 9
scp2/source/ooo/module_systemint.ulf | 7
scp2/source/ooo/ooo_brand.scp | 7
scp2/source/ooo/profile_ooo.scp | 7
scp2/source/ooo/profileitem_ooo.scp | 16
scp2/source/ooo/registryitem_ooo.scp | 14
scp2/source/ooo/registryitem_ooo.ulf | 9
scp2/source/ooo/scpaction_ooo.scp | 7
scp2/source/ooo/shortcut_ooo.scp | 7
scp2/source/ooo/starregistry_ooo.scp | 7
scp2/source/ooo/ure.scp | 17
scp2/source/ooo/ure_into_ooo.scp | 7
scp2/source/ooo/ure_standalone.scp | 7
scp2/source/ooo/vc_redist.scp | 6
scp2/source/ooo/windowscustomaction_ooo.scp | 7
scp2/source/python/file_python.scp | 7
scp2/source/python/makefile.mk | 8
scp2/source/python/module_python.scp | 7
scp2/source/python/module_python.ulf | 7
scp2/source/python/module_python_mailmerge.scp | 7
scp2/source/python/module_python_mailmerge.ulf | 7
scp2/source/python/profileitem_python.scp | 7
scp2/source/quickstart/file_quickstart.scp | 7
scp2/source/quickstart/folderitem_quickstart.scp | 7
scp2/source/quickstart/makefile.mk | 8
scp2/source/quickstart/module_quickstart.scp | 7
scp2/source/quickstart/module_quickstart.ulf | 7
scp2/source/quickstart/registryitem_quickstart.scp | 7
scp2/source/sdkoo/makefile.mk | 8
scp2/source/sdkoo/module_sdkoo.scp | 7
scp2/source/sdkoo/module_sdkoo.ulf | 7
scp2/source/sdkoo/sdkoo.scp | 7
scp2/source/templates/makefile.mk | 8
scp2/source/templates/module_langpack.sct | 7
scp2/source/templates/module_langpack_base.sct | 7
scp2/source/templates/module_langpack_binfilter.sct | 7
scp2/source/templates/module_langpack_calc.sct | 7
scp2/source/templates/module_langpack_draw.sct | 7
scp2/source/templates/module_langpack_impress.sct | 7
scp2/source/templates/module_langpack_math.sct | 7
scp2/source/templates/module_langpack_onlineupdate.sct | 7
scp2/source/templates/module_langpack_root.sct | 7
scp2/source/templates/module_langpack_writer.sct | 7
scp2/source/templates/modules.pl | 8
scp2/source/testtool/file_testtool.scp | 7
scp2/source/testtool/makefile.mk | 8
scp2/source/testtool/module_testtool.scp | 7
scp2/source/testtool/module_testtool.ulf | 7
scp2/source/winexplorerext/file_winexplorerext.scp | 7
scp2/source/winexplorerext/makefile.mk | 8
scp2/source/winexplorerext/module_winexplorerext.scp | 7
scp2/source/winexplorerext/module_winexplorerext.ulf | 7
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 7
scp2/source/writer/file_writer.scp | 9
scp2/source/writer/folderitem_writer.scp | 7
scp2/source/writer/folderitem_writer.ulf | 7
scp2/source/writer/makefile.mk | 8
scp2/source/writer/module_writer.scp | 7
scp2/source/writer/module_writer.ulf | 7
scp2/source/writer/registryitem_writer.scp | 127
scp2/source/writer/registryitem_writer.ulf | 13
scp2/source/xsltfilter/file_xsltfilter.scp | 7
scp2/source/xsltfilter/makefile.mk | 8
scp2/source/xsltfilter/module_xsltfilter.scp | 7
scp2/source/xsltfilter/module_xsltfilter.ulf | 7
scp2/util/makefile.mk | 8
set_soenv.in | 7
soldep/bootstrp/XmlBuildList.cxx | 7
soldep/bootstrp/appdef.cxx | 7
soldep/bootstrp/build_list_converter.pl | 8
soldep/bootstrp/dep.cxx | 7
soldep/bootstrp/hashtbl.cxx | 7
soldep/bootstrp/makefile.mk | 8
soldep/bootstrp/minormk.cxx | 7
soldep/bootstrp/prj.cxx | 7
soldep/bootstrp/prodmap.cxx | 7
soldep/inc/XmlBuildListDef.hxx | 7
soldep/inc/appdef.hxx | 7
soldep/inc/dep.hxx | 7
soldep/inc/dtsodcmp.hrc | 7
soldep/inc/minormk.hxx | 7
soldep/inc/prodmap.hxx | 7
soldep/inc/soldep/XmlBuildList.hxx | 7
soldep/inc/soldep/connctr.hxx | 5
soldep/inc/soldep/depper.hxx | 5
soldep/inc/soldep/depwin.hxx | 5
soldep/inc/soldep/graphwin.hxx | 7
soldep/inc/soldep/hashobj.hxx | 7
soldep/inc/soldep/hashtbl.hxx | 7
soldep/inc/soldep/objwin.hxx | 5
soldep/inc/soldep/prj.hxx | 7
soldep/inc/soldep/sdtresid.hxx | 7
soldep/inc/soldep/soldep.hxx | 7
soldep/inc/soldep/soldlg.hrc | 7
soldep/inc/soldep/soldlg.hxx | 7
soldep/inc/soldep/tbox.hxx | 7
soldep/source/connctr.cxx | 7
soldep/source/depapp.cxx | 7
soldep/source/depapp.hxx | 7
soldep/source/depper.cxx | 7
soldep/source/depwin.cxx | 7
soldep/source/graphwin.cxx | 7
soldep/source/hashobj.cxx | 7
soldep/source/makefile.mk | 8
soldep/source/objwin.cxx | 7
soldep/source/sdtresid.cxx | 7
soldep/source/soldep.cxx | 7
soldep/source/soldlg.cxx | 7
soldep/source/soldlg.src | 751
soldep/source/tbox.cxx | 7
soldep/util/perl.mk | 8
solenv/bin/addsym.awk | 8
solenv/bin/build.pl | 8
solenv/bin/build_client.pl | 8
solenv/bin/checkdll.sh | 8
solenv/bin/cleandiff.pl | 8
solenv/bin/cleanzip.pl | 8
solenv/bin/clipatchconfig.pl | 6
solenv/bin/convertlinks.pl | 2
solenv/bin/converttags.pl | 2
solenv/bin/createpdbrelocators.pl | 8
solenv/bin/cws.pl | 562
solenv/bin/cwsattach.pl | 8
solenv/bin/cwscheckapi | 8
solenv/bin/cwscheckapi.btm | 8
solenv/bin/cwstestresult.pl | 8
solenv/bin/cwstouched.pl | 5
solenv/bin/cwstouched.py | 5
solenv/bin/deliver.pl | 94
solenv/bin/diffmv.pl | 8
solenv/bin/exectest.pl | 8
solenv/bin/gccinstlib.pl | 8
solenv/bin/gen_update_info.pl | 8
solenv/bin/gen_userfeedback_VCL_names.pl | 6
solenv/bin/getcompver.awk | 8
solenv/bin/getcsym.awk | 8
solenv/bin/guw.pl | 8
solenv/bin/hicontrast-to-theme.pl | 8
solenv/bin/installoffice | 4
solenv/bin/installoffice.btm | 8
solenv/bin/installoffice.pl | 9
solenv/bin/leconvert.pl | 8
solenv/bin/licinserter.pl | 8
solenv/bin/linkoo | 8
solenv/bin/macosx-change-install-names.pl | 8
solenv/bin/macosx-create-bundle | 8
solenv/bin/macosx-dylib-link-list.pl | 8
solenv/bin/make_download.pl | 8
solenv/bin/make_ext_update_info.pl | 8
solenv/bin/make_installer.pl | 14
solenv/bin/makemani.pl | 8
solenv/bin/mapgen.pl | 8
solenv/bin/mhids.pl | 8
solenv/bin/mkdir.pl | 2
solenv/bin/mkout.pl | 8
solenv/bin/modules/CreatePDBRelocators.pm | 8
solenv/bin/modules/Cws.pm | 8
solenv/bin/modules/CwsConfig.pm | 98
solenv/bin/modules/Eis.pm | 8
solenv/bin/modules/GenInfoParser.pm | 8
solenv/bin/modules/SourceConfig.pm | 8
solenv/bin/modules/installer/archivefiles.pm | 8
solenv/bin/modules/installer/configuration.pm | 8
solenv/bin/modules/installer/control.pm | 8
solenv/bin/modules/installer/converter.pm | 8
solenv/bin/modules/installer/copyproject.pm | 8
solenv/bin/modules/installer/download.pm | 304
solenv/bin/modules/installer/downloadsigner.pm | 8
solenv/bin/modules/installer/environment.pm | 8
solenv/bin/modules/installer/epmfile.pm | 8
solenv/bin/modules/installer/existence.pm | 8
solenv/bin/modules/installer/exiter.pm | 8
solenv/bin/modules/installer/files.pm | 8
solenv/bin/modules/installer/followme.pm | 8
solenv/bin/modules/installer/globals.pm | 14
solenv/bin/modules/installer/javainstaller.pm | 8
solenv/bin/modules/installer/languagepack.pm | 8
solenv/bin/modules/installer/languages.pm | 8
solenv/bin/modules/installer/logger.pm | 8
solenv/bin/modules/installer/mail.pm | 8
solenv/bin/modules/installer/packagelist.pm | 8
solenv/bin/modules/installer/packagepool.pm | 40
solenv/bin/modules/installer/parameter.pm | 14
solenv/bin/modules/installer/pathanalyzer.pm | 8
solenv/bin/modules/installer/profiles.pm | 8
solenv/bin/modules/installer/regmerge.pm | 8
solenv/bin/modules/installer/remover.pm | 8
solenv/bin/modules/installer/scppatchsoname.pm | 8
solenv/bin/modules/installer/scpzipfiles.pm | 8
solenv/bin/modules/installer/scriptitems.pm | 8
solenv/bin/modules/installer/servicesfile.pm | 8
solenv/bin/modules/installer/setupscript.pm | 57
solenv/bin/modules/installer/simplepackage.pm | 12
solenv/bin/modules/installer/sorter.pm | 8
solenv/bin/modules/installer/strip.pm | 8
solenv/bin/modules/installer/substfilenamefiles.pm | 8
solenv/bin/modules/installer/systemactions.pm | 8
solenv/bin/modules/installer/upx.pm | 8
solenv/bin/modules/installer/windows/admin.pm | 8
solenv/bin/modules/installer/windows/assembly.pm | 8
solenv/bin/modules/installer/windows/binary.pm | 8
solenv/bin/modules/installer/windows/component.pm | 8
solenv/bin/modules/installer/windows/createfolder.pm | 8
solenv/bin/modules/installer/windows/directory.pm | 9
solenv/bin/modules/installer/windows/feature.pm | 8
solenv/bin/modules/installer/windows/featurecomponent.pm | 8
solenv/bin/modules/installer/windows/file.pm | 8
solenv/bin/modules/installer/windows/font.pm | 8
solenv/bin/modules/installer/windows/icon.pm | 8
solenv/bin/modules/installer/windows/idtglobal.pm | 8
solenv/bin/modules/installer/windows/inifile.pm | 8
solenv/bin/modules/installer/windows/java.pm | 8
solenv/bin/modules/installer/windows/language.pm | 8
solenv/bin/modules/installer/windows/media.pm | 8
solenv/bin/modules/installer/windows/mergemodule.pm | 8
solenv/bin/modules/installer/windows/msiglobal.pm | 8
solenv/bin/modules/installer/windows/msp.pm | 8
solenv/bin/modules/installer/windows/patch.pm | 8
solenv/bin/modules/installer/windows/property.pm | 10
solenv/bin/modules/installer/windows/registry.pm | 10
solenv/bin/modules/installer/windows/removefile.pm | 8
solenv/bin/modules/installer/windows/selfreg.pm | 8
solenv/bin/modules/installer/windows/shortcut.pm | 47
solenv/bin/modules/installer/windows/sign.pm | 8
solenv/bin/modules/installer/windows/strip.pm | 8
solenv/bin/modules/installer/windows/update.pm | 8
solenv/bin/modules/installer/windows/upgrade.pm | 10
solenv/bin/modules/installer/worker.pm | 159
solenv/bin/modules/installer/xpdinstaller.pm | 8
solenv/bin/modules/installer/ziplist.pm | 13
solenv/bin/modules/macosxotoolhelper.pm | 8
solenv/bin/modules/packager/check.pm | 8
solenv/bin/modules/packager/existence.pm | 8
solenv/bin/modules/packager/exiter.pm | 8
solenv/bin/modules/packager/files.pm | 8
solenv/bin/modules/packager/globals.pm | 8
solenv/bin/modules/packager/work.pm | 8
solenv/bin/modules/par2script/check.pm | 8
solenv/bin/modules/par2script/converter.pm | 8
solenv/bin/modules/par2script/existence.pm | 8
solenv/bin/modules/par2script/exiter.pm | 8
solenv/bin/modules/par2script/files.pm | 8
solenv/bin/modules/par2script/globals.pm | 8
solenv/bin/modules/par2script/module.pm | 8
solenv/bin/modules/par2script/parameter.pm | 8
solenv/bin/modules/par2script/remover.pm | 8
solenv/bin/modules/par2script/shortcut.pm | 8
solenv/bin/modules/par2script/systemactions.pm | 8
solenv/bin/modules/par2script/undefine.pm | 8
solenv/bin/modules/par2script/work.pm | 8
solenv/bin/modules/pre2par/directory.pm | 8
solenv/bin/modules/pre2par/existence.pm | 8
solenv/bin/modules/pre2par/exiter.pm | 8
solenv/bin/modules/pre2par/files.pm | 8
solenv/bin/modules/pre2par/globals.pm | 8
solenv/bin/modules/pre2par/language.pm | 8
solenv/bin/modules/pre2par/parameter.pm | 8
solenv/bin/modules/pre2par/pathanalyzer.pm | 8
solenv/bin/modules/pre2par/remover.pm | 8
solenv/bin/modules/pre2par/systemactions.pm | 8
solenv/bin/modules/pre2par/work.pm | 8
solenv/bin/oochkpatch.pl | 8
solenv/bin/packager.pl | 8
solenv/bin/packimages.pl | 8
solenv/bin/par2script.pl | 8
solenv/bin/patch_sanitizer.pl | 8
solenv/bin/pre2par.pl | 8
solenv/bin/relocate | 8
solenv/bin/rmdir.pl | 8
solenv/bin/rpm-wrapper | 8
solenv/bin/slfl.pl | 8
solenv/bin/soirpm.sh | 7
solenv/bin/sort.pl | 8
solenv/bin/touch.pl | 8
solenv/bin/transform_description.pl | 138
solenv/bin/unxmap-to-macosx-explist.awk | 8
solenv/bin/update_module_ignore_lists.pl | 8
solenv/bin/zipdep.pl | 8
solenv/config/sdev300.ini | 2
solenv/config/sooo320.ini | 11
solenv/inc/ant.mk | 8
solenv/inc/antsettings.mk | 8
solenv/inc/cppunit.mk | 8
solenv/inc/extension_post.mk | 26
solenv/inc/extension_pre.mk | 8
solenv/inc/javaunittest.mk | 8
solenv/inc/lang.mk | 8
solenv/inc/libs.mk | 8
solenv/inc/minor.mk | 6
solenv/inc/os2.mk | 8
solenv/inc/os2gcci.mk | 8
solenv/inc/pkg_config.mk | 8
solenv/inc/postmac.h | 7
solenv/inc/postset.mk | 6
solenv/inc/preinclude.h | 7
solenv/inc/premac.h | 7
solenv/inc/pstrules.mk | 8
solenv/inc/rules.mk | 8
solenv/inc/sc.mk | 8
solenv/inc/scpre.mk | 8
solenv/inc/set_ext.mk | 8
solenv/inc/set_wntx64.mk | 6
solenv/inc/settings.mk | 8
solenv/inc/shlinfo.rc | 8
solenv/inc/target.mk | 8
solenv/inc/templates/extension_tmpl.mk | 8
solenv/inc/tg_app.mk | 8
solenv/inc/tg_compv.mk | 8
solenv/inc/tg_config.mk | 8
solenv/inc/tg_def.mk | 8
solenv/inc/tg_dep.mk | 8
solenv/inc/tg_ext.mk | 6
solenv/inc/tg_help.mk | 82
solenv/inc/tg_jar.mk | 8
solenv/inc/tg_java.mk | 8
solenv/inc/tg_javav.mk | 8
solenv/inc/tg_lib.mk | 8
solenv/inc/tg_merge.mk | 8
solenv/inc/tg_moz.mk | 8
solenv/inc/tg_obj.mk | 8
solenv/inc/tg_res.mk | 8
solenv/inc/tg_rslb.mk | 8
solenv/inc/tg_scp.mk | 8
solenv/inc/tg_sdi.mk | 8
solenv/inc/tg_shl.mk | 8
solenv/inc/tg_slo.mk | 8
solenv/inc/tg_srs.mk | 8
solenv/inc/tg_wntx64.mk | 6
solenv/inc/tg_yxx.mk | 8
solenv/inc/tg_zip.mk | 8
solenv/inc/udkversion.mk | 8
solenv/inc/unitools.mk | 10
solenv/inc/unx.mk | 8
solenv/inc/unxaixp.mk | 8
solenv/inc/unxbsda.mk | 8
solenv/inc/unxbsdi.mk | 8
solenv/inc/unxbsdi2.mk | 8
solenv/inc/unxbsds.mk | 8
solenv/inc/unxfbsd.mk | 8
solenv/inc/unxfbsdi.mk | 8
solenv/inc/unxfbsdx.mk | 8
solenv/inc/unxhpgr.mk | 8
solenv/inc/unxhpxr.mk | 8
solenv/inc/unxirgm.mk | 8
solenv/inc/unxirxm.mk | 8
solenv/inc/unxirxm3.mk | 8
solenv/inc/unxlng.mk | 8
solenv/inc/unxlnga.mk | 8
solenv/inc/unxlngi.mk | 8
solenv/inc/unxlngi4.mk | 8
solenv/inc/unxlngi6.mk | 8
solenv/inc/unxlngm68k.mk | 8
solenv/inc/unxlngmips.mk | 8
solenv/inc/unxlngp.mk | 8
solenv/inc/unxlngppc.mk | 8
solenv/inc/unxlngppc4.mk | 8
solenv/inc/unxlngppc64.mk | 8
solenv/inc/unxlngr.mk | 8
solenv/inc/unxlngs.mk | 8
solenv/inc/unxlngs390.mk | 8
solenv/inc/unxlngs3904.mk | 8
solenv/inc/unxlngs390x.mk | 8
solenv/inc/unxlngx.mk | 8
solenv/inc/unxlngx6.mk | 8
solenv/inc/unxlnxi.mk | 8
solenv/inc/unxmacx.mk | 8
solenv/inc/unxmacxi.mk | 8
solenv/inc/unxmacxp.mk | 8
solenv/inc/unxscoi.mk | 8
solenv/inc/unxsogi.mk | 8
solenv/inc/unxsogs.mk | 8
solenv/inc/unxsoli4.mk | 9
solenv/inc/unxsols4.mk | 9
solenv/inc/unxsolu4.mk | 8
solenv/inc/verinfo.hrc | 7
solenv/inc/version.hrc | 160
solenv/inc/version_so.hrc | 158
solenv/inc/wnt.mk | 8
solenv/inc/wntgcci.mk | 8
solenv/inc/wntgcci6.mk | 8
solenv/inc/wntmsci10.mk | 8
solenv/inc/wntmsci11.mk | 8
solenv/makefile.mk | 6
solenv/src/version.c | 7
soltools/HIDCompiler/hidclex.l | 7
soltools/HIDCompiler/makefile.mk | 8
soltools/HIDCompiler/wrap_hidclex.cxx | 7
soltools/adjustvisibility/adjustvisibility.cxx | 7
soltools/adjustvisibility/makefile.mk | 8
soltools/checkdll/checkdll.c | 7
soltools/checkdll/makefile.mk | 8
soltools/cpp/makefile.mk | 8
soltools/giparser/gen_info.cxx | 7
soltools/giparser/gi_list.cxx | 7
soltools/giparser/gi_parse.cxx | 7
soltools/giparser/makefile.mk | 8
soltools/giparser/st_gilrw.cxx | 7
soltools/inc/gen_info.hxx | 7
soltools/inc/gi_list.hxx | 7
soltools/inc/gi_parse.hxx | 7
soltools/inc/gilacces.hxx | 7
soltools/inc/pch/precompiled_soltools.cxx | 7
soltools/inc/pch/precompiled_soltools.hxx | 7
soltools/inc/simstr.hxx | 7
soltools/inc/st_gilrw.hxx | 7
soltools/inc/st_list.hxx | 7
soltools/inc/st_types.hxx | 7
soltools/javadep/javadep.c | 7
soltools/javadep/makefile.mk | 8
soltools/ldump/hashtbl.cxx | 7
soltools/ldump/hashtbl.hxx | 7
soltools/ldump/ldump.cxx | 7
soltools/ldump/ldump.hxx | 7
soltools/ldump/makefile.mk | 8
soltools/mkdepend/makefile.mk | 8
soltools/support/makefile.mk | 8
soltools/support/simstr.cxx | 7
soltools/testSHL/inc/tlog.hxx | 7
soltools/testSHL/inc/tstMgr.hxx | 7
soltools/testSHL/inc/tutil.hxx | 7
soltools/testSHL/makefile.mk | 8
soltools/testSHL/testshl.cxx | 7
soltools/testSHL/util/makefile.mk | 8
soltools/testSHL/util/tlog.cxx | 7
soltools/testSHL/util/tstMgr.cxx | 7
soltools/testSHL/util/tutil.cxx | 7
soltools/testhxx/create.pl | 8
soltools/testhxx/makefile.mk | 8
soltools/testhxx/testhxx.cxx | 7
soltools/util/makefile.pmk | 8
soltools/winunistd/makefile.mk | 8
stlport/makefile.mk | 8
stlport/systemstl/functional | 7
stlport/systemstl/hash_map | 7
stlport/systemstl/hash_set | 7
stlport/systemstl/numeric | 7
stlport/systemstl/rope | 7
stlport/systemstl/slist | 7
stlport/systemstl/vector | 7
579 files changed, 13020 insertions(+), 13887 deletions(-)
New commits:
commit 26d511141e566ebe47e9a694c361f3fdde4d2d8e
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Apr 16 11:47:00 2010 +0200
masterfix: #i10000# pack.lst adapted
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
index fa9a684..45e392f 100755
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -17,6 +17,8 @@ OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pr
OpenOffice_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoo
OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US sdkoodev
#URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure
-OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|as|ast|bg|bn|ca|cs|da|de|dz|el|en-GB|en-US|eo|es|et|eu|fi|fr|ga|gl|gu|hi-IN|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
-OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|as|ast|bg|bn|ca|cs|da|de|dz|el|en-GB|en-US|eo|es|et|eu|fi|fr|ga|gl|gu|hi-IN|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooodevlanguagepack
-BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro pt-BR broolanguagepack
+OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|en-US ooolanguagepack
+#OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|as|ast|bg|bn|ca|cs|da|de|dz|el|en-GB|en-US|eo|es|et|eu|fi|fr|ga|gl|gu|hi-IN|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooolanguagepack
+OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|de|fr|ja|ru ooodevlanguagepack
+#OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro ar|as|ast|bg|bn|ca|cs|da|de|dz|el|en-GB|en-US|eo|es|et|eu|fi|fr|ga|gl|gu|hi-IN|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW ooodevlanguagepack
+#BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro pt-BR broolanguagepack
commit a83850767e7469f6cfae2bd29a598ecf7734c09a
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Apr 14 17:10:36 2010 +0200
masterfix: #i10000# add OpenOffice_wJRE
diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst
old mode 100644
new mode 100755
index 2bec71b..fa9a684
--- a/instsetoo_native/util/pack.lst
+++ b/instsetoo_native/util/pack.lst
@@ -10,7 +10,7 @@
OpenOffice unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro en-US openoffice
OpenOffice unxlngi6,unxmacxi,unxsoli4,unxsols4,wntmsci12 en-US openoffice
#BrOffice pt-BR broffice
-#OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12 en-US openofficewithjre
+OpenOffice_wJRE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,wntmsci12 en-US openofficewithjre
#BrOffice_wJRE pt-BR brofficewithjre
OpenOffice_Dev unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxmacxi.pro,unxlngx6.pro en-US openofficedev
#BrOffice_Dev pt-BR brofficedev
commit 3384a1451fc276f489456fe835befbf6fce0c041
Author: Release Engineering <releng at openoffice.org>
Date: Wed Apr 14 13:16:45 2010 +0200
OOO320
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 0360f44..43be65f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=320
-RSCREVISION=320m14(Build:9489)
-BUILD=9489
-LAST_MINOR=m14
+RSCREVISION=320m15(Build:9492)
+BUILD=9492
+LAST_MINOR=m15
SOURCEVERSION=OOO320
commit cfe4e088e3d5e1f1b7487a09afc076617791dbbd
Merge: 8e0e072... 4e1dea3...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Apr 14 12:17:56 2010 +0200
CWS-TOOLING: integrate CWS nativea2
diff --cc instsetoo_native/util/openoffice.lst
index 5df456e,681fdfc..0e93cf4
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@@ -38,7 -38,7 +38,8 @@@ Global
PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL 5
OPENSOURCE 1
+ OOODOWNLOADNAME 1
+ STARTCENTER_LAYOUT_STYLE 0
}
}
}
commit 8e0e072cc487bc61868ba43f803bd5551e4ee59e
Merge: d444e52... 92ae096...
Author: Kurt Zenker <kz at openoffice.org>
Date: Mon Apr 12 17:52:56 2010 +0200
CWS-TOOLING: integrate CWS native288
diff --cc instsetoo_native/util/openoffice.lst
index c02f4cb,777c73d..5df456e
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@@ -37,7 -36,7 +37,8 @@@ Global
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL 5
+ OPENSOURCE 1
+ OOODOWNLOADNAME 1
}
}
}
commit d444e5213caa1a575a7bdbe80d46d3774eb6fcb3
Merge: 6407d39... c959613...
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Apr 9 12:47:36 2010 +0200
CWS-TOOLING: integrate CWS calc321stopper1
commit 6407d39664526d8cc96880218e65a1e9abfe7b96
Merge: 88c88e8... f01bb2c...
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Apr 9 12:25:34 2010 +0200
CWS-TOOLING: integrate CWS sw321bf01
diff --cc scp2/source/ooo/file_ooo.scp
index 6ed00ad,45b40ea..b6d9495
mode 100755,100644..100755
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
commit 4e1dea34e75b829922fc1f563b37b6885e881e43
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Apr 7 11:33:56 2010 +0200
nativea #161862# enable packaging of debs
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 5867fd8..446b836 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1345,6 +1345,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::packagelist::resolve_packagevariables(\$packagename, $allvariableshashref, 0);
}
+ # Debian allows no underline in package name
+ if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; }
+
my $linkaddon = "";
my $linkpackage = 0;
$installer::globals::add_required_package = "";
commit a4e0dd2324e980b2902b0491c3fd9e23d066928e
Author: Ingo Schmidt <is at openoffice.org>
Date: Thu Apr 1 11:07:44 2010 +0200
nativea #161863# adjusting string on Welcome page
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 5468076..7b53137 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -284,7 +284,7 @@ en-US = "< &Back"
en-US = "Cancel"
[OOO_CONTROL_124]
-en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html"
[OOO_CONTROL_125]
en-US = "&Next >"
commit cfac114d491605686cb026dca7113146318b9a49
Author: Ingo Schmidt <is at openoffice.org>
Date: Wed Mar 31 18:16:03 2010 +0200
nativea #161863# default value for STARTCENTER
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index c02f4cb..681fdfc 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -38,6 +38,7 @@ Globals
PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL 5
OPENSOURCE 1
+ STARTCENTER_LAYOUT_STYLE 0
}
}
}
commit c9596131a7cf822733766b7862dd1faa677dc386
Author: Daniel Rentz <dr at openoffice.org>
Date: Wed Mar 31 11:24:42 2010 +0200
calc321stopper1: #i109372# on insert/remove rows/columns/cells: do not update cell position in note caption data before the cells have been moved in the document model
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 3917d5f..5d0aa9f 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -51,11 +51,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
-STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
commit f01bb2c5a21a9563747c1cd0c7406a81acafe5cf
Author: Mikhail Voytenko <mav at openoffice.org>
Date: Wed Mar 31 08:31:01 2010 +0200
sw321bf01: #i110216# let filter configuration be updated
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 91ff3a3..5936fde 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -153,7 +153,7 @@ End
File gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu
TXT_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED,PATCH);
Dir = gid_Dir_Share_Registry_Modules_Oo_TypeDetection_Filter;
Name = "/registry/spool/fcfg_global_filters.xcu";
End
commit 88c88e8f8c39ce4d9742d43518a4ba0703b9bf8f
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Tue Mar 30 19:11:30 2010 +0200
masterfix: #i110248#: fix mangled copyright notice
diff --git a/makefile.rc b/makefile.rc
index 40b8faa..6e859bb 100644
--- a/makefile.rc
+++ b/makefile.rc
@@ -1,28 +1,28 @@
#*************************************************************************
#
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
#*************************************************************************
TARGET=OpenOffice.org
commit e70b04005e96cf52c541a724eb0020b3948653ee
Merge: 8504dab... 9dcdf68...
Author: Ingo Schmidt <is at openoffice.org>
Date: Tue Mar 30 16:48:19 2010 +0200
merge
commit 9dcdf68b2afbc8c0f931e2643360a5510fb30793
Author: Ingo Schmidt <is at openoffice.org>
Date: Tue Mar 30 16:44:22 2010 +0200
nativea #161862# correct names for Windows installation directories
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index efd9b34..444c941 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -268,7 +268,7 @@ BEGIN
$isopensourceproduct = 1;
$manufacturer = "";
$longmanufacturer = "";
- $sundirname = "";
+ $sundirname = "Oracle";
$codefilename = "codes.txt";
$componentfilename = "components.txt";
$productcode = "";
commit 8504dab64f2ce4fb443b5062f1e0269f200d5fe5
Merge: 3c1bba6... 809e01e...
Author: Ingo Schmidt <is at openoffice.org>
Date: Tue Mar 30 16:32:51 2010 +0200
merge
commit 809e01ed1f5349bb62ba84a3b15c86fb3f7d4bb3
Author: Ingo Schmidt <is at openoffice.org>
Date: Tue Mar 30 16:27:40 2010 +0200
nativea #161792# correct name for old Windows registry entries
diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf
index f463bd1..8513e47 100644
--- a/scp2/source/calc/registryitem_calc.ulf
+++ b/scp2/source/calc/registryitem_calc.ulf
@@ -29,10 +29,10 @@
en-US = "&New"
[STR_REG_VAL_SO60_SPREADSHEET]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet"
[STR_REG_VAL_SO60_CALC_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template"
[STR_REG_VAL_OO_CALC]
en-US = "OpenDocument Spreadsheet"
diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf
index 99d084e..d3a807c 100644
--- a/scp2/source/draw/registryitem_draw.ulf
+++ b/scp2/source/draw/registryitem_draw.ulf
@@ -29,10 +29,10 @@
en-US = "&New"
[STR_REG_VAL_SO60_DRAWING]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing"
[STR_REG_VAL_SO60_DRAW_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing Template"
[STR_REG_VAL_OO_DRAW]
en-US = "OpenDocument Drawing"
diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf
index baa3123..538838c 100644
--- a/scp2/source/impress/registryitem_impress.ulf
+++ b/scp2/source/impress/registryitem_impress.ulf
@@ -32,10 +32,10 @@ en-US = "&New"
en-US = "Show"
[STR_REG_VAL_SO60_PRESENT]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation"
[STR_REG_VAL_SO60_IMPRESS_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation Template"
[STR_REG_VAL_OO_PRESENT]
en-US = "OpenDocument Presentation"
diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf
index af2e343..5c37938 100644
--- a/scp2/source/math/registryitem_math.ulf
+++ b/scp2/source/math/registryitem_math.ulf
@@ -29,7 +29,7 @@
en-US = "&New"
[STR_REG_VAL_SO60_FORMULA]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Formula"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula"
[STR_REG_VAL_OO_FORMULA]
en-US = "OpenDocument Formula"
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index d09423d..f106e55 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -34,6 +34,7 @@ Installation gid_Installation_Ooo
OOoBaseVersion = "${OOOBASEVERSION}";
UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
JavaVersion = "${JAVAVERSION}";
+ SxwFormatName = "OpenOffice.org";
SxwFormatVersion = "1.1";
VendorName = "OpenOffice.org";
#ifdef WNT
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index 46e8303..9ba28b6 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -32,7 +32,7 @@ en-US = "&New"
en-US = "&Install"
[STR_REG_VAL_SO60_CONFIGFILE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Configuration File"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
[STR_REG_VAL_SO50_TEMPLATE_OOO]
en-US = "StarOffice 5.0 Template"
diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf
index 8e6283d..c20ee2e 100644
--- a/scp2/source/writer/registryitem_writer.ulf
+++ b/scp2/source/writer/registryitem_writer.ulf
@@ -29,13 +29,13 @@
en-US = "&New"
[STR_REG_VAL_SO60_TEXT]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document"
[STR_REG_VAL_SO60_MASTERDOC]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Master Document"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Master Document"
[STR_REG_VAL_SO60_WRITER_TEMPLATE]
-en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document Template"
+en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template"
[STR_REG_VAL_OO_WRITER]
en-US = "OpenDocument Text"
commit 980da18c6fa7424853750614bdc083e9b896ad70
Author: Michael Stahl <mst at openoffice.org>
Date: Tue Mar 30 14:48:58 2010 +0200
sw321bf01: #i110187#: forgot patch flag for xmloff
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index fa2d1f0..f236a48 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1614,7 +1614,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof)
File gid_File_Lib_Xo
Name = LIBNAME(xo);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT);
+ Styles = (PACKED,PATCH,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
commit 3c1bba68e20adc1f4f97b5e628cff895d4b95e04
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Mar 26 16:57:56 2010 +0100
OOO320 masterfix: #i10000# generate new configure
diff --git a/configure b/configure
index ff483ba..5ef1027 100755
--- a/configure
+++ b/configure
@@ -1,55 +1,26 @@
#! /bin/sh
# From configure.in Revision: 1.290 .
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.59.
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
+# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -59,43 +30,8 @@ else
fi
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" "" $as_nl"
-
-# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
- as_myself=$0
-fi
-if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
-fi
-
# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
+$as_unset ENV MAIL MAILPATH
PS1='$ '
PS2='> '
PS4='+ '
@@ -109,19 +45,18 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ $as_unset $as_var
fi
done
# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
@@ -129,388 +64,157 @@ fi
# Name of the executable.
-as_me=`$as_basename -- "$0" ||
+as_me=`$as_basename "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ X"$0" : 'X\(/\)$' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
+ /^X\/\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
-if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
-else
- as_have_required=no
-fi
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-test \$exitcode = 0) || { (exit 1); exit 1; }
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
+ # Find who we are. Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
-else
- as_candidate_shells=
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ case $CONFIG_SHELL in
+ '')
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ for as_base in sh bash ksh sh5; do
+ case $as_dir in
/*)
- for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
- done;;
- esac
-done
-IFS=$as_save_IFS
-
-
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
+ if ("$as_dir/$as_base" -c '
as_lineno_1=$LINENO
as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
- break
-fi
-
-fi
-
- done
-
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
-}
-
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ CONFIG_SHELL=$as_dir/$as_base
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ fi;;
+ esac
+ done
+done
+;;
+ esac
# Create $as_me.lineno as a copy of $as_myself, but with $LINENO
# uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
+ # line-number line before each line; the second 'sed' does the real
+ # work. The second script uses 'N' to pair each line-number line
+ # with the numbered line, and appends trailing '-' during
+ # substitution so that $LINENO is not a special case at line end.
# (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
- sed -n '
- p
- /[$]LINENO/=
- ' <$as_myself |
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+ sed '=' <$as_myself |
sed '
- s/[$]LINENO.*/&-/
- t lineno
- b
- :lineno
N
- :loop
- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+ s,$,-,
+ : loop
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
t loop
- s/-\n.*//
+ s,-$,,
+ s,^['$as_cr_digits']*\n,,
' >$as_me.lineno &&
- chmod +x "$as_me.lineno" ||
+ chmod +x $as_me.lineno ||
{ echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensitive to this).
- . "./$as_me.lineno"
+ # original and so on. Autoconf is especially sensible to this).
+ . ./$as_me.lineno
# Exit status is that of the last command.
exit
}
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
- case `echo 'x\c'` in
- *c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
- esac;;
-*)
- ECHO_N='-n';;
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
+if expr a : '\(a\)' >/dev/null 2>&1; then
as_expr=expr
else
as_expr=false
fi
rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
- rm -f conf$$.dir/conf$$.file
-else
- rm -f conf$$.dir
- mkdir conf$$.dir
-fi
echo >conf$$.file
if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
+rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
@@ -519,28 +223,7 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -549,27 +232,39 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
+
+# CDPATH.
+$as_unset CDPATH
-exec 7<&0 </dev/null 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+exec 6>&1
+
#
# Initializations.
#
ac_default_prefix=/usr/local
-ac_clean_files=
ac_config_libobj_dir=.
-LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete. It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
@@ -580,445 +275,42 @@ PACKAGE_BUGREPORT=
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
+#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#ifdef HAVE_SYS_STAT_H
+#if HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef STDC_HEADERS
+#if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# ifdef HAVE_STDLIB_H
+# if HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#ifdef HAVE_STRINGS_H
+#if HAVE_STRINGS_H
# include <strings.h>
#endif
-#ifdef HAVE_INTTYPES_H
+#if HAVE_INTTYPES_H
# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-GREP
-EGREP
-AWK
-SED
-LOCAL_SOLENV
-_solenv
-UPD
-SOURCEVERSION
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-target
-target_cpu
-target_vendor
-target_os
-GNUTAR
-OSVERSION
-PTHREAD_CFLAGS
-PTHREAD_LIBS
-ENABLE_CRASHDUMP
-VC_STANDARD
-ENABLE_WERROR
-ENABLE_DEBUG
-PRODUCT
-PROFULLSWITCH
-PROEXT
-ENABLE_SYMBOLS
-DISABLE_STRIP
-ENABLE_CUPS
-ENABLE_FONTCONFIG
-WITH_BINFILTER
-ENABLE_DIRECTX
-DISABLE_ACTIVEX
-DISABLE_ATL
-ENABLE_RPATH
-WITH_MYSPELL_DICTS
-SYSTEM_DICTS
-DICT_SYSTEM_DIR
-HYPH_SYSTEM_DIR
-THES_SYSTEM_DIR
-USE_SHELL
-WITH_MINGWIN
-SHELLPATH
-GCC_HOME
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-COMPATH
-GCCVER
-HAVE_LD_BSYMBOLIC_FUNCTIONS
-ENABLE_PCH
-NO_HIDS
-GNUMAKE
-_cc
-HAVE_LD_HASH_STYLE
-PERL
-MSPDB_PATH
-COMEX
-USE_MINGW
-MIDL_PATH
-CSC_PATH
-FRAME_HOME
-CPP
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXCPP
-SIZEOF_LONG
-WORDS_BIGENDIAN
-LFS_CFLAGS
-ENABLE_VBA
-VBA_EXTENSION
-PAM
-NEW_SHADOW_API
-PAM_LINK
-CRYPT_LINK
-GXX_INCLUDE_PATH
-MINGW_LIB_INCLUDE_PATH
-MINGW_BACKWARD_INCLUDE_PATH
-MINGW_CLIB_DIR
-MINGW_SHARED_GCCLIB
-MINGW_GCCLIB_EH
-MINGW_SHARED_GXXLIB
-MINGW_GCCDLL
-MINGW_GXXDLL
-EXCEPTIONS
-STLPORT4
-STLPORT_VER
-USE_SYSTEM_STL
-USE_CCACHE
-CCACHE
-HAVE_GCC_VISIBILITY_FEATURE
-ALLOC
-BUILD_VER_STRING
-SOLAR_JAVA
-JAVAINTERPRETER
-JAVACOMPILER
-JAVACISGCJ
-JAVADOC
-AWTLIB
-JAVAAOTCOMPILER
-JAVA_HOME
-JDK
-JAVAFLAGS
-DMAKE
-BUILD_DMAKE
-EPM
-DPKG
-PKGMK
-BUILD_EPM
-PKGFORMAT
-RPM
-GPERF
-MINGWCXX
-MINGWSTRIP
-BUILD_UNOWINREG
-BUILD_QADEVOOO
-SYSTEM_STDLIBS
-SYSTEM_ZLIB
-SYSTEM_JPEG
-SYSTEM_EXPAT
-PKG_CONFIG
-LIBWPD_CFLAGS
-LIBWPD_LIBS
-SYSTEM_LIBWPD
-FREETYPE_CFLAGS
-FREETYPE_LIBS
-USE_FT_EMBOLDEN
-LIBXSLT_CFLAGS
-LIBXSLT_LIBS
-XSLTPROC
-SYSTEM_LIBXSLT
-LIBXML_CFLAGS
-LIBXML_LIBS
-SYSTEM_LIBXML
-PYTHON
-PYTHON_VERSION
-PYTHON_PREFIX
-PYTHON_EXEC_PREFIX
-PYTHON_PLATFORM
-pythondir
-pkgpythondir
-pyexecdir
-pkgpyexecdir
-BZIP2
-SYSTEM_PYTHON
-PYTHON_CFLAGS
-PYTHON_LIBS
-HOME
-SYSTEM_DB
-DB_VERSION
-DB_INCLUDES
-DB_JAR
-SYSTEM_LUCENE
-LUCENE_CORE_JAR
-LUCENE_ANALYZERS_JAR
-SYSTEM_HSQLDB
-HSQLDB_JAR
-SYSTEM_BSH
-BSH_JAR
-SERIALIZER_JAR
-SYSTEM_SAXON
-SAXON_JAR
-CURLCONFIG
-SYSTEM_CURL
-CURL_CFLAGS
-CURL_LIBS
-SYSTEM_BOOST
-SYSTEM_VIGRA
-SYSTEM_ODBC_HEADERS
-WITH_MOZILLA
-WITH_LDAP
-WITH_OPENLDAP
-MOZ_NSS_CFLAGS
-MOZ_NSS_LIBS
-NSS_LIB
-MOZ_NSPR_CFLAGS
-MOZ_NSPR_LIBS
-NSPR_LIB
-MOZILLAXPCOM_CFLAGS
-MOZILLAXPCOM_LIBS
-MOZILLA_VERSION
-MOZILLA_TOOLKIT
-MOZGTK2_CFLAGS
-MOZGTK2_LIBS
-MOZLIBREQ_CFLAGS
-MOZLIBREQ_LIBS
-BUILD_MOZAB
-ENABLE_NSS_MODULE
-MOZILLABUILD
-SYSTEM_MOZILLA
-MOZ_FLAVOUR
-MOZ_INC
-MOZ_LIB
-MOZ_LIB_XPCOM
-MOZ_LDAP_CFLAGS
-SYSTEM_SANE_HEADER
-SYSTEM_GENBRK
-SYSTEM_GENCCODE
-SYSTEM_GENCMN
-SYSTEM_ICU
-GRAPHITE_CFLAGS
-GRAPHITE_LIBS
-ENABLE_GRAPHITE
-SYSTEM_GRAPHITE
-XMKMF
-X_CFLAGS
-X_PRE_LIBS
-X_LIBS
-X_EXTRA_LIBS
-XINC
-XLIB
-XAU_LIBS
-DISABLE_XAW
-SYSTEM_XRENDER_HEADERS
-XRENDER_LINK
-XRANDR_CFLAGS
-XRANDR_LIBS
-XRANDR_DLOPEN
-ENABLE_RANDR
-DISABLE_NEON
-NEON_CFLAGS
-NEON_LIBS
-SYSTEM_NEON
-NEON_VERSION
-OPENSSL_CFLAGS
-OPENSSL_LIBS
-SYSTEM_OPENSSL
-ENABLE_AGG
-AGG_CFLAGS
-AGG_LIBS
-SYSTEM_AGG
-AGG_VERSION
-REDLAND_CFLAGS
-REDLAND_LIBS
-SYSTEM_REDLAND
-HUNSPELL_CFLAGS
-HUNSPELL_LIBS
-SYSTEM_HUNSPELL
-SYSTEM_HYPH
-HYPHEN_LIB
-SYSTEM_MYTHES
-SYSTEM_LPSOLVE
-PSDK_HOME
-WINDOWS_VISTA_PSDK
-DIRECTXSDK_HOME
-DIRECTXSDK_LIB
-NSIS_PATH
-BISON
-FLEX
-PATCH
-GNUCP
-GNUPATCH
-CYGWIN_PATH
-ML_EXE
-ASM_HOME
-ZIP
-UNZIP
-ZIP_HOME
-ENABLE_GTK
-ENABLE_KDE
-ENABLE_KDE4
-GCONF_CFLAGS
-GCONF_LIBS
-ENABLE_GCONF
-GNOMEVFS_CFLAGS
-GNOMEVFS_LIBS
-ENABLE_GNOMEVFS
-GTK_CFLAGS
-GTK_LIBS
-DBUS_CFLAGS
-DBUS_LIBS
-GIO_CFLAGS
-GIO_LIBS
-ENABLE_GIO
-ENABLE_DBUS
-ENABLE_SYSTRAY_GTK
-CAIRO_CFLAGS
-CAIRO_LIBS
-ENABLE_CAIRO
-BUILD_PIXMAN
-SYSTEM_CAIRO
-ENABLE_OPENGL
-ENABLE_MINIMIZER
-ENABLE_PRESENTER_SCREEN
-POPPLER_CFLAGS
-POPPLER_LIBS
-ENABLE_PDFIMPORT
-SYSTEM_POPPLER
-ENABLE_MEDIAWIKI
-SYSTEM_SERVLETAPI
-SERVLETAPI_JAR
-ENABLE_REPORTBUILDER
-SYSTEM_JFREEREPORT
-SAC_JAR
-LIBXML_JAR
-FLUTE_JAR
-JFREEREPORT_JAR
-LIBBASE_JAR
-LIBLAYOUT_JAR
-LIBLOADER_JAR
-LIBFORMULA_JAR
-LIBREPOSITORY_JAR
-LIBFONTS_JAR
-LIBSERIALIZER_JAR
-SYSTEM_APACHE_COMMONS
-COMMONS_CODEC_JAR
-COMMONS_LANG_JAR
-COMMONS_HTTPCLIENT_JAR
-COMMONS_LOGGING_JAR
-MOC
-KDE_CFLAGS
-KDE_LIBS
-MOC4
-KDE4_CFLAGS
-KDE4_LIBS
-ENABLE_LOCKDOWN
-GOBJECT_CFLAGS
-GOBJECT_LIBS
-ENABLE_EVOAB2
-ENABLE_KAB
-WITH_FONTS
-WITHOUT_PPDS
-WITHOUT_AFMS
-SCPDEFS
-USE_XINERAMA
-XINERAMA_LINK
-ANT
-ANT_HOME
-ANT_LIB
-WITH_LANG
-WITH_POOR_HELP_LOCALIZATIONS
-WITH_DICT
-INTRO_BITMAPS
-ABOUT_BITMAPS
-OOO_VENDOR
-UNIXWRAPPERNAME
-ENABLE_STATIC_GTK
-ENABLE_LAYOUT
-VERBOSE
-LOCAL_SOLVER
-BUILD_TYPE
-LIBOBJS
-LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR USE_SHELL WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENA
BLE_PCH NO_HIDS GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM GPERF MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG BUILD_QADEVOOO SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CF
LAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENC
MN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB SYSTEM_MYTHES SYSTEM_LPSOLVE PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_M
INIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS'
ac_subst_files=''
- ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-XMKMF'
-
# Initialize some variables set by options.
ac_init_help=
@@ -1045,48 +337,34 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
+datadir='${prefix}/share'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
ac_prev=
-ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval $ac_prev=\$ac_option
+ eval "$ac_prev=\$ac_option"
ac_prev=
continue
fi
- case $ac_option in
- *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
- *) ac_optarg=yes ;;
- esac
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_dashdash$ac_option in
- --)
- ac_dashdash=yes ;;
+ case $ac_option in
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -1108,45 +386,33 @@ do
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad)
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
datadir=$ac_optarg ;;
- -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
- | --dataroo | --dataro | --datar)
- ac_prev=datarootdir ;;
- -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
- | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
- datarootdir=$ac_optarg ;;
-
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
-
- -docdir | --docdir | --docdi | --doc | --do)
- ac_prev=docdir ;;
- -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
- docdir=$ac_optarg ;;
-
- -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
- ac_prev=dvidir ;;
- -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
- dvidir=$ac_optarg ;;
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ eval "enable_$ac_feature=no" ;;
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "enable_$ac_feature='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1173,12 +439,6 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
- -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
- ac_prev=htmldir ;;
- -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
- | --ht=*)
- htmldir=$ac_optarg ;;
-
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -1203,16 +463,13 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
- -localedir | --localedir | --localedi | --localed | --locale)
- ac_prev=localedir ;;
- -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
- localedir=$ac_optarg ;;
-
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst | --locals)
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -1277,16 +534,6 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
- -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
- ac_prev=pdfdir ;;
- -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
- pdfdir=$ac_optarg ;;
-
- -psdir | --psdir | --psdi | --psd | --ps)
- ac_prev=psdir ;;
- -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
- psdir=$ac_optarg ;;
-
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -1339,20 +586,24 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "with_$ac_package='$ac_optarg'" ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+ eval "with_$ac_package=no" ;;
--x)
# Obsolete; use --with-x.
@@ -1383,7 +634,8 @@ Try \`$0 --help' for more information." >&2
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
- eval $ac_envvar=\$ac_optarg
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ eval "$ac_envvar='$ac_optarg'"
export $ac_envvar ;;
*)
@@ -1403,19 +655,27 @@ if test -n "$ac_prev"; then
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute directory names.
-for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
do
- eval ac_val=\$$ac_var
+ eval ac_val=$`echo $ac_var`
case $ac_val in
- [\\/$]* | ?:[\\/]* ) continue;;
- NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ localstatedir libdir includedir oldincludedir infodir mandir
+do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1442,76 +702,86 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
test "$silent" = yes && exec 6>/dev/null
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
-
-
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
- # Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
+ # Try the directory containing this script, then its parent.
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$0" : 'X\(//\)[^/]' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r "$srcdir/$ac_unique_file"; then
+ if test ! -r $srcdir/$ac_unique_file; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r "$srcdir/$ac_unique_file"; then
- test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+if test ! -r $srcdir/$ac_unique_file; then
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
{ (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
- pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
- srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
- eval ac_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_env_${ac_var}_value=\$${ac_var}
- eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
- eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
+ else
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
+ fi
+fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+ac_env_CXX_set=${CXX+set}
+ac_env_CXX_value=$CXX
+ac_cv_env_CXX_set=${CXX+set}
+ac_cv_env_CXX_value=$CXX
+ac_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_env_CXXFLAGS_value=$CXXFLAGS
+ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
+ac_cv_env_CXXFLAGS_value=$CXXFLAGS
+ac_env_CXXCPP_set=${CXXCPP+set}
+ac_env_CXXCPP_value=$CXXCPP
+ac_cv_env_CXXCPP_set=${CXXCPP+set}
+ac_cv_env_CXXCPP_value=$CXXCPP
#
# Report the --help message.
@@ -1540,6 +810,9 @@ Configuration:
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
+_ACEOF
+
+ cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -1557,22 +830,15 @@ Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --infodir=DIR info documentation [PREFIX/info]
+ --mandir=DIR man documentation [PREFIX/man]
_ACEOF
cat <<\_ACEOF
@@ -1745,6 +1011,10 @@ Optional Features:
--disable-randr-link disable linking with libXrandr, instead dynamically
open it at runtime
+ --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.
+
--enable-minimizer enables the build of the Presentation Minimizer extension
--enable-presenter-console enables the build of the Presenter Console extension
@@ -1911,6 +1181,15 @@ Optional Packages:
--with-lucene-core-jar=JARFILE Specify path to jarfile manually
--with-lucene-analyzers-jar=JARFILE Specify path to jarfile manually
+ --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.
+
+ --with-libmysql-path Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension.
+
+ Usage: --with-libmysql-path=<absolute path to your Connector/C installation>
+
+ --with-system-mysql-cppconn Use MySQL C++ Connector libraries already on system
+
--with-system-hsqldb Use hsqldb already on system
--with-hsqldb-jar=JARFILE Specify path to jarfile manually
@@ -2178,99 +1457,129 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
- you have headers in a nonstandard directory <include dir>
+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+ headers in a nonstandard directory <include dir>
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
- XMKMF Path to xmkmf, Makefile generator for X Window System
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
_ACEOF
-ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
+ ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d $ac_dir || continue
ac_builddir=.
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
+if test "$ac_dir" != .; then
ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
case $srcdir in
- .) # We are building in place.
+ .) # No --srcdir option. We are building in place.
ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
- cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- echo &&
- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
- elif test -f "$ac_srcdir/configure"; then
- echo &&
- $SHELL "$ac_srcdir/configure" --help=recursive
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+ cd $ac_dir
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
+ echo
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_srcdir/configure; then
+ echo
+ $SHELL $ac_srcdir/configure --help=recursive
+ elif test -f $ac_srcdir/configure.ac ||
+ test -f $ac_srcdir/configure.in; then
+ echo
+ $ac_configure --help
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi || ac_status=$?
- cd "$ac_pwd" || { ac_status=$?; break; }
+ fi
+ cd $ac_popdir
done
fi
-test -n "$ac_init_help" && exit $ac_status
+test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-configure
-generated by GNU Autoconf 2.61
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit
+ exit 0
fi
-cat >config.log <<_ACEOF
+exec 5>config.log
+cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
_ACEOF
-exec 5>>config.log
{
cat <<_ASUNAME
## --------- ##
@@ -2289,7 +1598,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
@@ -2303,7 +1612,6 @@ do
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
-IFS=$as_save_IFS
} >&5
@@ -2325,6 +1633,7 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
+ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -2335,7 +1644,7 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *\'*)
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -2357,7 +1666,9 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+ ac_sep=" "
;;
esac
done
@@ -2368,8 +1679,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -2382,34 +1693,20 @@ trap 'exit_status=$?
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-(
- for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
- eval ac_val=\$$ac_var
- case $ac_val in #(
- *${as_nl}*)
- case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
- esac
- case $ac_var in #(
- _ | IFS | as_nl) ;; #(
- *) $as_unset $ac_var ;;
- esac ;;
- esac
- done
+{
(set) 2>&1 |
- case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
- *${as_nl}ac_space=\ *)
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
sed -n \
- "s/'\''/'\''\\\\'\'''\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
- ;; #(
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
*)
- sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+ sed -n \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
- esac |
- sort
-)
+ esac;
+}
echo
cat <<\_ASBOX
@@ -2420,28 +1717,22 @@ _ASBOX
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
+## ------------- ##
+## Output files. ##
+## ------------- ##
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=\$$ac_var
- case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
- esac
- echo "$ac_var='\''$ac_val'\''"
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -2453,24 +1744,26 @@ _ASBOX
## ----------- ##
_ASBOX
echo
- cat confdefs.h
+ sed "/^$/d" confdefs.h | sort
echo
fi
test "$ac_signal" != 0 &&
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core core.conftest.* &&
- rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core &&
+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
-' 0
+ ' 0
for ac_signal in 1 2 13 15; do
trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
# Predefined preprocessor variables.
@@ -2501,17 +1794,14 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ else
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ fi
fi
-shift
-for ac_site_file
-do
+for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
{ echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -2527,8 +1817,8 @@ if test -r "$cache_file"; then
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . "$cache_file";;
- *) . "./$cache_file";;
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+ *) . ./$cache_file;;
esac
fi
else
@@ -2540,11 +1830,12 @@ fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
+for ac_var in `(set) 2>&1 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val=\$ac_cv_env_${ac_var}_value
- eval ac_new_val=\$ac_env_${ac_var}_value
+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+ eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
{ echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -2569,7 +1860,8 @@ echo "$as_me: current value: $ac_new_val" >&2;}
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -2586,6 +1878,12 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov
{ (exit 1); exit 1; }; }
fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
@@ -2602,1044 +1900,1064 @@ fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
echo "$@" >config.parms
-# Check whether --with-gnu-patch was given.
+# Check whether --with-gnu-patch or --without-gnu-patch was given.
if test "${with_gnu_patch+set}" = set; then
- withval=$with_gnu_patch;
-fi
+ withval="$with_gnu_patch"
+fi;
-# Check whether --with-agg was given.
+# Check whether --with-agg or --without-agg was given.
if test "${with_agg+set}" = set; then
- withval=$with_agg;
+ withval="$with_agg"
+
else
with_agg=yes
-fi
-
+fi;
-# Check whether --with-gnu-cp was given.
+# Check whether --with-gnu-cp or --without-gnu-cp was given.
if test "${with_gnu_cp+set}" = set; then
- withval=$with_gnu_cp;
-fi
+ withval="$with_gnu_cp"
-# Check whether --enable-graphite was given.
+fi;
+# Check whether --enable-graphite or --disable-graphite was given.
if test "${enable_graphite+set}" = set; then
- enableval=$enable_graphite;
-fi
+ enableval="$enable_graphite"
+fi;
-# Check whether --with-system-graphite was given.
+# Check whether --with-system-graphite or --without-system-graphite was given.
if test "${with_system_graphite+set}" = set; then
- withval=$with_system_graphite;
-fi
+ withval="$with_system_graphite"
-# Check whether --enable-ldap was given.
+fi;
+# Check whether --enable-ldap or --disable-ldap was given.
if test "${enable_ldap+set}" = set; then
- enableval=$enable_ldap;
-fi
+ enableval="$enable_ldap"
+fi;
-# Check whether --with-openldap was given.
+# Check whether --with-openldap or --without-openldap was given.
if test "${with_openldap+set}" = set; then
- withval=$with_openldap;
-fi
+ withval="$with_openldap"
-# Check whether --enable-lockdown was given.
+fi;
+# Check whether --enable-lockdown or --disable-lockdown was given.
if test "${enable_lockdown+set}" = set; then
- enableval=$enable_lockdown;
-fi
+ enableval="$enable_lockdown"
-# Check whether --enable-vba was given.
+fi;
+# Check whether --enable-vba or --disable-vba was given.
if test "${enable_vba+set}" = set; then
- enableval=$enable_vba;
-fi
+ enableval="$enable_vba"
+fi;
-# Check whether --with-vba-package-format was given.
+# Check whether --with-vba-package-format or --without-vba-package-format was given.
if test "${with_vba_package_format+set}" = set; then
- withval=$with_vba_package_format;
-fi
+ withval="$with_vba_package_format"
-# Check whether --enable-pch was given.
+fi;
+# Check whether --enable-pch or --disable-pch was given.
if test "${enable_pch+set}" = set; then
- enableval=$enable_pch;
-fi
+ enableval="$enable_pch"
-# Check whether --enable-hids was given.
+fi;
+# Check whether --enable-hids or --disable-hids was given.
if test "${enable_hids+set}" = set; then
- enableval=$enable_hids;
-fi
+ enableval="$enable_hids"
-# Check whether --enable-mozilla was given.
+fi;
+# Check whether --enable-mozilla or --disable-mozilla was given.
if test "${enable_mozilla+set}" = set; then
- enableval=$enable_mozilla;
+ enableval="$enable_mozilla"
+
else
enable_mozilla="yes"
-fi
-
+fi;
-# Check whether --with-fonts was given.
+# Check whether --with-fonts or --without-fonts was given.
if test "${with_fonts+set}" = set; then
- withval=$with_fonts;
-fi
+ withval="$with_fonts"
+fi;
-# Check whether --with-ppds was given.
+# Check whether --with-ppds or --without-ppds was given.
if test "${with_ppds+set}" = set; then
- withval=$with_ppds;
-fi
+ withval="$with_ppds"
+fi;
-# Check whether --with-afms was given.
+# Check whether --with-afms or --without-afms was given.
if test "${with_afms+set}" = set; then
- withval=$with_afms;
-fi
+ withval="$with_afms"
-# Check whether --enable-epm was given.
+fi;
+# Check whether --enable-epm or --disable-epm was given.
if test "${enable_epm+set}" = set; then
- enableval=$enable_epm;
+ enableval="$enable_epm"
+
else
enable_epm="yes"
-fi
-
+fi;
-# Check whether --with-epm was given.
+# Check whether --with-epm or --without-epm was given.
if test "${with_epm+set}" = set; then
- withval=$with_epm;
-fi
+ withval="$with_epm"
+fi;
-# Check whether --with-package-format was given.
+# Check whether --with-package-format or --without-package-format was given.
if test "${with_package_format+set}" = set; then
- withval=$with_package_format;
-fi
+ withval="$with_package_format"
-# Check whether --enable-odk was given.
+fi;
+# Check whether --enable-odk or --disable-odk was given.
if test "${enable_odk+set}" = set; then
- enableval=$enable_odk;
+ enableval="$enable_odk"
+
else
enable_odk="yes"
-fi
-
-# Check whether --enable-qadevooo was given.
+fi;
+# Check whether --enable-qadevooo or --disable-qadevooo was given.
if test "${enable_qadevooo+set}" = set; then
- enableval=$enable_qadevooo;
+ enableval="$enable_qadevooo"
+
else
enable_qadevooo="yes"
-fi
-
-# Check whether --enable-fontooo was given.
+fi;
+# Check whether --enable-fontooo or --disable-fontooo was given.
if test "${enable_fontooo+set}" = set; then
- enableval=$enable_fontooo;
+ enableval="$enable_fontooo"
+
else
enable_fontooo="yes"
-fi
-
-# Check whether --enable-mathmldtd was given.
+fi;
+# Check whether --enable-mathmldtd or --disable-mathmldtd was given.
if test "${enable_mathmldtd+set}" = set; then
- enableval=$enable_mathmldtd;
+ enableval="$enable_mathmldtd"
+
else
enable_mathmldtd="yes"
-fi
-
-# Check whether --enable-evolution2 was given.
+fi;
+# Check whether --enable-evolution2 or --disable-evolution2 was given.
if test "${enable_evolution2+set}" = set; then
- enableval=$enable_evolution2;
-fi
+ enableval="$enable_evolution2"
+fi;
-# Check whether --with-system-stdlibs was given.
+# Check whether --with-system-stdlibs or --without-system-stdlibs was given.
if test "${with_system_stdlibs+set}" = set; then
- withval=$with_system_stdlibs;
+ withval="$with_system_stdlibs"
+
else
checkforprelink=yes
-fi
-
+fi;
-# Check whether --with-system-mspack was given.
+# Check whether --with-system-mspack or --without-system-mspack was given.
if test "${with_system_mspack+set}" = set; then
- withval=$with_system_mspack;
-fi
+ withval="$with_system_mspack"
-# Check whether --enable-cups was given.
+fi;
+# Check whether --enable-cups or --disable-cups was given.
if test "${enable_cups+set}" = set; then
- enableval=$enable_cups;
+ enableval="$enable_cups"
+
else
enable_cups=yes
-fi
-
-# Check whether --enable-fontconfig was given.
+fi;
+# Check whether --enable-fontconfig or --disable-fontconfig was given.
if test "${enable_fontconfig+set}" = set; then
- enableval=$enable_fontconfig;
+ enableval="$enable_fontconfig"
+
else
enable_fontconfig=yes
-fi
-
-# Check whether --enable-directx was given.
+fi;
+# Check whether --enable-directx or --disable-directx was given.
if test "${enable_directx+set}" = set; then
- enableval=$enable_directx;
+ enableval="$enable_directx"
+
else
enable_directx=yes
-fi
-
-# Check whether --enable-activex was given.
+fi;
+# Check whether --enable-activex or --disable-activex was given.
if test "${enable_activex+set}" = set; then
- enableval=$enable_activex;
-fi
+ enableval="$enable_activex"
+fi;
-# Check whether --enable-atl was given.
+# Check whether --enable-atl or --disable-atl was given.
if test "${enable_atl+set}" = set; then
- enableval=$enable_atl;
-fi
+ enableval="$enable_atl"
+fi;
-# Check whether --enable-symbols was given.
+# Check whether --enable-symbols or --disable-symbols was given.
if test "${enable_symbols+set}" = set; then
- enableval=$enable_symbols;
-fi
+ enableval="$enable_symbols"
-# Check whether --enable-strip-solver was given.
+fi;
+# Check whether --enable-strip-solver or --disable-strip-solver was given.
if test "${enable_strip_solver+set}" = set; then
- enableval=$enable_strip_solver;
-fi
+ enableval="$enable_strip_solver"
-# Check whether --enable-werror was given.
+fi;
+# Check whether --enable-werror or --disable-werror was given.
if test "${enable_werror+set}" = set; then
- enableval=$enable_werror;
-fi
+ enableval="$enable_werror"
-# Check whether --enable-debug was given.
+fi;
+# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
- enableval=$enable_debug;
-fi
+ enableval="$enable_debug"
-# Check whether --enable-dbgutil was given.
+fi;
+# Check whether --enable-dbgutil or --disable-dbgutil was given.
if test "${enable_dbgutil+set}" = set; then
- enableval=$enable_dbgutil;
-fi
+ enableval="$enable_dbgutil"
-# Check whether --enable-crashdump was given.
+fi;
+# Check whether --enable-crashdump or --disable-crashdump was given.
if test "${enable_crashdump+set}" = set; then
- enableval=$enable_crashdump;
+ enableval="$enable_crashdump"
+
else
enable_crashdump=no
-fi
-
-# Check whether --enable-cl-standard was given.
+fi;
+# Check whether --enable-cl-standard or --disable-cl-standard was given.
if test "${enable_cl_standard+set}" = set; then
- enableval=$enable_cl_standard;
-fi
+ enableval="$enable_cl_standard"
-# Check whether --enable-gtk was given.
+fi;
+# Check whether --enable-gtk or --disable-gtk was given.
if test "${enable_gtk+set}" = set; then
- enableval=$enable_gtk;
+ enableval="$enable_gtk"
+
else
enable_gtk=yes
-fi
-
-# Check whether --enable-systray was given.
+fi;
+# Check whether --enable-systray or --disable-systray was given.
if test "${enable_systray+set}" = set; then
- enableval=$enable_systray;
+ enableval="$enable_systray"
+
else
enable_systray=yes
-fi
-
-# Check whether --enable-cairo was given.
+fi;
+# Check whether --enable-cairo or --disable-cairo was given.
if test "${enable_cairo+set}" = set; then
- enableval=$enable_cairo;
+ enableval="$enable_cairo"
+
else
enable_cairo=no
-fi
+fi;
-
-# Check whether --with-system-cairo was given.
+# Check whether --with-system-cairo or --without-system-cairo was given.
if test "${with_system_cairo+set}" = set; then
- withval=$with_system_cairo;
-fi
+ withval="$with_system_cairo"
-# Check whether --enable-opengl was given.
+fi;
+# Check whether --enable-opengl or --disable-opengl was given.
if test "${enable_opengl+set}" = set; then
- enableval=$enable_opengl;
+ enableval="$enable_opengl"
+
else
enable_opengl=no
-fi
-
-# Check whether --enable-dbus was given.
+fi;
+# Check whether --enable-dbus or --disable-dbus was given.
if test "${enable_dbus+set}" = set; then
- enableval=$enable_dbus;
+ enableval="$enable_dbus"
+
else
enable_dbus=no
-fi
-
-# Check whether --enable-gconf was given.
+fi;
+# Check whether --enable-gconf or --disable-gconf was given.
if test "${enable_gconf+set}" = set; then
- enableval=$enable_gconf;
+ enableval="$enable_gconf"
+
else
enable_gconf=yes
-fi
-
-# Check whether --enable-gnome-vfs was given.
+fi;
+# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given.
if test "${enable_gnome_vfs+set}" = set; then
- enableval=$enable_gnome_vfs;
+ enableval="$enable_gnome_vfs"
+
else
enable_gnome_vfs=yes
-fi
-
-# Check whether --enable-gio was given.
+fi;
+# Check whether --enable-gio or --disable-gio was given.
if test "${enable_gio+set}" = set; then
- enableval=$enable_gio;
+ enableval="$enable_gio"
+
else
enable_gio=no
-fi
-
-# Check whether --enable-static-gtk was given.
+fi;
+# Check whether --enable-static-gtk or --disable-static-gtk was given.
if test "${enable_static_gtk+set}" = set; then
- enableval=$enable_static_gtk;
-fi
+ enableval="$enable_static_gtk"
-# Check whether --enable-layout was given.
+fi;
+# Check whether --enable-layout or --disable-layout was given.
if test "${enable_layout+set}" = set; then
- enableval=$enable_layout;
-fi
+ enableval="$enable_layout"
-# Check whether --enable-build-mozilla was given.
+fi;
+# Check whether --enable-build-mozilla or --disable-build-mozilla was given.
if test "${enable_build_mozilla+set}" = set; then
- enableval=$enable_build_mozilla;
-fi
+ enableval="$enable_build_mozilla"
+fi;
-# Check whether --with-mozilla-version was given.
+# Check whether --with-mozilla-version or --without-mozilla-version was given.
if test "${with_mozilla_version+set}" = set; then
- withval=$with_mozilla_version;
-fi
+ withval="$with_mozilla_version"
+fi;
-# Check whether --with-mozilla-toolkit was given.
+# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given.
if test "${with_mozilla_toolkit+set}" = set; then
- withval=$with_mozilla_toolkit;
-fi
+ withval="$with_mozilla_toolkit"
-# Check whether --enable-nss_module was given.
+fi;
+# Check whether --enable-nss_module or --disable-nss_module was given.
if test "${enable_nss_module+set}" = set; then
- enableval=$enable_nss_module;
+ enableval="$enable_nss_module"
+
else
enable_nss_module=yes
-fi
-
-# Check whether --enable-kde was given.
+fi;
+# Check whether --enable-kde or --disable-kde was given.
if test "${enable_kde+set}" = set; then
- enableval=$enable_kde;
-fi
+ enableval="$enable_kde"
-# Check whether --enable-kdeab was given.
+fi;
+# Check whether --enable-kdeab or --disable-kdeab was given.
if test "${enable_kdeab+set}" = set; then
- enableval=$enable_kdeab;
+ enableval="$enable_kdeab"
+
else
if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi
-fi
-
-# Check whether --enable-kde4 was given.
+fi;
+# Check whether --enable-kde4 or --disable-kde4 was given.
if test "${enable_kde4+set}" = set; then
- enableval=$enable_kde4;
-fi
+ enableval="$enable_kde4"
-# Check whether --enable-binfilter was given.
+fi;
+# Check whether --enable-binfilter or --disable-binfilter was given.
if test "${enable_binfilter+set}" = set; then
- enableval=$enable_binfilter;
+ enableval="$enable_binfilter"
+
else
if ! test -d ./binfilter; then enable_binfilter=no; fi
-fi
-
-# Check whether --enable-rpath was given.
+fi;
+# Check whether --enable-rpath or --disable-rpath was given.
if test "${enable_rpath+set}" = set; then
- enableval=$enable_rpath;
-fi
+ enableval="$enable_rpath"
-# Check whether --enable-pam was given.
+fi;
+# Check whether --enable-pam or --disable-pam was given.
if test "${enable_pam+set}" = set; then
- enableval=$enable_pam;
-fi
+ enableval="$enable_pam"
-# Check whether --enable-pam-link was given.
+fi;
+# Check whether --enable-pam-link or --disable-pam-link was given.
if test "${enable_pam_link+set}" = set; then
- enableval=$enable_pam_link;
-fi
+ enableval="$enable_pam_link"
-# Check whether --enable-crypt-link was given.
+fi;
+# Check whether --enable-crypt-link or --disable-crypt-link was given.
if test "${enable_crypt_link+set}" = set; then
- enableval=$enable_crypt_link;
+ enableval="$enable_crypt_link"
+
else
enable_crypt_link=yes
-fi
-
-# Check whether --enable-xrender-link was given.
+fi;
+# Check whether --enable-xrender-link or --disable-xrender-link was given.
if test "${enable_xrender_link+set}" = set; then
- enableval=$enable_xrender_link;
-fi
+ enableval="$enable_xrender_link"
-# Check whether --enable-randr was given.
+fi;
+# Check whether --enable-randr or --disable-randr was given.
if test "${enable_randr+set}" = set; then
- enableval=$enable_randr;
+ enableval="$enable_randr"
+
else
enable_randr=yes
-fi
-
-# Check whether --enable-randr-link was given.
+fi;
+# Check whether --enable-randr-link or --disable-randr-link was given.
if test "${enable_randr_link+set}" = set; then
- enableval=$enable_randr_link;
+ enableval="$enable_randr_link"
+
else
enable_randr_link=yes
-fi
-
+fi;
-# Check whether --with-myspell-dicts was given.
+# Check whether --with-myspell-dicts or --without-myspell-dicts was given.
if test "${with_myspell_dicts+set}" = set; then
- withval=$with_myspell_dicts;
-fi
+ withval="$with_myspell_dicts"
+fi;
-# Check whether --with-system-dicts was given.
+# Check whether --with-system-dicts or --without-system-dicts was given.
if test "${with_system_dicts+set}" = set; then
- withval=$with_system_dicts;
-fi
+ withval="$with_system_dicts"
+fi;
-# Check whether --with-external-dict-dir was given.
+# Check whether --with-external-dict-dir or --without-external-dict-dir was given.
if test "${with_external_dict_dir+set}" = set; then
- withval=$with_external_dict_dir;
-fi
+ withval="$with_external_dict_dir"
+fi;
-# Check whether --with-external-hyph-dir was given.
+# Check whether --with-external-hyph-dir or --without-external-hyph-dir was given.
if test "${with_external_hyph_dir+set}" = set; then
- withval=$with_external_hyph_dir;
-fi
+ withval="$with_external_hyph_dir"
+fi;
-# Check whether --with-external-thes-dir was given.
+# Check whether --with-external-thes-dir or --without-external-thes-dir was given.
if test "${with_external_thes_dir+set}" = set; then
- withval=$with_external_thes_dir;
-fi
+ withval="$with_external_thes_dir"
+fi;
-# Check whether --with-system-libs was given.
+# Check whether --with-system-libs or --without-system-libs was given.
if test "${with_system_libs+set}" = set; then
- withval=$with_system_libs;
-fi
+ withval="$with_system_libs"
+fi;
-# Check whether --with-system-headers was given.
+# Check whether --with-system-headers or --without-system-headers was given.
if test "${with_system_headers+set}" = set; then
- withval=$with_system_headers;
-fi
+ withval="$with_system_headers"
+fi;
-# Check whether --with-system-jars was given.
+# Check whether --with-system-jars or --without-system-jars was given.
if test "${with_system_jars+set}" = set; then
- withval=$with_system_jars;
-fi
+ withval="$with_system_jars"
+fi;
-# Check whether --with-system-zlib was given.
+# Check whether --with-system-zlib or --without-system-zlib was given.
if test "${with_system_zlib+set}" = set; then
- withval=$with_system_zlib;
-fi
+ withval="$with_system_zlib"
+fi;
-# Check whether --with-system-openssl was given.
+# Check whether --with-system-openssl or --without-system-openssl was given.
if test "${with_system_openssl+set}" = set; then
- withval=$with_system_openssl;
-fi
+ withval="$with_system_openssl"
+fi;
-# Check whether --with-system-jpeg was given.
+# Check whether --with-system-jpeg or --without-system-jpeg was given.
if test "${with_system_jpeg+set}" = set; then
- withval=$with_system_jpeg;
-fi
+ withval="$with_system_jpeg"
+fi;
-# Check whether --with-system-expat was given.
+# Check whether --with-system-expat or --without-system-expat was given.
if test "${with_system_expat+set}" = set; then
- withval=$with_system_expat;
-fi
+ withval="$with_system_expat"
+fi;
-# Check whether --with-system-libwpd was given.
+# Check whether --with-system-libwpd or --without-system-libwpd was given.
if test "${with_system_libwpd+set}" = set; then
- withval=$with_system_libwpd;
-fi
+ withval="$with_system_libwpd"
+fi;
-# Check whether --with-system-libxml was given.
+# Check whether --with-system-libxml or --without-system-libxml was given.
if test "${with_system_libxml+set}" = set; then
- withval=$with_system_libxml;
-fi
+ withval="$with_system_libxml"
+fi;
-# Check whether --with-system-python was given.
+# Check whether --with-system-python or --without-system-python was given.
if test "${with_system_python+set}" = set; then
- withval=$with_system_python;
-fi
+ withval="$with_system_python"
+fi;
-# Check whether --with-system-icu was given.
+# Check whether --with-system-icu or --without-system-icu was given.
if test "${with_system_icu+set}" = set; then
- withval=$with_system_icu;
-fi
+ withval="$with_system_icu"
+fi;
-# Check whether --with-system-poppler was given.
+# Check whether --with-system-poppler or --without-system-poppler was given.
if test "${with_system_poppler+set}" = set; then
- withval=$with_system_poppler;
-fi
+ withval="$with_system_poppler"
+fi;
-# Check whether --with-system-db was given.
+# Check whether --with-system-db or --without-system-db was given.
if test "${with_system_db+set}" = set; then
- withval=$with_system_db;
-fi
+ withval="$with_system_db"
+fi;
-# Check whether --with-system-lucene was given.
+# Check whether --with-system-lucene or --without-system-lucene was given.
if test "${with_system_lucene+set}" = set; then
- withval=$with_system_lucene;
-fi
+ withval="$with_system_lucene"
+fi;
-# Check whether --with-lucene-core-jar was given.
+# Check whether --with-lucene-core-jar or --without-lucene-core-jar was given.
if test "${with_lucene_core_jar+set}" = set; then
- withval=$with_lucene_core_jar; LUCENE_CORE_JAR="$withval"
-
-fi
+ withval="$with_lucene_core_jar"
+ LUCENE_CORE_JAR="$withval"
+fi;
-# Check whether --with-lucene-analyzers-jar was given.
+# Check whether --with-lucene-analyzers-jar or --without-lucene-analyzers-jar was given.
if test "${with_lucene_analyzers_jar+set}" = set; then
- withval=$with_lucene_analyzers_jar; LUCENE_ANALYZERS_JAR="$withval"
+ withval="$with_lucene_analyzers_jar"
+ LUCENE_ANALYZERS_JAR="$withval"
-fi
+fi;
+# Check whether --enable-mysql-connector or --disable-mysql-connector was given.
+if test "${enable_mysql_connector+set}" = set; then
+ enableval="$enable_mysql_connector"
+
+fi;
+
+# Check whether --with-system-mysql or --without-system-mysql was given.
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list