updated the tools to compile with gcc 4.0

* cleaned up the prepare.sh scripts
 * upgraded gtk+ (and dependencies) to 2.6.10
 * upgraded gtkmm (and dependencies) to 2.6.5
 * re-enabled ICU docs generation (fixing #1514)

livesupport/doc/developmentTools.html

@@ -92,8 +92,8 @@ without them, and the generated LiveSupport directory will be larger as
 well.<br>
 <ul>
   <li><a href="http://www.boost.org/">boost</a> &gt;= 1.31</li>
-  <li><a href="http://www.gtk.org/">gtk+</a> &gt;= 2.6.1</li>
+  <li><a href="http://www.gtk.org/">gtk+</a> &gt;= 2.6.10</li>
-  <li><a href="http://www.gtkmm.org/">gtk--</a> &gt;= 2.5.5</li>
+  <li><a href="http://www.gtkmm.org/">gtk--</a> &gt;= 2.6.5</li>
   <li><a href="http://www.ibm.com/software/globalization/icu/">icu</a>
 &gt;= 3.0</li>
   <li><a href="http://libxmlplusplus.sourceforge.net/">libxml++</a>

livesupport/etc/Makefile.in

@@ -111,9 +111,9 @@ XMLRPCXX_VERSION  = xmlrpc++-20040713
 LCOV_DIR          = ${TOOLS_DIR}/lcov
 LCOV_VERSION      = lcov-1.3
 GTK_DIR           = ${TOOLS_DIR}/gtk+
-GTK_VERSION       = gtk+-2.6.1
+GTK_VERSION       = gtk+-2.6.10
 GTKMM_DIR         = ${TOOLS_DIR}/gtkmm
-GTKMM_VERSION     = gtkmm-2.5.5
+GTKMM_VERSION     = gtkmm-2.6.5
 GSTREAMER_DIR     = ${TOOLS_DIR}/gstreamer
 GSTREAMER_VERSION = gstreamer-0.8.10
 ICU_DIR           = ${TOOLS_DIR}/icu

livesupport/etc/configure.ac

@@ -349,8 +349,8 @@ fi
 
 
 if test "$CHECK_GTK_LIB" = "yes" ; then
-    dnl check for gtk+ 2.6.1 or more recent
+    dnl check for gtk+ 2.6.10 or more recent
-    PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.6.1],
+    PKG_CHECK_MODULES(GTK,[gtk+-2.0 >= 2.6.10],
     [
         AC_MSG_RESULT([using gtk+ found on the system])
         COMPILE_GTK="no"
@@ -365,8 +365,8 @@ fi
 
 
 if test "$CHECK_GTKMM_LIB" = "yes" ; then
-    dnl check for gtk-- 2.5.5 or more recent
+    dnl check for gtk-- 2.6.5 or more recent
-    PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.5.5],
+    PKG_CHECK_MODULES(GTKMM,[gtkmm-2.4 >= 2.6.5],
     [
         AC_MSG_RESULT([using gtk-- found on the system])
         COMPILE_GTKMM="no"
@@ -496,8 +496,8 @@ by LiveSupport:
     cppunit 1.10.2             yes
     curl 7.12.3                yes
     gstreamer 0.8.10           yes
-    gtk+ 2.6.1                 ${COMPILE_GTK}
+    gtk+ 2.6.10                ${COMPILE_GTK}
-    gtk-- 2.5.5                ${COMPILE_GTKMM}
+    gtk-- 2.6.5                ${COMPILE_GTKMM}
     icu 3.0                    ${COMPILE_ICU}
     lcov 1.3                   yes
     libodbc++ 0.2.3            yes

livesupport/src/tools/boost/boost-1.31/bin/prepare.sh

@@ -33,7 +33,6 @@ product=boost_1_31_0
 
 reldir=`dirname $0`/..
 basedir=`cd $reldir; pwd;`
-installdir=`cd $basedir/../../../usr; pwd;`
 bindir=$basedir/bin
 etcdir=$basedir/etc
 tmpdir=$basedir/tmp

livesupport/src/tools/cppunit/cppunit-1.10.2/bin/prepare.sh

@@ -36,11 +36,9 @@ basedir=`cd $reldir; pwd;`
 bindir=$basedir/bin
 etcdir=$basedir/etc
 tmpdir=$basedir/tmp
+
 tar=$basedir/src/$product.tar.gz
 
-echo "preparing $product from $basedir to $tmpdir"
-
-
 mkdir -p $tmpdir
 cd $tmpdir
 

livesupport/src/tools/curl/curl-7.12.3/bin/prepare.sh

@@ -33,21 +33,11 @@ product=curl-7.12.3
 
 reldir=`dirname $0`/..
 basedir=`cd $reldir; pwd;`
-usrdir=`cd $basedir/../../../usr; pwd;`
 bindir=$basedir/bin
 etcdir=$basedir/etc
 tmpdir=$basedir/tmp
+
 tar=$basedir/src/$product.tar.bz2
-installdir=$usrdir
-
-export CPPFLAGS="-I$usrdir/include"
-export LDFLAGS="-L$usrdir/lib"
-export PKG_CONFIG_PATH="$usrdir/lib/pkgconfig"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
-
-
-echo "installing $product from $basedir to $installdir"
-
 
 mkdir -p $tmpdir
 cd $tmpdir

livesupport/src/tools/gstreamer/gstreamer-0.8.10/bin/prepare.sh

@@ -34,20 +34,12 @@ plugins=gst-plugins-0.8.10
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp
+
 gstreamer_tar=${basedir}/src/${product}.tar.bz2
 plugins_tar=${basedir}/src/${plugins}.tar.bz2
-pkg_config_path=${installdir}/lib/pkgconfig
-
-export PATH=${installdir}/bin:$PATH
-export LD_LIBRARY_PATH=${installdir}/lib
-export PKG_CONFIG_PATH=${pkg_config_path}
-
-export LDFLAGS="-L${installdir}/lib"
-export CPPFLAGS="-I${installdir}/install"
 
 mkdir -p ${tmpdir}
 

livesupport/src/tools/gtk+/gtk+-2.6.10/bin/prepare.sh

@@ -30,15 +30,14 @@
 # For more information on GTK+, see http://www.gtk.org/
 # This script will install GTK+, and its intermediate dependencies as well
 #-------------------------------------------------------------------------------
-glib_product=glib-2.6.1
+glib_product=glib-2.6.6
 tiff_product=tiff-3.7.1
-pango_product=pango-1.8.0
+pango_product=pango-1.8.2
 atk_product=atk-1.9.0
-gtk_product=gtk+-2.6.1
+gtk_product=gtk+-2.6.10
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp
@@ -49,12 +48,6 @@ pango_tar=$basedir/src/$pango_product.tar.bz2
 atk_tar=$basedir/src/$atk_product.tar.bz2
 gtk_tar=$basedir/src/$gtk_product.tar.bz2
 
-export CPPFLAGS="-I$installdir/include"
-export LDFLAGS="-L$installdir/lib"
-export PKG_CONFIG_PATH="$installdir/lib/pkgconfig"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
-export PATH="$PATH:$usrdir/bin"
-
 mkdir -p ${tmpdir}
 
 # copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it

livesupport/src/tools/gtk+/gtk+-2.6.10/etc/Makefile.in

@@ -52,16 +52,16 @@ TMP_DIR      = ${BASE_DIR}/tmp
 TIFF_VERSION  = tiff-3.7.1
 TIFF_DIR      = ${TMP_DIR}/${TIFF_VERSION}
 
-GLIB_VERSION  = glib-2.6.1
+GLIB_VERSION  = glib-2.6.6
 GLIB_DIR      = ${TMP_DIR}/${GLIB_VERSION}
 
-PANGO_VERSION = pango-1.8.0
+PANGO_VERSION = pango-1.8.2
 PANGO_DIR     = ${TMP_DIR}/${PANGO_VERSION}
 
 ATK_VERSION   = atk-1.9.0
 ATK_DIR       = ${TMP_DIR}/${ATK_VERSION}
 
-GTK_VERSION   = gtk+-2.6.1
+GTK_VERSION   = gtk+-2.6.10
 GTK_DIR       = ${TMP_DIR}/${GTK_VERSION}
 
 prefix=@prefix@

livesupport/src/tools/gtk+/gtk+-2.6.10/etc/configure.ac

@@ -32,12 +32,12 @@ dnl This is due to the fact that configure spreads a lot of trash around,
 dnl like atom4te cache directories, config.* files, etc. into the directory
 dnl it is being run from. We clearly don't want these in our base directory.
 dnl-----------------------------------------------------------------------------
-AC_INIT(gtk--, 2.5.5, bugs@campware.org)
+AC_INIT(gtk+, 2.6.10, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
 AC_REVISION($Revision$)
 
-AC_CONFIG_SRCDIR(../src/gtkmm-2.5.5.tar.bz2)
+AC_CONFIG_SRCDIR(../src/gtk+-2.6.10.tar.bz2)
 
 
 dnl untar the sources before anything happens

livesupport/src/tools/gtkmm/gtkmm-2.6.5/bin/prepare.sh

@@ -30,13 +30,12 @@
 # For more information on GTK--, see http://gtkmm.sourceforge.net/
 # This script will install GTK--, and its intermediate dependencies as well
 #-------------------------------------------------------------------------------
-sigc_product=libsigc++-2.0.6
+sigc_product=libsigc++-2.0.16
-glibmm_product=glibmm-2.5.4
+glibmm_product=glibmm-2.6.1
-gtkmm_product=gtkmm-2.5.5
+gtkmm_product=gtkmm-2.6.5
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp
@@ -45,12 +44,6 @@ sigc_tar=$basedir/src/$sigc_product.tar.bz2
 glibmm_tar=$basedir/src/$glibmm_product.tar.bz2
 gtkmm_tar=$basedir/src/$gtkmm_product.tar.bz2
 
-export CPPFLAGS="-I$installdir/include"
-export LDFLAGS="-L$installdir/lib"
-export PKG_CONFIG_PATH="$installdir/lib/pkgconfig"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$usrdir/lib"
-export PATH="$PATH:$usrdir/bin"
-
 mkdir -p ${tmpdir}
 
 # copy over install-sh, as AC_CONFIG_SUBDIRS will be looking for it

livesupport/src/tools/gtkmm/gtkmm-2.6.5/etc/Makefile.in

@@ -49,17 +49,19 @@ COVERAGE_DIR = ${DOC_DIR}/coverage
 ETC_DIR      = ${BASE_DIR}/etc
 TMP_DIR      = ${BASE_DIR}/tmp
 
-SIGC_VERSION    = libsigc++-2.0.6
+SIGC_VERSION    = libsigc++-2.0.16
 SIGC_DIR        = ${TMP_DIR}/${SIGC_VERSION}
 
-GLIBMM_VERSION  = glibmm-2.5.4
+GLIBMM_VERSION  = glibmm-2.6.1
 GLIBMM_DIR      = ${TMP_DIR}/${GLIBMM_VERSION}
 
-GTKMM_VERSION   = gtkmm-2.5.5
+GTKMM_VERSION   = gtkmm-2.6.5
 GTKMM_DIR       = ${TMP_DIR}/${GTKMM_VERSION}
 
 prefix=@prefix@
 
+export PKG_CONFIG_PATH:=${prefix}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
 
 #-------------------------------------------------------------------------------
 #   Targets

livesupport/src/tools/gtkmm/gtkmm-2.6.5/etc/configure.ac

@@ -32,12 +32,12 @@ dnl This is due to the fact that configure spreads a lot of trash around,
 dnl like atom4te cache directories, config.* files, etc. into the directory
 dnl it is being run from. We clearly don't want these in our base directory.
 dnl-----------------------------------------------------------------------------
-AC_INIT(gtk+, 2.6.1, bugs@campware.org)
+AC_INIT(gtk--, 2.6.5, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
 AC_REVISION($Revision$)
 
-AC_CONFIG_SRCDIR(../src/gtk+-2.6.1.tar.bz2)
+AC_CONFIG_SRCDIR(../src/gtkmm-2.6.5.tar.bz2)
 
 
 dnl untar the sources before anything happens

livesupport/src/tools/icu/icu-3.0/bin/prepare.sh

@@ -33,14 +33,11 @@ product=icu-3.0
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp
 
 tar=$basedir/src/$product.tgz
-docdir=$installdir/share/doc/icu/3.0
-doczip=$basedir/src/$product-docs.zip
 
 mkdir -p ${tmpdir}
 

livesupport/src/tools/icu/icu-3.0/etc/Makefile.in

@@ -37,6 +37,8 @@ XSLTPROC   = xsltproc
 ECHO       = @echo
 FLAWFINDER = flawfinder
 
+UNZIP      = unzip -o
+
 
 #-------------------------------------------------------------------------------
 #   Basic directory and file definitions
@@ -54,6 +56,9 @@ ICU_DIR        = ${TMP_DIR}/icu/source
 
 prefix=@prefix@
 
+DOC_ZIP         = ${BASE_DIR}/src/${ICU_VERSION}-docs.zip
+DOC_INSTALL_DIR = ${prefix}/share/doc/icu/3.0
+
 
 #-------------------------------------------------------------------------------
 #   Targets
@@ -64,7 +69,11 @@ ${TMP_DIR}/all.stamp:
 	${MAKE} -C ${ICU_DIR} install
 	touch ${TMP_DIR}/all.stamp
 
-install: all
+install: all install_docs
+
+install_docs:
+	${MKDIR} ${DOC_INSTALL_DIR}
+	${UNZIP} ${DOC_ZIP} -d ${DOC_INSTALL_DIR}
 
 clean:
 	${MAKE} -C ${ICU_DIR} clean
@@ -75,5 +84,3 @@ distclean:
 	${RMDIR} ${ICU_DIR}
 	${RMDIR} ${TMP_DIR}/icu
 	${RMDIR} ${TMP_DIR}/auto* ${TMP_DIR}/config* ${TMP_DIR}/install-sh
-
-

livesupport/src/tools/lcov/lcov-1.3/bin/prepare.sh

@@ -33,7 +33,6 @@ product=lcov-1.3
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp

livesupport/src/tools/libodbc++/libodbc++-0.2.3-20050404/bin/prepare.sh

@@ -33,7 +33,6 @@ product=libodbc++-0.2.3-20050404
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp

livesupport/src/tools/libxml++/libxml++-2.8.1/bin/prepare.sh

@@ -37,7 +37,6 @@ product=libxml++-2.8.1
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp

livesupport/src/tools/taglib/taglib-1.3.1/bin/prepare.sh

@@ -34,7 +34,6 @@ product=taglib-1.3.1
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp

livesupport/src/tools/xmlrpc++/xmlrpc++-20040713/bin/prepare.sh

@@ -33,7 +33,6 @@ product=xmlrpc++-20040713
 
 reldir=`dirname $0`/..
 basedir=`cd ${reldir}; pwd;`
-installdir=`cd ${basedir}/../../../usr; pwd;`
 bindir=${basedir}/bin
 etcdir=${basedir}/etc
 tmpdir=${basedir}/tmp