diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in index 451630166..fd4752593 100644 --- a/livesupport/modules/storage/etc/Makefile.in +++ b/livesupport/modules/storage/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: fgerlits $ -# Version : $Revision: 1.15 $ +# Version : $Revision: 1.16 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/Makefile.in,v $ # # @configure_input@ @@ -73,7 +73,7 @@ VPATH = ${SRC_DIR} LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ -CURL_LIBS=`${USR_DIR}/bin/curlpp-config --libs` +CURL_LIBS=`${USR_DIR}/bin/curl-config --libs` TEST_RESULTS = ${DOC_DIR}/testResults.xml # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index cb1e3a6c4..2475f0935 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: fgerlits $ -# Version : $Revision: 1.15 $ +# Version : $Revision: 1.16 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # # @configure_input@ @@ -92,7 +92,7 @@ SCHEDULER_CLIENT_LIB_FILE = ${SCHEDULER_CLIENT_LIB_DIR}/lib${SCHEDULER_CLIENT_LI LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ -CURL_LIBS=`${USR_DIR}/bin/curlpp-config --libs` +CURL_LIBS=`${USR_DIR}/bin/curl-config --libs` GTKMM_CFLAGS=@GTKMM_CFLAGS@ GTKMM_LIBS=@GTKMM_LIBS@ diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index d1c51883c..d2a9166cf 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: fgerlits $ -# Version : $Revision: 1.38 $ +# Version : $Revision: 1.39 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -65,7 +65,7 @@ VPATH = ${SRC_DIR} LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@ LIBXMLPP_LIBS=@LIBXMLPP_LIBS@ -CURL_LIBS=`${USR_DIR}/bin/curlpp-config --libs` +CURL_LIBS=`${USR_DIR}/bin/curl-config --libs` MODULES_DIR = ${BASE_DIR}/../../modules diff --git a/livesupport/tools/curl/curl-7.12.3/bin/install.sh b/livesupport/tools/curl/curl-7.12.3/bin/install.sh new file mode 100755 index 000000000..3e4af43ef --- /dev/null +++ b/livesupport/tools/curl/curl-7.12.3/bin/install.sh @@ -0,0 +1,65 @@ +#!/bin/sh +#------------------------------------------------------------------------------- +# Copyright (c) 2004 Media Development Loan Fund +# +# This file is part of the LiveSupport project. +# http://livesupport.campware.org/ +# To report bugs, send an e-mail to bugs@campware.org +# +# LiveSupport is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LiveSupport is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LiveSupport; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# +# Author : $Author: fgerlits $ +# Version : $Revision: 1.3 $ +# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/curl/curl-7.12.3/bin/Attic/install.sh,v $ +#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- +# Run this script to install cppunit into the development system usr +# environment. +# For more information on libxml++, see http://libxmlplusplus.sourceforge.net/ +# +# WARNING: This install script does NOT install related dependencies, like Glib. +# To have these dependencies installed, please install GTK-- first, which +# in fact installs all needed dependencies +#------------------------------------------------------------------------------- +product=curl-7.12.3 + +reldir=`dirname $0`/.. +basedir=`cd $reldir; pwd; cd -` +usrdir=`cd $basedir/../../../usr; pwd; cd -` +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="$usrdir/lib" + + +echo "installing $product from $basedir to $installdir" + + +mkdir -p $tmpdir +cd $tmpdir + +tar xfj $tar +cd $product +./configure --prefix=$installdir +make install + +cd $basedir +rm -rf tmp + diff --git a/livesupport/tools/curl/curl-7.12.3/src/curl-7.12.3.tar.bz2 b/livesupport/tools/curl/curl-7.12.3/src/curl-7.12.3.tar.bz2 new file mode 100644 index 000000000..47d151e2f Binary files /dev/null and b/livesupport/tools/curl/curl-7.12.3/src/curl-7.12.3.tar.bz2 differ