summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure844
-rw-r--r--configure.in154
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf3
-rw-r--r--instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt1
-rw-r--r--instsetoo_native/res/DS_Storebin12292 -> 12292 bytes
-rw-r--r--instsetoo_native/util/openoffice.lst100
-rw-r--r--scp2/source/base/file_base.scp4
-rw-r--r--scp2/source/calc/file_calc.scp4
-rw-r--r--scp2/source/calc/registryitem_calc.scp4
-rw-r--r--scp2/source/canvas/canvascommons.scp2
-rw-r--r--scp2/source/draw/registryitem_draw.scp4
-rw-r--r--scp2/source/impress/registryitem_impress.scp4
-rw-r--r--scp2/source/layout/layout.scp8
-rw-r--r--scp2/source/math/file_math.scp2
-rw-r--r--scp2/source/math/registryitem_math.scp4
-rw-r--r--scp2/source/onlineupdate/file_onlineupdate.scp2
-rw-r--r--scp2/source/ooo/file_improvement.scp2
-rw-r--r--scp2/source/ooo/file_library_ooo.scp120
-rw-r--r--scp2/source/ooo/file_ooo.scp14
-rw-r--r--scp2/source/ooo/file_resource_ooo.scp6
-rw-r--r--scp2/source/ooo/makefile.mk1
-rw-r--r--scp2/source/ooo/profile_ooo.scp2
-rw-r--r--scp2/source/ooo/registryitem_ooo.scp32
-rwxr-xr-xscp2/source/ooo/ure.scp10
-rw-r--r--scp2/source/ooo/vc_redist.scp41
-rwxr-xr-xscp2/source/ooo/windowscustomaction_ooo.scp6
-rw-r--r--scp2/source/writer/registryitem_writer.scp4
-rw-r--r--scp2/util/makefile.mk2
-rw-r--r--set_soenv.in53
-rwxr-xr-xsolenv/bin/checkdll.sh10
-rwxr-xr-xsolenv/bin/modules/osarch.pm9
-rwxr-xr-xsolenv/config/sdev300.ini2
-rw-r--r--solenv/inc/_tg_shl.mk80
-rw-r--r--solenv/inc/minor.mk6
-rwxr-xr-xsolenv/inc/tg_help.mk86
-rw-r--r--solenv/inc/tg_shl.mk8
-rw-r--r--solenv/inc/unx.mk12
-rw-r--r--solenv/inc/unxirgm.mk163
-rw-r--r--solenv/inc/unxirxm.mk162
-rw-r--r--solenv/inc/unxirxm3.mk162
-rw-r--r--solenv/inc/unxlng.mk8
-rw-r--r--solenv/inc/unxmacxi.mk1
-rw-r--r--solenv/inc/unxsoli4.mk2
-rw-r--r--solenv/inc/unxsols4.mk2
-rw-r--r--stlport/makefile.mk8
45 files changed, 576 insertions, 1578 deletions
diff --git a/configure b/configure
index a386d0c426a8..ca6818eaab0e 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
# 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 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 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 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_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 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_FONTOOO SYSTEM_MSPACK 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 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 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_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 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_files=''
# Initialize some variables set by options.
@@ -888,9 +888,6 @@ Optional Features:
--disable-qadevooo OO.o includes some qa testsuites which some
packagers may wish to build without
- --disable-fontooo disable FontOOo
- (useful for distributions using fontconfig for OOo)
-
--disable-mathmldtd disable mathmldtd
(useful for distributions that want to avoid packaging
it)
@@ -1046,11 +1043,6 @@ Optional Features:
explicitly enable if your version of ccache doesn't
identify as version 2.4_OOo
- --enable-sgistl for IRIX users, use this option option to build
- OpenOffice.org using SGI's STL.
-
- Usage: --enable-sgistl=yes
-
--enable-verbose Increase build verbosity.
--disable-verbose Decrease build verbosity.
@@ -1112,8 +1104,6 @@ Optional Packages:
--with-system-stdlibs use libstdc++/libgcc_s already on system
- --with-system-mspack use libmspack already installed on system
-
--with-system-cairo Use Cairo libraries already on system
--with-mozilla-version Choose which version of mozilla to use while building
@@ -2015,13 +2005,6 @@ if test "${enable_qadevooo+set}" = set; then
else
enable_qadevooo="yes"
fi;
-# Check whether --enable-fontooo or --disable-fontooo was given.
-if test "${enable_fontooo+set}" = set; then
- enableval="$enable_fontooo"
-
-else
- enable_fontooo="yes"
-fi;
# Check whether --enable-mathmldtd or --disable-mathmldtd was given.
if test "${enable_mathmldtd+set}" = set; then
enableval="$enable_mathmldtd"
@@ -2042,12 +2025,6 @@ if test "${with_system_stdlibs+set}" = set; then
else
checkforstdlibproblems=yes
fi;
-
-# Check whether --with-system-mspack or --without-system-mspack was given.
-if test "${with_system_mspack+set}" = set; then
- withval="$with_system_mspack"
-
-fi;
# Check whether --enable-cups or --disable-cups was given.
if test "${enable_cups+set}" = set; then
enableval="$enable_cups"
@@ -2903,11 +2880,6 @@ if test "${with_build_version+set}" = set; then
withval="$with_build_version"
with_build_version=$withval
fi;
-# Check whether --enable-sgistl or --disable-sgistl was given.
-if test "${enable_sgistl+set}" = set; then
- enableval="$enable_sgistl"
-
-fi;
# Check whether --with-alloc or --without-alloc was given.
if test "${with_alloc+set}" = set; then
@@ -3343,9 +3315,6 @@ echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
test_cups=yes
test_randr=yes
test_freetype=yes
- if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
- PTHREAD_CFLAGS="-DNPTL"
- fi
_os=Linux
;;
gnu)
@@ -3430,12 +3399,6 @@ echo "${ECHO_T}$PTHREAD_LIBS" >&6
PTHREAD_LIBS="-pthread -lpthread"
_os=NetBSD
;;
- irix*)
- test_cups=no
- test_randr=no
- test_freetype=yes
- _os=IRIX
- ;;
aix*)
test_cups=no
test_randr=no
@@ -4923,7 +4886,8 @@ done
COMPATH=`echo $COMPATH | $SED "s@/[^/:]*\\\$@@"`;
fi
-
+COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`;
+echo $COMPATH
GCCVER=20995
if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then
echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5
@@ -5171,7 +5135,7 @@ fi
test -n "$_cc" && break
done
- COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+ COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5
echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6
_sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
@@ -5261,75 +5225,6 @@ echo "${ECHO_T}not found " >&6
fi
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- if test "$CC" = "cc"; then
- for ac_prog in cc
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path__cc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $_cc in
- [\\/]* | ?:[\\/]*)
- ac_cv_path__cc="$_cc" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-_cc=$ac_cv_path__cc
-
-if test -n "$_cc"; then
- echo "$as_me:$LINENO: result: $_cc" >&5
-echo "${ECHO_T}$_cc" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$_cc" && break
-done
-
- COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
- echo "$as_me:$LINENO: checking the SGI MIPSpro C compiler version" >&5
-echo $ECHO_N "checking the SGI MIPSpro C compiler version... $ECHO_C" >&6
- _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
- _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
- if test "$_mipspro_major" != "7"; then
- { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
-echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
- { (exit 1); exit 1; }; }
- else
- _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
- if test "$_mipspro_minor" = "false"; then
- { { echo "$as_me:$LINENO: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
-echo "$as_me: error: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
- { (exit 1); exit 1; }; }
- else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
- fi
- fi
- fi
-fi
-
if test "$_os" = "OSF1"; then
if test "$CC" = "cc"; then
for ac_prog in cc
@@ -5376,7 +5271,7 @@ fi
test -n "$_cc" && break
done
- COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+ COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
{ echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5
echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;}
echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5
@@ -5653,8 +5548,8 @@ fi
# Remove /cl.exe from CC case insensitive
echo "$as_me:$LINENO: result: found ($CC)" >&5
echo "${ECHO_T}found ($CC)" >&6
- COMPATH=`echo $CC | $SED 's@/[cC][lL]\.[eE][xX][eE]@@'`
- export INCLUDE=`cygpath -d "$COMPATH/../Include"`
+ COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'`
+ export INCLUDE=`cygpath -d "$COMPATH/Include"`
echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5
echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6
CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ {
@@ -9533,7 +9428,7 @@ echo $ECHO_N "checking whether to use dynamic libgcc... $ECHO_C" >&6
echo "$as_me:$LINENO: checking dynamic libgcc name" >&5
echo $ECHO_N "checking dynamic libgcc name... $ECHO_C" >&6
MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
- MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+ MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null`
if test -n "$MINGW_GCCDLL"; then
MINGW_SHARED_GCCLIB=YES
echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5
@@ -9555,7 +9450,7 @@ echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6
echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5
echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6
MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
- MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+ MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null`
if test -n "$MINGW_GXXDLL"; then
MINGW_SHARED_GXXLIB=YES
echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
@@ -9605,20 +9500,6 @@ echo "${ECHO_T}checked" >&6
fi
fi
fi
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- if test "$CC" = "cc"; then
- echo "$as_me:$LINENO: checking SGI MIPSpro C++ Compiler" >&5
-echo $ECHO_N "checking SGI MIPSpro C++ Compiler... $ECHO_C" >&6
- if test "$CXX" != "CC"; then
- { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5
-echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;}
- echo "SGI MIPSpro C++ was not found" >> warn
- else
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
- fi
- fi
-fi
if test "$_os" = "OSF1"; then
echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5
echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6
@@ -9805,25 +9686,6 @@ echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 10
fi
fi
-if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then
- if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- echo "$as_me:$LINENO: checking for SGI STL" >&5
-echo $ECHO_N "checking for SGI STL... $ECHO_C" >&6
- if test -d /usr/include/CC ; then
- echo "$as_me:$LINENO: result: yes." >&5
-echo "${ECHO_T}yes." >&6
-
- else
- echo "$as_me:$LINENO: result: not found." >&5
-echo "${ECHO_T}not found." >&6
- fi
- else
- { { echo "$as_me:$LINENO: error: Option --enable-sgistl is only valid for IRIX" >&5
-echo "$as_me: error: Option --enable-sgistl is only valid for IRIX" >&2;}
- { (exit 1); exit 1; }; }
- fi
-else
-
echo "$as_me:$LINENO: checking what the default STL should be" >&5
echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6
DEFAULT_TO_STLPORT="no"
@@ -9956,24 +9818,6 @@ echo "${ECHO_T}checked" >&6
echo "$as_me: error: STLport libraries not found" >&2;}
{ (exit 1); exit 1; }; }
fi
- elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
- else
- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- echo "$as_me:$LINENO: result: checked" >&5
-echo "${ECHO_T}checked" >&6
- STLPORT_VER=500
- else
- { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5
-echo "$as_me: error: STLport libraries not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
- fi
else
if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
echo "$as_me:$LINENO: result: checked" >&5
@@ -9995,7 +9839,6 @@ echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >
echo "using stlport. Warning, breaks your ABI compatability!" >>warn
fi
fi
-fi
if test -z "$STLPORT4"; then
STLPORT4="NO_STLPORT4"
@@ -10402,11 +10245,18 @@ _ACEOF
if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
gccvisbroken=yes
else
- if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then
- gccvisbroken=no;
- else
- gccvisbroken=yes;
- fi
+ case "$build_cpu" in
+ i?86|x86_64)
+ if $EGREP -q '@PLT' visibility.s; then
+ gccvisbroken=no
+ else
+ gccvisbroken=yes
+ fi
+ ;;
+ *)
+ gccvisbroken=no
+ ;;
+ esac
fi
rm -f visibility.s
@@ -10942,7 +10792,7 @@ echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6
echo "${ECHO_T}checked (ecj)" >&6
#TODO: what's to do here? some switch to do 1.5 compiling?
JAVAFLAGS="-source 1.5 -target 1.5"
- _gij_longver="50000"
+ _gij_longver="40200"
fi
fi
@@ -11067,7 +10917,7 @@ fi
if test "$SOLAR_JAVA" != ""; then
if test "$JDK" == "gcj" -a -z "$JAVA_HOME"; then
- if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "50000"; then
+ if test "x$with_jdk_home" = "x" -a "$_gij_longver" -ge "40200"; then
cat > findhome.java <<_ACEOF
import java.io.File;
@@ -11118,7 +10968,7 @@ echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;
fi
fi
- if test "$JDK" != "gcj" -o "$_gij_longver" -ge "50000"; then
+ if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
@@ -12017,9 +11867,6 @@ echo $ECHO_N "checking which package format to use... $ECHO_C" >&6
OSF1)
PKGFORMAT=setld
;;
- IRIX)
- PKGFORMAT=tardist
- ;;
# we never should get here since we check the arciecture/os at the beginning,
# but go sure...
*)
@@ -14787,8 +14634,7 @@ fi
echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5
echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6
- for v in `seq 1 7`; do
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then
{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
See \`config.log' for more details." >&5
echo "$as_me: error: cannot run test program while cross compiling
@@ -14805,7 +14651,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <db.h>
int main(int argc, char **argv) {
- if(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == $v) return 0;
+ if(DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)) return 0;
else return 1;
}
@@ -14821,28 +14667,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- DB_VERSION_MINOR=$v
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5
+echo "$as_me: error: no. you need at least db 4.1" >&2;}
+ { (exit 1); exit 1; }; }
fi
rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
- done
- if test "$DB_VERSION_MINOR" -gt "1"; then
- echo "$as_me:$LINENO: result: OK" >&5
-echo "${ECHO_T}OK" >&6
- DB_VERSION=4.$DB_VERSION_MINOR
- else
- { { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5
-echo "$as_me: error: no. you need at least db 4.1" >&2;}
- { (exit 1); exit 1; }; }
- fi
- # does not work :/
- #AC_CHECK_LIB(db, db_create, [],
- # [AC_MSG_ERROR([db library not installed or functional])], [])
echo "$as_me:$LINENO: checking for main in -ldb" >&5
echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
@@ -20510,25 +20348,19 @@ echo "${ECHO_T}yes" >&6
for ac_header in X11/Xaw/Label.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo "$as_me:$LINENO: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
+#include <X11/Intrinsic.h>
+
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -20553,100 +20385,17 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_header_compiler=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_header_compiler=no
+eval "$as_ac_Header=no"
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -24369,8 +24118,8 @@ echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
- MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
- MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+ MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1`
+ MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1`
if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
@@ -26753,14 +26502,64 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5
echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6
if test "$with_system_apache_commons" = "yes"; then
- SYSTEM_APACHE_COMMONS=YES
- echo "$as_me:$LINENO: result: external" >&5
+ SYSTEM_APACHE_COMMONS=YES
+ echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6
if test "$ENABLE_MEDIAWIKI" = "YES"; then
- if test -z "$COMMONS_CODEC_JAR"; then
- COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
- fi
- as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
+ if test -z $COMMONS_CODEC_JAR; then
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec-1.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-codec-1.3.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-codec-1.3.jar"; then
+ ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_codec_1_3_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_codec_1_3_jar = yes; then
+ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar
+else
+
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-codec.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-codec.jar"; then
+ ac_cv_file__usr_share_java_commons_codec_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_codec_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_codec_jar = yes; then
+ COMMONS_CODEC_JAR=/usr/share/java/commons-codecs.jar
+else
+ { { echo "$as_me:$LINENO: error: commons-codec.jar replacement not found." >&5
+echo "$as_me: error: commons-codec.jar replacement not found." >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+ else
+ as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5
echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
@@ -26786,10 +26585,62 @@ echo "$as_me: error: commons-codec.jar not found." >&2;}
{ (exit 1); exit 1; }; }
fi
- if test -z "$COMMONS_LANG_JAR"; then
- COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
- fi
- as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
+ fi
+
+ if test -z $COMMONS_LANG_JAR; then
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang-2.3.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-lang-2.3.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-lang-2.3.jar"; then
+ ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_lang_2_3_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_lang_2_3_jar = yes; then
+ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar
+else
+
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-lang.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-lang.jar"; then
+ ac_cv_file__usr_share_java_commons_lang_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_lang_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_lang_jar = yes; then
+ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar
+else
+ { { echo "$as_me:$LINENO: error: commons-lang.jar replacement not found." >&5
+echo "$as_me: error: commons-lang.jar replacement not found." >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+ else
+ as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5
echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
@@ -26815,10 +26666,62 @@ echo "$as_me: error: commons-lang.jar not found." >&2;}
{ (exit 1); exit 1; }; }
fi
- if test -z "$COMMONS_HTTPCLIENT_JAR"; then
- COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
- fi
- as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
+ fi
+
+ if test -z $COMMONS_HTTPCLIENT_JAR; then
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-httpclient-3.1.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then
+ ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar = yes; then
+ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar
+else
+
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-httpclient.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-httpclient.jar"; then
+ ac_cv_file__usr_share_java_commons_httpclient_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_httpclient_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_httpclient_jar = yes; then
+ COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar
+else
+ { { echo "$as_me:$LINENO: error: commons-httpclient.jar replacement not found." >&5
+echo "$as_me: error: commons-httpclient.jar replacement not found." >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+ else
+ as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5
echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
@@ -26844,12 +26747,63 @@ echo "$as_me: error: commons-httpclient.jar not found." >&2;}
{ (exit 1); exit 1; }; }
fi
+ fi
fi
if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
- if test -z "$COMMONS_LOGGING_JAR"; then
- COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
- fi
- as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
+ if test -z $COMMONS_LOGGING_JAR; then
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then
+ ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar = yes; then
+ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar
+else
+
+ echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5
+echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6
+if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "/usr/share/java/commons-logging.jar"; then
+ ac_cv_file__usr_share_java_commons_logging_jar=yes
+else
+ ac_cv_file__usr_share_java_commons_logging_jar=no
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5
+echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6
+if test $ac_cv_file__usr_share_java_commons_logging_jar = yes; then
+ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar
+else
+ { { echo "$as_me:$LINENO: error: commons-logging.jar replacement not found." >&5
+echo "$as_me: error: commons-logging.jar replacement not found." >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+
+
+
+fi
+
+ else
+ as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5
echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6
if eval "test \"\${$as_ac_File+set}\" = set"; then
@@ -26875,13 +26829,13 @@ echo "$as_me: error: commons-logging.jar not found." >&2;}
{ (exit 1); exit 1; }; }
fi
-
+ fi
fi
else
- echo "$as_me:$LINENO: result: internal" >&5
+ echo "$as_me:$LINENO: result: internal" >&5
echo "${ECHO_T}internal" >&6
- SYSTEM_APACHE_COMMONS=NO
- BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
+ SYSTEM_APACHE_COMMONS=NO
+ BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
fi
fi
@@ -27424,268 +27378,6 @@ echo "${ECHO_T}no" >&6
fi
-echo "$as_me:$LINENO: checking whether to include FontOOo" >&5
-echo $ECHO_N "checking whether to include FontOOo... $ECHO_C" >&6
-if test -n "$enable_fontooo"; then
- if test "$enable_fontooo" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- WITH_FONTOOO=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
- else
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- WITH_FONTOOO=YES
- BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
- fi
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- WITH_FONTOOO=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-fi
-
-
-if test "$WITH_FONTOOO" = "YES"; then
- echo "$as_me:$LINENO: checking whether to use system libmspack" >&5
-echo $ECHO_N "checking whether to use system libmspack... $ECHO_C" >&6
- if test -n "$with_system_mspack" -o -n "$with_system_libs" && \
- test "$with_system_mspack" != "no"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- SYSTEM_MSPACK=YES
- if test "${ac_cv_header_mspack_h+set}" = set; then
- echo "$as_me:$LINENO: checking for mspack.h" >&5
-echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
-if test "${ac_cv_header_mspack_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking mspack.h usability" >&5
-echo $ECHO_N "checking mspack.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <mspack.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking mspack.h presence" >&5
-echo $ECHO_N "checking mspack.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <mspack.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: mspack.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: mspack.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: mspack.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: mspack.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: mspack.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: mspack.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: mspack.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: mspack.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: mspack.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: mspack.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mspack.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: mspack.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedence" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for mspack.h" >&5
-echo $ECHO_N "checking for mspack.h... $ECHO_C" >&6
-if test "${ac_cv_header_mspack_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_mspack_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mspack_h" >&5
-echo "${ECHO_T}$ac_cv_header_mspack_h" >&6
-
-fi
-if test $ac_cv_header_mspack_h = yes; then
- :
-else
- { { echo "$as_me:$LINENO: error: mspack.h not found, install libmspack" >&5
-echo "$as_me: error: mspack.h not found, install libmspack" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-
-
-echo "$as_me:$LINENO: checking for mspack_create_cab_decompressor in -lmspack" >&5
-echo $ECHO_N "checking for mspack_create_cab_decompressor in -lmspack... $ECHO_C" >&6
-if test "${ac_cv_lib_mspack_mspack_create_cab_decompressor+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmspack $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char mspack_create_cab_decompressor ();
-int
-main ()
-{
-mspack_create_cab_decompressor ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_lib_mspack_mspack_create_cab_decompressor=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mspack_mspack_create_cab_decompressor=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mspack_mspack_create_cab_decompressor" >&5
-echo "${ECHO_T}$ac_cv_lib_mspack_mspack_create_cab_decompressor" >&6
-if test $ac_cv_lib_mspack_mspack_create_cab_decompressor = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBMSPACK 1
-_ACEOF
-
- LIBS="-lmspack $LIBS"
-
-else
- { { echo "$as_me:$LINENO: error: libmspack not installed or functional" >&5
-echo "$as_me: error: libmspack not installed or functional" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- SYSTEM_MSPACK=NO
- fi
-fi
-
-
echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5
echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6
if test -n "$enable_mathmldtd"; then
@@ -29475,8 +29167,6 @@ s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t
s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t
s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t
s,@ENABLE_KAB@,$ENABLE_KAB,;t t
-s,@WITH_FONTOOO@,$WITH_FONTOOO,;t t
-s,@SYSTEM_MSPACK@,$SYSTEM_MSPACK,;t t
s,@WITH_FONTS@,$WITH_FONTS,;t t
s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t
s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t
diff --git a/configure.in b/configure.in
index 17cc81f905f5..0ce538aeed8e 100644
--- a/configure.in
+++ b/configure.in
@@ -115,10 +115,6 @@ AC_ARG_ENABLE(qadevooo,
[ --disable-qadevooo OO.o includes some qa testsuites which some
packagers may wish to build without
],,enable_qadevooo="yes")
-AC_ARG_ENABLE(fontooo,
-[ --disable-fontooo disable FontOOo
- (useful for distributions using fontconfig for OOo)
-],,enable_fontooo="yes")
AC_ARG_ENABLE(mathmldtd,
[ --disable-mathmldtd disable mathmldtd
(useful for distributions that want to avoid packaging
@@ -131,9 +127,6 @@ AC_ARG_ENABLE(evolution2,
AC_ARG_WITH(system-stdlibs,
[ --with-system-stdlibs use libstdc++/libgcc_s already on system
],,checkforstdlibproblems=yes)
-AC_ARG_WITH(system-mspack,
-[ --with-system-mspack use libmspack already installed on system
-],,)
AC_ARG_ENABLE(cups,
[ --disable-cups disable cups support in the psprint project
],,enable_cups=yes)
@@ -786,12 +779,6 @@ AC_ARG_WITH(build-version,
Usage: --with-build-version="Built by Jim"
],with_build_version=$withval)
-AC_ARG_ENABLE(sgistl,
-[ --enable-sgistl for IRIX users, use this option option to build
- OpenOffice.org using SGI's STL.
-
- Usage: --enable-sgistl=yes
-],,)
AC_ARG_WITH(alloc,
[ --with-alloc Define which allocator to build with
(choices are oo, system, tcmalloc)
@@ -939,9 +926,6 @@ case "$build_os" in
test_cups=yes
test_randr=yes
test_freetype=yes
- if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
- PTHREAD_CFLAGS="-DNPTL"
- fi
_os=Linux
;;
gnu)
@@ -1021,12 +1005,6 @@ case "$build_os" in
PTHREAD_LIBS="-pthread -lpthread"
_os=NetBSD
;;
- irix*)
- test_cups=no
- test_randr=no
- test_freetype=yes
- _os=IRIX
- ;;
aix*)
test_cups=no
test_randr=no
@@ -1635,31 +1613,6 @@ fi
AC_SUBST(HAVE_LD_HASH_STYLE)
dnl ===================================================================
-dnl Test the IRIX SGI Mips pro compiler
-dnl ===================================================================
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- if test "$CC" = "cc"; then
- AC_PATH_PROGS(_cc, cc)
- COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
- AC_MSG_CHECKING([the SGI MIPSpro C compiler version])
- dnl cc -version outputs to standard error!!!!
- _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
- _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
- if test "$_mipspro_major" != "7"; then
- AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])
- else
- _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
- if test "$_mipspro_minor" = "false"; then
- AC_MSG_ERROR([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])
- else
- dnl compiler will do
- AC_MSG_RESULT([checked])
- fi
- fi
- fi
-fi
-
-dnl ===================================================================
dnl Test the Compaq compiler for OSF1
dnl ===================================================================
if test "$_os" = "OSF1"; then
@@ -2288,21 +2241,6 @@ if test "$_os" = "Darwin"; then
fi
fi
dnl ===================================================================
-dnl Extra checking for the IRIX compiler
-dnl ===================================================================
-if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- dnl MIPSpro C++ compiler packaged with MIPSpro C compiler
- if test "$CC" = "cc"; then
- AC_MSG_CHECKING([SGI MIPSpro C++ Compiler])
- if test "$CXX" != "CC"; then
- AC_MSG_WARN([SGI MIPSpro C++ was not found])
- echo "SGI MIPSpro C++ was not found" >> warn
- else
- AC_MSG_RESULT([checked])
- fi
- fi
-fi
-dnl ===================================================================
dnl Extra checking for the OSF compiler
dnl ===================================================================
if test "$_os" = "OSF1"; then
@@ -2444,23 +2382,6 @@ if test "$_os" = "SunOS"; then
fi
dnl ===================================================================
-dnl Checks for SGI STL
-dnl ===================================================================
-if test -n "$enable_sgistl" && "$enable_sgistl" != "no"; then
- if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- AC_MSG_CHECKING([for SGI STL])
- if test -d /usr/include/CC ; then
- AC_MSG_RESULT([yes.])
-
- else
- AC_MSG_RESULT([not found.])
- fi
- else
- AC_MSG_ERROR([Option --enable-sgistl is only valid for IRIX])
- fi
-else
-
-dnl ===================================================================
dnl Checks for what the default STL should be
dnl ===================================================================
AC_MSG_CHECKING([what the default STL should be])
@@ -2543,19 +2464,6 @@ dnl ===================================================================
else
AC_MSG_ERROR([STLport libraries not found])
fi
- elif test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
- if test -f "$STLPORT4/lib/libstlport_mipspro_41.so"; then
- AC_MSG_RESULT([checked])
- else
- if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
- AC_MSG_RESULT([checked])
- elif test -f "$STLPORT4/lib/libstlport.so"; then
- AC_MSG_RESULT([checked])
- STLPORT_VER=500
- else
- AC_MSG_ERROR([STLport libraries not found])
- fi
- fi
else
if test -f "$STLPORT4/lib/libstlport_gcc.so"; then
AC_MSG_RESULT([checked])
@@ -2572,7 +2480,6 @@ dnl ===================================================================
echo "using stlport. Warning, breaks your ABI compatability!" >>warn
fi
fi
-fi
if test -z "$STLPORT4"; then
STLPORT4="NO_STLPORT4"
@@ -2713,11 +2620,18 @@ _ACEOF
if ! $CXX $CXXFLAGS $CPPFLAGS -fpic -S visibility.cxx 2>/dev/null > /dev/null; then
gccvisbroken=yes
else
- if $EGREP -q '@PLT|\$stub|\(PLT\)' visibility.s; then
- gccvisbroken=no;
- else
- gccvisbroken=yes;
- fi
+ case "$build_cpu" in
+ i?86|x86_64)
+ if $EGREP -q '@PLT' visibility.s; then
+ gccvisbroken=no
+ else
+ gccvisbroken=yes
+ fi
+ ;;
+ *)
+ gccvisbroken=no
+ ;;
+ esac
fi
rm -f visibility.s
@@ -3351,9 +3265,6 @@ if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \)
OSF1)
PKGFORMAT=setld
;;
- IRIX)
- PKGFORMAT=tardist
- ;;
# we never should get here since we check the arciecture/os at the beginning,
# but go sure...
*)
@@ -6286,47 +6197,6 @@ fi
AC_SUBST(ENABLE_KAB)
dnl ===================================================================
-dnl Test whether to include FontOOo
-dnl ===================================================================
-AC_MSG_CHECKING([whether to include FontOOo])
-if test -n "$enable_fontooo"; then
- if test "$enable_fontooo" = "no"; then
- AC_MSG_RESULT([no])
- WITH_FONTOOO=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
- else
- AC_MSG_RESULT([yes])
- WITH_FONTOOO=YES
- BUILD_TYPE="$BUILD_TYPE MSFONTEXTRACT"
- fi
-else
- AC_MSG_RESULT([no])
- WITH_FONTOOO=NO
- SCPDEFS="$SCPDEFS -DWITHOUT_FONTOOO"
-fi
-AC_SUBST(WITH_FONTOOO)
-
-if test "$WITH_FONTOOO" = "YES"; then
- dnl ===============================================================
- dnl Check whether to use libmspack from system
- dnl ===============================================================
- AC_MSG_CHECKING([whether to use system libmspack])
- if test -n "$with_system_mspack" -o -n "$with_system_libs" && \
- test "$with_system_mspack" != "no"; then
- AC_MSG_RESULT([yes])
- SYSTEM_MSPACK=YES
- AC_CHECK_HEADER(mspack.h, [],
- [AC_MSG_ERROR([mspack.h not found, install libmspack])], [])
- AC_CHECK_LIB(mspack, mspack_create_cab_decompressor, [],
- [AC_MSG_ERROR(libmspack not installed or functional)], [])
- else
- AC_MSG_RESULT([no])
- SYSTEM_MSPACK=NO
- fi
-fi
-AC_SUBST(SYSTEM_MSPACK)
-
-dnl ===================================================================
dnl Test whether to include MathMLDTD
dnl ===================================================================
AC_MSG_CHECKING([whether to include MathMLDTD])
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
index f4da77d0d8b9..20f2a60dd195 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/LaunchCo.ulf
@@ -1,3 +1,4 @@
[OOO_LAUNCH_1]
en-US = "The Installation Wizard cannot be run properly because you are logged in as a user without sufficient administrator rights for this system."
-
+[OOO_LAUNCH_2]
+en-US = "Please use the file setup.exe to start the installation."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
index 35d78694a664..c53ccda8d736 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt
@@ -2,3 +2,4 @@ Condition Description
s255 l255
WINDOWSENCODINGTEMPLATE LaunchCondition Condition
Privileged OOO_LAUNCH_1
+SETUP_USED=1 Or Installed OOO_LAUNCH_2
diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store
index d730660fb13f..3b7c9f7794b9 100644
--- a/instsetoo_native/res/DS_Store
+++ b/instsetoo_native/res/DS_Store
Binary files differ
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 76c70ed8a435..e6ba698fae7f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,24 +4,24 @@ Globals
{
variables
{
- OOOBASEVERSION 3.2
- OOOPACKAGEVERSION 3.2.0
- UREPACKAGEVERSION 1.6.0
+ OOOBASEVERSION 3.3
+ OOOPACKAGEVERSION 3.3.0
+ UREPACKAGEVERSION 1.7.0
URELAYERVERSION 1
BASISROOTNAME OpenOffice.org
UNIXBASISROOTNAME openoffice.org
- SERVICETAG_PRODUCTNAME OpenOffice.org 3.2
- SERVICETAG_PRODUCTVERSION 3.2
- SERVICETAG_PARENTNAME OpenOffice.org 3.2
+ SERVICETAG_PRODUCTNAME OpenOffice.org 3.3
+ SERVICETAG_PRODUCTVERSION 3.3
+ SERVICETAG_PARENTNAME OpenOffice.org 3.3
SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid})
- SERVICETAG_URN urn:uuid:cd39f1d0-f2fc-11dd-8c47-080020a9ed93
+ SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93
HIDELICENSEDIALOG 1
PACKAGEPREFIX
BASISPACKAGEPREFIX ooobasis
UREPACKAGEPREFIX openoffice.org
SOLSUREPACKAGEPREFIX openofficeorg
USE_FILEVERSION 1
- LIBRARYVERSION 9.2.0
+ LIBRARYVERSION 9.3.0
POOLPRODUCT 1
REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb
REGISTRATIONURL http://survey.services.openoffice.org/user/index.php
@@ -35,7 +35,7 @@ Globals
CREATE_MSP_INSTALLSET 0
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
- WINDOWSPATCHLEVEL 4
+ WINDOWSPATCHLEVEL 6
}
}
}
@@ -47,7 +47,7 @@ OpenOffice
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -55,10 +55,10 @@ OpenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.2.0
- BASEPRODUCTVERSION 3.2
+ ABOUTBOXPRODUCTVERSION 3.3.0
+ BASEPRODUCTVERSION 3.3
PCPFILENAME openoffice.pcp
- UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+ UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -67,7 +67,7 @@ OpenOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -83,7 +83,7 @@ OpenOffice
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.2.0
+ LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
DOWNLOADBANNER ooobanner.bmp
DOWNLOADBITMAP ooobitmap.bmp
@@ -111,7 +111,7 @@ OpenOffice_wJRE
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -119,9 +119,9 @@ OpenOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.2.0
- BASEPRODUCTVERSION 3.2
- UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+ ABOUTBOXPRODUCTVERSION 3.3.0
+ BASEPRODUCTVERSION 3.3
+ UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -130,7 +130,7 @@ OpenOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -146,7 +146,7 @@ OpenOffice_wJRE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.2.0
+ LIBRARYVERSION 9.3.0
PATCHCODEFILE ooo_patchcodes.txt
JAVAPRODUCT 1
DOWNLOADBANNER ooobanner.bmp
@@ -174,7 +174,7 @@ OpenOffice_Dev
variables
{
PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -184,22 +184,22 @@ OpenOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.2.0
- BASEPRODUCTVERSION 3.2
+ ABOUTBOXPRODUCTVERSION 3.3.0
+ BASEPRODUCTVERSION 3.3
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX ooobasis-dev
UREPACKAGEPREFIX ooodev
SOLSUREPACKAGEPREFIX ooodev
REGISTRYLAYERNAME LayerDev
- SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
- UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+ SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
+ UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -216,7 +216,7 @@ OpenOffice_Dev
CHANGETARGETDIR 1
USE_FILEVERSION 1
JAVAPRODUCT 1
- LIBRARYVERSION 9.2.0
+ LIBRARYVERSION 9.3.0
PATCHCODEFILE ooodev_patchcodes.txt
CODEFILENAME codes_ooodev.txt
DOWNLOADBANNER ooobanner.bmp
@@ -247,8 +247,8 @@ URE
variables
{
PRODUCTNAME URE
- PRODUCTVERSION 1.6
- PACKAGEVERSION 1.6
+ PRODUCTVERSION 1.7
+ PACKAGEVERSION 1.7
PACKAGEREVISION 1
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
@@ -288,14 +288,14 @@ OpenOffice_SDK
variables
{
PRODUCTNAME OpenOffice.org
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -331,7 +331,7 @@ OpenOffice_Dev_SDK
variables
{
PRODUCTNAME OOo-dev
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -340,7 +340,7 @@ OpenOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
BASISPACKAGEPREFIX ooobasis-dev
UREPACKAGEPREFIX ooodev
@@ -379,7 +379,7 @@ BrOffice
variables
{
PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -387,12 +387,12 @@ BrOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.2.0
+ ABOUTBOXPRODUCTVERSION 3.3.0
PROGRESSBARCOLOR
PROGRESSSIZE
PROGRESSPOSITION
PROGRESSFRAMECOLOR
- UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+ UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -401,7 +401,7 @@ BrOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -417,7 +417,7 @@ BrOffice
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.2.0
+ LIBRARYVERSION 9.3.0
CODEFILENAME codes_broo.txt
PATCHCODEFILE bro_patchcodes.txt
DOWNLOADBANNER brobanner.bmp
@@ -446,7 +446,7 @@ BrOffice_wJRE
variables
{
PRODUCTNAME BrOffice.org
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -454,12 +454,12 @@ BrOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.2.0
+ ABOUTBOXPRODUCTVERSION 3.3.0
PROGRESSBARCOLOR
PROGRESSSIZE
PROGRESSPOSITION
PROGRESSFRAMECOLOR
- UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+ UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
@@ -468,7 +468,7 @@ BrOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -484,7 +484,7 @@ BrOffice_wJRE
STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A}
CHANGETARGETDIR 1
USE_FILEVERSION 1
- LIBRARYVERSION 9.2.0
+ LIBRARYVERSION 9.3.0
CODEFILENAME codes_broo.txt
PATCHCODEFILE bro_patchcodes.txt
JAVAPRODUCT 1
@@ -513,7 +513,7 @@ BrOffice_Dev
variables
{
PRODUCTNAME BrOo-dev
- PRODUCTVERSION 3.2
+ PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
SHORT_PRODUCTEXTENSION
@@ -523,7 +523,7 @@ BrOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.2.0
+ ABOUTBOXPRODUCTVERSION 3.3.0
DEVELOPMENTPRODUCT 1
PROGRESSBARCOLOR
PROGRESSSIZE
@@ -533,15 +533,15 @@ BrOffice_Dev
UREPACKAGEPREFIX ooodev
SOLSUREPACKAGEPREFIX ooodev
REGISTRYLAYERNAME LayerDevBroffice
- SERVICETAG_URN urn:uuid:156a7974-f2fd-11dd-8c47-080020a9ed93
- UPDATEURL http://update34.services.openoffice.org/ProductUpdateService/check.Update
+ SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
+ UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.2.0
+ PACKAGEVERSION 3.3.0
PACKAGEREVISION {milestone}
LICENSENAME LGPL
SERVICESPROJEKT 1
@@ -558,7 +558,7 @@ BrOffice_Dev
CHANGETARGETDIR 1
USE_FILEVERSION 1
JAVAPRODUCT 1
- LIBRARYVERSION 9.2.0
+ LIBRARYVERSION 9.3.0
PATCHCODEFILE brodev_patchcodes.txt
CODEFILENAME codes_broodev.txt
DOWNLOADBANNER brobanner.bmp
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 397929e7c6e9..4506962806b7 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -57,7 +57,7 @@ STD_RES_FILE( gid_File_Res_Abp, abp)
STD_UNO_LIB_FILE( gid_File_Lib_Dbp, dbp)
STD_RES_FILE( gid_File_Res_Dbp, dbp)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbu, dbu )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbu, dbu )
STD_RES_FILE( gid_File_Res_Dbu, dbu)
STD_UNO_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
@@ -67,7 +67,7 @@ STD_RES_FILE( gid_File_Res_Cnr, cnr)
STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Rpt, rpt )
+STD_UNO_LIB_FILE( gid_File_Lib_Rpt, rpt )
STD_RES_FILE( gid_File_Res_Rpt, rpt)
STD_UNO_LIB_FILE( gid_File_Lib_Rptui, rptui )
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 46c07cc0ed3a..a4865b67b416 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -52,9 +52,9 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
-STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
+STD_LIB_FILE( gid_File_Lib_Scui, scui)
STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index c720c0a85d0f..4a30287e6fce 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Inprochand
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Inprochand
ModuleID = gid_Module_Prg_Calc_Bin;
Subkey = "CLSID\{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Insertable
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index b3a0d4505be5..87717292563a 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -30,7 +30,7 @@
#include "macros.inc"
-STD_LIB_FILE_PATCH(gid_File_Lib_CppCanvas, cppcanvas)
+STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
#ifdef ENABLE_AGG
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 13b32fd71d0d..b06ca6430fe4 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Inprochand
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{41662FC2-0D57-4aff-AB27-AD2E12E7C273}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Inprochand
ModuleID = gid_Module_Prg_Draw_Bin;
Subkey = "CLSID\{448BB771-CFE2-47C4-BCDF-1FBF378E202C}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Insertable
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 2e7d7f471cfe..cb23b879fc37 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Inprochand
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{E5A0B632-DFBA-4549-9346-E414DA06E6F8}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Inprochand
ModuleID = gid_Module_Prg_Impress_Bin;
Subkey = "CLSID\{EE5D1EA4-D445-4289-B2FC-55FC93693917}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Insertable
diff --git a/scp2/source/layout/layout.scp b/scp2/source/layout/layout.scp
index 64629d480a20..0bb9d19ec2ab 100644
--- a/scp2/source/layout/layout.scp
+++ b/scp2/source/layout/layout.scp
@@ -38,28 +38,28 @@ End
File gid_File_Zip_Toolkit_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "toolkit-layout.zip";
End
File gid_File_Zip_Sc_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "sc-layout.zip";
End
File gid_File_Zip_Svx_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "svx-layout.zip";
End
File gid_File_Zip_Sw_Layout
Dir = gid_Dir_Share_Layout;
USER_FILE_BODY;
- Styles = (ARCHIVE, PATCH);
+ Styles = (ARCHIVE);
Name = "sw-layout.zip";
End
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index f30914be604a..3426fea0f7e1 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -40,7 +40,7 @@ End
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sm , sm)
+STD_UNO_LIB_FILE( gid_File_Lib_Sm , sm)
STD_UNO_LIB_FILE( gid_File_Lib_Smd , smd)
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index 84c246f60b3c..cc50981da023 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -84,7 +84,7 @@ RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Inprochand
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D0484DE6-AAEE-468a-991F-8D4B0737B57A}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a__Insertable
@@ -203,7 +203,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Inprochand
ModuleID = gid_Module_Prg_Math_Bin;
Subkey = "CLSID\{D2D59CD1-0A6A-4D36-AE20-47817077D57C}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Insertable
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index b65391b57dfa..6405511d48fc 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -30,7 +30,7 @@
#include "macros.inc"
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updchk , updchk.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
File gid_File_Share_Registry_Onlineupdate_Xcd
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/file_improvement.scp b/scp2/source/ooo/file_improvement.scp
index e81f7d63dd2c..37e3e3e0c731 100644
--- a/scp2/source/ooo/file_improvement.scp
+++ b/scp2/source/ooo/file_improvement.scp
@@ -40,5 +40,5 @@ End
#endif
#if defined(BUILD_SPECIAL)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovement , oooimprovement)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovement , oooimprovement)
#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 0a286e3da4e2..0d00efe51e3a 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -150,13 +150,13 @@ File gid_File_Lib_Comphelper2
Name = STRING(CONCAT3(comphelp4,COMID,.dll));
#endif
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
STD_UNO_LIB_FILE( gid_File_Lib_Ctl , ctl)
-STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
+STD_LIB_FILE( gid_File_Lib_Cui, cui)
#ifndef SYSTEM_CURL
@@ -216,7 +216,7 @@ End
#endif
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dba, dba)
+STD_UNO_LIB_FILE( gid_File_Lib_Dba, dba)
STD_UNO_LIB_FILE( gid_File_Lib_Sdbt, sdbt)
@@ -224,7 +224,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Dbmm, dbmm)
STD_UNO_LIB_FILE( gid_File_Lib_Dbacfg, dbacfg)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbase2, dbase )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbase2, dbase )
STD_LIB_FILE( gid_File_Lib_Dbfile , file)
STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
@@ -242,9 +242,9 @@ File gid_File_Lib_Dbpool
#endif
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbt, dbtools )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbt, dbtools )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Dbaxml, dbaxml )
+STD_UNO_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
File gid_File_Lib_Dict_Ja
TXT_FILE_BODY;
@@ -303,7 +303,7 @@ End
File gid_File_Lib_Dlgprov
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -403,7 +403,7 @@ End
#endif
-STD_LIB_FILE_PATCH(gid_File_Lib_Drawinglayer,drawinglayer)
+STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Embobj,embobj)
@@ -413,11 +413,11 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
#if defined(WNT) && !defined(DISABLE_ATL)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser )
+STD_UNO_LIB_FILE( gid_File_Lib_Emser, emser )
File gid_File_Lib_Inprocserv
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
Name = "inprocserv.dll";
End
@@ -486,7 +486,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
File gid_File_Lib_Filterconfig1
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
Name = SPECIAL_NAME(filterconfig1);
@@ -510,7 +510,7 @@ End
File gid_File_Lib_Fps
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
Name = "fps.dll";
@@ -559,7 +559,7 @@ End
#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
@@ -627,14 +627,14 @@ End
#endif
-STD_LIB_FILE_PATCH( gid_File_Lib_Fwe , fwe)
+STD_LIB_FILE( gid_File_Lib_Fwe , fwe)
STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
File gid_File_Lib_Fwk
Name = LIBNAME(fwk);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -655,7 +655,7 @@ End
File gid_File_Lib_Go
Name = LIBNAME(go);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -666,7 +666,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
File gid_File_Lib_I18npool
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -840,12 +840,12 @@ File gid_File_Lib_Rebasemsi
TXT_FILE_BODY;
Name = "rebase.dll";
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
+ Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Lng, lng)
+STD_UNO_LIB_FILE( gid_File_Lib_Lng, lng)
File gid_File_Lib_Localedata_En
TXT_FILE_BODY;
@@ -912,7 +912,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
File gid_File_Lib_Mozbootstrap
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -1002,7 +1002,7 @@ File gid_File_Lib_Mingw_GccS
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Name = MINGW_GCCDLL;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
End
#endif
@@ -1013,7 +1013,7 @@ File gid_File_Lib_Mingw_Stdcpp
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Name = MINGW_GXXDLL;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
End
#endif
@@ -1104,7 +1104,7 @@ End
STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
#ifndef WITHOUT_MOZILLA
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Pl , pl)
+STD_UNO_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
STD_UNO_LIB_FILE( gid_File_Lib_Preload, preload)
@@ -1115,13 +1115,13 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Productregistration, productregistr
File gid_File_Lib_Desktop_Detector
Name = LIBNAME(desktop_detector);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
File gid_File_Lib_Vclplug_Gen
Name = LIBNAME(vclplug_gen);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1131,7 +1131,7 @@ End
File gid_File_Lib_Vclplug_Gtk
Name = LIBNAME(vclplug_gtk);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1140,7 +1140,7 @@ End
File gid_File_Lib_Vclplug_Kde
Name = LIBNAME(vclplug_kde);
TXT_FILE_BODY;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1176,7 +1176,7 @@ End
#endif
#if defined UNX && ! defined QUARTZ
-STD_LIB_FILE_PATCH( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
#endif
@@ -1227,7 +1227,7 @@ End
File gid_File_Lib_Res
Name = LIBNAME(res);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1258,9 +1258,9 @@ End
STD_LIB_FILE( gid_File_Lib_Sax , sax)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oox , oox)
+STD_UNO_LIB_FILE( gid_File_Lib_Oox , oox)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sb , sb)
+STD_UNO_LIB_FILE( gid_File_Lib_Sb , sb)
STD_UNO_LIB_FILE( gid_File_Lib_Scn, scn)
@@ -1277,15 +1277,15 @@ File gid_File_Lib_Scriptframe
#endif
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sd , sd)
-STD_LIB_FILE_PATCH( gid_File_Lib_Sdui, sdui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sd , sd)
+STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
File gid_File_Lib_Slideshow
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
@@ -1314,7 +1314,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
File gid_File_Lib_Sfx
Name = LIBNAME(sfx);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1342,7 +1342,7 @@ End
#endif
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sot, sot )
+STD_UNO_LIB_FILE( gid_File_Lib_Sot, sot )
#if defined(UNX) && !defined(QUARTZ)
@@ -1357,7 +1357,7 @@ End
File gid_File_Lib_Spell
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(spell);
Dir = SCP2_OOO_BIN_DIR;
@@ -1369,24 +1369,24 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
STD_LIB_FILE( gid_File_Lib_Sts , sts)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
+STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl )
+STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt )
-STD_LIB_FILE_PATCH( gid_File_Lib_Svx_Core, svxcore)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
+STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore)
+STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
-STD_LIB_FILE_PATCH( gid_File_Lib_Msfilter, msfilter)
+STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
-STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
+STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw)
+STD_LIB_FILE( gid_File_Lib_Swui, swui)
-STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
#if ! defined UNX
File gid_File_Lib_Sysdtrans
TXT_FILE_BODY;
- Styles = (PACKED,PATCH,UNO_COMPONENT);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Dir = SCP2_OOO_BIN_DIR;
Name = "sysdtrans.dll";
@@ -1457,13 +1457,13 @@ File gid_File_Lib_Ucpchelp1
End
#ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#ifndef SYSTEM_NEON
SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon)
#endif
#endif
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
+SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
@@ -1477,7 +1477,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
File gid_File_Lib_Lnth
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(lnth);
Dir = SCP2_OOO_BIN_DIR;
@@ -1485,22 +1485,22 @@ End
File gid_File_Lib_Hyph
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(hyphen);
Dir = SCP2_OOO_BIN_DIR;
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl)
+STD_UNO_LIB_FILE( gid_File_Lib_Utl , utl)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Uui, uui )
+STD_UNO_LIB_FILE( gid_File_Lib_Uui, uui )
STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
File gid_File_Lib_Vcl
Name = LIBNAME(vcl);
TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1525,7 +1525,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,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1588,7 +1588,7 @@ File gid_File_Lib_XSec_Framework
Name = "xsec_fw.dll";
#endif
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1600,7 +1600,7 @@ File gid_File_Lib_XSec_XmlSec
Name = "xsec_xmlsec.dll";
#endif
Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1668,9 +1668,9 @@ End
STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Updchkui , updchk )
+STD_UNO_LIB_FILE( gid_File_Lib_Updchkui , updchk )
-SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno )
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
#ifdef WNT
File gid_File_Lib_Onlinecheck
@@ -1718,7 +1718,7 @@ File gid_File_Lib_Unopkgapp
Styles = (PACKED);
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
+STD_UNO_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
!(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4fcc73bef25d..7ba2624edd76 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -163,7 +163,7 @@ End
File gid_File_Profile_Gengal
BIN_FILE_BODY;
Dir = gid_Dir_Program;
- Styles = (PACKED, PATCH);
+ Styles = (PACKED);
Name = PROFILENAME(gengal);
End
@@ -173,7 +173,7 @@ File gid_File_Bin_Pluginapp
BIN_FILE_BODY;
Dir = gid_Dir_Program;
Name = "pluginapp.bin";
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
End
#endif
@@ -348,7 +348,7 @@ End
STD_FILTER_FILE( gid_File_Filter_Eme, eme)
-STD_FILTER_FILE_PATCH( gid_File_Filter_Sdfilt, sdfilt)
+STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
STD_FILTER_FILE( gid_File_Filter_Icg, icg)
@@ -515,7 +515,7 @@ File gid_File_Jar_Unoil
TXT_FILE_BODY;
Name = "unoil.jar";
Dir = gid_Dir_Classes;
- Styles = (PACKED,DONT_OVERWRITE,PATCH);
+ Styles = (PACKED,DONT_OVERWRITE);
End
#endif
@@ -1171,7 +1171,7 @@ End
File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Dir_Program;
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
Name = "offapi.rdb";
End
@@ -1671,7 +1671,7 @@ File gid_Starregistry_Services_Rdb
TXT_FILE_BODY;
Name = "services.rdb";
Dir = gid_Dir_Program;
- Styles = (PACKED, STARREGISTRY, PATCH);
+ Styles = (PACKED, STARREGISTRY);
#if defined WNT
NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
#else
@@ -1818,7 +1818,7 @@ File gid_File_Images_Zip
TXT_FILE_BODY;
Dir = gid_Dir_Share_Config;
Name = "images.zip";
- Styles = (PACKED,PATCH);
+ Styles = (PACKED);
End
File gid_File_ImagesCrystal_Zip
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index c0371115788f..010a3ec5efd6 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -87,7 +87,7 @@ STD_RES_FILE( gid_File_Res_San, san )
STD_RES_FILE( gid_File_Res_Sd, sd )
-STD_RES_FILE_PATCH( gid_File_Res_Sfx, sfx )
+STD_RES_FILE( gid_File_Res_Sfx, sfx )
#if defined(UNX) && !defined(QUARTZ)
@@ -101,7 +101,7 @@ STD_RES_FILE( gid_File_Res_Sb, sb )
STD_RES_FILE( gid_File_Res_Svs, svs )
STD_RES_FILE( gid_File_Res_Svt, svt )
-STD_RES_FILE_ONLY_PATCH( gid_File_Res_Svp, svp )
+STD_RES_FILE_ONLY( gid_File_Res_Svp, svp )
STD_RES_FILE( gid_File_Res_Svx, svx )
STD_RES_FILE( gid_File_Res_TextConversionDlgs, textconversiondlgs )
@@ -115,7 +115,7 @@ STD_RES_FILE( gid_File_Res_Acc, acc )
STD_RES_FILE( gid_File_Res_Tpl, tpl )
-STD_RES_FILE_PATCH( gid_File_Res_Uui, uui )
+STD_RES_FILE( gid_File_Res_Uui, uui )
STD_RES_FILE( gid_File_Res_Vcl, vcl )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 345f28a8762c..aa8c3178c9fd 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -301,7 +301,6 @@ PARFILES += \
folder_ooo.par \
folderitem_ooo.par \
registryitem_ooo.par \
- mergemodules_ooo.par \
vc_redist.par \
windowscustomaction_ooo.par
.ENDIF
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index d61ab9d592d0..cbd331666851 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -45,7 +45,7 @@ Profile gid_Profile_Version_Ini_Basis
ModuleID = gid_Module_Root;
Name = PROFILENAME(version);
Dir = gid_Dir_Program;
- Styles = (PATCH);
+ Styles = ();
End
Profile gid_Profile_Fundamentalbasis_Ini
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index d06c4bd3864c..6544de17f993 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -266,7 +266,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Install
@@ -275,7 +275,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
@@ -284,7 +284,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Officeinstall
@@ -293,7 +293,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH,UPGRADEKEY);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,UPGRADEKEY);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Productversion
@@ -302,7 +302,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "ProductVersion";
Value = "[ProductVersion]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Officeinstall
@@ -311,7 +311,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Productversion
@@ -320,7 +320,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "ProductVersion";
Value = "[ProductVersion]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
@@ -329,7 +329,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[OFFICEINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
@@ -338,7 +338,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
@@ -347,7 +347,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
@@ -356,7 +356,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION,PATCH);
+ Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
@@ -365,7 +365,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[BASISINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
@@ -374,7 +374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
@@ -383,7 +383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED,PATCH);
+ Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
@@ -392,7 +392,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION,PATCH);
+ Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
@@ -401,7 +401,7 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[UREINSTALLLOCATION]";
- Styles = (ALWAYS_REQUIRED,PATCH);
+ Styles = (ALWAYS_REQUIRED);
End
RegistryItem gid_Regitem_Sog
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 1c260e2d2508..41f2b73adbe8 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -134,7 +134,7 @@ File gid_File_Exe_Javaldx
BIN_FILE_BODY;
Dir = gid_Dir_Ure_Bin;
Name = EXENAME(javaldx);
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "291B5981-3E41-40E2-9C3F-115A7DF1C6A1";
End
#endif
@@ -269,7 +269,7 @@ File gid_File_Dl_Sal
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER("sal", "3");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID,PATCH);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
End
@@ -336,7 +336,7 @@ File gid_File_Dl_Sunjavaplugin
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_BARE("sunjavaplugin");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E";
End
#endif
@@ -839,7 +839,7 @@ File gid_File_Dl_Libxml2
#else
Name = SCP2_URE_DL_VER("xml2", "2");
#endif
- Styles = (PACKED, PATCH, VERSION_INDEPENDENT_COMP_ID);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E";
End
#endif
@@ -1208,7 +1208,7 @@ Profile gid_Profile_Version_Ini_Ure
ModuleID = gid_Module_Root_Ure_Hidden;
Name = PROFILENAME(version);
Dir = gid_Dir_Ure_Bin;
- Styles = (PATCH);
+ Styles = ();
End
ProfileItem gid_Ure_Profileitem_Version_Buildid
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index cefdd69ce034..b7e6e81dc331 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -30,25 +30,29 @@
#include "macros.inc"
#if defined(WITH_VC_REDIST)
-WindowsCustomAction gid_Customaction_InstallRuntime
- Name = "InstallRuntime";
- Typ = "98";
- Source = "SystemFolder";
- Target = "[SourceDir]redist\vcredist_x86.exe /qb";
- Inbinarytable = 0;
- Styles = (NO_FILE);
- Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-End
-WindowsCustomAction gid_Customaction_InstallRuntime_X64
- Name = "InstallRuntimeX64";
- Typ = "98";
- Source = "SystemFolder";
- Target = "[SourceDir]redist\vcredist_x64.exe /qb";
- Inbinarytable = 0;
- Styles = (NO_FILE);
- Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
-End
+// WindowsCustomAction gid_Customaction_InstallRuntime
+// Name = "InstallRuntime";
+// Typ = "98";
+// Source = "SystemFolder";
+// Target = "[SourceDir]redist\vcredist_x86.exe /qb";
+// Inbinarytable = 0;
+// Styles = (NO_FILE);
+// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
+// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "FileCost");
+// End
+
+// WindowsCustomAction gid_Customaction_InstallRuntime_X64
+// Name = "InstallRuntimeX64";
+// Typ = "98";
+// Source = "SystemFolder";
+// Target = "[SourceDir]redist\vcredist_x64.exe /qb";
+// Inbinarytable = 0;
+// Styles = (NO_FILE);
+// Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction");
+// // Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "FileCost");
+// End
+
ScpAction scp_Copy_vcredist_x86
#if defined(BUILD_SPECIAL)
@@ -65,4 +69,5 @@ ScpAction scp_Copy_vcredist_x64
Name = "vcredist_x64.exe";
Subdir = "redist";
End
+
#endif
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index b4ddac39799b..ceb0b156cd7b 100755
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -394,7 +394,7 @@ WindowsCustomAction gid_Customaction_Patch_Isofficerunning
Target = "IsOfficeRunning";
Inbinarytable = 1;
Assignment1 = ("ControlEvent", "ReadyToInstall", "InstallNow", "DoAction", "IsOfficeRunning", "1", "1");
- Assignment2 = ("InstallExecuteSequence", "", "RunningOffice");
+ Assignment2 = ("InstallExecuteSequence", "VersionNT < 600", "RunningOffice");
End
WindowsCustomAction gid_Customaction_Full_Isofficerunning
@@ -403,7 +403,7 @@ WindowsCustomAction gid_Customaction_Full_Isofficerunning
Source = "shlxtmsi.dll";
Target = "IsOfficeRunning";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "", "RunningOffice");
+ Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 Or Not PATCH", "RunningOffice");
End
WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
@@ -412,7 +412,7 @@ WindowsCustomAction gid_Customaction_Langpack_Isofficerunning
Source = "lngpckinsthlp.dll";
Target = "IsOfficeRunning";
Inbinarytable = 1;
- Assignment1 = ("InstallExecuteSequence", "PATCH", "RunningOffice");
+ Assignment1 = ("InstallExecuteSequence", "PATCH And VersionNT < 600", "RunningOffice");
End
WindowsCustomAction gid_Customaction_CheckPatchList
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 33616500ac29..819ba6128663 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -85,7 +85,7 @@ RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Inprochand
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e__Insertable
@@ -204,7 +204,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Inprochand
ModuleID = gid_Module_Prg_Wrt_Bin;
Subkey = "CLSID\{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}\InprocHandler32";
Value = "<progpath>\program\inprocserv.dll";
- Styles = (PATCH);
+ Styles = ();
End
RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Insertable
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 9ba398eff7b9..bafca83860cb 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -129,7 +129,6 @@ SCP1FILES += \
folder_ooo.par \
folderitem_ooo.par \
windowscustomaction_ooo.par \
- mergemodules_ooo.par \
vc_redist.par \
registryitem_writer.par \
folderitem_writer.par \
@@ -283,7 +282,6 @@ SCP2FILES += \
folder_ooo.par \
folderitem_ooo.par \
windowscustomaction_ooo.par \
- mergemodules_ooo.par \
vc_redist.par \
registryitem_writer.par \
folderitem_writer.par \
diff --git a/set_soenv.in b/set_soenv.in
index e1655da4a928..4d3e41383a38 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -90,7 +90,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
$COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT,
- $SYSTEM_PYTHON, $PYTHONPATH, $SYSTEM_MOZILLA, $EPM_FLAGS);
+ $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -591,33 +591,6 @@ elsif ( $platform =~ m/osf1/ )
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
}
-elsif ( $platform =~ m/irix/ )
-{ print "Setting Irix specific values... ";
- $outfile = "IrixMipsEnv.Set";
- $BIG_SVX = "TRUE";
- if ($CC =~ "gcc" ) {
- $COM = "GCC";
- $OUTPATH = "unxirgm";
- $CVER = "C300";
- }
- else {
- $COM = "C730";
- $CVER = "C730";
- $OUTPATH = "unxirxm3";
- }
- $COMPATH = '@COMPATH@';
- $CPU = "M";
- $CPUNAME = "MIPS";
- $GUI = "UNX";
- $GUIBASE = "unx";
- $GVER = "VCL";
- $INPATH = $OUTPATH.$PROEXT;
- $OS = "IRIX";
- $PATH_SEPERATOR = $ps;
- $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips";
- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."client";
- $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."mips".$ds."native_threads";
-}
elsif ( $platform =~ m/cygwin/ )
{
$COMPATH = PathFormat('@COMPATH@');
@@ -1032,7 +1005,7 @@ if ($platform =~ m/solaris/)
$L.$USR_DT.$LIB.
$L.$USR_OPENWIN.$LIB;
}
-elsif ($platform =~ m/linux|netbsd|osf1|irix|freebsd|aix/)
+elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix/)
{
$SOLAREXTRALIB = $L.$par_dir.$LIB64;
}
@@ -1098,7 +1071,7 @@ if ($platform =~ m/cygwin|os2/)
}
# The general environment path.
-if ($platform =~ m/linux|netbsd|odf1|irix|freebsd|aix|solaris/)
+if ($platform =~ m/linux|netbsd|odf1|freebsd|aix|solaris/)
{ $PATH = $cur_dir.
# $ps.'$SOLARVER'.$ds.'$INPATH'.$BIN.
$ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
@@ -1330,7 +1303,7 @@ if ($platform =~ m/solaris/)
$L_STLPORT_LIB.
$L.$XLIB;
}
-elsif ($platform =~ m/linux|netbasd|osf1|irix|aix|freebsd/)
+elsif ($platform =~ m/linux|netbasd|osf1|aix|freebsd/)
{ $SOLARLIB = $L.$par_dir.$LIB.
$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
$L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
@@ -1373,7 +1346,7 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
-if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|irix/)
+if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
{
$SOLARINC .= $STLPORT_stlport;
if ($platform =~ m/linux|freebsd|netbsd/)
@@ -1418,9 +1391,6 @@ if ($platform =~ m/linux/)
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
}
- elsif ($platform =~ m/irix/)
- { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."irix";
- }
#java threads include path
@@ -1490,14 +1460,6 @@ else
{ AddWarning( "set_soenv", "$platform not configured for system dependant include dir" );
}
-if ($SYSTEM_PYTHON eq "NO") {
- $PYTHONPATH = '.'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'python'.$ds.'lib-dynload'.$wps.$SOLARVER.$ds.$INPATH.$ds.'lib'.$ds.'pyuno'.$wps.$SOLARVER.$ds.$INPATH.$ds.'bin'.$ds.'pyuno';
- if ($GUIBASE eq "WIN") {
- # PYTHONPATH need to use '\' directory seperators;
- $PYTHONPATH = WinPath( $PYTHONPATH, ";" );
- }
-}
-
#
print "done\n";
@@ -1821,11 +1783,9 @@ ToFile( "WITHOUT_PPDS", "@WITHOUT_PPDS@", "e" );
ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" );
ToFile( "BUILD_TYPE", "@BUILD_TYPE@", "e" );
ToFile( "VERBOSE", "@VERBOSE@", "e" );
-ToFile( "WITH_FONTOOO", "@WITH_FONTOOO@", "e" );
ToFile( "ENABLE_EVOAB2", "@ENABLE_EVOAB2@", "e" );
ToFile( "GOBJECT_CFLAGS", "@GOBJECT_CFLAGS@", "e" );
ToFile( "GOBJECT_LIBS", "@GOBJECT_LIBS@", "e" );
-ToFile( "SYSTEM_MSPACK", "@SYSTEM_MSPACK@", "e" );
if ( '@ENABLE_RPATH@' eq "no" ) {
ToFile( "LINKFLAGSRUNPATH",'', "e" );
}
@@ -1973,9 +1933,6 @@ ToFile( "MKOUT", $perlpre."mkout.pl", "e" );
ToFile( "ZIPDEP", $perlpre."zipdep.pl", "e" );
ToFile( "USE_SHELL", '@USE_SHELL@', "e" );
-if ($SYSTEM_PYTHON eq "NO") {
- ToFile( "PYTHONPATH", $PYTHONPATH, "e" );
-}
#
# Writing the aliases to file.
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index 0400f461666e..e64b8fd2aa4c 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -60,16 +60,6 @@ if [ -x $checkdll ]; then
*) DYLD_LIBRARY_PATH=$libpath;;
esac
export DYLD_LIBRARY_PATH;;
- IRIX) case "${LD_LIBRARYN32_PATH+X}" in
- X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
- *) LD_LIBRARYN32_PATH=$libpath;;
- esac
- export LD_LIBRARYN32_PATH;;
- IRIX64) case "${LD_LIBRARYN32_PATH+X}" in
- X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
- *) LD_LIBRARYN32_PATH=$libpath;;
- esac
- export LD_LIBRARYN32_PATH;;
*) case "${LD_LIBRARY_PATH+X}" in
X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
*) LD_LIBRARY_PATH=$libpath;;
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 8c3a87e4ddc5..205e4c933193 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -27,8 +27,7 @@ chop( $m_str, $s_str );
# "SCO_SV", "scouw21",
"Darwin", "macosxp",
"Mac OS", "macosxp",
- "SINIX-N", "sinix",
- "IRIX", "irix"
+ "SINIX-N", "sinix"
);
%osDefTable = ("SunOS", "-DSYSV -DSOLARIS",
@@ -42,8 +41,7 @@ chop( $m_str, $s_str );
# "SCO_SV", "-DSYSV -DSCO -DSCO_UW21",
"Darwin", "-DBSD -DMACOSX",
"Mac OS", "-DBSD -DMACOSX",
- "SINIX-N", "-DSYSV -DSINIX",
- "IRIX", "-DSYSV -DIRIX"
+ "SINIX-N", "-DSYSV -DSINIX"
);
%osDosTable = ("SunOS", "sol",
@@ -56,8 +54,7 @@ chop( $m_str, $s_str );
"SCO_SV", "sco",
"Darwin", "macx",
"Mac OS", "macx",
- "SINIX-N", "sni",
- "IRIX", "irx"
+ "SINIX-N", "sni"
);
%archTable = ("sun4c", "sparc",
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index be1fc69fa487..c3b6f91c9dd7 100755
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -885,7 +885,6 @@ unxlngx6
DEVROOT %SOLAR_ENV_ROOT%
PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
PKGFORMAT rpm
- PTHREAD_CFLAGS -DNPTL
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
@@ -2185,7 +2184,6 @@ unxubti8
PAM_LINK NO
PERL /usr/bin/perl
PKGFORMAT deb
- PTHREAD_CFLAGS -DNPTL
SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index a862ec39897f..19f6e30ad175 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -100,9 +100,7 @@ $(USE_SHL1VERSIONMAP) .PHONY:
.ENDIF # "$(SHL1VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
$(USE_SHL1VERSIONMAP): \
$(SHL1OBJS)\
@@ -139,9 +137,7 @@ $(USE_SHL1VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL1VERSIONMAP)"!=""
USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
@@ -189,11 +185,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL1SONAME=$(SONAME_SWITCH)$(SHL1TARGETN:f)
-.ELSE
SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -654,9 +646,7 @@ $(USE_SHL2VERSIONMAP) .PHONY:
.ENDIF # "$(SHL2VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
$(USE_SHL2VERSIONMAP): \
$(SHL2OBJS)\
@@ -693,9 +683,7 @@ $(USE_SHL2VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL2VERSIONMAP)"!=""
USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
@@ -743,11 +731,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL2SONAME=$(SONAME_SWITCH)$(SHL2TARGETN:f)
-.ELSE
SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1208,9 +1192,7 @@ $(USE_SHL3VERSIONMAP) .PHONY:
.ENDIF # "$(SHL3VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
$(USE_SHL3VERSIONMAP): \
$(SHL3OBJS)\
@@ -1247,9 +1229,7 @@ $(USE_SHL3VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL3VERSIONMAP)"!=""
USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
@@ -1297,11 +1277,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL3SONAME=$(SONAME_SWITCH)$(SHL3TARGETN:f)
-.ELSE
SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -1762,9 +1738,7 @@ $(USE_SHL4VERSIONMAP) .PHONY:
.ENDIF # "$(SHL4VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
$(USE_SHL4VERSIONMAP): \
$(SHL4OBJS)\
@@ -1801,9 +1775,7 @@ $(USE_SHL4VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL4VERSIONMAP)"!=""
USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
@@ -1851,11 +1823,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL4SONAME=$(SONAME_SWITCH)$(SHL4TARGETN:f)
-.ELSE
SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2316,9 +2284,7 @@ $(USE_SHL5VERSIONMAP) .PHONY:
.ENDIF # "$(SHL5VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
$(USE_SHL5VERSIONMAP): \
$(SHL5OBJS)\
@@ -2355,9 +2321,7 @@ $(USE_SHL5VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL5VERSIONMAP)"!=""
USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
@@ -2405,11 +2369,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL5SONAME=$(SONAME_SWITCH)$(SHL5TARGETN:f)
-.ELSE
SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -2870,9 +2830,7 @@ $(USE_SHL6VERSIONMAP) .PHONY:
.ENDIF # "$(SHL6VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
$(USE_SHL6VERSIONMAP): \
$(SHL6OBJS)\
@@ -2909,9 +2867,7 @@ $(USE_SHL6VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL6VERSIONMAP)"!=""
USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
@@ -2959,11 +2915,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL6SONAME=$(SONAME_SWITCH)$(SHL6TARGETN:f)
-.ELSE
SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3424,9 +3376,7 @@ $(USE_SHL7VERSIONMAP) .PHONY:
.ENDIF # "$(SHL7VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
$(USE_SHL7VERSIONMAP): \
$(SHL7OBJS)\
@@ -3463,9 +3413,7 @@ $(USE_SHL7VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL7VERSIONMAP)"!=""
USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
@@ -3513,11 +3461,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL7SONAME=$(SONAME_SWITCH)$(SHL7TARGETN:f)
-.ELSE
SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -3978,9 +3922,7 @@ $(USE_SHL8VERSIONMAP) .PHONY:
.ENDIF # "$(SHL8VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
$(USE_SHL8VERSIONMAP): \
$(SHL8OBJS)\
@@ -4017,9 +3959,7 @@ $(USE_SHL8VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL8VERSIONMAP)"!=""
USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
@@ -4067,11 +4007,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL8SONAME=$(SONAME_SWITCH)$(SHL8TARGETN:f)
-.ELSE
SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -4532,9 +4468,7 @@ $(USE_SHL9VERSIONMAP) .PHONY:
.ENDIF # "$(SHL9VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
$(USE_SHL9VERSIONMAP): \
$(SHL9OBJS)\
@@ -4571,9 +4505,7 @@ $(USE_SHL9VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL9VERSIONMAP)"!=""
USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
@@ -4621,11 +4553,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL9SONAME=$(SONAME_SWITCH)$(SHL9TARGETN:f)
-.ELSE
SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
@@ -5086,9 +5014,7 @@ $(USE_SHL10VERSIONMAP) .PHONY:
.ENDIF # "$(SHL10VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
$(USE_SHL10VERSIONMAP): \
$(SHL10OBJS)\
@@ -5125,9 +5051,7 @@ $(USE_SHL10VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL10VERSIONMAP)"!=""
USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
@@ -5175,11 +5099,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL10SONAME=$(SONAME_SWITCH)$(SHL10TARGETN:f)
-.ELSE
SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b27b78230620..74248a6e8cd7 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m68(Build:9474)
-BUILD=9474
-LAST_MINOR=m68
+RSCREVISION=300m69(Build:9475)
+BUILD=9475
+LAST_MINOR=m69
SOURCEVERSION=DEV300
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
new file mode 100755
index 000000000000..a8a33051f0fc
--- /dev/null
+++ b/solenv/inc/tg_help.mk
@@ -0,0 +1,86 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.pmk,v $
+#
+# $Revision: 1.25 $
+#
+# 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.
+#
+#*************************************************************************
+
+# to make it usable with special lang selection of
+# helpcontent2
+
+aux_alllangiso*:=$(alllangiso)
+
+SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
+HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+
+ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
+
+$(HLANGXHPFILES) : $$(@:d)thisdir.created
+
+$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
+ @$(TOUCH) $@
+# internal dependencies not sufficient to trigger merge?
+# @$(NULL)
+
+
+$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+.IF "$(WITH_LANG)"!=""
+ $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+.ELSE # "$(WITH_LANG)"!=""
+ cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
+.ENDIF # "$(WITH_LANG)"!=""
+.IF "$(OS)"=="SOLARIS"
+ @$(ECHONL) " "
+.ELSE # "$(OS)"=="SOLARIS"
+ @$(ECHONL)
+.ENDIF # "$(OS)"=="SOLARIS"
+
+$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES)
+ @$(TOUCH) $@
+
+# urks - dmake mixes up operators and strings :-(
+.IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
+
+.IF "$(HELPTRANSPHONY)"!=""
+$(COMMONMISC)$/$(TARGET).done .PHONY :
+.ELSE # "$(HELPTRANSPHONY)"!=""
+
+$(COMMONMISC)$/$(TARGET).done : makefile.mk
+.IF "$(WITH_LANG)"!=""
+$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF)
+.ENDIF # "$(WITH_LANG)"!=""
+.ENDIF # "$(HELPTRANSPHONY)"!=""
+.ENDIF # "$(HLANGXHPFILES)"!=""
+
+optix: $(COMMONMISC)$/$(TARGET).done
+ @echo done
+
+%.created :
+ @@-$(MKDIRHIER) $(@:d)
+ @$(TOUCH) $@
+
+
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 496e95926981..8cb6653f334e 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -133,9 +133,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
.ENDIF # "$(SHL$(TNR)VERSIONMAP)"!=""
-.IF "$(OS)"!="IRIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
$(USE_SHL$(TNR)VERSIONMAP): \
$(SHL$(TNR)OBJS)\
@@ -172,9 +170,7 @@ $(USE_SHL$(TNR)VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
@@ -222,11 +218,7 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
.IF "$(UNIXVERSIONNAMES)"!=""
.IF "$(OS)"!="MACOSX"
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL$(TNR)SONAME=$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)
-.ELSE
SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
-.ENDIF
.ENDIF # "$(GUI)"!="UNX"
.ENDIF # "$(OS)"!="MACOSX"
.ENDIF # "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index bb5a4864484d..36e5cd70447f 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -151,18 +151,6 @@
.INCLUDE : unxfbsd.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
-.INCLUDE : unxirxm3.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCIRIXM"
-.INCLUDE : unxirgm.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "C710IRIXM"
-.INCLUDE : unxirxm.mk
-.ENDIF
-
.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
.INCLUDE : unxmacxp.mk
.ENDIF
diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk
deleted file mode 100644
index b3abfb76d2c3..000000000000
--- a/solenv/inc/unxirgm.mk
+++ /dev/null
@@ -1,163 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirgm.mk,v $
-#
-# $Revision: 1.15 $
-#
-# 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.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI
-ASM=
-AFLAGS=
-
-SOLAR_JAVA=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= gcc
-CXX= g++
-CFLAGS=-c
-CDEFS+= -D_PTHREADS -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX=$(ARCH_FLAGS)
-PICSWITCH:=-fpic
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-Wall
-CFLAGSWERRCC=-Werror
-
-# exception flags
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= g++
-LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
-THREADLIB= -lpthread
-
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST= -lstlport
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST= -lstlport_gcc
-.ENDIF
-
-LIBMGR= ar
-LIBFLAGS= -r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC= irc
-RCFLAGS= -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX= im
-DLLPRE= lib
-DLLPOST= .so
-
-
-LDUMP=c++filt
diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk
deleted file mode 100644
index 80aae3d5b382..000000000000
--- a/solenv/inc/unxirxm.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirxm.mk,v $
-#
-# $Revision: 1.10 $
-#
-# 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.
-#
-#*************************************************************************
-
-# mak-file for IRIX/mips
-ASM=
-AFLAGS=
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#
-# Zu den Compilerflags:
-#
-# -ptused : instantisiert Templates, wenn sie benutzt werden.
-# Der Schalter wurde neu eingefuegt, weil sich eine
-# statische Memberfunktion nicht instantisieren liess.
-# (ts&sdo/10.06.98)
-#
-CC= cc -KPIC -c -n32
-CXX= CC -KPIC -c -n32 -ptused -OPT:Olimit=20523
-CDEFS+=-D_PTHREADS
-CDEFS+= -D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-# 1009 ...nested comment is not allowed...
-# 1021 ...type qualifiers are meaningless in this declaration...
-# 1107 ...signed bit field of length 1...
-# 1110 ...statement not reached...
-# 1155 ...unrecognized #pragma...
-# 1171 ...expression has no effect...
-# 1183 ...comparison of unsigned integer with zero...
-# 1185 ...enumerated type mixed with another type...
-# 1188 ...type qualifier is meaningless on cast type...
-# 1233 ...explicit type is missing ("int" assumed)...
-# 1234 ...access control not specified...
-# 1257 ...NULL reference is not allowed...
-# 1440 ...initial value of reference to non-const must be an lvalue...
-# 1516 ...pointless comparison of unsigned integer with a negative constant
-# 1681 ...virtual function override intended...
-# 1682 ...is only partially overridden in class...
-CFLAGSCC= -Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSCXX= -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG= -g
-CFLAGSDBGUTIL=
-CFLAGSOPT= -O
-CFLAGSNOOPT=
-CFLAGSOUTOBJ= -o
-
-STATIC= -B static
-DYNAMIC= -B dynamic
-
-#
-# Zu den Linkflags:
-#
-# -update_registry <file> : fuer das Linken mehrerer shared Libraries
-# erforderlich.
-# **FUER LOKALE STAENDE FEHLT Z.ZT. EIN GULTIGER
-# MECHANISMUS**
-#
-LINK= CC
-LINKFLAGS=
-LINKFLAGSAPPGUI=-n32 -multigot
-LINKFLAGSSHLGUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSAPPCUI=-n32 -multigot
-LINKFLAGSSHLCUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-# Reihenfolge der Libraries NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-# STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm
-# STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
-THREADLIB= -lpthread
-
-LIBMGR= ar
-LIBFLAGS= -r
-# LIBEXT= .so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC= irc
-RCFLAGS= -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX= im
-.IF "$(WORK_STAMP)"=="MIX364"
-DLLPOSTFIX=
-.ENDIF
-DLLPRE= lib
-DLLPOST= .so
-
-
-LDUMP=
-
-
-# --------------------------
-# AUS DEM ALTEN ENVIRONMENT:
-# --------------------------
-#
-# Linken einer statischen Library:
-# ar -r ...
-#
-# Linken einer shared Library:
-# CC -B symbolic -soname <...> -B dynamic -shared -n32 -multigot
-# -update_registry <...> ...
-#
-# Linken einer Applikation mit statischen Librarys:
-# CC -B static ...
-#
-# Linken einer Applikation mit stared Librarys:
-# CC -n32 -multigot ...
-#
-
diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk
deleted file mode 100644
index 8d24d2c54032..000000000000
--- a/solenv/inc/unxirxm3.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirxm3.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips
-ASM=
-AFLAGS=
-
-SOLAR_JAVA*=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= cc
-CXX= CC
-CFLAGS= -c
-CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX= -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS)
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=-KPIC
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=-KPIC
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-fullwarn
-CFLAGSWERRCC=
-
-# exception flags
-CFLAGSEXCEPTIONS=-LANG:exceptions=ON
-CFLAGS_NO_EXCEPTIONS=-LANG:exceptions=OFF
-#CFLAGS_NO_EXCEPTIONS=
-
-STATIC= -Wl,-Bstatic
-DYNAMIC= -Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= CC
-LINKFLAGS= -L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT= $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDLIBCUIMT= $(THREADLIB) $(DYNAMIC) -lc -lm
-STDSHLGUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDSHLCUIMT= -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lc
-THREADLIB= -lpthread
-
-#LIBSTLPORT=$(DYNAMIC) -lstlport_mipspro
-LIBSTLPORT=$(DYNAMIC)
-LIBSTLPORTST=
-#LIBSTLPORTST= -lstlport_mipspro
-
-LIBMGR= ar
-LIBFLAGS= -r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC= irc
-RCFLAGS= -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX= im
-DLLPRE= lib
-DLLPOST= .so
-
-
-LDUMP=c++filt
-
-
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index a79d3e47c6cf..b6c8f798a5f9 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
# _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
# enable visibility define in "sal/types.h"
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort
.ENDIF
# libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
+STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
# libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
+STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
.IF "$(USE_STLP_DEBUG)" != ""
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 6d27121366e5..09d5d424b690 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -55,7 +55,6 @@ CFLAGSENABLESYMBOLS=-g
.IF "$(SNOW_LEOPARD_10_4)"!=""
JAVACOMPILER+=-target 1.5
-DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib
.EXPORT: DYLD_INSERT_LIBRARIES
.ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index afcea59a9971..c4c777376561 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
# libdl.so - no really an GUI library but required in this context
STDLIBGUIMT+=-ldl
STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
# @@@ interposer needed for -Bdirect @@@
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index a28b097e13b4..67bafa3a1c14 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
# libdl.so - no really an GUI library but required in this context
STDLIBGUIMT+=-ldl
STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
# @@@ interposer needed for -Bdirect @@@
# LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
diff --git a/stlport/makefile.mk b/stlport/makefile.mk
index ab4dfa244e72..bff4f60fd719 100644
--- a/stlport/makefile.mk
+++ b/stlport/makefile.mk
@@ -169,14 +169,6 @@ OUT2INC= \
stlport$/SC5$/*.SUNWCCh
.ENDIF
-.IF "$(OS)"=="IRIX"
-TARFILE_NAME=STLport-4.5
-PATCH_FILES=STLport-4.5.patch
-BUILD_ACTION=gmake
-BUILD_FLAGS=-f gcc-3.0.mak
-BUILD_FLAGS+= -j$(MAXPROCESS)
-.ENDIF
-
OUTDIR2INC= \
stlport