From dfd118a28f8405bb46f4eccd1b87ea539a7620dc Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 9 Jan 2016 22:55:56 +0000 Subject: [PATCH] make-tarball: support either swig or swig3.0 --- make-tarball.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make-tarball.sh b/make-tarball.sh index 932552f2..ad6f2e38 100755 --- a/make-tarball.sh +++ b/make-tarball.sh @@ -42,13 +42,14 @@ git checkout-index --all --prefix=$TMPDIR/$ZNCDIR/ sed -e 's:#include "Csocket.h":#include :' third_party/Csocket/Csocket.cc > $TMPDIR/$ZNCDIR/src/Csocket.cpp sed -e 's:#include "defines.h":#include :' third_party/Csocket/Csocket.h > $TMPDIR/$ZNCDIR/include/znc/Csocket.h ( + which swig3.0 && SWIG=`which swig3.0` || SWIG=`which swig` cd $TMPDIR/$ZNCDIR echo "Generating configure" AUTOMAKE_FLAGS="--add-missing --copy" ./autogen.sh rm -r autom4te.cache/ mkdir -p modules/.depend - make -C modules -f modperl/Makefile.gen srcdir=. SWIG=`which swig` PERL=`which perl` - make -C modules -f modpython/Makefile.gen srcdir=. SWIG=`which swig` PERL=`which perl` + make -C modules -f modperl/Makefile.gen srcdir=. SWIG=$SWIG PERL=`which perl` + make -C modules -f modpython/Makefile.gen srcdir=. SWIG=$SWIG PERL=`which perl` rm -rf modules/.depend rm .travis* .appveyor* rm make-tarball.sh