1
1
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00

Merge branch 'master' into nextdev

This commit is contained in:
James Booth 2013-07-30 23:45:47 +01:00
commit 92fe3b0396

View File

@ -46,7 +46,7 @@ install_lib_strophe()
echo echo
echo Profanity installer... installing libstrophe echo Profanity installer... installing libstrophe
echo echo
git clone git://github.com/metajack/libstrophe.git git clone git://github.com/strophe/libstrophe.git
cd libstrophe cd libstrophe
./bootstrap.sh ./bootstrap.sh
./configure ./configure
@ -71,7 +71,7 @@ cyg_install_lib_strophe()
echo echo
echo Profanity installer... installing libstrophe echo Profanity installer... installing libstrophe
echo echo
git clone git://github.com/metajack/libstrophe.git git clone git://github.com/strophe/libstrophe.git
cd libstrophe cd libstrophe
./bootstrap.sh ./bootstrap.sh
./bootstrap.sh # second call seems to fix problem on cygwin ./bootstrap.sh # second call seems to fix problem on cygwin