aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Updates to install-all.sh

Browse Source 
Use main apt-get git repo
Use main libstrophe git repo
Configure libstrophe with --prefix==/usr on cygwin
Use 0.8.6 tag of libstrophe
This commit is contained in:
James Booth 2014-08-09 19:12:37 +01:00
parent 8fc4249228
commit 192656e5b8
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
install-all.sh
View File

@ -41,10 +41,10 @@ fedora_prepare()
opensuse_prepare() opensuse_prepare()
{ {
echo echo
echo Profanity installer...installing dependencies echo Profanity installer...installing dependencies
echo echo
sudo zypper -n in gcc git automake make autoconf libopenssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel sudo zypper -n in gcc git automake make autoconf libopenssl-devel expat libexpat-devel ncurses-devel glib2-devel libnotify-devel libcurl-devel libXScrnSaver-devel libotr-devel
} }
cygwin_prepare() cygwin_prepare()
@ -53,19 +53,18 @@ cygwin_prepare()
echo Profanity installer... installing dependencies echo Profanity installer... installing dependencies
echo echo
wget --no-check-certificate https://raw.github.com/boothj5/apt-cyg/master/apt-cyg wget https://raw.githubusercontent.com/transcode-open/apt-cyg/master/apt-cyg
#wget --no-check-certificate https://raw.github.com/boothj5/apt-cyg/master/apt-cyg
#wget http://apt-cyg.googlecode.com/svn/trunk/apt-cyg #wget http://apt-cyg.googlecode.com/svn/trunk/apt-cyg
chmod +x apt-cyg chmod +x apt-cyg
mv apt-cyg /usr/local/bin/ mv apt-cyg /usr/local/bin/
if [ -n "$CYG_MIRROR" ]; then if [ -n "$CYG_MIRROR" ]; then
apt-cyg -m $CYG_MIRROR install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel apt-cyg -m $CYG_MIRROR install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel libgcrypt-devel
else else
apt-cyg install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel apt-cyg install git make gcc-core m4 automake autoconf pkg-config openssl-devel libexpat-devel zlib-devel libncursesw-devel libglib2.0-devel libcurl-devel libidn-devel libssh2-devel libkrb5-devel openldap-devel libgcrypt-devel
fi fi
export LIBRARY_PATH=/usr/local/lib/
} }
install_lib_strophe() install_lib_strophe()
@ -73,10 +72,9 @@ install_lib_strophe()
echo echo
echo Profanity installer... installing libstrophe echo Profanity installer... installing libstrophe
echo echo
#clone fork so as to not pick up any breaking changes git clone git://github.com/strophe/libstrophe.git
#git clone git://github.com/strophe/libstrophe.git
git clone git://github.com/boothj5/libstrophe.git
cd libstrophe cd libstrophe
git checkout 0.8.6
./bootstrap.sh ./bootstrap.sh
./configure ./configure
make make
@ -105,9 +103,10 @@ cyg_install_lib_strophe()
echo echo
git clone git://github.com/strophe/libstrophe.git git clone git://github.com/strophe/libstrophe.git
cd libstrophe cd libstrophe
git checkout 0.8.6
./bootstrap.sh ./bootstrap.sh
./bootstrap.sh # second call seems to fix problem on cygwin ./bootstrap.sh # second call seems to fix problem on cygwin
./configure ./configure --prefix=/usr
make make
make install make install