diff options
67 files changed, 1371 insertions, 944 deletions
diff --git a/bootstrap.1 b/bootstrap.1 index 622f68b228f4..156f5625557a 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -77,3 +77,8 @@ chmod +x "$SRC_ROOT/solenv/bin/build.pl" chmod +x "$SRC_ROOT/solenv/bin/build_client.pl" chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl" chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl" + +# fetch or update external tarballs +if [ "$DO_FETCH_TARBALLS" = "yes" ]; then + $SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst +fi diff --git a/configure b/configure index ee17df11c94c..09ad0891473a 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 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 JAVAIFLAGS 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 CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT 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 ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_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_PRESENTER_EXTRA_UI 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 OOO_JUNIT_JAR 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 TARFILE_LOCATION DO_FETCH_TARBALLS 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 ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_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_PRESENTER_EXTRA_UI 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. @@ -866,6 +866,8 @@ Optional Features: --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK + --disable-fetch-external Disables fetching external tarballs from web sources. + --enable-lockdown Enables the gconf integration work in OOo --disable-vba disables the vba compatibility feature @@ -1064,6 +1066,7 @@ Optional Packages: --with-system-graphite use graphite library already installed on system + --with-external-tar=<TARFILE PATH> Specify path to tarfiles manually --with-openldap Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one @@ -1234,8 +1237,6 @@ Optional Packages: --with-system-lpsolve Use lpsolve already on system - --with-system-cppunit Use cppunit already on system - --with-system-mozilla Use mozilla already on system. Note that some components cannot be built against a contemporary mozilla. The flavour used can be specified by @@ -1278,12 +1279,6 @@ Optional Packages: Usage: --with-ant-home=<absolute path to Ant home> - --with-junit Specifies the JUnit 4 jar file to use for JUnit-based - tests. --without-junit disables those tests. Not - relevant in the --without-java case. - - Usage: --with-junit=<absolute path to JUnit 4 jar> - --with-perl-home If you have installed the Perl 5 Distribution, on your system, please supply the path here. Note that this is not the location of the Perl binary @@ -1421,7 +1416,7 @@ Optional Packages: Usage: --with-zip-home=<path to zip executable> --with-mingwin For Windows users, use the mingwin32 compiler within - cygwin environment + cygwin environment, this implies --with-use-shell=tcsh Usage: --with-mingwin=yes @@ -1431,6 +1426,14 @@ Optional Packages: Usage: --with-mingwin=i586-mingw32msvc-g++ + --with-use-shell Use this option to override the default shell to be + used for the build environment. + Supported options: + tcsh (default) + bash + + Usage: --with-use-shell=tcsh|bash + --with-build-version Allows the builder to add a custom version tag that will appear in the Help/About box for QA purposes. @@ -1545,7 +1548,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -1929,6 +1932,18 @@ if test "${enable_ldap+set}" = set; then enableval="$enable_ldap" fi; +# Check whether --enable-fetch-external or --disable-fetch-external was given. +if test "${enable_fetch_external+set}" = set; then + enableval="$enable_fetch_external" + +fi; + +# Check whether --with-external-tar or --without-external-tar was given. +if test "${with_external_tar+set}" = set; then + withval="$with_external_tar" + TARFILE_LOCATION="$withval" + +fi; # Check whether --with-openldap or --without-openldap was given. if test "${with_openldap+set}" = set; then @@ -2706,12 +2721,6 @@ if test "${with_system_lpsolve+set}" = set; then fi; -# Check whether --with-system-cppunit or --without-system-cppunit was given. -if test "${with_system_cppunit+set}" = set; then - withval="$with_system_cppunit" - -fi; - # Check whether --with-system-mozilla or --without-system-mozilla was given. if test "${with_system_mozilla+set}" = set; then withval="$with_system_mozilla" @@ -2759,14 +2768,6 @@ if test "${with_ant_home+set}" = set; then fi; -# Check whether --with-junit or --without-junit was given. -if test "${with_junit+set}" = set; then - withval="$with_junit" - -else - with_junit=yes -fi; - # Check whether --with-perl-home or --without-perl-home was given. if test "${with_perl_home+set}" = set; then withval="$with_perl_home" @@ -2925,6 +2926,14 @@ else WITH_MINGWIN=0 fi; +# Check whether --with-use-shell or --without-use-shell was given. +if test "${with_use_shell+set}" = set; then + withval="$with_use_shell" + with_use_shell=$withval +else + with_use_shell="tcsh" +fi; + # Check whether --with-build-version or --without-build-version was given. if test "${with_build_version+set}" = set; then withval="$with_build_version" @@ -3631,6 +3640,16 @@ echo "${ECHO_T}no" >&6 fi +if test -z $TARFILE_LOCATION; then + TARFILE_LOCATION="DEFAULT" +fi + + +if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \ + && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then + DO_FETCH_TARBALLS="yes" +fi + echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6 @@ -3758,9 +3777,14 @@ fi +echo "$as_me:$LINENO: checking which shell to use" >&5 +echo $ECHO_N "checking which shell to use... $ECHO_C" >&6 if test $_os = "WINNT"; then - echo "$as_me:$LINENO: checking Windows build environment sanity" >&5 -echo $ECHO_N "checking Windows build environment sanity... $ECHO_C" >&6 + if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then + { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 +echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} + { (exit 1); exit 1; }; } + fi if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink! Native windows programs cannot use cygwin symlinks. Remove the symbolic @@ -3777,15 +3801,32 @@ link, and copy the program to the name of the link." >&2;} WITH_MINGWIN="yes" fi fi - if test "$WITH_MINGWIN" = "yes" ; then + if test "$WITH_MINGWIN" = "yes" ; then + if test "x$with_use_shell" = "x"; then + with_use_shell="tcsh" + fi if test -z "$CC"; then CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" fi fi - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 +elif test $_os = "OS2"; then + if test "$with_use_shell" != "tcsh"; then + { { echo "$as_me:$LINENO: error: only \"tcsh\" is supported options" >&5 +echo "$as_me: error: only \"tcsh\" is supported options" >&2;} + { (exit 1); exit 1; }; } + fi +else + if test "$with_use_shell" != "tcsh" -a "$with_use_shell" != "bash"; then + { { echo "$as_me:$LINENO: error: only \"tcsh\" or \"bash\" are supported options" >&5 +echo "$as_me: error: only \"tcsh\" or \"bash\" are supported options" >&2;} + { (exit 1); exit 1; }; } + fi fi +USE_SHELL="$with_use_shell" +echo "$as_me:$LINENO: result: $USE_SHELL" >&5 +echo "${ECHO_T}$USE_SHELL" >&6 + if test "$_os" = "WINNT" ; then @@ -3802,7 +3843,55 @@ echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} fi -# Extract the first word of "bash", so it can be a program name with args. +if test "$with_use_shell" = "tcsh"; then + # Extract the first word of "tcsh", so it can be a program name with args. +set dummy tcsh; 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_SHELLPATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $SHELLPATH in + [\\/]* | ?:[\\/]*) + ac_cv_path_SHELLPATH="$SHELLPATH" # 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_SHELLPATH="$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 +SHELLPATH=$ac_cv_path_SHELLPATH + +if test -n "$SHELLPATH"; then + echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +echo "${ECHO_T}$SHELLPATH" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test -z "$SHELLPATH"; then + { { echo "$as_me:$LINENO: error: tcsh not found in \$PATH" >&5 +echo "$as_me: error: tcsh not found in \$PATH" >&2;} + { (exit 1); exit 1; }; } + else + SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/tcsh$//p"` + fi +elif test "$with_use_shell" = "bash"; then + # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 @@ -3841,12 +3930,17 @@ else echo "${ECHO_T}no" >&6 fi -if test -z "$SHELLPATH"; then - { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 + if test -z "$SHELLPATH"; then + { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 echo "$as_me: error: bash not found in \$PATH" >&2;} { (exit 1); exit 1; }; } + else + SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` + fi else - SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` + { echo "$as_me:$LINENO: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&5 +echo "$as_me: WARNING: Windows/OS/2 4NT builds don't test for the shell" >&2;} + SHELLPATH="NO_SHELLPATH_NEEDED" fi @@ -4436,7 +4530,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -4494,7 +4589,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -4610,7 +4706,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -4664,7 +4761,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -4709,7 +4807,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -4753,7 +4852,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -4917,7 +5017,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -5147,7 +5248,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -6006,7 +6108,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -6286,7 +6389,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6344,7 +6448,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6415,7 +6520,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -6459,7 +6565,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -7001,7 +7108,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7066,7 +7174,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7128,7 +7237,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7168,7 +7278,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7224,7 +7335,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7264,7 +7376,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7328,7 +7441,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7359,8 +7473,10 @@ See \`config.log' for more details." >&2;} esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -echo "$as_me: error: internal error: not reached in cross-compile" >&2;} + { { 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 +See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF @@ -7477,7 +7593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7519,7 +7636,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7576,7 +7694,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7722,7 +7841,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7751,7 +7871,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7821,7 +7942,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7873,7 +7995,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7944,7 +8067,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -7996,7 +8120,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -8115,7 +8240,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -8269,7 +8395,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -8429,7 +8556,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -8536,7 +8664,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -8594,7 +8723,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -8654,7 +8784,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -8770,7 +8901,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -8974,7 +9106,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9032,7 +9165,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9103,7 +9237,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9147,7 +9282,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9473,7 +9609,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -9798,7 +9935,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -9933,7 +10071,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10018,7 +10157,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10111,7 +10251,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -10273,7 +10414,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -10353,7 +10495,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -10505,17 +10648,6 @@ echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} fi JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` - elif test "$_os" = "Darwin"; then - echo "$as_me:$LINENO: checking whether to pass -d32 to Java interpreter" >&5 -echo $ECHO_N "checking whether to pass -d32 to Java interpreter... $ECHO_C" >&6 - if "$JAVAINTERPRETER" -d32 >&5 2>&5; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - JAVAIFLAGS=-d32 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - fi fi fi @@ -10988,7 +11120,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -11141,7 +11274,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -11215,7 +11349,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -11368,7 +11503,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -11437,7 +11573,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -11560,7 +11697,6 @@ fi - # Extract the first word of "dmake", so it can be a program name with args. set dummy dmake; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -11644,7 +11780,7 @@ fi echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6 -if test "$enable_epm" = "yes"; then +if test "$_os" != "WINNT" -a \( "z$enable_epm" = "z" -o "$enable_epm" != "no" \) ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 if test "$_os" != "WINNT"; then @@ -11746,6 +11882,18 @@ echo "${ECHO_T}too old. epm >= 3.7 is required." >&6 # test which package format to use echo "$as_me:$LINENO: checking which package format to use" >&5 echo $ECHO_N "checking which package format to use... $ECHO_C" >&6 + # epm supports the following formats: + # aix - AIX software distribution + # bsd - FreeBSD, NetBSD, or OpenBSD software distribution + # depot or swinstall - HP-UX software distribution + # deb - Debian software distribution + # inst or tardist - IRIX software distribution + # osx - MacOS X software distribution + # pkg - Solaris software distribution + # rpm - RedHat software distribution + # setld - Tru64 (setld) software distribution + # native - "Native" software distribution for the platform + # portable - Portable software distribution # defaults case "$_os" in @@ -11775,9 +11923,6 @@ echo $ECHO_N "checking which package format to use... $ECHO_C" >&6 OSF1) PKGFORMAT=setld ;; - WINNT) - PKGFORMAT=msi - ;; # we never should get here since we check the arciecture/os at the beginning, # but go sure... *) @@ -11788,7 +11933,7 @@ echo "$as_me: error: unknown system" >&2;} if test -n "$with_package_format"; then for i in $with_package_format; do case "$i" in - aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi) + aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable) ;; *) { { echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are: @@ -11803,11 +11948,6 @@ rpm - RedHat software distribution setld - Tru64 (setld) software distribution native - \"Native\" software distribution for the platform portable - Portable software distribution -OOo additionally supports: -archive - .tar.gz or .zip -dmg - Mac OS X .dmg -installed - installation tree -msi - Windows .msi " >&5 echo "$as_me: error: unsupported format $i. Supported by EPM are: aix - AIX software distribution @@ -11821,11 +11961,6 @@ rpm - RedHat software distribution setld - Tru64 (setld) software distribution native - \"Native\" software distribution for the platform portable - Portable software distribution -OOo additionally supports: -archive - .tar.gz or .zip -dmg - Mac OS X .dmg -installed - installation tree -msi - Windows .msi " >&2;} { (exit 1); exit 1; }; } ;; @@ -12353,7 +12488,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12421,7 +12557,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12486,7 +12623,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -12708,7 +12846,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -12861,7 +13000,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -12939,7 +13079,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -13092,7 +13233,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -13169,7 +13311,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -13323,7 +13466,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -13483,134 +13627,6 @@ fi -echo "$as_me:$LINENO: checking which cppunit to use" >&5 -echo $ECHO_N "checking which cppunit to use... $ECHO_C" >&6 -if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \ - test "$with_system_cppunit" != "no"; then - echo "$as_me:$LINENO: result: external" >&5 -echo "${ECHO_T}external" >&6 - SYSTEM_CPPUNIT=YES - # might work for earlier, too but go sure. We didn't have - # a system-cppunit before the first version using a proper cppunit - # (and that being 1.12.1) anyway - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; 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_PKG_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$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 - - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG - -if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - fi - - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for cppunit >= 1.12.1 " >&5 -echo $ECHO_N "checking for cppunit >= 1.12.1 ... $ECHO_C" >&6 - - if $PKG_CONFIG --exists "cppunit >= 1.12.1 " ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking CPPUNIT_CFLAGS" >&5 -echo $ECHO_N "checking CPPUNIT_CFLAGS... $ECHO_C" >&6 - CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.1 "` - echo "$as_me:$LINENO: result: $CPPUNIT_CFLAGS" >&5 -echo "${ECHO_T}$CPPUNIT_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking CPPUNIT_LIBS" >&5 -echo $ECHO_N "checking CPPUNIT_LIBS... $ECHO_C" >&6 - CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.1 "` - echo "$as_me:$LINENO: result: $CPPUNIT_LIBS" >&5 -echo "${ECHO_T}$CPPUNIT_LIBS" >&6 - else - CPPUNIT_CFLAGS="" - CPPUNIT_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - CPPUNIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cppunit >= 1.12.1 "` - echo $CPPUNIT_PKG_ERRORS - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi - - if test $succeeded = yes; then - : - else - { { echo "$as_me:$LINENO: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} - { (exit 1); exit 1; }; } - fi - - echo "$as_me:$LINENO: checking STL compatibility" >&5 -echo $ECHO_N "checking STL compatibility... $ECHO_C" >&6 - if test "$WITH_STLPORT" != "no"; then - { { echo "$as_me:$LINENO: error: to use system cppunit you need to use --without-stlport" >&5 -echo "$as_me: error: to use system cppunit you need to use --without-stlport" >&2;} - { (exit 1); exit 1; }; } - else - echo "$as_me:$LINENO: result: OK" >&5 -echo "${ECHO_T}OK" >&6 - fi -else - echo "$as_me:$LINENO: result: internal" >&5 -echo "${ECHO_T}internal" >&6 - SYSTEM_CPPUNIT=NO - BUILD_TYPE="$BUILD_TYPE CPPUNIT" -fi - - - - if test "$test_freetype" = "yes"; then echo "$as_me:$LINENO: checking whether freetype is available" >&5 echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6 @@ -13760,7 +13776,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -14369,7 +14386,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -14580,7 +14598,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -14632,7 +14651,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -14750,7 +14770,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -15154,7 +15175,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15302,7 +15324,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15837,7 +15860,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -15982,7 +16006,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16127,7 +16152,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16272,7 +16298,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16359,7 +16386,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -16526,7 +16554,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -16745,7 +16774,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -16903,7 +16933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -16982,7 +17013,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -17714,7 +17746,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -17923,37 +17956,46 @@ echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely MOZILLA_VERSION=1.1.14 fi MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" - for e in gz bz2; do - echo "$as_me:$LINENO: checking for $MOZILLA_SOURCE_VERSION.tar.$e" >&5 -echo $ECHO_N "checking for $MOZILLA_SOURCE_VERSION.tar.$e... $ECHO_C" >&6 - if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then - echo "$as_me:$LINENO: result: not found" >&5 + MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst` + echo "$as_me:$LINENO: checking for mozilla sources" >&5 +echo $ECHO_N "checking for mozilla sources... $ECHO_C" >&6 + if test -z "$MOZILLA_FETCH_FILE"; then + echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6 + HAVE_MOZILLA_TARBALL=n + else + echo "$as_me:$LINENO: checking for $MOZILLA_FETCH_FILE" >&5 +echo $ECHO_N "checking for $MOZILLA_FETCH_FILE... $ECHO_C" >&6 + if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then + if test -z "$DO_FETCH"; then + echo "$as_me:$LINENO: result: will be fetched" >&5 +echo "${ECHO_T}will be fetched" >&6 + HAVE_MOZILLA_TARBALL=y + else + echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6 - HAVE_MOZILLA_TARBALL=n + HAVE_MOZILLA_TARBALL=n + fi else echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 HAVE_MOZILLA_TARBALL=y fi - done + fi if test "$HAVE_MOZILLA_TARBALL" != "y"; then - { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. -Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. -The archives can be found here: -ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&5 + { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. +Use \"./fetch_tarballs.sh ooo.lst\" to download." >&5 echo "$as_me: error: Mozilla/SeaMonkey source archive not found. -Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. -The archives can be found here: -ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/" >&2;} +Use \"./fetch_tarballs.sh ooo.lst\" to download." >&2;} { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then echo "$as_me:$LINENO: checking for moztools binaries" >&5 echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6 - if test ! -e "moz/download/vc8-moztools.zip" ; then - { { echo "$as_me:$LINENO: error: The following file is missing in moz/download: vc8-moztools.zip + if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then + { { echo "$as_me:$LINENO: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5 -echo "$as_me: error: The following file is missing in moz/download: vc8-moztools.zip +echo "$as_me: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;} { (exit 1); exit 1; }; } else @@ -18629,7 +18671,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -19170,247 +19213,6 @@ elif test "$_os" != "WINNT" ; then echo "$as_me:$LINENO: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 -ac_path_x_has_been_run=yes - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <X11/Xlib.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 - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <X11/Xlib.h> -int -main () -{ -XrmInitialize () - ; - 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 - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r $ac_dir/libX11.$ac_extension; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 -fi - - -if test "x$ac_path_x_has_been_run" != xyes; then - echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - -ac_path_x_has_been_run=yes # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -19503,7 +19305,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -19511,7 +19313,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Xlib.h> +#include <X11/Intrinsic.h> _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -19538,7 +19340,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -19552,18 +19354,18 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" + LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Xlib.h> +#include <X11/Intrinsic.h> int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } @@ -19577,7 +19379,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -19601,7 +19404,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libX11.$ac_extension; then + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi @@ -19637,16 +19440,11 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi -fi -if test "$no_x" = yes; then + if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. cat >>confdefs.h <<\_ACEOF @@ -19693,7 +19491,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -19744,7 +19543,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -19820,7 +19620,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -19875,7 +19676,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -19943,7 +19745,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20051,7 +19854,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20115,7 +19919,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20183,7 +19988,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20287,7 +20093,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20351,7 +20158,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20448,7 +20256,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20512,7 +20321,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20609,7 +20419,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20673,7 +20484,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20752,7 +20564,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20843,7 +20656,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -20914,7 +20728,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -21005,7 +20820,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -21072,7 +20888,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -21141,7 +20958,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -21216,7 +21034,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -21431,7 +21250,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -21592,7 +21412,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -21770,7 +21591,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -21925,7 +21747,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -22642,7 +22465,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22782,7 +22606,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -22934,7 +22759,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -23027,7 +22853,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -23174,7 +23001,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -23218,7 +23046,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -23289,7 +23118,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -23361,7 +23191,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -23434,7 +23265,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -23513,7 +23345,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -23661,7 +23494,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -23743,7 +23577,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -23897,7 +23732,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -23985,7 +23821,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -25760,7 +25597,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -25908,7 +25746,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -25979,7 +25818,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -28197,7 +28037,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 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' + { 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=$? @@ -28358,7 +28199,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 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' + { 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=$? @@ -28701,41 +28543,6 @@ echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;} fi rm -f conftest* core core.* *.core -OOO_JUNIT_JAR= -if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then - echo "$as_me:$LINENO: checking for JUnit 4" >&5 -echo $ECHO_N "checking for JUnit 4... $ECHO_C" >&6 - if test "$with_junit" == "yes"; then - if test -e /usr/share/java/junit4.jar; then - OOO_JUNIT_JAR=/usr/share/java/junit4.jar - else - OOO_JUNIT_JAR=/usr/share/java/junit.jar - fi - else - OOO_JUNIT_JAR=$with_junit - fi - if test "$_os" = "WINNT"; then - OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"` - fi - "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \ - grep org/junit/Before.class > /dev/null 2>&5 - if test $? -eq 0; then - echo "$as_me:$LINENO: result: $OOO_JUNIT_JAR" >&5 -echo "${ECHO_T}$OOO_JUNIT_JAR" >&6 - else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR; -please install one and/or specify its pathname via --with-junit=..., -or disable it via --without-junit" >&5 -echo "$as_me: error: cannot find JUnit 4 jar at $OOO_JUNIT_JAR; -please install one and/or specify its pathname via --with-junit=..., -or disable it via --without-junit" >&2;} - { (exit 1); exit 1; }; } - fi -fi - - echo "$as_me:$LINENO: checking which languages to be built" >&5 echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6 WITH_LANG="$with_lang" @@ -29594,6 +29401,8 @@ s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t +s,@TARFILE_LOCATION@,$TARFILE_LOCATION,;t t +s,@DO_FETCH_TARBALLS@,$DO_FETCH_TARBALLS,;t t s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t @@ -29604,6 +29413,7 @@ s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t +s,@USE_SHELL@,$USE_SHELL,;t t s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t s,@SHELLPATH@,$SHELLPATH,;t t s,@GCC_HOME@,$GCC_HOME,;t t @@ -29671,7 +29481,6 @@ s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t s,@JAVA_HOME@,$JAVA_HOME,;t t s,@JDK@,$JDK,;t t s,@JAVAFLAGS@,$JAVAFLAGS,;t t -s,@JAVAIFLAGS@,$JAVAIFLAGS,;t t s,@DMAKE@,$DMAKE,;t t s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t s,@EPM@,$EPM,;t t @@ -29695,9 +29504,6 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t -s,@CPPUNIT_CFLAGS@,$CPPUNIT_CFLAGS,;t t -s,@CPPUNIT_LIBS@,$CPPUNIT_LIBS,;t t -s,@SYSTEM_CPPUNIT@,$SYSTEM_CPPUNIT,;t t s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t @@ -29911,7 +29717,6 @@ s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t s,@ANT@,$ANT,;t t s,@ANT_HOME@,$ANT_HOME,;t t s,@ANT_LIB@,$ANT_LIB,;t t -s,@OOO_JUNIT_JAR@,$OOO_JUNIT_JAR,;t t s,@WITH_LANG@,$WITH_LANG,;t t s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t s,@WITH_DICT@,$WITH_DICT,;t t @@ -30088,6 +29893,11 @@ esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -30126,12 +29936,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub diff --git a/configure.in b/configure.in index 8d1015441097..91ff5806fbe5 100644 --- a/configure.in +++ b/configure.in @@ -35,6 +35,13 @@ AC_ARG_ENABLE(ldap, [ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK ],,) +AC_ARG_ENABLE(fetch-external, +[ --disable-fetch-external Disables fetching external tarballs from web sources. +],,) +AC_ARG_WITH(external-tar, +[ --with-external-tar=<TARFILE PATH> Specify path to tarfiles manually ], +[ TARFILE_LOCATION="$withval" +]) AC_ARG_WITH(openldap, [ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one @@ -374,7 +381,7 @@ AC_ARG_ENABLE(mysql-connector, AC_ARG_WITH(system-mysql, [ --with-system-mysql Use MySQL libraries already on system, for building the MySQL Connector/OOo extension. Requires MYSQLCONFIG to point to the mysql_config executable. -],,with_system_mysql="no") +],,) AC_ARG_WITH(libmysql-path, [ --with-libmysql-path Use Connector/C (libmysql) installation for building the MySQL Connector/OOo extension. @@ -1197,6 +1204,19 @@ else fi AC_SUBST(ENABLE_FONTCONFIG) +dnl =================================================================== +dnl find external tarballs. +dnl =================================================================== +if test -z $TARFILE_LOCATION; then + TARFILE_LOCATION="DEFAULT" +fi +AC_SUBST(TARFILE_LOCATION) + +if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \ + && test -z "$with_system_libs" -a "$with_system_jars" != "no"; then + DO_FETCH_TARBALLS="yes" +fi +AC_SUBST(DO_FETCH_TARBALLS) dnl =================================================================== dnl Disable legacy binary file formats filters @@ -3938,13 +3958,6 @@ int main(int argc, char **argv) { ], [AC_MSG_RESULT(OK)], [AC_MSG_ERROR([not suitable, we need >= 1.0.6])]) AC_LANG_POP([C++]) - AC_MSG_CHECKING([STL compatibility]) - if test "$WITH_STLPORT" != "no"; then - AC_MSG_ERROR([to use system mysqlcppconn you need to use --without-stlport]) - else - AC_MSG_RESULT([OK]) - fi - else AC_MSG_RESULT([internal]) AC_MSG_CHECKING([for mysqlcppconn module]) @@ -4061,6 +4074,70 @@ if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ [AC_MSG_ERROR(serializer.jar not found.)], []) AC_SUBST(SERIALIZER_JAR) fi + +dnl Saxon comes in two practically available versions, the out-of-date saxonb which +dnl supports the java extensions that OOo uses, and the up-to-date saxon he +dnl "home edition" version, which is crippled to not support those java extensions. +dnl And as an aside the he one also needs to be tweaked to include +dnl a META-INF/services to broadcast that it supports the jaxp transform factory + + AC_MSG_CHECKING([if saxon works]) + cat > saxontest.java <<_ACEOF +[import javax.xml.transform.TransformerFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.stream.StreamSource; +import java.io.*; + +import net.sf.saxon.FeatureKeys; + +class saxontest { + public static void main(String[] args) { + System.setProperty("javax.xml.transform.TransformerFactory", + "net.sf.saxon.TransformerFactoryImpl"); + try { + TransformerFactory tfactory = TransformerFactory.newInstance(); + // some external saxons (Debian, Ubuntu, ...) have this disabled + // per default + tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true)); + System.out.println("TransformerFactory is" + + tfactory.getClass().getName()); + Transformer transformer = tfactory.newTransformer( + new StreamSource(new File(args[0]))); + } catch(Exception e){ + e.printStackTrace(System.err); + System.exit(-1); + } + System.exit(0); + } +} +] +_ACEOF + cat > saxontest.xsl<<_ACEOF +[<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + <xsl:template match="/"> + <xsl:value-of select="math:sqrt(1)" xmlns:math="java:java.lang.Math"/> + </xsl:template> +</xsl:stylesheet> +] +_ACEOF + javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2" + AC_TRY_EVAL(javac_cmd) + if test $? = 0 && test -f ./saxontest.class ; then + java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2" + AC_TRY_EVAL(java_cmd) + if test $? = 0; then + AC_MSG_RESULT([yes]) + else + cat saxontest.java >&5 + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb]) + fi + else + AC_MSG_RESULT([no]) + cat saxontest.java >&5 + AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar]) + fi else AC_MSG_RESULT([internal]) SYSTEM_SAXON=NO @@ -4453,26 +4530,34 @@ if test "$BUILD_MOZAB" = "TRUE"; then MOZILLA_VERSION=1.1.14 fi MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" - for e in gz bz2; do - AC_MSG_CHECKING([for $MOZILLA_SOURCE_VERSION.tar.$e]) - if test ! -e "moz/download/$MOZILLA_SOURCE_VERSION.tar.$e" && test "$HAVE_MOZILLA_TARBALL" != "y"; then - AC_MSG_RESULT([not found]) - HAVE_MOZILLA_TARBALL=n + MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst` + AC_MSG_CHECKING([for mozilla sources]) + if test -z "$MOZILLA_FETCH_FILE"; then + AC_MSG_RESULT([not found]) + HAVE_MOZILLA_TARBALL=n + else + AC_MSG_CHECKING([for $MOZILLA_FETCH_FILE]) + if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then + if test -z "$DO_FETCH"; then + AC_MSG_RESULT([will be fetched]) + HAVE_MOZILLA_TARBALL=y + else + AC_MSG_RESULT([not found]) + HAVE_MOZILLA_TARBALL=n + fi else AC_MSG_RESULT([found]) HAVE_MOZILLA_TARBALL=y fi - done + fi if test "$HAVE_MOZILLA_TARBALL" != "y"; then - AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found. -Please copy $MOZILLA_SOURCE_VERSION.tar.bz2 or $MOZILLA_SOURCE_VERSION.tar.gz to moz/download/. -The archives can be found here: -ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$MOZILLA_VERSION/]) + AC_MSG_ERROR([Mozilla/SeaMonkey source archive not found. +Use "./fetch_tarballs.sh ooo.lst" to download.]) fi if test "$_os" = "WINNT"; then AC_MSG_CHECKING([for moztools binaries]) - if test ! -e "moz/download/vc8-moztools.zip" ; then - AC_MSG_ERROR([The following file is missing in moz/download: vc8-moztools.zip + if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then + AC_MSG_ERROR([The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip (from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)]) else AC_MSG_RESULT([ok]) diff --git a/fetch_tarballs.sh b/fetch_tarballs.sh new file mode 100755 index 000000000000..87c2c80e4be3 --- /dev/null +++ b/fetch_tarballs.sh @@ -0,0 +1,143 @@ +#!/bin/sh +#************************************************************************* +# +# 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.mk,v $ +# +# $Revision: 1.8 $ +# +# 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. +# +#************************************************************************* + +if [ -z "$TARFILE_LOCATION" ]; then + echo "ERROR: no destination defined! please set TARFILE_LOCATION!" + exit +fi + +if [ ! -d "$TARFILE_LOCATION" ]; then + mkdir $TARFILE_LOCATION +fi +if [ ! -d "$TARFILE_LOCATION" ]; then + echo "ERROR: can't create" + exit +fi + +if [ -z "$1" ]; then + echo "ERROR: parameter missing!" + echo "usage: $0 <fetch list>" + echo "first line must define the base url." + exit +fi + +# check for wget and md5sum +wget= +md5sum= +curl= + +for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do + eval "$i --version" > /dev/null 2>&1 + ret=$? + if [ $ret -eq 0 ]; then + wget=$i + echo found wget: $wget + break 2 + fi +done + +for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do +# mac curl returns "2" on --version +# eval "$i --version" > /dev/null 2>&1 +# ret=$? +# if [ $ret -eq 0 ]; then + if [ -x $i ]; then + curl=$i + echo found curl: $curl + break 2 + fi +done + +if [ -z "$wget" -a -z "$curl" ]; then + echo "ERROR: neither wget nor curl found!" + exit +fi + +for i in md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum /opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do + eval "$i --version" > /dev/null 2>&1 + ret=$? + if [ $ret -eq 0 ]; then + md5sum=$i + echo found md5sum: $md5sum + break 2 + fi +done + +if [ -z "$md5sum" ]; then + echo "Warning: no md5sum: found!" +fi + +start_dir=`pwd` +filelist=`cat $1` +cd $TARFILE_LOCATION +for i in $filelist ; do +# echo $i + if [ "$i" != `echo $i | sed "s/^http:\///"` ]; then + tarurl=$i + # TODO: check for comment + else + if [ "$tarurl" != "" ]; then + if [ ! -f "$i" ]; then + if [ ! -z "$wget" ]; then + $wget -nv -N $tarurl/$i + else + echo fetching $i + $curl $file_date_check -O $tarurl/$i + fi + wret=$? + if [ $wret -ne 0 ]; then + failed="$failed $i" + wret=0 + fi + if [ -f $i -a -n "$md5sum" ]; then + sum=`$md5sum $i | sed "s/ [ *].*//"` + sum2=`echo $i | sed "s/-.*//"` + if [ "$sum" != "$sum2" ]; then + echo checksum failure for $i + failed="$failed $i" + fi + fi + fi + fi + fi +done +cd $start_dir + +if [ ! -z "$failed" ]; then + echo + echo ERROR: failed on: + for i in $failed ; do + echo $i + done + exit 1 +fi + diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 5468076d22d4..7fcb566af0e3 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -284,7 +284,7 @@ en-US = "< &Back" en-US = "Cancel" [OOO_CONTROL_124] -en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html" +en-US = "Build contributed in collaboration with the community by Oracle. For credits, see: http://www.openoffice.org/welcome/credits.html" [OOO_CONTROL_125] en-US = "&Next >" @@ -668,10 +668,10 @@ en-US = "Microsoft Po&werPoint Presentations" en-US = "&[ProductName] Writer/Web" [OOO_CONTROL_274] -en-US = "Set [DEFINEDPRODUCT] to be the default application for these file types." +en-US = "Set [DEFINEDPRODUCT] to be the default application for Microsoft Office file types." [OOO_CONTROL_275] -en-US = "[ProductName] can be set as the default application to open the following file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the progam that opens it now." +en-US = "[ProductName] can be set as the default application to open Microsoft Office file types. This means, for instance, that if you double click on one of these files, [ProductName] will open it, not the program that opens it now." [OOO_CONTROL_276] en-US = "File types" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt index d3b7a6027356..f335fb6828e1 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt @@ -12,6 +12,12 @@ CustomerInformation SerialNumber Show SERIALNUMSHOW CustomSetup ChangeFolder Hide Installed CustomSetup Details Hide Installed CustomSetup InstallLabel Hide Installed +FileTypeDialog CheckBox1 Enable &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) +FileTypeDialog CheckBox1 Disable NOT ( &gm_p_Wrt=3 OR ( !gm_p_Wrt=3 AND &gm_p_Wrt=-1 ) ) +FileTypeDialog CheckBox2 Enable &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) +FileTypeDialog CheckBox2 Disable NOT ( &gm_p_Calc=3 OR ( !gm_p_Calc=3 AND &gm_p_Calc=-1 ) ) +FileTypeDialog CheckBox3 Enable &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) +FileTypeDialog CheckBox3 Disable NOT ( &gm_p_Impress=3 OR ( !gm_p_Impress=3 AND &gm_p_Impress=-1 ) ) InstallWelcome Copyright Hide SHOWCOPYRIGHT="No" InstallWelcome Copyright Show SHOWCOPYRIGHT="Yes" LicenseAgreement Next Disable AgreeToLicense <> "Yes" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index 9aff71e515d9..2200f4d28a3a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -33,7 +33,7 @@ CustomSetup Details SelectionBrowse DiskSpaceRequirements 1 1 CustomSetup Help SpawnDialog CustomSetupTips 1 1 CustomSetup Next [_IsSetupTypeMin] Custom 1 0 CustomSetup Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0 -CustomSetup Next NewDialog ReadyToInstall OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1) 9 +CustomSetup Next NewDialog FileTypeDialog OutOfNoRbDiskSpace <> 1 And (LANG_SELECTED = 1) And (APP_SELECTED = 1) 9 CustomSetup Next DoAction ResetLanguageSelected 1 1 CustomSetup Next DoAction SetLanguageSelected (isMulti <> 1) Or Installed 3 CustomSetup Next DoAction SetLanguageSelected (isMulti = 1) And Not Installed And (LANGUAGECONDITIONINSTALL) 4 @@ -57,8 +57,7 @@ DiskSpaceRequirements OK EndDialog Return 1 0 FilesInUse Exit EndDialog Exit 1 0 FilesInUse Ignore EndDialog Ignore 1 0 FilesInUse Retry EndDialog Retry 1 0 -FileTypeDialog Back NewDialog CustomSetup Installed OR _IsSetupTypeMin = "Custom" 2 -FileTypeDialog Back NewDialog SetupType NOT Installed AND _IsSetupTypeMin <> "Custom" 1 +FileTypeDialog Back NewDialog CustomSetup 1 1 FileTypeDialog Cancel SpawnDialog CancelSetup 1 0 FileTypeDialog Next NewDialog ReadyToInstall 1 0 InstallChangeFolder Cancel EndDialog Return 1 2 @@ -102,7 +101,7 @@ PatchWelcome Cancel SpawnDialog CancelSetup 1 1 PatchWelcome Next EndDialog Return 1 3 PatchWelcome Next Reinstall ALL PATCH And REINSTALL="" 1 PatchWelcome Next ReinstallMode omus PATCH And REINSTALLMODE="" 2 -ReadyToInstall Back NewDialog CustomSetup Installed OR _IsSetupTypeMin = "Custom" 2 +ReadyToInstall Back NewDialog FileTypeDialog Installed OR _IsSetupTypeMin = "Custom" 2 ReadyToInstall Back NewDialog MaintenanceType Installed AND _IsMaintenance = "Reinstall" 3 ReadyToInstall Back NewDialog SetupType NOT Installed AND _IsSetupTypeMin <> "Custom" 1 ReadyToInstall Cancel SpawnDialog CancelSetup 1 0 @@ -148,6 +147,7 @@ SetupType Back NewDialog CustomerInformation 1 0 SetupType Cancel SpawnDialog CancelSetup 1 0 SetupType Next AddLocal ALL _IsSetupTypeMin = "Typical" 0 SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0 -SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0 +SetupType Next [FILETYPEDIALOGUSED] 0 _IsSetupTypeMin <> "Custom" 5 +SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 6 SplashBitmap Cancel SpawnDialog CancelSetup 1 0 SplashBitmap Next NewDialog InstallWelcome 1 0 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt index c53ccda8d736..3fe0c2062177 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/LaunchCo.idt @@ -2,4 +2,4 @@ Condition Description s255 l255 WINDOWSENCODINGTEMPLATE LaunchCondition Condition Privileged OOO_LAUNCH_1 -SETUP_USED=1 Or Installed OOO_LAUNCH_2 +(VersionNT < 600) or (SETUP_USED=1) or Installed OOO_LAUNCH_2
\ No newline at end of file diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index c9f672b2548e..6009edf00041 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -21,6 +21,7 @@ DisplayNameMinimal IDPROP_SETUPTYPE_COMPACT DisplayNameTypical IDPROP_SETUPTYPE_TYPICAL DWUSINTERVAL 30 ErrorDialog SetupError +FILETYPEDIALOGUSED 0 InstallChoice AR INSTALLLEVEL INSTALLLEVELTEMPLATE ISCHECKFORPRODUCTUPDATES ISCHECKFORPRODUCTUPDATESTEMPLATE @@ -45,6 +46,9 @@ ReinstallModeText omus REMOVEOLDPRODUCTS 1 SecureCustomProperties NEWPRODUCTS;SAMEPRODUCTS;OLDPRODUCTS;OLDPRODUCTSSAMEMAJOR;OLDPRODUCTS2;BETAPRODUCTS;STUBPRODUCTS;O2LPENUS;O2LPPT;O2LPRU;O2LPEL;O2LPNL;O2LPFR;O2LPES;O2LPFI;O2LPHU;O2LPCA;O2LPIT;O2LPCS;O2LPSK;O2LPENGB;O2LPDA;O2LPSV;O2LPNO;O2LPPL;O2LPDE;O2LPPTBR;O2LPTH;O2LPET;O2LPJA;O2LPKO;O2LPZHCN;O2LPZHTW;O2LPTR;O2LPHI;O2LPAR;O2LPHE SetupType Typical +SELECT_WORD 0 +SELECT_EXCEL 0 +SELECT_POWERPOINT 0 STR_NEW_DISPLAY_NAME OOO_STR_NEW_DISPLAY_NAME STR_EDIT OOO_STR_EDIT STR_MS_WORD_DOCUMENT OOO_STR_MS_WORD_DOCUMENT diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index abcc2e3f0b32..1dfdeb95321e 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -38,6 +38,8 @@ Globals PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL 6 OPENSOURCE 1 + OOODOWNLOADNAME 1 + STARTCENTER_LAYOUT_STYLE 0 } } } @@ -137,6 +139,7 @@ OpenOffice_wJRE PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 + WITHJREPRODUCT 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles SPELLCHECKERFILE spellchecker_selection.txt @@ -353,6 +356,7 @@ OpenOffice_Dev_SDK UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDev + DEVELOPMENTPRODUCT 1 PACK_INSTALLED 1 POOLPRODUCT 0 DMG_VOLUMEEXTENSION SDK @@ -483,6 +487,7 @@ BrOffice_wJRE PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 + WITHJREPRODUCT 1 SETSTATICPATH 1 GLOBALFILEGID gid_File_Lib_Vcl GLOBALPATCHFILEGID gid_File_Txt_Patchfiles diff --git a/ooo.lst b/ooo.lst new file mode 100644 index 000000000000..6e7f4d7b003c --- /dev/null +++ b/ooo.lst @@ -0,0 +1,74 @@ +http://hg.services.openoffice.org/binaries +05a0ece1372392a2cf310ebb96333025-openssl-0.9.8l.tar.gz +09357cc74975b01714e00c5899ea1881-pixman-0.12.0.tar.gz +0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt +1177af54a09e320d2c24015f29c3a93e-hunspell-1.2.8.tar.gz +128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz +17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz +18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz +195d042623bcc2e1668ab8370de6dc2a-xmlsec1-1.2.12.tar.gz +24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html +26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz +284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz +2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz +2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz +2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz +2dfbbf27a5822eeabaeacdf16d7c41e7-fondu_src-051010.tar.gz +2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz +30102daecfb3a6aa022d2691dc075180-liberation-fonts-1.05.zip +35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip +377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt +39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz +3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz +48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt +48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz +4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz +4ea70ea87b47e92d318d4e7f5b940f47-cairo-1.8.0.tar.gz +599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz +5aba06ede2daa9f2c11892fbd7bc3057-libserializer.zip +6244eb0b6e2647ee50470951fa6efb47-nss_3_12_5.tar.gz +67b42915c8432abf0a922438f00860a2-libxml.zip +71ef7bcd3493a94395abccecbcf62dd7-libxml2-2.6.31.tar.gz +7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz +79600e696a98ff95c2eba976f7a8dfbb-liblayout.zip +798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +ecb2e37e45c9933e2a963cabe03670ab-curl-7.19.7.tar.gz +8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar +8ea307d71d11140574bfb9fcc2487e33-libbase.zip +9f18d97ca99b4f095f5ff18139df59c3-cppunit-1.8.0.tar.gz +a06a496d7a43cbdc35e69dbe678efadb-libloader.zip +a169ab152209200a7bad29a275cb0333-seamonkey-1.1.14.source.tar.gz +a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html +a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +abc405d0bdd3ee22782d7aa20e440f08-zlib-1.1.4.tar.gz +ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz +ba1015b59c112d44d7797b62fe7bee51-neon-0.29.3.tar.gz +bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 +c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz +ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz +cd5997284f4ba1e8dde5d1e5869fc342-libwpd-0.8.8.tar.gz +d0b5af6e408b8d2958f3d83b5244f5e8-hyphen-2.4.tar.gz +d1a3205871c3c52e8a50c9f18510ae12-libformula.zip +d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz +d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip +d70951c80dabecc2892c919ff5d07172-db-4.7.25.NC-custom.tar.gz +dbb3757275dc5cc80820c0b4dd24ed95-librepository.zip +dbd5f3b47ed13132f04c685d608a7547-jpeg-6b.tar.gz +e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt +e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2 +e83ec5d27fc4c10c6f612879bea9a153-libxslt-1.1.24.tar.gz +ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz +ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz +ee8b492592568805593f81f8cdf2a04c-expat-2.0.1.tar.gz +f3e2febd267c8e4b13df00dac211dd6d-flute.zip +f7925ba8491fe570e5164d2c72791358-libfonts.zip +fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt +fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz +fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz +fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz +fe5b3e2b7c4577f30dc001054365653e-dejavu-fonts-ttf-2.30.zip +831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp index 833ed3905241..833ed3905241 100644..100755 --- a/scp2/source/base/registryitem_base.scp +++ b/scp2/source/base/registryitem_base.scp diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp index 7b392f173378..aaba3cd6c2ab 100644 --- a/scp2/source/calc/file_calc.scp +++ b/scp2/source/calc/file_calc.scp @@ -49,11 +49,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc) STD_UNO_LIB_FILE( gid_File_Lib_Date, date) -STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc) +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc) -STD_LIB_FILE( gid_File_Lib_Scui, scui) +STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui) -STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt) +STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt) STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd) diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp index 84ab326814ee..0c26c3a7a78b 100644 --- a/scp2/source/calc/module_calc.scp +++ b/scp2/source/calc/module_calc.scp @@ -89,4 +89,13 @@ Module gid_Module_Langpack_Calc_Template gid_File_Res_Solver); End +Module gid_Module_Prg_Calc_MSO_Reg + ParentID = gid_Module_Prg_Calc; + Name = "gid_Module_Prg_Calc_MSO_Reg"; + Description = "gid_Module_Prg_Calc_MSO_Reg"; + Styles = (HIDDEN_ROOT); + Minimal = YES; + Default = YES; +End + #include "alllangmodules_calc.inc" diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index e2504579e0a0..efc71ac73f63 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1110,11 +1110,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc ) // registering the mso file types -CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_Bin, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_Bin, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_MSO_Reg, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_MSO_Reg, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) diff --git a/scp2/source/calc/registryitem_calc.ulf b/scp2/source/calc/registryitem_calc.ulf index 2f6e1e8eda9a..da0739ee1756 100644 --- a/scp2/source/calc/registryitem_calc.ulf +++ b/scp2/source/calc/registryitem_calc.ulf @@ -29,10 +29,10 @@ en-US = "&New" [STR_REG_VAL_SO60_SPREADSHEET] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet" [STR_REG_VAL_SO60_CALC_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Spreadsheet Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template" [STR_REG_VAL_OO_CALC] en-US = "OpenDocument Spreadsheet" diff --git a/scp2/source/draw/registryitem_draw.ulf b/scp2/source/draw/registryitem_draw.ulf index 46224625dfb8..7e6bce29fa21 100644 --- a/scp2/source/draw/registryitem_draw.ulf +++ b/scp2/source/draw/registryitem_draw.ulf @@ -29,10 +29,10 @@ en-US = "&New" [STR_REG_VAL_SO60_DRAWING] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing" [STR_REG_VAL_SO60_DRAW_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Drawing Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Drawing Template" [STR_REG_VAL_OO_DRAW] en-US = "OpenDocument Drawing" diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp index 7f8bcb7c44f7..1682b88d051f 100644 --- a/scp2/source/impress/module_impress.scp +++ b/scp2/source/impress/module_impress.scp @@ -77,4 +77,13 @@ Module gid_Module_Langpack_Impress_Template Files = (gid_File_Help_Simpress_Zip); End +Module gid_Module_Prg_Impress_MSO_Reg + ParentID = gid_Module_Prg_Impress; + Name = "gid_Module_Prg_Impress_MSO_Reg"; + Description = "gid_Module_Prg_Impress_MSO_Reg"; + Styles = (HIDDEN_ROOT); + Minimal = YES; + Default = YES; +End + #include "alllangmodules_impress.inc" diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index 689dcd7e1526..cce7f1d85ad3 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -975,10 +975,10 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti ) // registering the mso file types -CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_Bin, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_Bin, pps, PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_Bin, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_MSO_Reg, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_MSO_Reg, pps, PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_MSO_Reg, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_MSO_Reg, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_MSO_Reg, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_MSO_Reg, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) diff --git a/scp2/source/impress/registryitem_impress.ulf b/scp2/source/impress/registryitem_impress.ulf index 2b49957ea470..0221ab122d52 100644 --- a/scp2/source/impress/registryitem_impress.ulf +++ b/scp2/source/impress/registryitem_impress.ulf @@ -32,10 +32,10 @@ en-US = "&New" en-US = "Show" [STR_REG_VAL_SO60_PRESENT] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation" [STR_REG_VAL_SO60_IMPRESS_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Presentation Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Presentation Template" [STR_REG_VAL_OO_PRESENT] en-US = "OpenDocument Presentation" diff --git a/scp2/source/math/registryitem_math.ulf b/scp2/source/math/registryitem_math.ulf index cee55d76d3c8..c7cfb663f369 100644 --- a/scp2/source/math/registryitem_math.ulf +++ b/scp2/source/math/registryitem_math.ulf @@ -29,7 +29,7 @@ en-US = "&New" [STR_REG_VAL_SO60_FORMULA] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Formula" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Formula" [STR_REG_VAL_OO_FORMULA] en-US = "OpenDocument Formula" diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 4a39b5da4978..400baaa5ef04 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1,5 +1,5 @@ -************************************************************************* -* +/************************************************************************* + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * Copyright 2000, 2010 Oracle and/or its affiliates. @@ -23,7 +23,7 @@ * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. * -************************************************************************/ + ************************************************************************/ #include "macros.inc" #ifdef WNT @@ -653,7 +653,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi) File gid_File_Lib_Fwk Name = LIBNAME(fwk); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,PATCH,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -677,7 +677,7 @@ STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker) File gid_File_Lib_I18npool TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,PATCH,UNO_COMPONENT); RegistryID = gid_Starregistry_Services_Rdb; Dir = SCP2_OOO_BIN_DIR; #ifdef UNX @@ -1325,7 +1325,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); + Styles = (PACKED,PATCH,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1381,7 +1381,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1) STD_LIB_FILE( gid_File_Lib_Sts , sts) STD_UNO_LIB_FILE( gid_File_Lib_Svl, svl ) -STD_UNO_LIB_FILE( gid_File_Lib_Svtools, svt ) +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt ) STD_LIB_FILE( gid_File_Lib_Svx_Core, svxcore) STD_UNO_LIB_FILE( gid_File_Lib_Svx, svx) @@ -1390,10 +1390,10 @@ STD_LIB_FILE( gid_File_Lib_Editeng, editeng) STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter) -STD_UNO_LIB_FILE( gid_File_Lib_Sw , sw) -STD_LIB_FILE( gid_File_Lib_Swui, swui) +STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw) +STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui) -STD_LIB_FILE( gid_File_Lib_Msword, msword ) +STD_LIB_FILE_PATCH( gid_File_Lib_Msword, msword ) #if ! defined UNX File gid_File_Lib_Sysdtrans @@ -1537,7 +1537,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Xof , xof) File gid_File_Lib_Xo Name = LIBNAME(xo); TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); + Styles = (PACKED,PATCH,UNO_COMPONENT); Dir = SCP2_OOO_BIN_DIR; RegistryID = gid_Starregistry_Services_Rdb; End @@ -1698,7 +1698,7 @@ File gid_File_Lib_Openssl TXT_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - #ifdef WNT + #ifdef WNT Name = "ssleay32.dll"; #endif End @@ -1709,7 +1709,7 @@ File gid_File_Lib_Crypto TXT_FILE_BODY; Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; - + #ifdef WNT Name = "libeay32.dll"; #endif diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 94f9bb6e4450..19a15f7fcc11 100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2100,7 +2100,7 @@ End File gid_File_Extension_Dictionary_Sl Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-sl.oxt"; - Styles = (PACKED, FORCELANGUAGEPACK); + Styles = (PACKED, PATCH, FORCELANGUAGEPACK); UnixRights = 444; End #endif diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp index 8b045bb440c2..26bdc09eddd3 100644 --- a/scp2/source/ooo/installation_ooo.scp +++ b/scp2/source/ooo/installation_ooo.scp @@ -34,6 +34,7 @@ Installation gid_Installation_Ooo OOoBaseVersion = "${OOOBASEVERSION}"; UserDirProductVersion = "${USERDIRPRODUCTVERSION}"; JavaVersion = "${JAVAVERSION}"; + SxwFormatName = "OpenOffice.org"; SxwFormatVersion = "1.1"; VendorName = "OpenOffice.org"; #ifdef WNT diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 5d8673ef9855..47a053f225cd 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -34,11 +34,18 @@ RegistryItem gid_Regitem_Bau Value = "soffice.StarConfigFile.6"; End -RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e +RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}"; ModuleID = gid_Module_Root; - Value = "%PRODUCTNAME Service Manager"; + Value = "%PRODUCTNAME Service Manager (Ver 1.0)"; +End + +RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e_soffice + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = "AppID\soffice.exe"; + ModuleID = gid_Module_Root; + Value = "%PRODUCTNAME Service Manager (Ver 1.0)"; End RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_ diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf index cbb57ef56d98..d37db89c113a 100644 --- a/scp2/source/ooo/registryitem_ooo.ulf +++ b/scp2/source/ooo/registryitem_ooo.ulf @@ -32,7 +32,7 @@ en-US = "&New" en-US = "&Install" [STR_REG_VAL_SO60_CONFIGFILE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Configuration File" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File" [STR_REG_VAL_SO50_TEMPLATE_OOO] en-US = "StarOffice 5.0 Template" diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index b69082b05cd5..9228b5cd711c 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -51,7 +51,7 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll Source = "reg4allmsdoc.dll"; Target = "FindRegisteredExtensions"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH", "CostFinalize"); + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize"); End WindowsCustomAction gid_Customaction_Regactivexdll1 @@ -516,3 +516,21 @@ WindowsCustomAction gid_Customaction_ShowSurvey Inbinarytable = 1; Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end"); End + +WindowsCustomAction gid_Customaction_LookForRegisteredExtensions + Name = "LookForRegisteredExtensions"; + Typ = "65"; + Source = "reg4allmsdoc.dll"; + Target = "LookForRegisteredExtensions"; + Inbinarytable = 1; + Assignment1 = ("ControlEvent", "CustomSetup", "Next", "DoAction", "LookForRegisteredExtensions", "1", "2"); +End + +WindowsCustomAction gid_Customaction_RegisterSomeExtensions + Name = "RegisterSomeExtensions"; + Typ = "65"; + Source = "reg4allmsdoc.dll"; + Target = "RegisterSomeExtensions"; + Inbinarytable = 1; + Assignment1 = ("ControlEvent", "FileTypeDialog", "Next", "DoAction", "RegisterSomeExtensions", "1", "1"); +End diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index 50f0aa064d71..50f0aa064d71 100644..100755 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk index 21eaad714eac..21eaad714eac 100644..100755 --- a/scp2/source/winexplorerext/makefile.mk +++ b/scp2/source/winexplorerext/makefile.mk diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp index 6993ba25c1d1..6993ba25c1d1 100644..100755 --- a/scp2/source/winexplorerext/module_winexplorerext.scp +++ b/scp2/source/winexplorerext/module_winexplorerext.scp diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp index 7c932bac1f28..7c932bac1f28 100644..100755 --- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp +++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp index 16928c8b25b9..0d959dd3f86b 100644 --- a/scp2/source/writer/module_writer.scp +++ b/scp2/source/writer/module_writer.scp @@ -92,5 +92,15 @@ Module gid_Module_Langpack_Writer_Template gid_File_Res_T602Filter); End +Module gid_Module_Prg_Wrt_MSO_Reg + ParentID = gid_Module_Prg_Wrt; + Name = "gid_Module_Prg_Wrt_MSO_Reg"; + Description = "gid_Module_Prg_Wrt_MSO_Reg"; + Styles = (HIDDEN_ROOT); + Minimal = YES; + Default = YES; +End + + #include "alllangmodules_writer.inc" diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index a1233bb1792f..8c3f0a5b82ad 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -1488,11 +1488,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg ) // registering the mso file types // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid, key, cond, disp_name, icon_id, app, default, dox_type) -CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_Bin, doc, DOC, MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot, gid_Module_Prg_Wrt_Bin, dot, DOT, MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_Bin, rtf, RTF, MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_MSO_Reg, doc, DOC, MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_MSO_Reg, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_MSO_Reg, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot, gid_Module_Prg_Wrt_MSO_Reg, dot, DOT, MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_MSO_Reg, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_MSO_Reg, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_MSO_Reg, rtf, RTF, MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer ) diff --git a/scp2/source/writer/registryitem_writer.ulf b/scp2/source/writer/registryitem_writer.ulf index ce8108ae572d..f353df21d9cc 100644 --- a/scp2/source/writer/registryitem_writer.ulf +++ b/scp2/source/writer/registryitem_writer.ulf @@ -29,13 +29,13 @@ en-US = "&New" [STR_REG_VAL_SO60_TEXT] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document" [STR_REG_VAL_SO60_MASTERDOC] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Master Document" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Master Document" [STR_REG_VAL_SO60_WRITER_TEMPLATE] -en-US = "%PRODUCTNAME %SXWFORMATVERSION Text Document Template" +en-US = "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template" [STR_REG_VAL_OO_WRITER] en-US = "OpenDocument Text" diff --git a/set_soenv.in b/set_soenv.in index 0cb65ee3d72a..64815d418f99 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -89,7 +89,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TMPDIR, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD, - $PROEXT, + $PROEXT, $TARFILE_LOCATION, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS); # #------------------------------------------- @@ -197,6 +197,7 @@ $ENABLEUNICODE = "TRUE"; $NEW_JAR_PACK = "TRUE"; $NO_BSYMBOLIC = "TRUE"; $comment = "#"; # UNIX script comment character +$TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external sources # Setting platform dependent constant values. if ( $platform =~ m/solaris/ ) @@ -941,6 +942,12 @@ $SOLARSRC = '$SRC_ROOT'; my @splitlist = split( /\//, $SRC_ROOT ); pop @splitlist; $SOURCE_ROOT_DIR = join("/", @splitlist); + +# default TARFILE_LOCATION +if ('@TARFILE_LOCATION@' eq "DEFAULT") +{ $TARFILE_LOCATION="$SOURCE_ROOT_DIR/ext_sources"; +} + # $DEVROOT = '$SRC_ROOT'; # Set solenv and solver to given or default values. @@ -1614,6 +1621,8 @@ ToFile( "MOC4", "@MOC4@", "e" ); ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" ); ToFile( "PSPRINT", "TRUE", "e" ); ToFile( "MKDEPENDSOLVER", "TRUE", "e" ); +ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" ); +ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" ); # # Writing the platform dependent constant values to file. # (c = comment, e = environment variable, a = alias ) diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl index a4fc9f21d2b5..f9f163f7be4c 100755 --- a/solenv/bin/deliver.pl +++ b/solenv/bin/deliver.pl @@ -1212,6 +1212,13 @@ sub zip_files print "ZIP: updating $zip_file\n" if $opt_verbose; next if ( $opt_check ); + if ( $opt_delete ) { + if ( -e $zip_file ) { + unlink $zip_file or die "Error: can't remove file '$zip_file': $!"; + next; + } + } + local $work_file = ""; if ( $zip_file eq $common_zip_file) { # Zip file in common tree: work on uniq copy to avoid collisions @@ -1240,31 +1247,14 @@ sub zip_files # zip content has to be relative to $dest_dir chdir($dest_dir{$zip_file}) or die "Error: cannot chdir into $dest_dir{$zip_file}"; my $this_ref = $list_ref{$zip_file}; - if ( $opt_delete ) { - if ( -e $work_file ) { - open(UNZIP, "unzip -t $work_file 2>&1 |") or die "error opening zip file"; - if ( grep /empty/, (<UNZIP>)) { - close(UNZIP); - unlink $work_file; - next; - } - close(UNZIP); - open(ZIP, "| $zipexe -q -o -d -@ $work_file") or die "error opening zip file"; - foreach $file ( @$this_ref ) { - print "ZIP: removing $file from $platform_zip_file\n" if $is_debug; - print ZIP "$file\n"; - } - close(ZIP); - } - } else { - open(ZIP, "| $zipexe -q -o -u -@ $work_file") or die "error opening zip file"; - foreach $file ( @$this_ref ) { - print "ZIP: adding $file to $zip_file\n" if $is_debug; - print ZIP "$file\n"; - } - close(ZIP); - fix_broken_cygwin_created_zips($work_file) if $^O eq "cygwin"; + open(ZIP, "| $zipexe -q -o -u -@ $work_file") or die "error opening zip file"; + foreach $file ( @$this_ref ) { + print "ZIP: adding $file to $zip_file\n" if $is_debug; + print ZIP "$file\n"; } + close(ZIP); + fix_broken_cygwin_created_zips($work_file) if $^O eq "cygwin"; + if ( $zip_file eq $common_zip_file) { # rename work file back if ( -e $work_file ) { @@ -1303,7 +1293,7 @@ sub fix_broken_cygwin_created_zips foreach $member ( $zip->members() ) { my $attributes = $member->unixFileAttributes(); $attributes &= ~0xFE00; - print $member->fileName($name) . ": " . sprintf("%lo", $attributes) if $is_debug; + print $member->fileName() . ": " . sprintf("%lo", $attributes) if $is_debug; $attributes |= 0x10; # add group write permission print "-> " . sprintf("%lo", $attributes) . "\n" if $is_debug; $member->unixFileAttributes($attributes); diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index bde0763e4564..143f60d986db 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1345,6 +1345,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) installer::packagelist::resolve_packagevariables(\$packagename, $allvariableshashref, 0); } + # Debian allows no underline in package name + if ( $installer::globals::debian ) { $packagename =~ s/_/-/g; } + my $linkaddon = ""; my $linkpackage = 0; $installer::globals::add_required_package = ""; @@ -1374,7 +1377,11 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # try it again later. #################################################### - if (( $installer::globals::patch ) || ( $installer::globals::languagepack ) || ( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; } + if (( $installer::globals::patch ) || + ( $installer::globals::languagepack ) || + ( $installer::globals::packageformat eq "native" ) || + ( $installer::globals::packageformat eq "portable" ) || + ( $installer::globals::packageformat eq "osx" )) { $allvariableshashref->{'POOLPRODUCT'} = 0; } if ( $allvariableshashref->{'POOLPRODUCT'} ) { diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index c3503221b8fa..c3503221b8fa 100644..100755 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 7818b74f4b40..f4edc8129255 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -710,7 +710,7 @@ sub set_addsystemintegration if ( $installer::globals::patch ) { $installer::globals::addsystemintegration = 0; } if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; } - if ( $installer::globals::packageformat eq "native" ) { $installer::globals::addsystemintegration = 0; } + if (( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "portable" )) { $installer::globals::addsystemintegration = 0; } my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n"; push( @installer::globals::globallogfileinfo, $infoline); diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 46512e525046..f98770a15790 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -446,11 +446,10 @@ sub get_downloadname_language # en-US is default language and can be removed therefore # for one-language installation sets - if ( $languages =~ /^\s*en-US\s*$/ ) - { - $languages = ""; - } - + # if ( $languages =~ /^\s*en-US\s*$/ ) + # { + # $languages = ""; + # } if ( length ($languages) > $installer::globals::max_lang_length ) { @@ -461,20 +460,252 @@ sub get_downloadname_language } ######################################################### -# Setting download name, first part +# Setting download name ######################################################### -sub get_downloadname_start +sub get_downloadname_productname { my ($allvariables) = @_; my $start = "OOo"; + + if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start = "OOo"; } + + if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start = "OOo-Dev"; } + + if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-SDK"; } + + if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-Dev-SDK"; } + + if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "OOo-URE"; } + if ( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) { $start = "BrOo"; } + if ( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) { $start = "BrOo-Dev"; } + + if (( $allvariables->{'PRODUCTNAME'} eq "BrOffice.org" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-SDK"; } + + if (( $allvariables->{'PRODUCTNAME'} eq "BrOo-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "BrOo-Dev-SDK"; } + return $start; } ######################################################### +# Setting download version +######################################################### + +sub get_download_version +{ + my ($allvariables) = @_; + + my $version = ""; + + my $devproduct = 0; + if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; } + + my $cwsproduct = 0; + # the environment variable CWS_WORK_STAMP is set only in CWS + if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; } + + if (( $cwsproduct ) || ( $devproduct )) # use "DEV300m75" + { + my $source = uc($installer::globals::build); # DEV300 + my $localminor = ""; + if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; } + else { $localminor = $installer::globals::lastminor; } + $version = $source . $localminor; + } + else # use 3.2.0rc1 + { + $version = $allvariables->{'PRODUCTVERSION'}; + if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; } + if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; } + } + + return $version; +} + +############################################################### +# Set date string, format: yymmdd +############################################################### + +sub set_date_string +{ + my ($allvariables) = @_; + + my $datestring = ""; + + my $devproduct = 0; + if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; } + + my $cwsproduct = 0; + # the environment variable CWS_WORK_STAMP is set only in CWS + if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; } + + my $releasebuild = 1; + if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; } + + if (( ! $devproduct ) && ( ! $cwsproduct ) && ( ! $releasebuild )) + { + my @timearray = localtime(time); + + my $day = $timearray[3]; + my $month = $timearray[4] + 1; + my $year = $timearray[5] + 1900; + + if ( $month < 10 ) { $month = "0" . $month; } + if ( $day < 10 ) { $day = "0" . $day; } + + $datestring = $year . $month . $day; + } + + return $datestring; +} + +################################################################# +# Setting the platform name for download +################################################################# + +sub get_download_platformname +{ + my $platformname = ""; + + if ( $installer::globals::islinuxbuild ) + { + $platformname = "Linux"; + } + elsif ( $installer::globals::issolarisbuild ) + { + $platformname = "Solaris"; + } + elsif ( $installer::globals::iswindowsbuild ) + { + $platformname = "Win"; + } + elsif ( $installer::globals::isfreebsdbuild ) + { + $platformname = "FreeBSD"; + } + elsif ( $installer::globals::ismacbuild ) + { + $platformname = "MacOS"; + } + else + { + # $platformname = $installer::globals::packageformat; + $platformname = $installer::globals::compiler; + } + + return $platformname; +} + +######################################################### +# Setting the architecture for the download name +######################################################### + +sub get_download_architecture +{ + my $arch = ""; + + if ( $installer::globals::compiler =~ /unxlngi/ ) + { + $arch = "x86"; + } + elsif ( $installer::globals::compiler =~ /unxlngppc/ ) + { + $arch = "PPC"; + } + elsif ( $installer::globals::compiler =~ /unxlngx/ ) + { + $arch = "x86-64"; + } + elsif ( $installer::globals::issolarissparcbuild ) + { + $arch = "Sparc"; + } + elsif ( $installer::globals::issolarisx86build ) + { + $arch = "x86"; + } + elsif ( $installer::globals::iswindowsbuild ) + { + $arch = "x86"; + } + elsif ( $installer::globals::compiler =~ /^unxmacxi/ ) + { + $arch = "x86"; + } + elsif ( $installer::globals::compiler =~ /^unxmacxp/ ) + { + $arch = "PPC"; + } + + return $arch; +} + +######################################################### +# Setting the installation type for the download name +######################################################### + +sub get_install_type +{ + my ($allvariables) = @_; + + my $type = ""; + + my $cwsproduct = 0; + # the environment variable CWS_WORK_STAMP is set only in CWS + if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; } + + if ( $installer::globals::languagepack ) + { + $type = "langpack"; + + if ( $installer::globals::islinuxrpmbuild ) + { + $type = $type . "-rpm"; + } + + if ( $installer::globals::islinuxdebbuild ) + { + $type = $type . "-deb"; + } + + if (( $installer::globals::packageformat eq "archive" ) && ( $cwsproduct )) + { + $type = $type . "-arc"; + } + } + else + { + $type = "install"; + + if ( $installer::globals::islinuxrpmbuild ) + { + $type = $type . "-rpm"; + } + + if ( $installer::globals::islinuxdebbuild ) + { + $type = $type . "-deb"; + } + + if (( $installer::globals::packageformat eq "archive" ) && ( $cwsproduct )) + { + $type = $type . "-arc"; + } + + if (( $allvariables->{'WITHJREPRODUCT'} ) && ( $allvariables->{'WITHJREPRODUCT'} == 1 )) + { + $type = $type . "-wJRE"; + } + + } + + return $type; +} + +######################################################### # Setting installation addons ######################################################### @@ -548,48 +779,29 @@ sub get_current_version return $versionstring; } -######################################################### -# Determining the download file name -# Samples: -# OOo_2.0.2rc1_060213_Solarisx86_install_de -# OOo_2.0.2rc1_060213_LinuxIntel_langpack_zh-TW -# OOo_2.0.2rc1_060213_SolarisSparc_install_zh-TW_wJRE -# OOo_2.0.2rc1_060213_Win32Intel_install_zh-TW_wJRE -# OOo_2.0.157_LinuxIntel_install_de -# -######################################################### +############################################################################################### +# Setting the download file name +# Syntax: +# (PRODUCTNAME)_(VERSION)_(TIMESTAMP)_(OS)_(ARCH)_(INSTALLTYPE)_(LANGUAGE).(FILEEXTENSION) +# Rules: +# Timestamp only for Beta and Release Candidate +############################################################################################### sub set_download_filename { my ($languagestringref, $allvariables) = @_; - my $start = get_downloadname_start($allvariables); - # my $versionstring = get_current_version(); - my $versionstring = ""; - my $date = installer::logger::set_installation_date(); - if ( $installer::globals::product =~ /_Dev\s*$/ ) { $date = ""; } - my $platform = installer::worker::get_platform_name(); - my $type = get_installation_type(); + my $start = get_downloadname_productname($allvariables); + my $versionstring = get_download_version($allvariables); + my $date = set_date_string($allvariables); + my $platform = get_download_platformname(); + my $architecture = get_download_architecture(); + my $type = get_install_type($allvariables); my $language = get_downloadname_language($languagestringref); - my $addon = get_downloadname_addon(); - if ( $installer::globals::product =~ /_Dev\s*$/ ) - { - my $localminor = ""; - if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; } - else { $localminor = $installer::globals::lastminor; } - if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; } - $versionstring = $allvariables->{'PRODUCTVERSION'} . "." . $localminor; - } - else - { - if ( $allvariables->{'PACKAGEVERSION'} ) - { - $versionstring = $allvariables->{'PACKAGEVERSION'}; - } - } + # Setting the extension happens automatically - my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $type . "_" . $language . $addon; + my $filename = $start . "_" . $versionstring . "_" . $date . "_" . $platform . "_" . $architecture . "_" . $type . "_" . $language; $filename =~ s/\_\_/\_/g; # necessary, if $versionstring or $platform or $language are empty $filename =~ s/\_\s*$//; # necessary, if $language and $addon are empty diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index b646b071dda0..72ab0215dbcf 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -136,7 +136,9 @@ BEGIN $issolarispkgbuild = 0; $issolarissparcbuild = 0; $issolarisx86build = 0; + $isfreebsdbuild = 0; $isfreebsdpkgbuild = 0; + $ismacbuild = 0; $ismacdmgbuild = 0; $unpackpath = ""; $idttemplatepath = ""; @@ -268,7 +270,7 @@ BEGIN $isopensourceproduct = 1; $manufacturer = ""; $longmanufacturer = ""; - $sundirname = ""; + $sundirname = "Oracle"; $codefilename = "codes.txt"; $componentfilename = "components.txt"; $productcode = ""; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index bb38eede2375..0961b598902f 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -289,8 +289,10 @@ sub setglobalvariables } } - if ( $installer::globals::compiler =~ /unxmacxi/ ) + if (( $installer::globals::compiler =~ /unxmacxi/ ) || ( $installer::globals::compiler =~ /unxmacxp/ )) { + $installer::globals::ismacbuild = 1; + if ( $installer::globals::packageformat eq "dmg" ) { $installer::globals::ismacdmgbuild = 1; @@ -299,6 +301,8 @@ sub setglobalvariables if ( $installer::globals::compiler =~ /unxfbsd/ ) { + $installer::globals::isfreebsdbuild = 1; + if ( $installer::globals::packageformat eq "bsd" ) { $installer::globals::epmoutpath = "freebsd"; diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm index 38c21a57593b..63e5f44125c8 100644 --- a/solenv/bin/modules/installer/servicesfile.pm +++ b/solenv/bin/modules/installer/servicesfile.pm @@ -133,12 +133,14 @@ sub register_unocomponents my $filestring = ""; for ( my $i = 0; $i <= $#{$unocomponents}; ++$i ) { + my $local_error1_occured = 0; + my $local_error2_occured = 0; + my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'}); my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'}; if (defined($urlprefix)) { - call_regcomp( - $regcompfileref, $servicesfile, $sourcepath, $urlprefix); + $local_error1_occured = call_regcomp($regcompfileref, $servicesfile, $sourcepath, $urlprefix); } else { @@ -148,11 +150,11 @@ sub register_unocomponents if (length($filestring) > $installer::globals::unomaxservices || ($i == $#{$unocomponents} && $filestring ne "")) { - call_regcomp( - $regcompfileref, $servicesfile, $filestring, - $nativeservicesurlprefix); + $local_error2_occured = call_regcomp($regcompfileref, $servicesfile, $filestring, $nativeservicesurlprefix); $filestring = ""; } + + if (( $local_error1_occured ) || ( $local_error2_occured )) { $error_occured = 1; } } return $error_occured; @@ -163,6 +165,8 @@ sub call_regcomp my ($regcompfileref, $servicesfile, $filestring, $urlprefix) = @_; my @regcompoutput = (); + my $error_occured = 0; + my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |"; open (REG, "$systemcall"); @@ -187,6 +191,8 @@ sub call_regcomp $infoline = "SUCCESS: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); } + + return $error_occured; } ################################################################ diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm index 16174750d178..f2edd8d0e830 100644 --- a/solenv/bin/modules/installer/windows/registry.pm +++ b/solenv/bin/modules/installer/windows/registry.pm @@ -387,7 +387,7 @@ sub create_registry_table $registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage; installer::files::save_file($registrytablename ,\@reg64table ); - my $infoline = "Created idt file: $registrytablename\n"; + $infoline = "Created idt file: $registrytablename\n"; push(@installer::globals::logfileinfo, $infoline); } } diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 181df6213c8c..878ae45c99f0 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -218,6 +218,7 @@ finish { *o: cd %SOLARSRC% ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so + TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources } common_jre:0 IF %JREPATH% == { @@ -277,12 +278,14 @@ finish CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.4 } jdk15 { CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.5 } l10n { @@ -294,6 +297,7 @@ finish CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar ILIB %LIB%$;%JDKLIB% LIB %LIB%$;%JDKLIB% + JAVA_TARGET_FLAG -target 1.6 } } order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a @@ -495,6 +499,7 @@ unxfbsdi 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -507,6 +512,7 @@ unxfbsdi 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -766,6 +772,7 @@ unxlngi6 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -778,6 +785,7 @@ unxlngi6 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1040,6 +1048,7 @@ unxlngx6 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1052,6 +1061,7 @@ unxlngx6 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1310,6 +1320,7 @@ unxmacxi 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1322,6 +1333,7 @@ unxmacxi 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1564,6 +1576,7 @@ unxsoli4 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1576,6 +1589,7 @@ unxsoli4 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -1827,6 +1841,7 @@ unxsols4 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -1839,6 +1854,7 @@ unxsols4 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -2060,6 +2076,7 @@ unxsolu4 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh 850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR 851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2 900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR @@ -2072,6 +2089,7 @@ unxsolu4 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -2310,6 +2328,7 @@ unxubti8 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE 600: umask 002 800: rehash + 820: wrapfetch.sh } sh { @@ -2318,7 +2337,7 @@ unxubti8 415: fi 600: umask 002 800: hash -r - 882: fi + 820: wrapfetch.sh } } switches @@ -3154,6 +3173,7 @@ wntmsci12 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi @@ -3494,6 +3514,7 @@ wntmsci13 415: fi 600: umask 002 800: hash -r + 820: wrapfetch.sh 850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then 851: export SO_GEN_ERROR 852: fi diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index 0f9edf93b805..54eda38b47f9 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -30,6 +30,7 @@ common BIG_SVX BIG_TOOLS BISON_HAIRY + BISON_PKGDATADIR BISON_SIMPLE BMP_WRITES_FLAG bndchk @@ -223,6 +224,7 @@ common STLPORT4 STLPORT_VER SYSPATH + TARFILE_LOCATION TF_CAPELLA TF_CFG TF_CFGDATA diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk index bf2ca9314f33..bf2ca9314f33 100644..100755 --- a/solenv/inc/set_wntx64.mk +++ b/solenv/inc/set_wntx64.mk diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 6136e21acc96..495720f9d038 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -161,6 +161,8 @@ JAVARESPONSE= .ENDIF .ENDIF +JAVAFLAGS+=$(JAVA_TARGET_FLAG) + #END JAVA CDEFS= @@ -806,8 +808,8 @@ L10N_MODULE*=$(SOLARSRC)$/l10n ALT_L10N_MODULE*=$(SOLARSRC)$/l10n_so .IF "$(WITH_LANG)"!="" -.INCLUDE .IGNORE: $(L10N_MODULE)/localization_present.mk -.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/localization_present.mk +.INCLUDE .IGNORE: $(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk +.INCLUDE .IGNORE: $(ALT_L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/inc/localization_present.mk # check for localizations not hosted in l10n module. if a file exists there # it won't in l10n diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 3427b88836fc..e19c7124d4a7 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -110,9 +110,9 @@ clean: $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := bzip2 -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.bz2 $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ @@ -120,53 +120,53 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z @-$(RM) $@ .IF "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ") + @noop $(assign UNPACKCMD := sh -c "uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ") .ELSE # "$(GUI)"=="UNX" - @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := uncompress -c $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.Z | $(GNUTAR) -x$(tar_verbose_switch)f - ) .ENDIF # "$(GUI)"=="UNX" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.gz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.gz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tgz @-$(RM) $@ - @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) + @noop $(assign UNPACKCMD := gzip -d -c $(subst,\,/ $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tgz) $(TARFILE_FILTER) | $(GNUTAR) -x$(tar_verbose_switch)f - ) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar @-$(RM) $@ - @noop $(assign UNPACKCMD := $(GNUTAR) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_NAME).tar) + @noop $(assign UNPACKCMD := $(GNUTAR) -x$(tar_verbose_switch)f $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip @-$(RM) $@ - @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_NAME).zip) + @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).zip) @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar @-$(RM) $@ .IF "$(OS)"=="SOLARIS" - @noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_NAME).jar) + @noop $(assign UNPACKCMD := jar xf $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar) .ELSE # "$(OS)"=="SOLARIS" - @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_NAME).jar) + @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch) -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).jar) .ENDIF # "$(OS)"=="SOLARIS" @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ #do unpack -$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP) +$(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILE_DEP) $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI) $(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir) - $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) + $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE) @echo make writeable... @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE) @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \; @@ -294,11 +294,11 @@ $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) .ENDIF # "$(OUT2BIN)"!="" $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) -$(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_NAME).unpack $(PATCH_FILES) +$(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_MD5)-$(TARFILE_NAME).unpack $(PATCH_FILES) @-mv $(MISC)/$(TARFILE_ROOTDIR) $(MISC)/$(TARFILE_ROOTDIR).old @-rm -rf $(MISC)/$(TARFILE_ROOTDIR).old @-$(MKDIRHIER) $(MISC)$(fake_root_dir) - $(COMMAND_ECHO)cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) + $(COMMAND_ECHO)cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack)) .IF "$(P_ADDITIONAL_FILES)"!="" noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i)) .ENDIF "$(P_ADDITIONAL_FILES)"!="" diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk index aa62b1cf477f..aa62b1cf477f 100755..100644 --- a/solenv/inc/tg_help.mk +++ b/solenv/inc/tg_help.mk diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 0a4010bc7803..6ea51ae6ccfe 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -85,8 +85,8 @@ ARCH_FLAGS*= # objcpp = Objective C++ compiler to use CXX*=g++ CC*=gcc -objc*=gcc -objcpp*=g++ +objc*=$(CC) +objcpp*=$(CXX) CFLAGS=-fsigned-char -fmessage-length=0 -malign-natural -c $(EXTRA_CFLAGS) diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk index 6a21022d4830..7c7f0a88f4f4 100644 --- a/solenv/inc/unxmacxi.mk +++ b/solenv/inc/unxmacxi.mk @@ -49,10 +49,5 @@ CFLAGSENABLESYMBOLS=-g1 CFLAGSENABLESYMBOLS=-g .ENDIF -.IF "$(SNOW_LEOPARD_10_4)"!="" -JAVACOMPILER+=-target 1.5 -.EXPORT: DYLD_INSERT_LIBRARIES -.ENDIF # "$(SNOW_LEOPARD_10_4)"!="" - # Include generic Mac OS X makefile .INCLUDE : unxmacx.mk diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk index ea0d09c2cf96..ea0d09c2cf96 100755..100644 --- a/soltools/adjustvisibility/makefile.mk +++ b/soltools/adjustvisibility/makefile.mk diff --git a/soltools/mkdepend/cppsetup.c b/soltools/mkdepend/cppsetup.c index b75a2ed5b26e..173798105a3c 100644 --- a/soltools/mkdepend/cppsetup.c +++ b/soltools/mkdepend/cppsetup.c @@ -143,6 +143,9 @@ _my_if_errors (ip, cp, expecting) } fprintf (stderr, "^--- expecting %s\n", expecting); #endif /* DEBUG_MKDEPEND */ + (void)ip; + (void)cp; + (void)expecting; return NULL; } @@ -150,13 +153,11 @@ _my_if_errors (ip, cp, expecting) #define MAXNAMELEN 256 char * -_lookup_variable (ip, var, len) - IfParser *ip; +_lookup_variable (var, len) const char *var; int len; { char tmpbuf[MAXNAMELEN + 1]; - struct _parse_data *pd = (struct _parse_data *) ip->data; if (len > MAXNAMELEN) return 0; @@ -173,7 +174,8 @@ _my_eval_defined (ip, var, len) const char *var; int len; { - if (_lookup_variable (ip, var, len)) + (void)ip; + if (_lookup_variable (var, len)) return 1; else return 0; @@ -189,14 +191,16 @@ _my_eval_variable (ip, var, len) { char *s; - s = _lookup_variable (ip, var, len); + (void)ip; + + s = _lookup_variable (var, len); if (!s) return 0; do { var = s; if (!isvarfirstletter(*var)) break; - s = _lookup_variable (ip, var, strlen(var)); + s = _lookup_variable (var, strlen(var)); } while (s); return atoi(var); diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index 9da82495f024..ac04357212e2 100644 --- a/soltools/mkdepend/def.h +++ b/soltools/mkdepend/def.h @@ -164,12 +164,25 @@ void define( char *def, struct symhash **symbols ); void hash_define(char *name, char * val, struct symhash **symbols); struct symhash *hash_copy( struct symhash *symbols ); void hash_free( struct symhash *symbols ); - -#if NeedVarargsPrototypes -extern fatalerr(char *, ...); -extern warning(char *, ...); -extern warning1(char *, ...); -#endif +void freefile( struct filepointer * fp ); +int find_includes(struct filepointer *filep, struct inclist *file, + struct inclist *file_red, int recursion, boolean failOK, + struct IncludesCollection* incCollection, struct symhash *symbols); +void included_by(register struct inclist *ip, + register struct inclist * newfile); +int cppsetup(register char *line, + register struct filepointer *filep, register struct inclist *inc); +void add_include(struct filepointer *filep, struct inclist *file, + struct inclist *file_red, char *include, boolean dot, boolean failOK, + struct IncludesCollection* incCollection, struct symhash *symbols); +int match(register char *str, register char **list); +void recursive_pr_include(register struct inclist *head, register char *file, + register char *base); +void inc_clean(); + +void fatalerr(char *, ...); +void warning(char *, ...); +void warning1(char *, ...); void convert_slashes(char *); char *append_slash(char *); diff --git a/soltools/mkdepend/ifparser.c b/soltools/mkdepend/ifparser.c index 7c8a8c40205a..3c47de64e2f0 100644 --- a/soltools/mkdepend/ifparser.c +++ b/soltools/mkdepend/ifparser.c @@ -59,6 +59,8 @@ #include "ifparser.h" #include <ctype.h> +#include <stdlib.h> +#include <string.h> /**************************************************************************** Internal Macros and Utilities for Parser diff --git a/soltools/mkdepend/ifparser.h b/soltools/mkdepend/ifparser.h index 9b0b58191b97..d832bfbcb6d7 100644 --- a/soltools/mkdepend/ifparser.h +++ b/soltools/mkdepend/ifparser.h @@ -57,14 +57,13 @@ #include <stdio.h> -#define const /**/ typedef int Bool; #define False 0 #define True 1 typedef struct _if_parser { struct { /* functions */ - char *(*handle_error) (/* struct _if_parser *, const char *, + const char *(*handle_error) (/* struct _if_parser *, const char *, const char * */); int (*eval_variable) (/* struct _if_parser *, const char *, int */); int (*eval_defined) (/* struct _if_parser *, const char *, int */); @@ -72,5 +71,5 @@ typedef struct _if_parser { char *data; } IfParser; -char *ParseIfExpression (/* IfParser *, const char *, int * */); +const char *ParseIfExpression (/* IfParser *, const char *, int * */); diff --git a/soltools/mkdepend/imakemdep.h b/soltools/mkdepend/imakemdep.h index a71f8c3836ac..67a98929c904 100644 --- a/soltools/mkdepend/imakemdep.h +++ b/soltools/mkdepend/imakemdep.h @@ -515,215 +515,215 @@ char *cpp_argv[ARGUMENTS] = { */ struct pair predefs[] = { #ifdef apollo - {"apollo", "1"}, + {"apollo", "1", NULL}, #endif #ifdef ibm032 - {"ibm032", "1"}, + {"ibm032", "1", NULL}, #endif #ifdef ibm - {"ibm", "1"}, + {"ibm", "1", NULL}, #endif #ifdef aix - {"aix", "1"}, + {"aix", "1", NULL}, #endif #ifdef sun - {"sun", "1"}, + {"sun", "1", NULL}, #endif #ifdef sun2 - {"sun2", "1"}, + {"sun2", "1", NULL}, #endif #ifdef sun3 - {"sun3", "1"}, + {"sun3", "1", NULL}, #endif #ifdef sun4 - {"sun4", "1"}, + {"sun4", "1", NULL}, #endif #ifdef sparc - {"sparc", "1"}, + {"sparc", "1", NULL}, #endif #ifdef __sparc__ - {"__sparc__", "1"}, + {"__sparc__", "1", NULL}, #endif #ifdef hpux - {"hpux", "1"}, + {"hpux", "1", NULL}, #endif #ifdef __hpux - {"__hpux", "1"}, + {"__hpux", "1", NULL}, #endif #ifdef __hp9000s800 - {"__hp9000s800", "1"}, + {"__hp9000s800", "1", NULL}, #endif #ifdef __hp9000s700 - {"__hp9000s700", "1"}, + {"__hp9000s700", "1", NULL}, #endif #ifdef vax - {"vax", "1"}, + {"vax", "1", NULL}, #endif #ifdef VMS - {"VMS", "1"}, + {"VMS", "1", NULL}, #endif #ifdef cray - {"cray", "1"}, + {"cray", "1", NULL}, #endif #ifdef CRAY - {"CRAY", "1"}, + {"CRAY", "1", NULL}, #endif #ifdef _CRAY - {"_CRAY", "1"}, + {"_CRAY", "1", NULL}, #endif #ifdef att - {"att", "1"}, + {"att", "1", NULL}, #endif #ifdef mips - {"mips", "1"}, + {"mips", "1", NULL}, #endif #ifdef __mips__ - {"__mips__", "1"}, + {"__mips__", "1", NULL}, #endif #ifdef ultrix - {"ultrix", "1"}, + {"ultrix", "1", NULL}, #endif #ifdef stellar - {"stellar", "1"}, + {"stellar", "1", NULL}, #endif #ifdef mc68000 - {"mc68000", "1"}, + {"mc68000", "1", NULL}, #endif #ifdef mc68020 - {"mc68020", "1"}, + {"mc68020", "1", NULL}, #endif #ifdef __GNUC__ - {"__GNUC__", "1"}, + {"__GNUC__", "1", NULL}, #endif #if __STDC__ - {"__STDC__", "1"}, + {"__STDC__", "1", NULL}, #endif #ifdef __HIGHC__ - {"__HIGHC__", "1"}, + {"__HIGHC__", "1", NULL}, #endif #ifdef CMU - {"CMU", "1"}, + {"CMU", "1", NULL}, #endif #ifdef luna - {"luna", "1"}, + {"luna", "1", NULL}, #ifdef luna1 - {"luna1", "1"}, + {"luna1", "1", NULL}, #endif #ifdef luna2 - {"luna2", "1"}, + {"luna2", "1", NULL}, #endif #ifdef luna88k - {"luna88k", "1"}, + {"luna88k", "1", NULL}, #endif #ifdef uniosb - {"uniosb", "1"}, + {"uniosb", "1", NULL}, #endif #ifdef uniosu - {"uniosu", "1"}, + {"uniosu", "1", NULL}, #endif #endif #ifdef ieeep754 - {"ieeep754", "1"}, + {"ieeep754", "1", NULL}, #endif #ifdef is68k - {"is68k", "1"}, + {"is68k", "1", NULL}, #endif #ifdef m68k - {"m68k", "1"}, + {"m68k", "1", NULL}, #endif #ifdef m88k - {"m88k", "1"}, + {"m88k", "1", NULL}, #endif #ifdef __m88k__ - {"__m88k__", "1"}, + {"__m88k__", "1", NULL}, #endif #ifdef bsd43 - {"bsd43", "1"}, + {"bsd43", "1", NULL}, #endif #ifdef hcx - {"hcx", "1"}, + {"hcx", "1", NULL}, #endif #ifdef sony - {"sony", "1"}, + {"sony", "1", NULL}, #ifdef SYSTYPE_SYSV - {"SYSTYPE_SYSV", "1"}, + {"SYSTYPE_SYSV", "1", NULL}, #endif #ifdef _SYSTYPE_SYSV - {"_SYSTYPE_SYSV", "1"}, + {"_SYSTYPE_SYSV", "1", NULL}, #endif #endif #ifdef __OSF__ - {"__OSF__", "1"}, + {"__OSF__", "1", NULL}, #endif #ifdef __osf__ - {"__osf__", "1"}, + {"__osf__", "1", NULL}, #endif #ifdef __alpha - {"__alpha", "1"}, + {"__alpha", "1", NULL}, #endif #ifdef __DECC - {"__DECC", "1"}, + {"__DECC", "1", NULL}, #endif #ifdef __decc - {"__decc", "1"}, + {"__decc", "1", NULL}, #endif #ifdef __uxp__ - {"__uxp__", "1"}, + {"__uxp__", "1", NULL}, #endif #ifdef __sxg__ - {"__sxg__", "1"}, + {"__sxg__", "1", NULL}, #endif #ifdef _SEQUENT_ - {"_SEQUENT_", "1"}, - {"__STDC__", "1"}, + {"_SEQUENT_", "1", NULL}, + {"__STDC__", "1", NULL}, #endif #ifdef __bsdi__ - {"__bsdi__", "1"}, + {"__bsdi__", "1", NULL}, #endif #ifdef nec_ews_svr2 - {"nec_ews_svr2", "1"}, + {"nec_ews_svr2", "1", NULL}, #endif #ifdef nec_ews_svr4 - {"nec_ews_svr4", "1"}, + {"nec_ews_svr4", "1", NULL}, #endif #ifdef _nec_ews_svr4 - {"_nec_ews_svr4", "1"}, + {"_nec_ews_svr4", "1", NULL}, #endif #ifdef _nec_up - {"_nec_up", "1"}, + {"_nec_up", "1", NULL}, #endif #ifdef SX - {"SX", "1"}, + {"SX", "1", NULL}, #endif #ifdef nec - {"nec", "1"}, + {"nec", "1", NULL}, #endif #ifdef _nec_ft - {"_nec_ft", "1"}, + {"_nec_ft", "1", NULL}, #endif #ifdef PC_UX - {"PC_UX", "1"}, + {"PC_UX", "1", NULL}, #endif #ifdef sgi - {"sgi", "1"}, + {"sgi", "1", NULL}, #endif #ifdef __sgi - {"__sgi", "1"}, + {"__sgi", "1", NULL}, #endif #ifdef __FreeBSD__ - {"__FreeBSD__", "1"}, + {"__FreeBSD__", "1", NULL}, #endif #ifdef __NetBSD__ - {"__NetBSD__", "1"}, + {"__NetBSD__", "1", NULL}, #endif #ifdef __OpenBSD__ - {"__OpenBSD__", "1"}, + {"__OpenBSD__", "1", NULL}, #endif #ifdef __EMX__ - {"__EMX__", "1"}, + {"__EMX__", "1", NULL}, #endif /* add any additional symbols before this line */ - {NULL, NULL} + {NULL, NULL, NULL} }; #endif /* MAKEDEPEND */ diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c index fd9bdc18e5d2..cf5c42c14bdf 100644 --- a/soltools/mkdepend/main.c +++ b/soltools/mkdepend/main.c @@ -70,9 +70,7 @@ typedef _W64 int ssize_t; #endif #endif -#if NeedVarargsPrototypes #include <stdarg.h> -#endif #ifdef MINIX #define USE_CHMOD 1 @@ -112,7 +110,6 @@ char *directives[] = { /******* function declarations ********/ /******* added by -Wall project *******/ -void freefile(struct filepointer * fp); void redirect(char * line, char * makefile ); struct inclist inclist[ MAXFILES ], @@ -495,7 +492,7 @@ struct filepointer *getfile(file) /* Since off_t is larger than size_t, need to test for * truncation. */ - if ( malloc_size != size_backup ) + if ( (off_t)malloc_size != size_backup ) { close( fd ); warning("makedepend: File \"%s\" size larger than can fit in size_t. Cannot allocate memory for contents.\n", file); @@ -726,69 +723,38 @@ void redirect(line, makefile) fclose(fdin); } -#if NeedVarargsPrototypes -int fatalerr(char *msg, ...) -#else -/*VARARGS*/ -int fatalerr(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) - char *msg; -#endif +void fatalerr(char *msg, ...) { -#if NeedVarargsPrototypes va_list args; -#endif fprintf(stderr, "%s: error: ", ProgramName); -#if NeedVarargsPrototypes va_start(args, msg); vfprintf(stderr, msg, args); va_end(args); -#else - fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); -#endif exit (1); } -#if NeedVarargsPrototypes -int warning(char *msg, ...) -#else -/*VARARGS0*/ -int warning(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) - char *msg; -#endif +void warning(char *msg, ...) { #ifdef DEBUG_MKDEPEND -#if NeedVarargsPrototypes va_list args; -#endif fprintf(stderr, "%s: warning: ", ProgramName); -#if NeedVarargsPrototypes va_start(args, msg); vfprintf(stderr, msg, args); va_end(args); #else - fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); -#endif + (void)msg; #endif /* DEBUG_MKDEPEND */ - return 0; } -#if NeedVarargsPrototypes void warning1(char *msg, ...) -#else -/*VARARGS0*/ -void warning1(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) - char *msg; -#endif { #ifdef DEBUG_MKDEPEND -#if NeedVarargsPrototypes va_list args; va_start(args, msg); vfprintf(stderr, msg, args); va_end(args); #else - fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); -#endif + (void)msg; #endif /* DEBUG_MKDEPEND */ } @@ -809,13 +775,15 @@ void convert_slashes(path) if (*ptr == '\\') *ptr = '/'; }; +#else + (void)path; #endif } char* append_slash(path) char* path; { - char *ptr, *new_string; + char *new_string; if ((path[strlen(path) - 1] == '/') || (path[strlen(path) - 1] == '\\')) { new_string = path; } else { diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index 630c688faba2..630c688faba2 100755..100644 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c index b98cfce5b6a8..31d48bf2bbc5 100644 --- a/soltools/mkdepend/parse.c +++ b/soltools/mkdepend/parse.c @@ -29,6 +29,13 @@ in this Software without prior written authorization from the X Consortium. #include "def.h" char *hash_lookup( char *symbol, struct symhash *symbols ); void hash_undefine( char *symbol, struct symhash *symbols ); +int gobble( register struct filepointer *filep, struct inclist *file, + struct inclist *file_red, struct symhash *symbols ); +int deftype ( register char *line, register struct filepointer *filep, + register struct inclist *file_red, register struct inclist *file, + int parse_it, struct symhash *symbols); +int zero_value(register char *exp, register struct filepointer *filep, + register struct inclist *file_red, register struct symhash *symbols); extern char *directives[]; extern struct symhash *maininclist; @@ -412,8 +419,7 @@ static int hash( str ) { /* Hash (Kernighan and Ritchie) */ register unsigned int hashval = 0; - register unsigned int i = 0; - char *s = str; + //char *s = str; for ( ; *str; str++ ) { diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c index 78b56e23b313..1319972f99c5 100644 --- a/soltools/mkdepend/pr.c +++ b/soltools/mkdepend/pr.c @@ -44,6 +44,7 @@ void add_include(filep, file, file_red, include, dot, failOK, incCollection, sym struct inclist *file, *file_red; char *include; boolean dot; + boolean failOK; struct IncludesCollection* incCollection; struct symhash *symbols; { diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index 33c04cf547eb..33c04cf547eb 100755..100644 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk diff --git a/stlport/download/STLport-4.0.tar.gz b/stlport/download/STLport-4.0.tar.gz Binary files differdeleted file mode 100644 index b3943d874775..000000000000 --- a/stlport/download/STLport-4.0.tar.gz +++ /dev/null diff --git a/stlport/download/STLport-4.5-0119.tar.gz b/stlport/download/STLport-4.5-0119.tar.gz Binary files differdeleted file mode 100644 index 09ca9b740615..000000000000 --- a/stlport/download/STLport-4.5-0119.tar.gz +++ /dev/null diff --git a/stlport/download/STLport-4.5.tar.gz b/stlport/download/STLport-4.5.tar.gz Binary files differdeleted file mode 100644 index 0ffc673825fb..000000000000 --- a/stlport/download/STLport-4.5.tar.gz +++ /dev/null diff --git a/stlport/makefile.mk b/stlport/makefile.mk index dc5482525cdd..907c0935cbe8 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -62,17 +62,21 @@ $(INCCOM)$/stlport$/vector: systemstl$/$$(@:f) .EXPORT : CC CXX .IF "$(COMID)"=="gcc3" TARFILE_NAME=STLport-4.5 + TARFILE_MD5=18f577b374d60b3c760a3a3350407632 PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch .ELIF "$(GUI)"=="WNT" .IF "$(CCNUMVER)"<="001300000000" TARFILE_NAME=STLport-4.0 + TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16 PATCH_FILES=STLport-4.0.patch .ELSE TARFILE_NAME=STLport-4.5-0119 + TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8 PATCH_FILES=STLport-4.5-0119.patch .ENDIF .ELSE TARFILE_NAME=STLport-4.0 + TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16 PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch # To disable warnings from within STLport headers on unxsoli4 and # unxsols4, STLport-4.0.patch had to be extended mechanically by |