Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-04-17 23:39:35 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-04-17 23:39:35 +0000
commit6d57b0710f006461241c40c3706083466cb485f9 (patch)
treeba88066c6b9a2c18b9c71421ed85633e38ad8725 /app-office
parentremove old version (diff)
downloadgentoo-2-6d57b0710f006461241c40c3706083466cb485f9.tar.gz
gentoo-2-6d57b0710f006461241c40c3706083466cb485f9.tar.bz2
gentoo-2-6d57b0710f006461241c40c3706083466cb485f9.zip
alpha version of openoffice
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-STLport-gcc2-gcc3.patch22
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-code_err.patch109
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-configure.patch36
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-gcc-version-check.patch36
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-gcc3.patch120
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-ran-autoconf.patch1383
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-set-compiler-vars.patch84
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-use-compiler-vars.patch73
-rw-r--r--app-office/openoffice/files/641d/openoffice-641d-zipdep-not-found.patch23
-rw-r--r--app-office/openoffice/files/641d/read_ins.pl321
-rw-r--r--app-office/openoffice/files/641d/read_ins.pl.orig321
-rw-r--r--app-office/openoffice/files/digest-openoffice-641d3
-rw-r--r--app-office/openoffice/openoffice-641d.ebuild266
13 files changed, 2797 insertions, 0 deletions
diff --git a/app-office/openoffice/files/641d/openoffice-641d-STLport-gcc2-gcc3.patch b/app-office/openoffice/files/641d/openoffice-641d-STLport-gcc2-gcc3.patch
new file mode 100644
index 000000000000..125c86c2c90f
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-STLport-gcc2-gcc3.patch
@@ -0,0 +1,22 @@
+--- oo_641d_src/stlport/STLport-4.5.patch.orig Mon Apr 15 19:47:35 2002
++++ oo_641d_src/stlport/STLport-4.5.patch Mon Apr 15 19:51:47 2002
+@@ -30,8 +30,8 @@
+ ! #
+ ! # compiler
+ ! #
+-! CC = gcc
+-! CXX = g++ -D_REENTRANT -fexceptions
++! CC = $(CCCOMP)
++! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
+ !
+ ! #
+ ! # Basename for libraries
+@@ -43,7 +43,7 @@
+ ! #
+ ! #
+ ! LINK=ar cr
+-! DYN_LINK=g++ --fexceptions -shared -o
++! DYN_LINK=$(CXXCOMP) --fexceptions -shared -o
+ !
+ ! OBJEXT=o
+ ! DYNEXT=so
diff --git a/app-office/openoffice/files/641d/openoffice-641d-code_err.patch b/app-office/openoffice/files/641d/openoffice-641d-code_err.patch
new file mode 100644
index 000000000000..d3d7f124658c
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-code_err.patch
@@ -0,0 +1,109 @@
+diff -urNd oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.new
+--- oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java Sun Mar 31 00:24:20 2002
++++ oo_641d_src/XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.new Thu Nov 30 13:03:34 2000
+@@ -79,7 +79,7 @@
+ Class.forName(className != null
+ ? className
+ : "sun.net.www.protocol." + protocol + ".Handler");
+- return (URLStreamHandler)handlerClass.newInstance();;
++ return (URLStreamHandler)handlerClass.newInstance();
+ }
+ catch (Exception e) {
+ System.err.println(e);
+diff -urNd oo_641d_src/tools/source/datetime/ttime.cxx oo_641d_src/tools/source/datetime/ttime.cxx.new
+--- oo_641d_src/tools/source/datetime/ttime.cxx Sun Mar 31 01:24:44 2002
++++ oo_641d_src/tools/source/datetime/ttime.cxx.new Sun Mar 31 01:26:36 2002
+@@ -493,7 +493,7 @@
+
+ if ( !nImplTicksPerSecond )
+ {
+- nImplTicksPerSecond = CLK_TCK;
++ nImplTicksPerSecond = CLOCKS_PER_SEC;
+ dImplTicksPerSecond = nImplTicksPerSecond;
+ dImplTicksULONGMAX = (double)(ULONG)ULONG_MAX;
+ }
+diff -urNd oo_641d_src/sj2/stardiv/applet/DocumentProxy.java oo_641d_src/sj2/stardiv/applet/DocumentProxy.java.new
+--- oo_641d_src/sj2/stardiv/applet/DocumentProxy.java Mon Sep 18 12:54:03 2000
++++ oo_641d_src/sj2/stardiv/applet/DocumentProxy.java.new Sun Mar 31 05:52:59 2002
+@@ -68,7 +68,10 @@
+ import java.applet.AudioClip;
+
+ import java.io.IOException;
++import java.io.InputStream;
+
++import java.util.HashMap;
++import java.util.Iterator;
+ import java.util.Enumeration;
+ import java.util.Hashtable;
+ import java.util.Observer;
+@@ -123,6 +126,27 @@
+ instances --;
+ }
+
++
++ /* Stream stuff to satisfy JDK 1.4 */
++ private HashMap stream_map = new HashMap();
++
++ public void setStream(String key,
++ InputStream stream)
++ throws IOException
++ {
++ stream_map.put(key, stream);
++ }
++
++ public InputStream getStream(String key)
++ {
++ return (InputStream) stream_map.get(key);
++ }
++
++ public Iterator getStreamKeys()
++ {
++ return stream_map.keySet().iterator();
++ }
++
+ /*
+ ** DocumentProxy methods
+ */
+diff -urNd oo_641d_src/sj2/stardiv/app/AppletViewer.java oo_641d_src/sj2/stardiv/app/AppletViewer.java.new
+--- oo_641d_src/sj2/stardiv/app/AppletViewer.java Sun Mar 31 06:14:33 2002
++++ oo_641d_src/sj2/stardiv/app/AppletViewer.java.new Sun Mar 31 06:16:11 2002
+@@ -196,7 +196,7 @@
+ public AppletViewer(int x, int y, URL doc, Hashtable atts, PrintStream statusMsgStream) {
+ // resourceViewer = new stardiv.util.ResourceViewer();
+ // resourceViewer.show();
+- System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
++// System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
+ this.statusMsgStream = statusMsgStream;
+ this.atts = atts;
+
+diff -urNd oo_641d_src/svtools/inc/svarray.hxx oo_641d_src/svtools/inc/svarray.hxx.new
+--- oo_641d_src/svtools/inc/svarray.hxx Mon Apr 1 12:15:09 2002
++++ oo_641d_src/svtools/inc/svarray.hxx.new Mon Apr 1 12:15:18 2002
+@@ -742,11 +742,11 @@
+
+ // SORTARR - Begin
+
+-#ifdef __MWERKS__
++// #ifdef __MWERKS__
+ #define __MWERKS__PRIVATE public
+-#else
+-#define __MWERKS__PRIVATE private
+-#endif
++// #else
++// #define __MWERKS__PRIVATE private
++// #endif
+
+ #define _SORT_CLASS_DEF(nm, AE, IS, GS)\
+ typedef BOOL (*FnForEach_##nm)( const AE&, void* );\
+diff -urNd oo_641d_src/sw/inc/ndhints.hxx oo_641d_src/sw/inc/ndhints.hxx.new
+--- oo_641d_src/sw/inc/ndhints.hxx Mon Apr 1 12:16:27 2002
++++ oo_641d_src/sw/inc/ndhints.hxx.new Mon Apr 1 12:09:50 2002
+@@ -98,7 +98,7 @@
+ *************************************************************************/
+
+ // Das neue Hintsarray:
+-class SwpHintsArr : private SwpHtStart
++class SwpHintsArr : protected SwpHtStart
+ {
+
+ protected:
diff --git a/app-office/openoffice/files/641d/openoffice-641d-configure.patch b/app-office/openoffice/files/641d/openoffice-641d-configure.patch
new file mode 100644
index 000000000000..9b48befffc26
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-configure.patch
@@ -0,0 +1,36 @@
+diff -urNd oo_641d_src/config_office/configure.in oo_641d_src/config_office/configure.in.new
+--- oo_641d_src/config_office/configure.in Sat Mar 30 23:18:04 2002
++++ oo_641d_src/config_office/configure.in.new Sat Mar 30 22:31:31 2002
+@@ -808,10 +808,14 @@
+ if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
++ _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'`
+
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+ _jdk_minor="true"
+ fi
++ if test "$_jdk_middle" = "false" -a "$_jdk_middle4" = "true"; then
++ _jdk_minor="true"
++ fi
+ fi
+ if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+diff -urNd oo_641d_src/config_office/configure oo_641d_src/config_office/configure.new
+--- oo_641d_src/config_office/configure Sat Mar 30 23:18:02 2002
++++ oo_641d_src/config_office/configure.new Sat Mar 30 22:31:26 2002
+@@ -2296,10 +2296,14 @@
+ if test "$_os" = "Linux" -a "$_machine_type" = "i686"; then
+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
+ _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
++ _jdk_middle4=`echo $_jdk | $AWK -F. '{ if ($2 != 4) print "false"; else print "true" }'`
+
+ if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
+ _jdk_minor="true"
+ fi
++ if test "$_jdk_middle" = "false" -a "$_jdk_middle4" = "true"; then
++ _jdk_minor="true"
++ fi
+ fi
+ if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
+ _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
diff --git a/app-office/openoffice/files/641d/openoffice-641d-gcc-version-check.patch b/app-office/openoffice/files/641d/openoffice-641d-gcc-version-check.patch
new file mode 100644
index 000000000000..43a3f9fd928b
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-gcc-version-check.patch
@@ -0,0 +1,36 @@
+diff -Nurd oo_cvs/config_office/configure.in oo_stable1_cvs20020325_src/config_office/configure.in
+--- oo_cvs/config_office/configure.in Mon Mar 25 10:07:39 2002
++++ oo_stable1_cvs20020325_src/config_office/configure.in Tue Mar 26 17:39:20 2002
+@@ -277,13 +277,13 @@
+
+ if test $GCC; then
+ AC_MSG_CHECKING([the GNU gcc compiler version])
+- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
++ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
+ if test "$_gcc_releasetype" = "egcs"; then
+ AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler])
+ AC_MSG_WARN([found egcs- version, use (stable=gcc-) version of the compiler]) >> warn
+- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
++ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
+ else
+- _gcc_version=`$GCC --version`
++ _gcc_version=`$CC --version`
+ fi
+ _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
+ if test -n "$enable_gcc3"; then
+@@ -296,13 +296,13 @@
+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+ COMPATH="NO_GCC"
+ else
+- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
++ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
+ if test "$_gcc_middle" = "false"; then
+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+ COMPATH="NO_GCC"
+ else
+- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
++ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
+ if test "$_gcc_minor" = "false"; then
+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
+ AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
diff --git a/app-office/openoffice/files/641d/openoffice-641d-gcc3.patch b/app-office/openoffice/files/641d/openoffice-641d-gcc3.patch
new file mode 100644
index 000000000000..46553f7d9ebd
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-gcc3.patch
@@ -0,0 +1,120 @@
+diff -urNd oo_641d_src/solenv/inc/unxlngi4.mk oo_641d_src/solenv/inc/unxlngi4.mk.new
+--- oo_641d_src/solenv/inc/unxlngi4.mk Fri Dec 21 07:24:32 2001
++++ oo_641d_src/solenv/inc/unxlngi4.mk.new Sat Mar 30 22:57:26 2002
+@@ -100,7 +100,7 @@
+ # Flags for enabling exception handling
+ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+ # Flags for disabling exception handling
+-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++# CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+ # -fpermissive should be removed as soon as possible
+ CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive -fno-rtti
+diff -urNd oo_641d_src/tools/source/fsys/unx.hxx oo_641d_src/tools/source/fsys/unx.hxx.new
+--- oo_641d_src/tools/source/fsys/unx.hxx Sun Mar 31 01:04:00 2002
++++ oo_641d_src/tools/source/fsys/unx.hxx.new Sun Mar 31 01:05:30 2002
+@@ -97,11 +97,11 @@
+ #include <time.h>
+ #include <datetime.hxx>
+
+-#ifndef localtime_r
++/* #ifndef localtime_r
+ extern "C" {
+ struct tm *localtime_r(const time_t *timep, struct tm *buffer);
+ }
+-#endif
++#endif */
+
+ inline Time Unx2Time( time_t nTime )
+ {
+diff -urNd oo_641d_src/tools/source/datetime/ttime.cxx oo_641d_src/tools/source/datetime/ttime.cxx.new
+--- oo_641d_src/tools/source/datetime/ttime.cxx Mon Jun 11 13:17:46 2001
++++ oo_641d_src/tools/source/datetime/ttime.cxx.new Sun Mar 31 01:19:26 2002
+@@ -93,7 +93,7 @@
+ #include <math.h>
+ #endif
+
+-#ifndef WNT
++/* #ifndef WNT
+ #ifndef localtime_r
+ extern "C" {
+ struct tm *localtime_r(const time_t *timep, struct tm *buffer);
+@@ -105,7 +105,7 @@
+ struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
+ }
+ #endif
+-#endif
++#endif */
+
+ // =======================================================================
+
+diff -urNd oo_641d_src/tools/source/memmgr/memmgr.cxx oo_641d_src/tools/source/memmgr/memmgr.cxx.new
+--- oo_641d_src/tools/source/memmgr/memmgr.cxx Mon Oct 15 14:40:32 2001
++++ oo_641d_src/tools/source/memmgr/memmgr.cxx.new Sun Mar 31 01:31:48 2002
+@@ -121,7 +121,7 @@
+ static std::new_handler volatile g_pfnHandler = 0;
+
+ std::new_handler
+-SAL_CALL std::set_new_handler (std::new_handler pfnHandler) throw ()
++SAL_CALL std::set_new_handler (std::new_handler pfnHandler)
+ {
+ std::new_handler f = g_pfnHandler;
+ g_pfnHandler = pfnHandler;
+diff -urNd oo_641d_src/product/util/makefile.mk oo_641d_src/product/util/makefile.mk.new
+--- oo_641d_src/product/util/makefile.mk Mon Mar 11 11:09:13 2002
++++ oo_641d_src/product/util/makefile.mk.new Sun Mar 31 14:18:28 2002
+@@ -111,8 +111,8 @@
+ ADDITIONAL_DLLS= \
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+- $(DESTDIRDLL)$/libstdc++.so.3 \
+- $(DESTDIRDLL)$/libstdc++.so.3.0.1
++ $(DESTDIRDLL)$/libstdc++.so.3 \
++ $(DESTDIRDLL)$/libstdc++.so.3.0.4
+ .ENDIF
+ .ELIF "$(OS)"=="FREEBSD"
+ ###########
+@@ -128,7 +128,7 @@
+ $(DESTDIRDLL)$/libgcc_s.so.1 \
+ $(DESTDIRDLL)$/libgcc_s.so \
+ $(DESTDIRDLL)$/libstdc++.so.3 \
+- $(DESTDIRDLL)$/libstdc++.so.3.0.1
++ $(DESTDIRDLL)$/libstdc++.so.3.0.4
+ .ENDIF
+ .ELIF "$(OS)"=="IRIX"
+ ###############
+@@ -422,17 +422,17 @@
+
+ #---------------------------------------------------------
+ # special targets for linux gcc3
+-$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.3.0.4 : $(DLLOUT)$/libstdc++.so.3.0.4 $(DIRLIST)
+ -rm -f $@
+- $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
++ $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.4 $@
+
+-$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
++$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.4 $(DIRLIST)
+ -rm -f $@
+- +ln -s libstdc++.so.3.0.1 $@
++ +ln -s libstdc++.so.3.0.4 $@
+
+ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
+ -rm -f $@
+- $(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@
++ $(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@
+
+ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)
+ -rm -f $@
+diff -urNd oo_641d_src/sw/source/filter/html/htmlform.cxx oo_641d_src/sw/source/filter/html/htmlform.cxx.new
+--- oo_641d_src/sw/source/filter/html/htmlform.cxx Fri Sep 28 02:27:53 2001
++++ oo_641d_src/sw/source/filter/html/htmlform.cxx.new Mon Apr 1 05:14:19 2002
+@@ -741,7 +741,7 @@
+ }
+ }
+
+-void SwHTMLImageWatcher::disposing(const lang::EventObject& evt)
++void SwHTMLImageWatcher::disposing(const lang::EventObject& evt) throw ( ::com::sun::star::uno::RuntimeException)
+ {
+ Reference< awt::XImageConsumer > xTmp;
+
diff --git a/app-office/openoffice/files/641d/openoffice-641d-ran-autoconf.patch b/app-office/openoffice/files/641d/openoffice-641d-ran-autoconf.patch
new file mode 100644
index 000000000000..b145f29122c7
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-ran-autoconf.patch
@@ -0,0 +1,1383 @@
+--- oo_cvs/config_office/configure Mon Mar 25 10:07:39 2002
++++ oo_stable1_cvs20020411_src/config_office/configure Fri Apr 12 22:12:55 2002
+@@ -1140,48 +1140,235 @@
+ fi
+
+ fi
+-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
++if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$GCC" = "yes" \) ; then
+ if test -z "$with_gcc_home"; then
+- if test "$CC" = "gcc"; then
+- # Extract the first word of "gcc", so it can be a program name with args.
++
++ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:1150: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_GCC'+set}'`\" = set"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+- case "$GCC" in
+- /*)
+- ac_cv_path_GCC="$GCC" # Let the user override the test with a path.
+- ;;
+- ?:/*)
+- ac_cv_path_GCC="$GCC" # Let the user override the test with a dos path.
+- ;;
+- *)
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+- for ac_dir in $ac_dummy; do
++ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+- ac_cv_path_GCC="$ac_dir/$ac_word"
++ ac_cv_prog_CC="gcc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+- ;;
+-esac
+ fi
+-GCC="$ac_cv_path_GCC"
+-if test -n "$GCC"; then
+- echo "$ac_t""$GCC" 1>&6
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++ echo "$ac_t""$CC" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+- COMPATH=`echo $GCC | $SED -n "s/\/gcc//p"`
+- _gcc_include_start=/usr/lib/gcc-lib
+- _gxx_include_start=/usr/include
++if test -z "$CC"; then
++ # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1180: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_prog_rejected=no
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
++ ac_prog_rejected=yes
++ continue
+ fi
++ ac_cv_prog_CC="cc"
++ break
++ fi
++ done
++ IFS="$ac_save_ifs"
++if test $ac_prog_rejected = yes; then
++ # We found a bogon in the path, so make sure we never use it.
++ set dummy $ac_cv_prog_CC
++ shift
++ if test $# -gt 0; then
++ # We chose a different compiler from the bogus one.
++ # However, it has the same basename, so the bogon will be chosen
++ # first if we set CC to just the basename; use the full file name.
++ shift
++ set dummy "$ac_dir/$ac_word" "$@"
++ shift
++ ac_cv_prog_CC="$@"
++ fi
++fi
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++ echo "$ac_t""$CC" 1>&6
++else
++ echo "$ac_t""no" 1>&6
++fi
++
++ if test -z "$CC"; then
++ case "`uname -s`" in
++ *win32* | *WIN32*)
++ # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1231: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ if test -n "$CC"; then
++ ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ ac_cv_prog_CC="cl"
++ break
++ fi
++ done
++ IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++ echo "$ac_t""$CC" 1>&6
++else
++ echo "$ac_t""no" 1>&6
++fi
++ ;;
++ esac
++ fi
++ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
++fi
++
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:1263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++cat > conftest.$ac_ext << EOF
++
++#line 1274 "configure"
++#include "confdefs.h"
++
++main(){return(0);}
++EOF
++if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++ ac_cv_prog_cc_works=yes
++ # If we can't run a trivial program, we are probably using a cross compiler.
++ if (./conftest; exit) 2>/dev/null; then
++ ac_cv_prog_cc_cross=no
++ else
++ ac_cv_prog_cc_cross=yes
++ fi
++else
++ echo "configure: failed program was:" >&5
++ cat conftest.$ac_ext >&5
++ ac_cv_prog_cc_works=no
++fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
++if test $ac_cv_prog_cc_works = no; then
++ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:1305: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
++echo "configure:1310: checking whether we are using GNU C" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ cat > conftest.c <<EOF
++#ifdef __GNUC__
++ yes;
++#endif
++EOF
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++ ac_cv_prog_gcc=yes
++else
++ ac_cv_prog_gcc=no
++fi
++fi
++
++echo "$ac_t""$ac_cv_prog_gcc" 1>&6
++
++if test $ac_cv_prog_gcc = yes; then
++ GCC=yes
++else
++ GCC=
++fi
++
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:1338: checking whether ${CC-cc} accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ echo 'void f(){}' > conftest.c
++if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
++ ac_cv_prog_cc_g=yes
++else
++ ac_cv_prog_cc_g=no
++fi
++rm -f conftest*
++
++fi
++
++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
++if test "$ac_test_CFLAGS" = set; then
++ CFLAGS="$ac_save_CFLAGS"
++elif test $ac_cv_prog_cc_g = yes; then
++ if test "$GCC" = yes; then
++ CFLAGS="-g -O2"
++ else
++ CFLAGS="-g"
++ fi
++else
++ if test "$GCC" = yes; then
++ CFLAGS="-O2"
++ else
++ CFLAGS=
++ fi
++fi
++
++ COMPATH=`echo $CC | $SED -n "s,/^/\+$,,p"`
++ _gcc_include_start=/usr/lib/gcc-lib
++ _gxx_include_start=/usr/include
++
+ else
+ _gcc_path="$with_gcc_home/bin/gcc"
+ if test -x $_gcc_path; then
+@@ -1203,14 +1390,14 @@
+
+ if test $GCC; then
+ echo $ac_n "checking the GNU gcc compiler version""... $ac_c" 1>&6
+-echo "configure:1207: checking the GNU gcc compiler version" >&5
+- _gcc_releasetype=`$GCC --version | $AWK -F"-" '{ print \$1 }'`
++echo "configure:1394: checking the GNU gcc compiler version" >&5
++ _gcc_releasetype=`$CC --version | $AWK -F"-" '{ print \$1 }'`
+ if test "$_gcc_releasetype" = "egcs"; then
+ echo "configure: warning: found egcs- version, use (stable=gcc-) version of the compiler" 1>&2
+ echo "configure: warning: found egcs- version, use (stable=gcc-) version of the compiler" 1>&2 >> warn
+- _gcc_version=`$GCC --version | $AWK -F"-" '{ print \$2 }'`
++ _gcc_version=`$CC --version | $AWK -F"-" '{ print \$2 }'`
+ else
+- _gcc_version=`$GCC --version`
++ _gcc_version=`$CC --version`
+ fi
+ _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
+ if test -n "$enable_gcc3"; then
+@@ -1223,13 +1410,13 @@
+ echo "configure: warning: found version "$_gcc_version", use version 2.95.2+ of the gcc compiler" 1>&2 >> warn
+ COMPATH="NO_GCC"
+ else
+- _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
++ _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
+ if test "$_gcc_middle" = "false"; then
+ echo "configure: warning: found version "$_gcc_version", use version 2.95.2+ of the gcc compiler" 1>&2
+ echo "configure: warning: found version "$_gcc_version", use version 2.95.2+ of the gcc compiler" 1>&2 >> warn
+ COMPATH="NO_GCC"
+ else
+- _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
++ _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
+ if test "$_gcc_minor" = "false"; then
+ echo "configure: warning: found version "$_gcc_version", use version 2.95.2+ of the gcc compiler" 1>&2
+ echo "configure: warning: found version "$_gcc_version", use version 2.95.2+ of the gcc compiler" 1>&2 >> warn
+@@ -1241,7 +1428,7 @@
+ if test "$COMPATH" != "NO_GCC"; then
+ echo "$ac_t""checked (gcc $_gcc_version)" 1>&6
+ echo $ac_n "checking the GNU gcc include paths""... $ac_c" 1>&6
+-echo "configure:1245: checking the GNU gcc include paths" >&5
++echo "configure:1432: checking the GNU gcc include paths" >&5
+ _gcc_include_path=`find $_gcc_include_start -name $_gcc_version -print 2> /dev/null`
+ if test "$_gcc_include_path"; then
+ _multiple=`echo $_gcc_include_path | $AWK '{ if ($2) print "true"; else print "false" }'`
+@@ -1313,7 +1500,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1317: checking for $ac_word" >&5
++echo "configure:1504: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1350,7 +1537,7 @@
+
+ COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
+ echo $ac_n "checking the SUN Workshop C compiler version""... $ac_c" 1>&6
+-echo "configure:1354: checking the SUN Workshop C compiler version" >&5
++echo "configure:1541: checking the SUN Workshop C compiler version" >&5
+ _workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $7 }'`
+ if test "$_workshop_version" = "C"; then
+ _workshop_version=`$CC -V 2>&1 | $AWK '/^cc/ { print $8 }'`
+@@ -1379,7 +1566,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1383: checking for $ac_word" >&5
++echo "configure:1570: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1416,7 +1603,7 @@
+
+ COMPATH=`echo $_cc | $SED -n "s/\/cc//p"`
+ echo $ac_n "checking the gcc compiler version""... $ac_c" 1>&6
+-echo "configure:1420: checking the gcc compiler version" >&5
++echo "configure:1607: checking the gcc compiler version" >&5
+ cc_version=`$CC -v 2>&1 | $AWK '/Apple Computer/ { print $15 }'`
+ cc_major=`echo $cc_version | $AWK -F. '{ print $1 }'`
+ if test "$cc_major" != "2"; then
+@@ -1449,7 +1636,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1453: checking for $ac_word" >&5
++echo "configure:1640: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1486,7 +1673,7 @@
+
+ COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"`
+ echo $ac_n "checking the SGI MIPSpro C compiler version""... $ac_c" 1>&6
+-echo "configure:1490: checking the SGI MIPSpro C compiler version" >&5
++echo "configure:1677: checking the SGI MIPSpro C compiler version" >&5
+ _mipspro_version=`$CC -version 2>&1 | $AWK '{ print $4 }'`
+ _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
+ if test "$_mipspro_major" != "7"; then
+@@ -1513,7 +1700,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1517: checking for $ac_word" >&5
++echo "configure:1704: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path__cc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1551,7 +1738,7 @@
+ COMPATH=`echo $_cc | $SED -n "s/\/usr\/bin\/cc//p"`
+ echo "configure: warning: ******* $_cc , $COMPATH" 1>&2
+ echo $ac_n "checking the Compaq C compiler version""... $ac_c" 1>&6
+-echo "configure:1555: checking the Compaq C compiler version" >&5
++echo "configure:1742: checking the Compaq C compiler version" >&5
+ _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'`
+ _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
+ if test "$_compaqc_major" != "T6"; then
+@@ -1567,7 +1754,7 @@
+ if test "$_os" = "WINNT"; then
+ if test "$WITH_MINGWIN" != "yes"; then
+ echo $ac_n "checking the Microsoft C/C++ Compiler""... $ac_c" 1>&6
+-echo "configure:1571: checking the Microsoft C/C++ Compiler" >&5
++echo "configure:1758: checking the Microsoft C/C++ Compiler" >&5
+ if test -e $with_cl_home"/bin/cl.exe"; then
+ COMPATH=$with_cl_home
+ echo "$ac_t""found." 1>&6
+@@ -1577,13 +1764,13 @@
+ fi
+ else
+ echo $ac_n "checking the Mingwin32 C++ Compiler""... $ac_c" 1>&6
+-echo "configure:1581: checking the Mingwin32 C++ Compiler" >&5
++echo "configure:1768: checking the Mingwin32 C++ Compiler" >&5
+ fi
+ fi
+
+ if test "$_os" != "WINNT"; then
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1587: checking how to run the C preprocessor" >&5
++echo "configure:1774: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -1598,13 +1785,13 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 1602 "configure"
++#line 1789 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1615,13 +1802,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 1619 "configure"
++#line 1806 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1632,13 +1819,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 1636 "configure"
++#line 1823 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1663,12 +1850,12 @@
+ echo "$ac_t""$CPP" 1>&6
+
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1667: checking for ANSI C header files" >&5
++echo "configure:1854: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1672 "configure"
++#line 1859 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1676,7 +1863,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -1693,7 +1880,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1697 "configure"
++#line 1884 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1711,7 +1898,7 @@
+ if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1715 "configure"
++#line 1902 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1732,7 +1919,7 @@
+ :
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 1736 "configure"
++#line 1923 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1743,7 +1930,7 @@
+ exit (0); }
+
+ EOF
+-if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ :
+ else
+@@ -1770,7 +1957,7 @@
+
+ if test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
+ echo $ac_n "checking pam_appl.h""... $ac_c" 1>&6
+-echo "configure:1774: checking pam_appl.h" >&5
++echo "configure:1961: checking pam_appl.h" >&5
+ if test -f "/usr/include/security/pam_appl.h"; then
+ echo "$ac_t""yes" 1>&6
+ else
+@@ -1784,7 +1971,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1788: checking for $ac_word" >&5
++echo "configure:1975: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1816,7 +2003,7 @@
+
+
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1820: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:2007: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -1827,12 +2014,12 @@
+
+ cat > conftest.$ac_ext << EOF
+
+-#line 1831 "configure"
++#line 2018 "configure"
+ #include "confdefs.h"
+
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cxx_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+@@ -1858,12 +2045,12 @@
+ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1862: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2049: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:1867: checking whether we are using GNU C++" >&5
++echo "configure:2054: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1872,7 +2059,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gxx=yes
+ else
+ ac_cv_prog_gxx=no
+@@ -1891,7 +2078,7 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:1895: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:2082: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1925,7 +2112,7 @@
+ if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "IRIX" -o "$_os" = "IRIX64" ; then
+ if test "$CC" = "gcc"; then
+ echo $ac_n "checking g++ Compiler""... $ac_c" 1>&6
+-echo "configure:1929: checking g++ Compiler" >&5
++echo "configure:2116: checking g++ Compiler" >&5
+ if test -z "$GXX"; then
+ echo "configure: warning: GNU g++/c++ was not found" 1>&2
+ echo "configure: warning: GNU g++/c++ was not found" 1>&2 >> warn
+@@ -1938,7 +2125,7 @@
+ CXX=CC; export CXX;
+ if test "$CC" = "cc"; then
+ echo $ac_n "checking Sun Workshop C++ Compiler""... $ac_c" 1>&6
+-echo "configure:1942: checking Sun Workshop C++ Compiler" >&5
++echo "configure:2129: checking Sun Workshop C++ Compiler" >&5
+ if test "$CXX" != "CC"; then
+ echo "configure: warning: Sun Workshop C++ was not found" 1>&2
+ echo "configure: warning: Sun Worlshop C++ was not found" 1>&2 >> warn
+@@ -1951,7 +2138,7 @@
+ CXX=c++; export CXX;
+ if test "$CC" = "cc"; then
+ echo $ac_n "checking Macosx c++ Compiler""... $ac_c" 1>&6
+-echo "configure:1955: checking Macosx c++ Compiler" >&5
++echo "configure:2142: checking Macosx c++ Compiler" >&5
+ if test "$CXX" != "c++"; then
+ echo "configure: warning: Macosx C++ was not found" 1>&2
+ echo "configure: warning: Macosx C++ was not found" 1>&2 >> warn
+@@ -1964,7 +2151,7 @@
+ if test "$CC" = "cc"; then
+ CXX=CC; export CXX;
+ echo $ac_n "checking SGI MIPSpro C++ Compiler""... $ac_c" 1>&6
+-echo "configure:1968: checking SGI MIPSpro C++ Compiler" >&5
++echo "configure:2155: checking SGI MIPSpro C++ Compiler" >&5
+ if test "$CXX" != "CC"; then
+ echo "configure: warning: SGI MIPSpro C++ was not found" 1>&2
+ echo "configure: warning: SGI MIPSpro C++ was not found" 1>&2 >> warn
+@@ -1976,7 +2163,7 @@
+ if test "$_os" = "OSF1"; then
+ CXX="cxx"; export CXX;
+ echo $ac_n "checking Compaq C++ compiler version""... $ac_c" 1>&6
+-echo "configure:1980: checking Compaq C++ compiler version" >&5
++echo "configure:2167: checking Compaq C++ compiler version" >&5
+ _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'`
+ _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
+ if test "$_compaqcxx_major" != "V6"; then
+@@ -1991,7 +2178,7 @@
+ _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
+ if test "$_os_release" = "7"; then
+ echo $ac_n "checking for patch 106327-06 or greater""... $ac_c" 1>&6
+-echo "configure:1995: checking for patch 106327-06 or greater" >&5
++echo "configure:2182: checking for patch 106327-06 or greater" >&5
+ _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'`
+ _patch="false"
+ for i in $_temp
+@@ -2011,7 +2198,7 @@
+ echo "configure: warning: patch 106327-06 not found, please install compiler patch 106327-06 or greater" 1>&2 >> warn
+ fi
+ echo $ac_n "checking for patch 106950-11 or greater""... $ac_c" 1>&6
+-echo "configure:2015: checking for patch 106950-11 or greater" >&5
++echo "configure:2202: checking for patch 106950-11 or greater" >&5
+ _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'`
+ _patch="false"
+ for i in $_temp
+@@ -2033,7 +2220,7 @@
+ else
+ if test "$_os_release" = "6"; then
+ echo $ac_n "checking for patch 105591-09 or greater""... $ac_c" 1>&6
+-echo "configure:2037: checking for patch 105591-09 or greater" >&5
++echo "configure:2224: checking for patch 105591-09 or greater" >&5
+ _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'`
+ _patch="false"
+ for i in $_temp
+@@ -2053,7 +2240,7 @@
+ echo "configure: warning: patch 105591-09 not found, please install compiler patch 105591-09 or greater" 1>&2 >> warn
+ fi
+ echo $ac_n "checking for patch 107733-08 or greater""... $ac_c" 1>&6
+-echo "configure:2057: checking for patch 107733-08 or greater" >&5
++echo "configure:2244: checking for patch 107733-08 or greater" >&5
+ _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'`
+ _patch="false"
+ for i in $_temp
+@@ -2085,7 +2272,7 @@
+ cross_compiling=$ac_cv_prog_cxx_cross
+
+ echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+-echo "configure:2089: checking how to run the C++ preprocessor" >&5
++echo "configure:2276: checking how to run the C++ preprocessor" >&5
+ if test -z "$CXXCPP"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2098,12 +2285,12 @@
+ cross_compiling=$ac_cv_prog_cxx_cross
+ CXXCPP="${CXX-g++} -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 2102 "configure"
++#line 2289 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -2128,12 +2315,12 @@
+ echo "$ac_t""$CXXCPP" 1>&6
+
+ cat > conftest.$ac_ext <<EOF
+-#line 2132 "configure"
++#line 2319 "configure"
+ #include "confdefs.h"
+ ""
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -2148,7 +2335,7 @@
+ if test -n "$enable_sgistl"; then
+ if test "$_os" = "IRIX" -o "$_os" = "IRIX64"; then
+ echo $ac_n "checking for SGI STL""... $ac_c" 1>&6
+-echo "configure:2152: checking for SGI STL" >&5
++echo "configure:2339: checking for SGI STL" >&5
+ if test -d /usr/include/CC ; then
+ echo "$ac_t""yes." 1>&6
+
+@@ -2161,17 +2348,17 @@
+ else
+
+ echo $ac_n "checking for STLport4 headers""... $ac_c" 1>&6
+-echo "configure:2165: checking for STLport4 headers" >&5
++echo "configure:2352: checking for STLport4 headers" >&5
+ if test -d "$with_stlport4_home"; then
+ STLPORT4=$with_stlport4_home
+ if test "$_os" != "WINNT"; then
+ cat > conftest.$ac_ext <<EOF
+-#line 2170 "configure"
++#line 2357 "configure"
+ #include "confdefs.h"
+ $STLPORT4/stlport/hash_map
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -2193,7 +2380,7 @@
+ fi
+ if test "$_os" != "WINNT"; then
+ echo $ac_n "checking for STLport4 libraries""... $ac_c" 1>&6
+-echo "configure:2197: checking for STLport4 libraries" >&5
++echo "configure:2384: checking for STLport4 libraries" >&5
+ if test "$_os" = "SunOS"; then
+ if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
+ echo "$ac_t""checked" 1>&6
+@@ -2234,7 +2421,7 @@
+ # Extract the first word of "javac", so it can be a program name with args.
+ set dummy javac; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2238: checking for $ac_word" >&5
++echo "configure:2425: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2273,7 +2460,7 @@
+ fi
+ fi
+ echo $ac_n "checking the installed JDK""... $ac_c" 1>&6
+-echo "configure:2277: checking the installed JDK" >&5
++echo "configure:2464: checking the installed JDK" >&5
+ if test "$JAVA"; then
+ _correct_jdk_exists="false"
+ _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }'`
+@@ -2375,7 +2562,7 @@
+ fi
+ if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:2379: checking how to run the C preprocessor" >&5
++echo "configure:2566: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -2390,13 +2577,13 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 2394 "configure"
++#line 2581 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -2407,13 +2594,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 2411 "configure"
++#line 2598 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -2424,13 +2611,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 2428 "configure"
++#line 2615 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -2457,7 +2644,7 @@
+ fi
+ if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+ echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+-echo "configure:2461: checking how to run the C++ preprocessor" >&5
++echo "configure:2648: checking how to run the C++ preprocessor" >&5
+ if test -z "$CXXCPP"; then
+ if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2470,12 +2657,12 @@
+ cross_compiling=$ac_cv_prog_cxx_cross
+ CXXCPP="${CXX-g++} -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 2474 "configure"
++#line 2661 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -2504,7 +2691,7 @@
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2508: checking for $ac_word" >&5
++echo "configure:2695: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2544,7 +2731,7 @@
+ fi
+ if test "$PERL"; then
+ echo $ac_n "checking the Perl version""... $ac_c" 1>&6
+-echo "configure:2548: checking the Perl version" >&5
++echo "configure:2735: checking the Perl version" >&5
+ _perl_temp=`$PERL -version 2> /dev/null | $AWK -F" " '/built for/ { print $4 }'`
+ if test "$_perl_temp" = "version"; then
+ _perl_version=`$PERL -version 2> /dev/null | $AWK -F" " '/built for/ { print $5 }'`
+@@ -2570,7 +2757,7 @@
+ # Extract the first word of "tcsh", so it can be a program name with args.
+ set dummy tcsh; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2574: checking for $ac_word" >&5
++echo "configure:2761: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_TCSH'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2618,7 +2805,7 @@
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:2622: checking for X" >&5
++echo "configure:2809: checking for X" >&5
+
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -2680,12 +2867,12 @@
+
+ # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 2684 "configure"
++#line 2871 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -2754,14 +2941,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2758 "configure"
++#line 2945 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -2867,17 +3054,17 @@
+ case "`(uname -sr) 2>/dev/null`" in
+ "SunOS 5"*)
+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+-echo "configure:2871: checking whether -R must be followed by a space" >&5
++echo "configure:3058: checking whether -R must be followed by a space" >&5
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+ cat > conftest.$ac_ext <<EOF
+-#line 2874 "configure"
++#line 3061 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_nospace=yes
+ else
+@@ -2893,14 +3080,14 @@
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat > conftest.$ac_ext <<EOF
+-#line 2897 "configure"
++#line 3084 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_space=yes
+ else
+@@ -2932,7 +3119,7 @@
+ # libraries were built with DECnet support. And karl@cs.umb.edu says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:2936: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:3123: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2940,7 +3127,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldnet $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2944 "configure"
++#line 3131 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -2954,7 +3141,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2976,7 +3163,7 @@
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:2980: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:3167: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2984,7 +3171,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2988 "configure"
++#line 3175 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -2998,7 +3185,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3027,12 +3214,12 @@
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to dickey@clark.net.
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:3031: checking for gethostbyname" >&5
++echo "configure:3218: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3036 "configure"
++#line 3223 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname(); below. */
+@@ -3058,7 +3245,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_gethostbyname=yes"
+ else
+@@ -3079,7 +3266,7 @@
+
+ if test $ac_cv_func_gethostbyname = no; then
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:3083: checking for gethostbyname in -lnsl" >&5
++echo "configure:3270: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3087,7 +3274,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3091 "configure"
++#line 3278 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -3101,7 +3288,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3131,12 +3318,12 @@
+ # -lsocket must be given before -lnsl if both are needed.
+ # We assume that if connect needs -lnsl, so does gethostbyname.
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:3135: checking for connect" >&5
++echo "configure:3322: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3140 "configure"
++#line 3327 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); below. */
+@@ -3162,7 +3349,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_connect=yes"
+ else
+@@ -3183,7 +3370,7 @@
+
+ if test $ac_cv_func_connect = no; then
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:3187: checking for connect in -lsocket" >&5
++echo "configure:3374: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3191,7 +3378,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3195 "configure"
++#line 3382 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -3205,7 +3392,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3229,12 +3416,12 @@
+
+ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+ echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:3233: checking for remove" >&5
++echo "configure:3420: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3238 "configure"
++#line 3425 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove(); below. */
+@@ -3260,7 +3447,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_remove=yes"
+ else
+@@ -3281,7 +3468,7 @@
+
+ if test $ac_cv_func_remove = no; then
+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:3285: checking for remove in -lposix" >&5
++echo "configure:3472: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3289,7 +3476,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lposix $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3293 "configure"
++#line 3480 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -3303,7 +3490,7 @@
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3327,12 +3514,12 @@
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:3331: checking for shmat" >&5
++echo "configure:3518: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3336 "configure"
++#line 3523 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat(); below. */
+@@ -3358,7 +3545,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_shmat=yes"
+ else
+@@ -3379,7 +3566,7 @@
+
+ if test $ac_cv_func_shmat = no; then
+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:3383: checking for shmat in -lipc" >&5
++echo "configure:3570: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3387,7 +3574,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lipc $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3391 "configure"
++#line 3578 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -3401,7 +3588,7 @@
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3434,7 +3621,7 @@
+ # libraries we check for below, so use a different variable.
+ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:3438: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:3625: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3442,7 +3629,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3446 "configure"
++#line 3633 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -3456,7 +3643,7 @@
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3495,7 +3682,7 @@
+ CFLAGS=$X_CFLAGS
+ LDFLAGS="$X_LDFLAGS $X_LIBS"
+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
+-echo "configure:3499: checking for XOpenDisplay in -lX11" >&5
++echo "configure:3686: checking for XOpenDisplay in -lX11" >&5
+ ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3503,7 +3690,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lX11 $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3507 "configure"
++#line 3694 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -3517,7 +3704,7 @@
+ XOpenDisplay()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3544,7 +3731,7 @@
+ fi
+ if test "$_os" = "Linux"; then
+ echo $ac_n "checking for gnu_get_libc_version in -lc""... $ac_c" 1>&6
+-echo "configure:3548: checking for gnu_get_libc_version in -lc" >&5
++echo "configure:3735: checking for gnu_get_libc_version in -lc" >&5
+ ac_lib_var=`echo c'_'gnu_get_libc_version | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3552,7 +3739,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lc $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3556 "configure"
++#line 3743 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ #ifdef __cplusplus
+@@ -3566,7 +3753,7 @@
+ gnu_get_libc_version()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3587,7 +3774,7 @@
+ fi
+
+ echo $ac_n "checking the installed libc is at least version 2.1.1""... $ac_c" 1>&6
+-echo "configure:3591: checking the installed libc is at least version 2.1.1" >&5
++echo "configure:3778: checking the installed libc is at least version 2.1.1" >&5
+ if test "$HAVE_LIBC"; then
+ echo "$ac_t""checked" 1>&6
+ else
+@@ -3597,7 +3784,7 @@
+ # Extract the first word of "bison", so it can be a program name with args.
+ set dummy bison; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3601: checking for $ac_word" >&5
++echo "configure:3788: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_BISON'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3635,7 +3822,7 @@
+ # Extract the first word of "flex", so it can be a program name with args.
+ set dummy flex; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3639: checking for $ac_word" >&5
++echo "configure:3826: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_FLEX'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3673,7 +3860,7 @@
+ # Extract the first word of "patch", so it can be a program name with args.
+ set dummy patch; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3677: checking for $ac_word" >&5
++echo "configure:3864: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_PATCH'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3712,7 +3899,7 @@
+ # Extract the first word of "bash", so it can be a program name with args.
+ set dummy bash; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3716: checking for $ac_word" >&5
++echo "configure:3903: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_CYGWIN'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3751,7 +3938,7 @@
+ # Extract the first word of "ml.exe", so it can be a program name with args.
+ set dummy ml.exe; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3755: checking for $ac_word" >&5
++echo "configure:3942: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_ML_EXE'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3797,7 +3984,7 @@
+ # Extract the first word of "unzip.exe", so it can be a program name with args.
+ set dummy unzip.exe; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:3801: checking for $ac_word" >&5
++echo "configure:3988: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_UNZIP_EXE'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3841,7 +4028,7 @@
+
+
+ echo $ac_n "checking GPC files""... $ac_c" 1>&6
+-echo "configure:3845: checking GPC files" >&5
++echo "configure:4032: checking GPC files" >&5
+ if test -f ../external/gpc/gpc.h; then
+ HAVE_GPC_H="yes"
+ else
+@@ -3957,12 +4144,14 @@
+ echo "\$MINGWIN32="$WITH_MINGWIN
+ echo "\$with_use_shell="$with_use_shell
+ echo "\$USE_GCC3="$USE_GCC3
++echo "\$CC="$CC
++echo "\$CXX="$CXX
+ echo
+ fi
+
+ # Executing the set_soenv script to setup the environment variables.
+ if test -z "$enable_check_only"; then
+- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $CC $CXX
+ else
+ echo
+ echo Test Complete
+@@ -4128,7 +4317,6 @@
+ s%@AWK@%$AWK%g
+ s%@SED@%$SED%g
+ s%@CC@%$CC%g
+-s%@GCC@%$GCC%g
+ s%@_cc@%$_cc%g
+ s%@CPP@%$CPP%g
+ s%@CXX@%$CXX%g
diff --git a/app-office/openoffice/files/641d/openoffice-641d-set-compiler-vars.patch b/app-office/openoffice/files/641d/openoffice-641d-set-compiler-vars.patch
new file mode 100644
index 000000000000..a84a1507f162
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-set-compiler-vars.patch
@@ -0,0 +1,84 @@
+diff -ur oo_cvs/config_office/configure.in oo_stable1_cvs20020411_src/config_office/configure.in
+--- oo_cvs/config_office/configure.in Mon Mar 25 10:07:39 2002
++++ oo_stable1_cvs20020411_src/config_office/configure.in Fri Apr 12 19:55:09 2002
+@@ -241,18 +241,18 @@
+ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
+ AC_PROG_CC
+ fi
+-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
++if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$GCC" = "yes" \) ; then
+ dnl ******************************************
+ dnl Testing for GNU compiler and version...
+ dnl ******************************************
+ dnl Check whether the gnu gcc compiler is used.
+ if test -z "$with_gcc_home"; then
+- if test "$CC" = "gcc"; then
+- AC_PATH_PROG(GCC, gcc)
+- COMPATH=`echo $GCC | $SED -n "s/\/gcc//p"`
+- _gcc_include_start=/usr/lib/gcc-lib
+- _gxx_include_start=/usr/include
+- fi
++
++ AC_PROG_CC
++ COMPATH=`echo $CC | $SED -n "s,/[^/]\+$,,p"`
++ _gcc_include_start=/usr/lib/gcc-lib
++ _gxx_include_start=/usr/include
++
+ else
+ dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home
+ _gcc_path="$with_gcc_home/bin/gcc"
+@@ -1177,12 +1177,14 @@
+ echo "\$MINGWIN32="$WITH_MINGWIN
+ echo "\$with_use_shell="$with_use_shell
+ echo "\$USE_GCC3="$USE_GCC3
++echo "\$CC="$CC
++echo "\$CXX="$CXX
+ echo
+ fi
+
+ # Executing the set_soenv script to setup the environment variables.
+ if test -z "$enable_check_only"; then
+- './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
++ './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $CC $CXX
+ else
+ echo
+ echo Test Complete
+diff -ur oo_cvs/config_office/set_soenv.1 oo_stable1_cvs20020411_src/config_office/set_soenv.1
+--- oo_cvs/config_office/set_soenv.1 Wed Mar 20 19:10:58 2002
++++ oo_stable1_cvs20020411_src/config_office/set_soenv.1 Fri Apr 12 16:45:11 2002
+@@ -40,7 +40,7 @@
+ #
+ # Set this value equal to the corresponding amount of
+ # command line arguments.
+-my $numArgs = 20;
++my $numArgs = 22;
+ # Determining the amount of arguments in the call.
+ my $numEnter = $#ARGV + 1;
+ if ( $numEnter != $numArgs )
+@@ -96,7 +96,7 @@
+ $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
+ $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME,
+ $BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
+- $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 );
++ $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $CC, $CXX );
+ #
+ #-------------------------------------------
+ # IId. Declaring the aliases.
+@@ -146,6 +146,8 @@
+ $MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32
+ $use_shell = $ARGV [ 18 ]; # preferred shell
+ $USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment)
++$CC = $ARGV [ 20 ]; # C compiler
++$CXX = $ARGV [ 21 ]; # C++ compiler
+ #
+ #---------------------------------------------------------------
+ # IIIb. Initialising the variables for the system commands, etc.
+@@ -1464,6 +1466,8 @@
+ ToFile( "SOLARINC", $SOLARINC, "e" );
+ ToFile( "COMP_ENV", $COMP_ENV, "e" );
+ ToFile( "JAVAHOME", $JAVAHOME, "e" );
++ToFile( "CCCOMP", $CC, "e" );
++ToFile( "CXXCOMP", $CXX, "e" );
+ ToFile( "BISON_HAIRY", $BISON_HAIRY, "e" );
+ ToFile( "BISON_SIMPLE", $BISON_SIMPLE, "e" );
+ ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,"e" );
diff --git a/app-office/openoffice/files/641d/openoffice-641d-use-compiler-vars.patch b/app-office/openoffice/files/641d/openoffice-641d-use-compiler-vars.patch
new file mode 100644
index 000000000000..6a63e74b597f
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-use-compiler-vars.patch
@@ -0,0 +1,73 @@
+diff -ru oo_cvs/solenv/inc/unxlngi3.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngi3.mk
+--- oo_cvs/solenv/inc/unxlngi3.mk Wed Oct 24 19:21:47 2001
++++ oo_stable1_cvs20020411_src/solenv/inc/unxlngi3.mk Fri Apr 12 21:15:30 2002
+@@ -85,9 +85,9 @@
+ .ENDIF
+
+ # name of C++ Compiler
+-CC=g++
++CC=$(CXXCOMP)
+ # name of C Compiler
+-cc=gcc
++cc=$(CCCOMP)
+ # flags for C and C++ Compiler
+ # do not use standard header search paths
+ # if installed elsewhere
+@@ -138,7 +138,7 @@
+ DYNAMIC = -Wl,-Bdynamic
+
+ # name of linker
+-LINK=gcc
++LINK=$(CXXCOMP)
+ # default linker flags
+ LINKFLAGS=
+
+Only in oo_stable1_cvs20020411_src/solenv/inc: unxlngi3.mk.orig
+diff -ru oo_cvs/solenv/inc/unxlngi4.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngi4.mk
+--- oo_cvs/solenv/inc/unxlngi4.mk Fri Dec 21 13:24:32 2001
++++ oo_stable1_cvs20020411_src/solenv/inc/unxlngi4.mk Fri Apr 12 19:58:42 2002
+@@ -85,9 +85,9 @@
+ .ENDIF
+
+ # name of C++ Compiler
+-CC=g++
++CC=$(CXXCOMP)
+ # name of C Compiler
+-cc=gcc
++cc=$(CCCOMP)
+ # flags for C and C++ Compiler
+ # do not use standard header search paths
+ # if installed elsewhere
+@@ -147,7 +147,7 @@
+ DYNAMIC = -Wl,-Bdynamic
+
+ # name of linker
+-LINK=gcc
++LINK=$(CXXCOMP)
+ # default linker flags
+ LINKFLAGS=
+
+diff -ru oo_cvs/solenv/inc/unxlngppc.mk oo_stable1_cvs20020411_src/solenv/inc/unxlngppc.mk
+--- oo_cvs/solenv/inc/unxlngppc.mk Thu Feb 28 21:39:42 2002
++++ oo_stable1_cvs20020411_src/solenv/inc/unxlngppc.mk Fri Apr 12 21:14:54 2002
+@@ -26,9 +26,9 @@
+
+
+ # name of C++ Compiler
+-CC=g++
++CC=$(CXXCOMP)
+ # name of C Compiler
+-cc=gcc
++cc=$(CCCOMP)
+
+ # source code is still not signed versus unsigned char clean
+ CFLAGS=-fsigned-char -w -nostdinc -c $(INCLUDE) -I$(SOLARENV)/unxlngppc/usr/include
+@@ -81,7 +81,7 @@
+ DYNAMIC = -Wl,-Bdynamic
+
+ # name of linker
+-LINK=gcc
++LINK=$(CXXCOMP)
+ # default linker flags
+ LINKFLAGS=
+
diff --git a/app-office/openoffice/files/641d/openoffice-641d-zipdep-not-found.patch b/app-office/openoffice/files/641d/openoffice-641d-zipdep-not-found.patch
new file mode 100644
index 000000000000..3803e159c1ee
--- /dev/null
+++ b/app-office/openoffice/files/641d/openoffice-641d-zipdep-not-found.patch
@@ -0,0 +1,23 @@
+--- oo_641c_src/solenv/inc/_tg_zip.mk.zipdep Fri Nov 2 18:59:44 2001
++++ oo_641c_src/solenv/inc/_tg_zip.mk Sat Feb 16 16:59:57 2002
+@@ -163,7 +163,8 @@
+ +-zipdep $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,$(longlang_{$(subst,$(BIN)$/$(ZIP2TARGET), $(@:db))}) $j )) >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+ .ENDIF # "$(ZIP2DIR)" != ""
+ .ENDIF # "$(common_build_zip)"!=""
+- @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
++# (gb) workaround for setup2/script/makefile.mk
++# @+echo $@ : makefile.mk >> $(MISC)$/$(TARGET).$(PWD:f).$(@:b).dpzz
+ .ENDIF # "$(make_zip_deps)" != ""
+ .ENDIF
+
+--- oo_641c_src/tools/bootstrp/makefile.mk.zipdep Tue Oct 16 16:21:13 2001
++++ oo_641c_src/tools/bootstrp/makefile.mk Fri Feb 15 17:02:24 2002
+@@ -147,7 +147,7 @@
+ APP4LIBS= $(LB)$/bootstrp.lib
+ APP4DEPN= $(LB)$/atools.lib $(LB)$/bootstrp.lib
+
+-#APP5TARGET= zipdep
++APP5TARGET= zipdep
+ APP5OBJS= $(OBJ)$/zipdep.obj
+ APP5LIBS= $(LB)$/bootstrp.lib
+ APP5STDLIBS=$(STATIC_LIBS)
diff --git a/app-office/openoffice/files/641d/read_ins.pl b/app-office/openoffice/files/641d/read_ins.pl
new file mode 100644
index 000000000000..a1429055de8c
--- /dev/null
+++ b/app-office/openoffice/files/641d/read_ins.pl
@@ -0,0 +1,321 @@
+#!/usr/bin/perl
+#
+
+use strict;
+
+my ($prefix) = $ENV{PREFIX};
+my ($instdir) = $ENV{INSTDIR};
+my ($destdir) = $ENV{DESTDIR};
+my ($regcomp) = $ENV{REGCOMP};
+
+die if (!length($instdir) || !length($destdir) || !length($regcomp));
+
+my ($finaldestdir) = $destdir;
+$finaldestdir =~ s/^$prefix//;
+$finaldestdir = "/" . $finaldestdir if ($finaldestdir !~ /^\//);
+
+my (%directories, %packages, %files, %shortcuts, @dblines);
+my ($tmp, %useddirs, %profiles, %profileitems, @components);
+
+my ($directory, $parent, $hostname, $component);
+my ($file, $filename, $package, $dir, $perms);
+my ($installation, $product, $version, $language);
+my ($shortcut, $scname, $fileid, $scdir);
+my ($profile, $p_name, $p_dir, $profileitem);
+my ($pi_profile, $pi_sect, $pi_key, $pi_value);
+
+$directories{PREDEFINED_PROGDIR} = [ "", $destdir ];
+$directories{PREDEFINED_CONFIGDIR} = [ "", $ENV{HOME} ];
+
+open(FH, "$instdir/setup.ins");
+while (<FH>) {
+ chomp;
+
+ if (/^End/)
+ {
+ if (length($directory) && length($parent) && length($hostname))
+ {
+ $directories{$directory} = [ $parent, $hostname ];
+ }
+ $directory = $parent = $hostname = "";
+
+ if (length($file))
+ {
+ if (length($filename))
+ {
+ $files{$file} = [ $filename, $dir ];
+ push(@components, $filename) if ($component);
+ }
+ if (length($package) && length($dir) && length($perms))
+ {
+ $packages{$package} = [ $dir, $perms ];
+ }
+ }
+ $component = 0;
+ $file = $filename = $package = $dir = $perms = "";
+
+ if (length($installation))
+ {
+ if (length($product) && length($version))
+ {
+ push(@dblines, "\tDefaultDestPath = \"" . $product . $version . "\";");
+ }
+ if (length($language))
+ {
+ push(@dblines, "\tInstLanguages = \"" . $language . ":1:1\";");
+ }
+ push(@dblines, "\tDestPath = \"" . $finaldestdir . "\";");
+ push(@dblines, "\tSourcePath = \"" . $instdir . "\";");
+ push(@dblines, "\tMode = NETWORK;");
+ }
+ $installation = $language = "";
+
+ if (length($shortcut) && length($scname) && length($fileid) && length($scdir))
+ {
+ $shortcuts{$shortcut} = [ $scname, $fileid, $scdir ];
+ }
+ $shortcut = $scname = $fileid = $scdir = "";
+
+ if (length($profile) && length($p_name) && length($p_dir))
+ {
+ $profiles{$profile} = [ $p_name, $p_dir ];
+ }
+ $profile = $p_name = $p_dir = "";
+
+ if (length($profileitem) && length($pi_profile) && length($pi_sect) && length($pi_key))
+ {
+ $profileitems{$pi_profile}->{$pi_sect}->{$pi_key} = $pi_value;
+ }
+ $profileitem = $pi_profile = $pi_sect = $pi_key = $pi_value = "";
+ }
+ elsif (/^Installation\s+(\S+)/)
+ {
+ $installation = $1;
+ }
+ elsif (/^Directory\s+(\S+)/)
+ {
+ $directory = $1;
+ }
+ elsif (/^File\s+(\S+)/)
+ {
+ $file = $1;
+ }
+ elsif (/^Shortcut\s+(\S+)/)
+ {
+ $shortcut = $1;
+ }
+ elsif (/^Profile\s+(\S+)/)
+ {
+ $profile = $1;
+ }
+ elsif (/^ProfileItem\s+(\S+)/)
+ {
+ $profileitem = $1;
+ }
+ elsif (length($installation))
+ {
+ if (/^\s*DefaultDestPath\s*=/)
+ {
+ next;
+ }
+ if (/^\s*ProductName\s*=\s*\"([^;]+)\";/)
+ {
+ $product = $1;
+ }
+ elsif (/^\s*ProductVersion\s*=\s*\"([^"]+)\";/)
+ {
+ $version = $1;
+ }
+ elsif (/^\s*DefaultLanguage\s*=\s*\"([^"]+)\";/)
+ {
+ $language = $1;
+ }
+ }
+ elsif (length($directory))
+ {
+ if (/^\s*ParentID\s*=\s*([^;]+);/)
+ {
+ $parent = $1;
+ }
+ elsif (/^\s*HostName\s*=\s*\"([^"]+)\";/)
+ {
+ $hostname = $1;
+ }
+ }
+ elsif (length($file))
+ {
+ if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+ {
+ $filename = $1;
+ }
+ elsif (/^\s*PackedName\s*=\s*\"([^"]+)\";/)
+ {
+ $package = $1;
+ }
+ elsif (/^\s*Dir\s*=\s*([^;]+);/)
+ {
+ $dir = $1;
+ }
+ elsif (/^\s*UnixRights\s*=\s*([^;]+);/)
+ {
+ $perms = $1;
+ }
+ elsif (/^\s*Styles\s*=\s*\(.*UNO_COMPONENT.*\);/)
+ {
+ $component = 1;
+ }
+ }
+ elsif (length($shortcut))
+ {
+ if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+ {
+ $scname = $1;
+ }
+ elsif (/^\s*FileID\s*=\s*([^;]+);/)
+ {
+ $fileid = $1;
+ }
+ elsif (/^\s*Dir\s*=\s*([^;]+);/)
+ {
+ $scdir = $1;
+ }
+ }
+ elsif (length($profile))
+ {
+ if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+ {
+ $p_name = $1;
+ }
+ elsif (/^\s*Dir\s*=\s*([^;]+);/)
+ {
+ $p_dir = $1;
+ }
+ }
+ elsif (length($profileitem))
+ {
+ if (/^\s*ProfileID\s*=\s*([^;]+);/)
+ {
+ $pi_profile = $1;
+ }
+ elsif (/^\s*Section\s*=\s*\"([^"]+)\";/)
+ {
+ $pi_sect = $1;
+ }
+ elsif (/^\s*Key\s*=\s*\"([^"]+)\";/)
+ {
+ $pi_key = $1;
+ }
+ elsif (/^\s*Value\s*=\s*\"([^"]+)\";/)
+ {
+ $pi_value = $1;
+ }
+ }
+
+ my ($line) = $_;
+ $line =~ s/[']/'"'"'/g;
+ chop($line);
+
+ push(@dblines, $line);
+}
+close(FH);
+
+sub getFilePath
+{
+ my ($rv);
+ my ($lookfor) = shift;
+
+ if (defined($directories{$lookfor}))
+ {
+ if (defined($directories{@{$directories{$lookfor}}[0]}))
+ {
+ $rv = getFilePath(@{$directories{$lookfor}}[0]);
+ }
+ $rv .= "/" if (length($rv));
+ $rv .= @{$directories{$lookfor}}[1];
+ }
+ return $rv;
+}
+
+foreach $tmp (sort keys %packages)
+{
+ my ($dir) = getFilePath($packages{$tmp}[0]);
+ $useddirs{$dir} = ".";
+}
+
+print "#!/bin/sh\n";
+
+print "mkdir -p $destdir\n";
+print "chmod 755 $destdir\n";
+
+foreach $tmp (sort keys %useddirs)
+{
+ print "mkdir -p $tmp\n";
+ print "chmod 755 $tmp\n";
+}
+
+print "mkdir /tmp/inst$$\n";
+print "cd /tmp/inst$$\n";
+
+foreach $tmp (sort keys %packages)
+{
+ print "rm -f *\n";
+ print "unzip $instdir/$tmp\n";
+ print "chmod $packages{$tmp}[1] *\n";
+ print "mv * " . getFilePath($packages{$tmp}[0]) . "\n";
+}
+
+print "cd $destdir\n";
+print "rm -rf /tmp/inst$$\n";
+
+foreach $tmp (sort keys %shortcuts)
+{
+ if (defined($files{@{$shortcuts{$tmp}}[1]}) &&
+ defined($directories{@{$shortcuts{$tmp}}[2]}))
+ {
+ my ($newdir) = getFilePath($files{$shortcuts{$tmp}[1]}[1]);
+ $newdir =~ s/^$prefix//;
+ $newdir = "/" . $newdir if ($newdir !~ /^\//);
+ print "ln -sf $newdir/$files{$shortcuts{$tmp}[1]}[0] " .
+ getFilePath($shortcuts{$tmp}[2]) . "/$shortcuts{$tmp}[0]\n";
+ }
+}
+
+foreach $tmp (sort keys %profiles)
+{
+ if (defined($directories{@{$profiles{$tmp}}[1]}))
+ {
+ my ($dir) = getFilePath($profiles{$tmp}[1]);
+ my ($sect);
+ foreach $sect (sort keys %{$profileitems{$tmp}})
+ {
+ print "echo '[" . $sect . "]' >>$dir/$profiles{$tmp}[0]\n";
+ my ($key);
+ foreach $key (sort keys %{$profileitems{$tmp}->{$sect}})
+ {
+ my ($key2) = $key;
+ $key2 =~ s/\%PRODUCTNAME/$product/;
+ $key2 =~ s/\%PRODUCTVERSION/$version/;
+ my ($value) = $profileitems{$tmp}->{$sect}->{$key};
+ $value =~ s/<installmode>/NETWORK/;
+ $value =~ s/<productkey>/$product $version/;
+ $value =~ s,<workpath_url>,file://$finaldestdir,;
+ print "echo '$key2 = $value' >>$dir/$profiles{$tmp}[0]\n";
+ }
+ print "echo '' >>$dir/$profiles{$tmp}[0]\n";
+ }
+ }
+}
+
+print "LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:$destdir/program; export LD_LIBRARY_PATH\n";
+foreach $tmp (sort @components)
+{
+ print "$regcomp -register -c $destdir/program/$tmp -r $destdir/program/applicat.rdb\n";
+}
+
+print "cp $instdir/LICENSE* $destdir\n";
+print "cp $instdir/README* $destdir\n";
+
+foreach $tmp (@dblines)
+{
+ print "echo '$tmp' >>$destdir/program/instdb.ins\n";
+}
diff --git a/app-office/openoffice/files/641d/read_ins.pl.orig b/app-office/openoffice/files/641d/read_ins.pl.orig
new file mode 100644
index 000000000000..e1f99847fa60
--- /dev/null
+++ b/app-office/openoffice/files/641d/read_ins.pl.orig
@@ -0,0 +1,321 @@
+#!/usr/bin/perl
+#
+
+use strict;
+
+my ($prefix) = $ENV{PREFIX};
+my ($instdir) = $ENV{INSTDIR};
+my ($destdir) = $ENV{DESTDIR};
+my ($regcomp) = $ENV{REGCOMP};
+
+die if (!length($instdir) || !length($destdir) || !length($regcomp));
+
+my ($finaldestdir) = $destdir;
+$finaldestdir =~ s/^$prefix//;
+$finaldestdir = "/" . $finaldestdir if ($finaldestdir !~ /^\//);
+
+my (%directories, %packages, %files, %shortcuts, @dblines);
+my ($tmp, %useddirs, %profiles, %profileitems, @components);
+
+my ($directory, $parent, $hostname, $component);
+my ($file, $filename, $package, $dir, $perms);
+my ($installation, $product, $version, $language);
+my ($shortcut, $scname, $fileid, $scdir);
+my ($profile, $p_name, $p_dir, $profileitem);
+my ($pi_profile, $pi_sect, $pi_key, $pi_value);
+
+$directories{PREDEFINED_PROGDIR} = [ "", $destdir ];
+$directories{PREDEFINED_CONFIGDIR} = [ "", $ENV{HOME} ];
+
+open(FH, "$instdir/setup.ins");
+while (<FH>) {
+ chomp;
+
+ if (/^End/)
+ {
+ if (length($directory) && length($parent) && length($hostname))
+ {
+ $directories{$directory} = [ $parent, $hostname ];
+ }
+ $directory = $parent = $hostname = "";
+
+ if (length($file))
+ {
+ if (length($filename))
+ {
+ $files{$file} = [ $filename, $dir ];
+ push(@components, $filename) if ($component);
+ }
+ if (length($package) && length($dir) && length($perms))
+ {
+ $packages{$package} = [ $dir, $perms ];
+ }
+ }
+ $component = 0;
+ $file = $filename = $package = $dir = $perms = "";
+
+ if (length($installation))
+ {
+ if (length($product) && length($version))
+ {
+ push(@dblines, "\tDefaultDestPath = \"" . $product . $version . "\";");
+ }
+ if (length($language))
+ {
+ push(@dblines, "\tInstLanguages = \"" . $language . ":1:1\";");
+ }
+ push(@dblines, "\tDestPath = \"" . $finaldestdir . "\";");
+ push(@dblines, "\tSourcePath = \"" . $instdir . "\";");
+ push(@dblines, "\tMode = STANDALONE;");
+ }
+ $installation = $language = "";
+
+ if (length($shortcut) && length($scname) && length($fileid) && length($scdir))
+ {
+ $shortcuts{$shortcut} = [ $scname, $fileid, $scdir ];
+ }
+ $shortcut = $scname = $fileid = $scdir = "";
+
+ if (length($profile) && length($p_name) && length($p_dir))
+ {
+ $profiles{$profile} = [ $p_name, $p_dir ];
+ }
+ $profile = $p_name = $p_dir = "";
+
+ if (length($profileitem) && length($pi_profile) && length($pi_sect) && length($pi_key))
+ {
+ $profileitems{$pi_profile}->{$pi_sect}->{$pi_key} = $pi_value;
+ }
+ $profileitem = $pi_profile = $pi_sect = $pi_key = $pi_value = "";
+ }
+ elsif (/^Installation\s+(\S+)/)
+ {
+ $installation = $1;
+ }
+ elsif (/^Directory\s+(\S+)/)
+ {
+ $directory = $1;
+ }
+ elsif (/^File\s+(\S+)/)
+ {
+ $file = $1;
+ }
+ elsif (/^Shortcut\s+(\S+)/)
+ {
+ $shortcut = $1;
+ }
+ elsif (/^Profile\s+(\S+)/)
+ {
+ $profile = $1;
+ }
+ elsif (/^ProfileItem\s+(\S+)/)
+ {
+ $profileitem = $1;
+ }
+ elsif (length($installation))
+ {
+ if (/^\s*DefaultDestPath\s*=/)
+ {
+ next;
+ }
+ if (/^\s*ProductName\s*=\s*\"([^;]+)\";/)
+ {
+ $product = $1;
+ }
+ elsif (/^\s*ProductVersion\s*=\s*\"([^"]+)\";/)
+ {
+ $version = $1;
+ }
+ elsif (/^\s*DefaultLanguage\s*=\s*\"([^"]+)\";/)
+ {
+ $language = $1;
+ }
+ }
+ elsif (length($directory))
+ {
+ if (/^\s*ParentID\s*=\s*([^;]+);/)
+ {
+ $parent = $1;
+ }
+ elsif (/^\s*HostName\s*=\s*\"([^"]+)\";/)
+ {
+ $hostname = $1;
+ }
+ }
+ elsif (length($file))
+ {
+ if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+ {
+ $filename = $1;
+ }
+ elsif (/^\s*PackedName\s*=\s*\"([^"]+)\";/)
+ {
+ $package = $1;
+ }
+ elsif (/^\s*Dir\s*=\s*([^;]+);/)
+ {
+ $dir = $1;
+ }
+ elsif (/^\s*UnixRights\s*=\s*([^;]+);/)
+ {
+ $perms = $1;
+ }
+ elsif (/^\s*Styles\s*=\s*\(.*UNO_COMPONENT.*\);/)
+ {
+ $component = 1;
+ }
+ }
+ elsif (length($shortcut))
+ {
+ if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+ {
+ $scname = $1;
+ }
+ elsif (/^\s*FileID\s*=\s*([^;]+);/)
+ {
+ $fileid = $1;
+ }
+ elsif (/^\s*Dir\s*=\s*([^;]+);/)
+ {
+ $scdir = $1;
+ }
+ }
+ elsif (length($profile))
+ {
+ if (/^\s*Name\s*=\s*\"([^"]+)\";/)
+ {
+ $p_name = $1;
+ }
+ elsif (/^\s*Dir\s*=\s*([^;]+);/)
+ {
+ $p_dir = $1;
+ }
+ }
+ elsif (length($profileitem))
+ {
+ if (/^\s*ProfileID\s*=\s*([^;]+);/)
+ {
+ $pi_profile = $1;
+ }
+ elsif (/^\s*Section\s*=\s*\"([^"]+)\";/)
+ {
+ $pi_sect = $1;
+ }
+ elsif (/^\s*Key\s*=\s*\"([^"]+)\";/)
+ {
+ $pi_key = $1;
+ }
+ elsif (/^\s*Value\s*=\s*\"([^"]+)\";/)
+ {
+ $pi_value = $1;
+ }
+ }
+
+ my ($line) = $_;
+ $line =~ s/[']/'"'"'/g;
+ chop($line);
+
+ push(@dblines, $line);
+}
+close(FH);
+
+sub getFilePath
+{
+ my ($rv);
+ my ($lookfor) = shift;
+
+ if (defined($directories{$lookfor}))
+ {
+ if (defined($directories{@{$directories{$lookfor}}[0]}))
+ {
+ $rv = getFilePath(@{$directories{$lookfor}}[0]);
+ }
+ $rv .= "/" if (length($rv));
+ $rv .= @{$directories{$lookfor}}[1];
+ }
+ return $rv;
+}
+
+foreach $tmp (sort keys %packages)
+{
+ my ($dir) = getFilePath($packages{$tmp}[0]);
+ $useddirs{$dir} = ".";
+}
+
+print "#!/bin/sh\n";
+
+print "mkdir -p $destdir\n";
+print "chmod 755 $destdir\n";
+
+foreach $tmp (sort keys %useddirs)
+{
+ print "mkdir -p $tmp\n";
+ print "chmod 755 $tmp\n";
+}
+
+print "mkdir /tmp/inst$$\n";
+print "cd /tmp/inst$$\n";
+
+foreach $tmp (sort keys %packages)
+{
+ print "rm -f *\n";
+ print "unzip $instdir/$tmp\n";
+ print "chmod $packages{$tmp}[1] *\n";
+ print "mv * " . getFilePath($packages{$tmp}[0]) . "\n";
+}
+
+print "cd $destdir\n";
+print "rm -rf /tmp/inst$$\n";
+
+foreach $tmp (sort keys %shortcuts)
+{
+ if (defined($files{@{$shortcuts{$tmp}}[1]}) &&
+ defined($directories{@{$shortcuts{$tmp}}[2]}))
+ {
+ my ($newdir) = getFilePath($files{$shortcuts{$tmp}[1]}[1]);
+ $newdir =~ s/^$prefix//;
+ $newdir = "/" . $newdir if ($newdir !~ /^\//);
+ print "ln -sf $newdir/$files{$shortcuts{$tmp}[1]}[0] " .
+ getFilePath($shortcuts{$tmp}[2]) . "/$shortcuts{$tmp}[0]\n";
+ }
+}
+
+foreach $tmp (sort keys %profiles)
+{
+ if (defined($directories{@{$profiles{$tmp}}[1]}))
+ {
+ my ($dir) = getFilePath($profiles{$tmp}[1]);
+ my ($sect);
+ foreach $sect (sort keys %{$profileitems{$tmp}})
+ {
+ print "echo '[" . $sect . "]' >>$dir/$profiles{$tmp}[0]\n";
+ my ($key);
+ foreach $key (sort keys %{$profileitems{$tmp}->{$sect}})
+ {
+ my ($key2) = $key;
+ $key2 =~ s/\%PRODUCTNAME/$product/;
+ $key2 =~ s/\%PRODUCTVERSION/$version/;
+ my ($value) = $profileitems{$tmp}->{$sect}->{$key};
+ $value =~ s/<installmode>/STANDALONE/;
+ $value =~ s/<productkey>/$product $version/;
+ $value =~ s,<workpath_url>,file://$finaldestdir,;
+ print "echo '$key2 = $value' >>$dir/$profiles{$tmp}[0]\n";
+ }
+ print "echo '' >>$dir/$profiles{$tmp}[0]\n";
+ }
+ }
+}
+
+print "LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:$destdir/program; export LD_LIBRARY_PATH\n";
+foreach $tmp (sort @components)
+{
+ print "$regcomp -register -c $destdir/program/$tmp -r $destdir/program/applicat.rdb\n";
+}
+
+print "cp $instdir/LICENSE* $destdir\n";
+print "cp $instdir/README* $destdir\n";
+
+foreach $tmp (@dblines)
+{
+ print "echo '$tmp' >>$destdir/program/instdb.ins\n";
+}
diff --git a/app-office/openoffice/files/digest-openoffice-641d b/app-office/openoffice/files/digest-openoffice-641d
new file mode 100644
index 000000000000..e3474064c1ac
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-641d
@@ -0,0 +1,3 @@
+MD5 6f72837c9609b17ed7631ab5539259bc oo_641d_src.tar.bz2 116352036
+MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
+MD5 1d0062ce61a3ad4baa92bdcad496c682 mozilla-source-0.9.5.tar.bz2 26903227
diff --git a/app-office/openoffice/openoffice-641d.ebuild b/app-office/openoffice/openoffice-641d.ebuild
new file mode 100644
index 000000000000..780f4e17fd14
--- /dev/null
+++ b/app-office/openoffice/openoffice-641d.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Authors: Preston A. Elder <prez@goth.net>, Martin Schlemmer <azarah@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-641d.ebuild,v 1.1 2002/04/17 23:39:35 azarah Exp $
+
+# IMPORTANT: This is extremely alpha!!!
+
+# notes:
+# This will take a HELL of a long time to compile, be warned.
+# According to openoffice.org, it takes approximately 12 hours on a
+# P3/600 with 256mb ram. And thats where building is its only task.
+#
+# You will also need a bucketload of diskspace ... in the order of
+# 4-5 gb free to store all the compiled files and installation
+# directories.
+#
+# The information on how to build and what is required comes from:
+# http://www.openoffice.org/dev_docs/source/build_linux.html
+# http://tools.openoffice.org/ext_comp.html
+#
+# todo:
+# Some kind of install process.
+
+LOC="/opt"
+MAIN_VER="`echo ${PV} |sed -e "s:[a-z]::g"`"
+S="${WORKDIR}/oo_${PV}_src"
+DESCRIPTION="OpenOffice productivity suite"
+SRC_URI="http://ny1.mirror.openoffice.org/${PV}/oo_${PV}_src.tar.bz2
+ http://sf1.mirror.openoffice.org/${PV}/oo_${PV}_src.tar.bz2
+ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"
+HOMEPAGE="http://www.openoffice.org"
+
+COMMONDEPEND=">=sys-libs/glibc-2.1
+ >=sys-devel/perl-5.0
+ virtual/x11
+ app-arch/zip
+ app-arch/unzip
+ >=virtual/jdk-1.3.1"
+
+# All these are included with the source archive ...
+# >=media-libs/nas-1.4.1
+# >=media-libs/jpeg-6b
+# >=media-gfx/sane-frontends-1.0.0
+# >=dev-libs/expat-1.95.1
+# >=sys-libs/zlib-1.1.3
+# >=net-misc/neon-0.3.1
+
+# We need gcc-3.0 or greater, as the Mozilla runtime libs is compiled with
+# gcc3, and the build segfault with gcc-2.95.3 if we recompile mozilla
+# with gcc-2.95.3.
+#
+# Azarah -- 14 April 2002
+RDEPEND="${COMMONDEPEND}
+ >=sys-devel/gcc-3.0.4-r3"
+DEPEND="${COMMONDEPEND}
+ >=sys-devel/gcc-3.0.4-r3
+ app-shells/tcsh"
+
+# All these are included with the source archive ...
+# >=dev-util/dmake-3.2.1
+
+SLOT="0"
+
+GCC_VER="`gcc --version`"
+
+# fix a bug with tcsh and dircolors
+#
+# Azarah -- 10 April 2002
+export LS_COLORS=""
+
+src_unpack() {
+ cd ${WORKDIR}
+ unpack ${A}
+ cd ${WORKDIR}/gpc231
+ cp gpc.* ${S}/external/gpc
+ cd ${S}
+
+ # This allows JDK 1.4.0 to be used
+ patch -p1 <${FILESDIR}/${PV}/${P}-configure.patch || die
+
+ # Fixes code errors that stop compile
+ patch -p1 <${FILESDIR}/${PV}/${P}-code_err.patch || die
+
+ # This forces exceptions to always be enabled for gcc 3.0.x
+ patch -p1 <${FILESDIR}/${PV}/${P}-gcc3.patch || die
+
+ # Debian patch to enable build of zipdep
+ #
+ # Azarah -- 14 April 2002
+ patch -p1 <${FILESDIR}/${PV}/${P}-zipdep-not-found.patch || die
+
+ # Some Debian patches to get the build to use $CC and $CXX,
+ # thanks to nidd from #openoffice.org
+ #
+ # Azarah -- 14 April 2002
+ patch -p1 <${FILESDIR}/${PV}/${P}-gcc-version-check.patch || die
+ patch -p1 <${FILESDIR}/${PV}/${P}-set-compiler-vars.patch || die
+ patch -p1 <${FILESDIR}/${PV}/${P}-use-compiler-vars.patch || die
+ patch -p1 <${FILESDIR}/${PV}/${P}-ran-autoconf.patch || die
+
+ # Fix STLport to use gcc-3.x/g++-3.x as compilter when we have
+ # gcc-2.95.3 as base compiler.
+ #
+ # Azarah -- 15 April 2002
+ if [ 0`echo ${GCC_VER} | cut -f1 -d.` -eq 2 ]
+ then
+ patch -p1 <${FILESDIR}/${PV}/${P}-STLport-gcc2-gcc3.patch || die
+ fi
+
+ # Now for our optimization flags ...
+ cd ${S}/solenv/inc
+ cp unxlngi3.mk unxlngi3.mk.orig
+ cp unxlngi4.mk unxlngi4.mk.orig
+ sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=${CFLAGS}:g" \
+ unxlngi3.mk.orig >unxlngi3.mk
+ sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=${CFLAGS}:g" \
+ unxlngi4.mk.orig >unxlngi4.mk
+}
+
+src_compile() {
+
+ local myargs=""
+ if [ 0`echo ${GCC_VER} | cut -f1 -d.` -eq 3 ]
+ then
+ myargs="${myargs} --enable-gcc3"
+ else
+ myargs="${myargs} --enable-gcc3"
+
+ # We use the dual/multiple install of gcc-3.x if the user
+ # have 2.95.3 as base
+ #
+ # Azarah -- 15 April 2002
+ if [ -x /usr/bin/gcc-3.0 ]
+ then
+ export CC=gcc-3.0
+ export CXX=g++-3.0
+ elif [ -x /usr/bin/gcc-3.1 ]
+ then
+ export CC=gcc-3.1
+ export CXX=g++-3.1
+ else
+ die "Cannot find gcc version 3.0 or later"
+ fi
+ fi
+
+ # Workaround for missing libs with GCC3 (thanks to Debian)
+ #
+ # Azarah -- 15 April 2002
+ mkdir -p ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
+ cp -f /lib/libgcc_s.so.1* ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
+ cp -f /usr/lib/libstdc++.so.3* ${S}/solver/${MAIN_VER}/unxlngi4.pro/lib
+
+ # Do NOT compile with a external STLport, as gcc-2.95.3 users will
+ # get linker errors due to the ABI being different (STLport will be
+ # compiled with 2.95.3, while OO is compiled with 3.x).
+ #
+ # Azarah -- 15 April 2002
+ cd ${S}/config_office
+ rm -f config.cache
+ ./configure ${myargs} \
+ --with-jdk-home=${JAVA_HOME} \
+ --with-lang=ENUS \
+ --with-x || die
+
+ cd ${S}
+ ./bootstrap || die "Bootstrap failed!"
+
+ BS=${S}/gentoo-build.csh
+ cat >${BS} <<EOT
+source LinuxIntelEnv.Set
+dmake
+EOT
+ chmod +x ${BS}
+ tcsh ${BS} || die "Build failed!"
+
+ GVERDIR="`grep GVERDIR LinuxIntelEnv.Set |awk '{print $3}'`"
+ [ -d ${S}/instsetoo/${GVERDIR} ] || die "Cannot find build dir!"
+}
+
+pkg_setup() {
+
+ # This gets in our way ... we MUST use the JDK version, not gcj's
+ if [ -f /usr/include/jni.h ]
+ then
+ mv /usr/include/jni.h /usr/include/jni.h.oo_compile
+ fi
+}
+
+pkg_preinst() {
+
+ # Restore it if we exiled it before ...
+ if [ -f /usr/include/jni.h.oo_compile ]
+ then
+ mv /usr/include/jni.h.oo_compile /usr/include/jni.h
+ fi
+}
+
+src_install() {
+ # This allows us to change languages without editing the ebuild.
+ [ -z "$LANGUAGE" ] && LANGUAGE=01
+
+ GVERDIR="`grep GVERDIR LinuxIntelEnv.Set |awk '{print $3}'`"
+
+ # This next lot is not really tested, and could fail horridly.
+ # what I basically do, is generate two scripts with
+ # Preston A. Elder's read_ins.pl script. The first is just
+ # the install part extracted, with install location in ${D}.
+ # The second is just the db generation, and component registration,
+ # which will be done in pkg_postinst() and have the *live*
+ # ${ROOT} as target.
+ #
+ # Azarah -- 16 April 2002
+
+ # Generate a install script template
+ PREFIX=${D}
+ REGCOMP=${S}/solver/${MAIN_VER}/${GVERDIR}/bin/regcomp
+ INSTDIR=${S}/instsetoo/${GVERDIR}/${LANGUAGE}/normal
+ DESTDIR=${D}${LOC}/OpenOffice-${PV}
+ export PREFIX REGCOMP INSTDIR DESTDIR
+ ${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-install.sh.orig
+
+ # Generate a register script template
+ PREFIX=""
+ REGCOMP=${LOC}/OpenOffice-${PV}/program/regcomp
+ INSTDIR=${S}/instsetoo/${GVERDIR}/${LANGUAGE}/normal
+ DESTDIR=${LOC}/OpenOffice-${PV}
+ export PREFIX REGCOMP INSTDIR DESTDIR
+ ${FILESDIR}/${PV}/read_ins.pl >${S}/gentoo-register.sh.orig
+
+ # Extract our install script
+ grep -v "^${S}" ${S}/gentoo-install.sh.orig | grep -v "^echo" > \
+ ${S}/gentoo-install.sh
+ chmod 0755 ${S}/gentoo-install.sh
+ ${S}/gentoo-install.sh
+
+ # Leave for now ... need for figuring the language selection
+ #
+ # Azarah -- 16 April 2002
+ # 01 03 07 30 31 33 34 39 45 46 48 49 81 82 86 88 90 96
+
+ # Copy regcomp and needed libraries to install directory. We
+ # need them for pkg_postinst component registration.
+ cd ${S}/solver/${MAIN_VER}/${GVERDIR}
+ mkdir -p ${D}${LOC}/OpenOffice-${PV}/program
+ cp bin/regcomp ${D}${LOC}/OpenOffice-${PV}/program
+
+ # Extract our register script
+ echo '#!/bin/sh' > ${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+ grep "^echo" ${S}/gentoo-register.sh.orig >> \
+ ${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+ grep "^LD_LIBRARY_PATH" ${S}/gentoo-register.sh.orig \
+ ${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+ grep "^${LOC}/OpenOffice-${PV}/program/regcomp" \
+ ${S}/gentoo-register.sh.orig >> \
+ ${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+ chmod 0755 ${D}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+}
+
+pkg_postinst() {
+ # Register the components in the live $ROOT
+ if [ -x ${ROOT}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh ]
+ then
+ ${ROOT}${LOC}/OpenOffice-${PV}/program/gentoo-register.sh
+ fi
+}
+