BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FreeBSD: Also check for swig2.0 in addition to swig. 

On FreeBSD (for example) the SWIG binary is called "swig2.0".

This fixes bug #557.
This commit is contained in:
Uwe Hermann 2015-08-18 18:01:54 +02:00
parent 731c01f248
commit 3f03ffaf2f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -609,7 +609,7 @@ $(JDOC): $(srcdir)/bindings/swig/doc.py $(CPPXMLDOC)
$(JCXX): $(srcdir)/$(JSWG) $(JDOC) bindings/swig/classes.i bindings/swig/enums.i \
$(library_include_HEADERS) $(nodist_library_include_HEADERS)
$(AM_V_at)make java-clean
$(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
$(AM_V_GEN)$(SWIG) -c++ -java -package org.sigrok.core.classes \
-Ibindings -I$(JCLS) $(local_includes) -I$(srcdir) $(JNI_CPPFLAGS) \
-outdir $(JCLS) -o $@ $(srcdir)/$(JSWG)

6
configure.ac
View File

@ -396,8 +396,8 @@ test "x$HAVE_PYMOD_SETUPTOOLS" = xyes \
|| sr_python_missing="$sr_python_missing Setuptools"
# The Python bindings use SWIG to generate code.
AC_CHECK_PROG([HAVE_SWIG], [swig], [yes], [no])
test "x$HAVE_SWIG" = xyes || sr_python_missing="$sr_python_missing SWIG"
AC_CHECK_PROGS([SWIG], [swig swig2.0], [no])
test "x$SWIG" != xno || sr_python_missing="$sr_python_missing SWIG"
AS_IF([test -z "$sr_python_missing"],
[BINDINGS_PYTHON=$enable_python], [BINDINGS_PYTHON=no])
@ -411,7 +411,7 @@ sr_java_missing=
test "x$BINDINGS_CXX" = xyes || sr_java_missing=" C++ bindings"
# The Java bindings use SWIG to generate code.
test "x$HAVE_SWIG" = xyes || sr_java_missing="$sr_java_missing SWIG"
test "x$SWIG" != xno || sr_java_missing="$sr_java_missing SWIG"
# Find Java compiler and JNI includes for Java bindings.
AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])