cleanups

author: Seth Chandler <sethbc@gentoo.org> 2003-03-31 22:52:24 +0000
committer: Seth Chandler <sethbc@gentoo.org> 2003-03-31 22:52:24 +0000
commit: e5e312415135b8b33c8555b0bfe8917c3bc2b8b8 (patch)
tree: a6d5cf9ca7ca51a91e0faa773f99d85064f95ce8 /app-office/openoffice
parent: big cleanups (diff)
download: historical-e5e312415135b8b33c8555b0bfe8917c3bc2b8b8.tar.gz
historical-e5e312415135b8b33c8555b0bfe8917c3bc2b8b8.tar.bz2
historical-e5e312415135b8b33c8555b0bfe8917c3bc2b8b8.zip
19 files changed, 0 insertions, 2365 deletions
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-STLport-gcc2-gcc3.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-STLport-gcc2-gcc3.patch
deleted file mode 100644
index f302a55d84cc..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-STLport-gcc2-gcc3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- oo_641d_src/stlport/STLport-4.5.patch.orig	Tue May 21 21:52:15 2002
-+++ oo_641d_src/stlport/STLport-4.5.patch	Tue May 21 21:54:51 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/1.0.0/openoffice-1.0.0-STLport-gcc31.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-STLport-gcc31.patch
deleted file mode 100644
index 821e1491a9a2..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-STLport-gcc31.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- oo_641d_src/stlport/STLport-4.5.patch.orig	Thu Jun  6 22:57:54 2002
-+++ oo_641d_src/stlport/STLport-4.5.patch	Thu Jun  6 23:02:55 2002
-@@ -174,3 +174,55 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
-+*** misc/STLport-4.5/stlport/config/stl_gcc.h	Thu Jun  6 22:53:04 2002
-+--- misc/build/STLport-4.5/stlport/config/stl_gcc.h	Thu Jun  6 22:53:56 2002
-+***************
-+*** 226,233 ****
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+--- 226,233 ----
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v31
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v31/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+***************
-+*** 261,274 ****
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+--- 261,274 ----
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v31
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-31
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3)
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-31
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-class-SwpHtStart-SAR.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-class-SwpHtStart-SAR.patch
deleted file mode 100644
index 9c4459816480..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-class-SwpHtStart-SAR.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- oo_cvs/sw/source/core/txtnode/thints.cxx	Thu Nov  8 09:35:13 2001
-+++ oo_stable1_cvs20020409_src/sw/source/core/txtnode/thints.cxx	Thu Apr 11 11:45:43 2002
-@@ -1851,7 +1851,7 @@
- 			( SFX_ITEM_SET == rNode.GetpSwAttrSet()->GetItemState( nWhich,
- 				FALSE, &pParaItem ) ) && ( pParaItem == &pHint->GetAttr() );
- 		BOOL bReplace = !( SETATTR_DONTREPLACE & nMode );
--		SwpHtStart_SAR *pTmpHints = 0;
-+		::SwpHtStart_SAR *pTmpHints = 0;
- 
- 		USHORT i;
- 		// Wir wollen zwar von nHtStart bis nMaxEnd, muessen aber ggf.
-@@ -2027,7 +2027,7 @@
- 									// Beim Einfuegen spaltet es sich selbst.
- 										if( pHistory ) pHistory->Add( pOther );
- 										if( !pTmpHints )
--											pTmpHints = new SwpHtStart_SAR();
-+											pTmpHints = new ::SwpHtStart_SAR();
- 										pTmpHints->C40_INSERT( SwTxtAttr, pOther,
- 											pTmpHints->Count() );
- 										Cut( i );
-@@ -2076,7 +2076,7 @@
- 									// Beim Einfuegen spaltet es sich selbst.
- 										if( pHistory ) pHistory->Add( pOther );
- 										if( !pTmpHints )
--											pTmpHints = new SwpHtStart_SAR();
-+											pTmpHints = new ::SwpHtStart_SAR();
- 										pTmpHints->C40_INSERT( SwTxtAttr, pOther,
- 											pTmpHints->Count() );
- 										Cut( i );
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-clk-tck-gcc-3.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-clk-tck-gcc-3.patch
deleted file mode 100644
index 30e301b41c5a..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-clk-tck-gcc-3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- oo_641c_src/tools/source/datetime/ttime.cxx.gcc3	Mon Jun 11 19:17:46 2001
-+++ oo_641c_src/tools/source/datetime/ttime.cxx	Thu Feb 21 19:44:52 2002
-@@ -73,7 +73,7 @@
- #include <dos.h>
- #elif defined UNX
- #include <limits.h>
--#ifdef IRIX
-+#if defined( IRIX ) || defined( UNX )
- #include <unistd.h>
- #endif
- #include <sys/times.h>
-@@ -493,7 +493,13 @@
- 
- 	if ( !nImplTicksPerSecond )
- 	{
-+#if defined( CLK_TCK )
- 		nImplTicksPerSecond = CLK_TCK;
-+#elif defined( _SC_CLK_TCK )
-+		nImplTicksPerSecond = sysconf(_SC_CLK_TCK);
-+#else
-+#error "I don't know how to get CLK_TCK, you lose."
-+#endif
- 		dImplTicksPerSecond = nImplTicksPerSecond;
- 		dImplTicksULONGMAX	= (double)(ULONG)ULONG_MAX;
- 	}
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-configure.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-configure.patch
deleted file mode 100644
index 9b48befffc26..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-configure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/1.0.0/openoffice-1.0.0-define-XSetIMValues.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-define-XSetIMValues.patch
deleted file mode 100644
index ff65b513946c..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-define-XSetIMValues.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur oo_cvs/vcl/unx/source/app/i18n_im.cxx oo_stable1_cvs20020409_src/vcl/unx/source/app/i18n_im.cxx
---- oo_cvs/vcl/unx/source/app/i18n_im.cxx	Thu Jan 10 14:06:51 2002
-+++ oo_stable1_cvs20020409_src/vcl/unx/source/app/i18n_im.cxx	Wed Apr 10 15:59:17 2002
-@@ -90,6 +90,9 @@
- #ifdef SOLARIS
- extern "C" char * XSetIMValues(XIM im, ...);
- #endif
-+#ifdef LINUX
-+extern "C" char * XSetIMValues(XIM im, ...);
-+#endif
- 
- // ------------------------------------------------------------------------------------
- //
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-exception-sprecs.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-exception-sprecs.patch
deleted file mode 100644
index 6ec5b0e7a8f2..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-exception-sprecs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- oo_641c_src/tools/source/memmgr/memmgr.cxx.specs	Mon Oct 15 20:40:32 2001
-+++ oo_641c_src/tools/source/memmgr/memmgr.cxx	Fri Feb 15 17:02:12 2002
-@@ -121,7 +121,8 @@
- 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)
-+//	throw ()
- {
- 	std::new_handler f = g_pfnHandler;
- 	g_pfnHandler = pfnHandler;
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-gcc-version-check.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-gcc-version-check.patch
deleted file mode 100644
index 43a3f9fd928b..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-gcc-version-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/1.0.0/openoffice-1.0.0-gcc31-getcompver.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-gcc31-getcompver.patch
deleted file mode 100644
index 4e3ebec63c0f..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-gcc31-getcompver.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- oo_1.0_src/solenv/bin/getcompver.awk	Thu Jun  6 22:26:22 2002
-+++ oo_1.0_src.azarah/solenv/bin/getcompver.awk	Thu Jun  6 22:31:36 2002
-@@ -77,7 +77,7 @@
-     x = match( $0, /..\...\...../ )
-     CCversion = substr( $0, RSTART, RLENGTH)
- }
--/^[0-9]*[.][0-9]*[.][0-9]*$/ {
-+/^[0-9]*[.][0-9]*$/ {
-     CCversion = $0
- }
- END {
-@@ -85,6 +85,7 @@
-         tokencount = split (CCversion,vertoken,".")
-         for ( i = 1 ; i <= tokencount ; i++ ) {
-             printf ("%04d",vertoken[i] )
-+        printf "0000";
-         }
-     } else
-         print CCversion
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-no-mozab.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-no-mozab.patch
deleted file mode 100644
index 4f1db5abd84d..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-no-mozab.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- oo_641c_src/connectivity/prj/build.lst.no-mozab	Tue Dec 11 18:14:02 2001
-+++ oo_641c_src/connectivity/prj/build.lst	Wed Feb 20 14:22:33 2002
-@@ -7,8 +7,6 @@
- cn	connectivity\source\resource			nmake	-	all	cn_res NULL
- cn	connectivity\source\sdbcx				nmake	-	all	cn_sdbcx cn_types NULL
- cn	connectivity\source\drivers\ado			nmake	-	w	cn_ado cn_dbtools NULL
--cn	connectivity\source\drivers\mozab\mozillasrc		nmake	-	all	cn_mozab_mozillasrc cn_file NULL
--cn	connectivity\source\drivers\mozab	nmake	-	all	cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
- cn	connectivity\source\drivers\calc		nmake	-	all	cn_calc cn_file NULL
- cn	connectivity\source\drivers\odbc		nmake	-	all	cn_odbc cn_dbtools NULL
- cn	connectivity\source\drivers\jdbc		nmake	-	all	cn_jdbc cn_dbtools NULL
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-ran-autoconf.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-ran-autoconf.patch
deleted file mode 100644
index b145f29122c7..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-ran-autoconf.patch
+++ /dev/null
@@ -1,1383 +0,0 @@
---- 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/1.0.0/openoffice-1.0.0-remove-libstdc-from-scp.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-remove-libstdc-from-scp.patch
deleted file mode 100644
index 1c811b1c3a3c..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-remove-libstdc-from-scp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- oo-src/product/inc/scp/udk_basefiles.scp	Fri Mar 15 12:58:28 2002
-+++ oo_stable1_cvs20020414_src/product/inc/scp/udk_basefiles.scp	Mon Apr 15 08:25:49 2002
-@@ -10,6 +10,7 @@
-     Styles		= (PACKED, SETUPZIP);
- End
- 
-+#ifdef NOTHING
- File gid_File_Lib_Stdc
-     BIN_FILE_BODY;
-     Name		= STRING(libstdc++.so.3.0.1);
-@@ -23,6 +24,7 @@
-     Name        = STRING(libstdc++.so.3);
-     Styles      = (NETWORK,RELATIVE);
- End
-+#endif
- #endif
- 
- File gid_File_Lib_Sal
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-set-compiler-vars.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-set-compiler-vars.patch
deleted file mode 100644
index a84a1507f162..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-set-compiler-vars.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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/1.0.0/openoffice-1.0.0-use-compiler-vars.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-compiler-vars.patch
deleted file mode 100644
index 6a63e74b597f..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-compiler-vars.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-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/1.0.0/openoffice-1.0.0-use-libstdc++-3.0.4.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-3.0.4.patch
deleted file mode 100644
index 1861470bce8e..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-3.0.4.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru oo_cvs/product/util/makefile.mk oo_stable1_cvs20020409_src/product/util/makefile.mk
---- oo_cvs/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
-+++ oo_stable1_cvs20020409_src/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
-@@ -112,7 +112,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)"=="FREEBSD"
- ###########
-@@ -438,13 +438,13 @@
- 
- #---------------------------------------------------------
- # 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 $@
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-4.0.0.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-4.0.0.patch
deleted file mode 100644
index 2e18a105a7e6..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-4.0.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru oo_cvs/product/util/makefile.mk oo_stable1_cvs20020409_src/product/util/makefile.mk
---- oo_cvs/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
-+++ oo_stable1_cvs20020409_src/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
-@@ -112,7 +112,7 @@
- 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
- 	$(DESTDIRDLL)$/libgcc_s.so 		\
--	$(DESTDIRDLL)$/libstdc++.so.3 		\
-+	$(DESTDIRDLL)$/libstdc++.so.4 		\
--	$(DESTDIRDLL)$/libstdc++.so.3.0.1
-+	$(DESTDIRDLL)$/libstdc++.so.4.0.0
- .ENDIF
- .ELIF "$(OS)"=="FREEBSD"
- ###########
-@@ -438,13 +438,13 @@
- 
- #---------------------------------------------------------
- # special targets for linux gcc3 
--$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.4.0.0 : $(DLLOUT)$/libstdc++.so.4.0.0 $(DIRLIST)
- 	-rm -f $@
--	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-+	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.0 $@
- 
--$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.0 $(DIRLIST)
- 	-rm -f $@
--	+ln -s libstdc++.so.3.0.1 $@
-+	+ln -s libstdc++.so.4.0.0 $@
- 
- $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-4.0.1.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-4.0.1.patch
deleted file mode 100644
index 4bf082e5940b..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-use-libstdc++-4.0.1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru oo_cvs/product/util/makefile.mk oo_stable1_cvs20020409_src/product/util/makefile.mk
---- oo_cvs/product/util/makefile.mk	Mon Apr  8 10:34:21 2002
-+++ oo_stable1_cvs20020409_src/product/util/makefile.mk	Wed Apr 10 18:18:09 2002
-@@ -112,7 +112,7 @@
- 	$(DESTDIRDLL)$/libgcc_s.so.1 		\
- 	$(DESTDIRDLL)$/libgcc_s.so 		\
--	$(DESTDIRDLL)$/libstdc++.so.3 		\
-+	$(DESTDIRDLL)$/libstdc++.so.4 		\
--	$(DESTDIRDLL)$/libstdc++.so.3.0.1
-+	$(DESTDIRDLL)$/libstdc++.so.4.0.1
- .ENDIF
- .ELIF "$(OS)"=="FREEBSD"
- ###########
-@@ -438,13 +438,13 @@
- 
- #---------------------------------------------------------
- # special targets for linux gcc3 
--$(DESTDIRDLL)$/libstdc++.so.3.0.1 : $(DLLOUT)$/libstdc++.so.3.0.1 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.4.0.1 : $(DLLOUT)$/libstdc++.so.4.0.1 $(DIRLIST)
- 	-rm -f $@
--	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.3.0.1 $@
-+	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.4.0.1 $@
- 
--$(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST)
-+$(DESTDIRDLL)$/libstdc++.so.4 : $(DESTDIRDLL)$/libstdc++.so.4.0.1 $(DIRLIST)
- 	-rm -f $@
--	+ln -s libstdc++.so.3.0.1 $@
-+	+ln -s libstdc++.so.4.0.1 $@
- 
- $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)
- 	-rm -f $@
diff --git a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-zipdep-not-found.patch b/app-office/openoffice/files/1.0.0/openoffice-1.0.0-zipdep-not-found.patch
deleted file mode 100644
index 3803e159c1ee..000000000000
--- a/app-office/openoffice/files/1.0.0/openoffice-1.0.0-zipdep-not-found.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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/1.0.0/read_ins.pl b/app-office/openoffice/files/1.0.0/read_ins.pl
deleted file mode 100644
index ce2d37e4f178..000000000000
--- a/app-office/openoffice/files/1.0.0/read_ins.pl
+++ /dev/null
@@ -1,431 +0,0 @@
-#!/usr/bin/perl
-#
-# Author: Preston A. Elder <prez@goth.net>
-#
-# Modified: Martin Schlemmer <azarah@gentoo.org>
-#
-#   20 Apr 2002: Change from STANDALONE to NETWORK.  Also do not create
-#                the "InstLanguages" entry in the "Installation" section.
-#                Fixed a stray "Styles" entry in the "Installation" section.
-#                Updated to add " Installed\t = YES" to appropriate "Module"
-#                sections.  Added output to first remove stale config files.
-#                Modify to support $RUNARGS, as we dont want one script to
-#                do all the work.
-#
-#   21 Apr 2002: Make use of NetDir for getting a value for $dir.
-#
-#                NOTE: as I dont know any perl to start with, things may not
-#                      be done by the book ... feel free to fix .. =)
-
-use strict;
-
-my ($prefix) = $ENV{PREFIX};
-my ($instdir) = $ENV{INSTDIR};
-my ($destdir) = $ENV{DESTDIR};
-my ($regcomp) = $ENV{REGCOMP};
-my ($runargs) = $ENV{RUNARGS};
-
-if (!length($runargs))
-{
-	$runargs = "install register createdb";
-}
-
-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, $dontdelete);
-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))
-		{
-			$hostname =~ s/\%PRODUCTNAME/$product/;
-			$hostname =~ s/\%PRODUCTVERSION/$version/;
-			$directories{$directory} = [ $parent, $hostname, $dontdelete ];
-		}
-		$dontdelete = 0;
-		$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 . "\";");
-			}
-			push(@dblines, "\tDestPath = \"" . $finaldestdir . "\";");
-			push(@dblines, "\tSourcePath = \"" . $instdir . "\";");
-			push(@dblines, "\tMode = NETWORK;");
-			push(@dblines, "\tInstallFromNet = NO;");
-		}
-		$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 (/^\s*Styles\s*=\s*\(.*DONT_DELETE.*\);/)
-		{
-			$dontdelete = 1;
-		}
-	}
-	elsif (length($file))
-	{
-		if (/^\s*Name\s*=\s*\"([^"]+)\";/)
-		{
-			$filename = $1;
-		}
-		elsif (/^\s*PackedName\s*=\s*\"([^"]+)\";/)
-		{
-			$package = $1;
-		}
-		# Only use Dir if not $dir is not set, as otherwise
-		# $dir will contain a valid NetDir.
-		elsif (/^\s*Dir\s*=\s*([^;]+);/)
-		{
-			if (!length($dir))
-			{
-				$dir = $1;
-			}
-		}
-		elsif (/^\s*NetDir\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} = ".";
-}
-
-foreach $tmp (sort keys %directories)
-{
-	if (@{$directories{$tmp}}[2])
-	{
-	    my ($dir) = getFilePath($tmp);
-	    $useddirs{$dir} = ".";
-	}
-}
-
-print "#!/bin/sh\n";
-
-if ($runargs =~ /install/)
-{
-	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 -o \"$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";
-		}
-	}
-}
-
-if ($runargs =~ /createdb/)
-{
-	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}})
-			{
-				# First remove any stale config files
-				my ($cfgfile) = $profiles{$tmp}[0];
-				if ($cfgfile !~ /sversionrc/)
-				{
-					print "rm -f \"$dir/$profiles{$tmp}[0]\"\n";
-				}
-				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";
-			}
-		}
-	}
-}
-
-if ($runargs =~ /register/)
-{
-	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";
-	}
-}
-
-if ($runargs =~ /install/)
-{
-	print "cp \"$instdir\"/LICENSE* \"$destdir\"\n";
-	print "cp \"$instdir\"/README* \"$destdir\"\n";
-}
-
-if ($runargs =~ /createdb/)
-{
-	print "rm -f \"$destdir/program/instdb.ins\"\n";
-
-	my ($ismod) = "0";
-	my ($isinst) = "0";
-	my ($modname) = "foo";
-	foreach $tmp (@dblines)
-	{
-		# NETWORK installation
-		$tmp =~ s,<installmode>,NETWORK,;
-	
-		# Are we in the "Installation" section?
-		if ($tmp =~ /^Installation/)
-		{
-			$isinst = "1";
-		}
-		elsif ($tmp =~ /^End/)
-		{
-			$isinst = "0";
-		}
-	
-		# Do not print a "Styles" line for the "Installation" section
-		if (!(($isinst =~ "1") and ($tmp =~ /Styles/)))
-		{
-			print "echo '$tmp' >>\"$destdir/program/instdb.ins\"\n";
-		}
-	
-		# Are we in a "Module" section?
-		if ($tmp =~ /^Module/)
-		{
-			$ismod = "1";
-			$modname = $tmp;
-		}
-		elsif ($tmp =~ /^End/)
-		{
-			$ismod = "0";
-		}
-		# All modules are installed
-		if (($ismod =~ "1") and ($tmp =~ /Default/))
-		{
-			print "echo '\tInstalled\t = YES;' >>\"$destdir/program/instdb.ins\"\n";
-		}
-		# gid_Module_Root should also be "installed"
-		elsif (($ismod =~ "1") and ($modname =~ /gid_Module_Root/) and ($tmp =~ /Description/))
-		{
-			print "echo '\tInstalled\t = YES;' >>\"$destdir/program/instdb.ins\"\n";
-		}
-	}
-}
-
author	Seth Chandler <sethbc@gentoo.org>	2003-03-31 22:52:24 +0000
committer	Seth Chandler <sethbc@gentoo.org>	2003-03-31 22:52:24 +0000
commit	e5e312415135b8b33c8555b0bfe8917c3bc2b8b8 (patch)
tree	a6d5cf9ca7ca51a91e0faa773f99d85064f95ce8 /app-office/openoffice
parent	big cleanups (diff)
download	historical-e5e312415135b8b33c8555b0bfe8917c3bc2b8b8.tar.gz historical-e5e312415135b8b33c8555b0bfe8917c3bc2b8b8.tar.bz2 historical-e5e312415135b8b33c8555b0bfe8917c3bc2b8b8.zip