alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use swig2.0 if available.

Browse source 
* configure.ac: Search for swig2.0 and swig.
* wrap/python/Makefile.am: Use $(SWIG).
This commit is contained in:
Alexandre Duret-Lutz 2010-12-23 22:27:07 +01:00
parent 3d61b3a3c0
commit 8419cb6f8d
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2010-12-23 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Use swig2.0 if available.
* configure.ac: Search for swig2.0 and swig.
* wrap/python/Makefile.am: Use $(SWIG).
2010-12-23 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2010-12-23 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Get rid of ltihooks.py. Get rid of ltihooks.py.

3
configure.ac
View file

@ -73,6 +73,9 @@ AC_CHECK_PROG([PERL], [perl], [perl])
AC_CHECK_PROG([SPIN], [spin], [spin]) AC_CHECK_PROG([SPIN], [spin], [spin])
AX_CHECK_VALGRIND AX_CHECK_VALGRIND
AC_CHECK_PROG([WRING2LBTT], [wring2lbtt], [wring2lbtt]) AC_CHECK_PROG([WRING2LBTT], [wring2lbtt], [wring2lbtt])
# Debian has a binary for SWIG 2.0 named swig2.0 and they kept swig as
# an alias for swig-1.3. Let's use the former when available.
AC_CHECK_PROGS([SWIG], [swig2.0 swig], [swig])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile

4
wrap/python/Makefile.am
View file

@ -40,7 +40,7 @@ _spot_la_LDFLAGS = -avoid-version -module
_spot_la_LIBADD = $(top_builddir)/src/libspot.la _spot_la_LIBADD = $(top_builddir)/src/libspot.la
$(srcdir)/spot_wrap.cxx: $(srcdir)/spot.i $(srcdir)/spot_wrap.cxx: $(srcdir)/spot.i
swig -c++ -python -I$(srcdir) -I$(top_srcdir)/src $(srcdir)/spot.i $(SWIG) -c++ -python -I$(srcdir) -I$(top_srcdir)/src $(srcdir)/spot.i
$(srcdir)/spot.py: $(srcdir)/spot.i $(srcdir)/spot.py: $(srcdir)/spot.i
$(MAKE) $(AM_MAKEFLAGS) spot_wrap.cxx $(MAKE) $(AM_MAKEFLAGS) spot_wrap.cxx
@ -52,7 +52,7 @@ _buddy_la_SOURCES = $(srcdir)/buddy_wrap.cxx
_buddy_la_LDFLAGS = -avoid-version -module $(BUDDY_LDFLAGS) _buddy_la_LDFLAGS = -avoid-version -module $(BUDDY_LDFLAGS)
$(srcdir)/buddy_wrap.cxx: $(srcdir)/buddy.i $(srcdir)/buddy_wrap.cxx: $(srcdir)/buddy.i
swig -c++ -python $(BUDDY_CPPFLAGS) $(srcdir)/buddy.i $(SWIG) -c++ -python $(BUDDY_CPPFLAGS) $(srcdir)/buddy.i
$(srcdir)/buddy.py: $(srcdir)/buddy.i $(srcdir)/buddy.py: $(srcdir)/buddy.i
$(MAKE) $(AM_MAKEFLAGS) buddy_wrap.cxx $(MAKE) $(AM_MAKEFLAGS) buddy_wrap.cxx