Skip to content

Commit

Permalink
Merge pull request #2116 from btovar/fix_swig_for_osg
Browse files Browse the repository at this point in the history
allow python and perl bindings (and no python3) for old versions of swig
  • Loading branch information
btovar committed Aug 7, 2019
2 parents 2bab715 + 932d346 commit b697941
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions configure
Expand Up @@ -977,8 +977,7 @@ then
# http://sourceforge.net/p/swig/news/?page=1
echo "*** Sorry, Swig $swig_version does not work with Python 3 version $python3_version."
echo "*** Specifically, Swig >= 2.0.4 is needed for Python 3 support."
echo "*** skipping swig bindings for work queue and chirp"

found_swig=old
elif [ `format_version $swig_version` -ge `format_version 1.3.29` ]
then
found_swig=yes
Expand Down Expand Up @@ -1226,7 +1225,12 @@ EOF
python3_ldflags="$python3_ldflags -undefined dynamic_lookup"
fi

swig_bindings="$swig_bindings python3"
if [ ${found_swig} = old ]
then
echo "*** Sorry, for Python3 swig 2.0.4 is required."
else
swig_bindings="$swig_bindings python3"
fi
else
python3=0
fi
Expand Down Expand Up @@ -1611,7 +1615,7 @@ fi

swig_workqueue_bindings=""
swig_chirp_bindings=""
if [ "$found_swig" = yes ]
if [ "$found_swig" != no ]
then
for binding in $swig_bindings
do
Expand Down

0 comments on commit b697941

Please sign in to comment.