Author: scribe
Date: 2013-07-08 01:57:38 -0700 (Mon, 08 Jul 2013)
New Revision: 2860
Modified:
trunk/bindings/swig/package/Makefile.am
trunk/bindings/swig/package/README
trunk/bindings/swig/package/configure.ac
trunk/bindings/swig/package/perl.m4
trunk/bindings/swig/package/php4.m4
trunk/bindings/swig/package/python.m4
trunk/bindings/swig/package/swig.m4
trunk/bindings/swig/package/sword.m4
trunk/bindings/swig/package/tcl.m4
trunk/bindings/swig/package/zlib.m4
Log:
more fun with autotools for bindings
Modified: trunk/bindings/swig/package/Makefile.am
===================================================================
--- trunk/bindings/swig/package/Makefile.am 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/Makefile.am 2013-07-08 08:57:38 UTC (rev 2860)
@@ -1,4 +1,5 @@
-INCLUDES = $(SWORD_CFLAGS)
+AM_CPPFLAGS = $(SWORD_CFLAGS)
+ACLOCAL_AMFLAGS=$(ACLOCAL_AMFLAGS) -I m4
lib_LTLIBRARIES = libsword_csharpsword.la
libsword_csharpsword_la_LIBADD = $(SWORD_LIBS)
libsword_csharpsword_la_SOURCES = csharp/Sword.cxx
@@ -42,7 +43,7 @@
@echo " 'VERSION' => '$(VERSION)'," >> perl/Makefile.PL
@echo " 'INC' => '$(SWORD_CFLAGS) -I..'," >> perl/Makefile.PL
@echo " 'DEFINE' => '-DSWIG'," >> perl/Makefile.PL
- @echo " 'LIBS' => '$(LIB_SWORD) -lz'," >> perl/Makefile.PL
+ @echo " 'LIBS' => '$(LIB_SWORD) -lz -lsword -lstdc++'," >> perl/Makefile.PL
@echo " 'PREREQ_PM' => {}, # e.g., Module::Name => 1.1" >> perl/Makefile.PL
@echo " ($$] >= 5.005 ? ## Add these new keywords supported since 5.005" >> perl/Makefile.PL
@echo " (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module" >> perl/Makefile.PL
Modified: trunk/bindings/swig/package/README
===================================================================
--- trunk/bindings/swig/package/README 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/README 2013-07-08 08:57:38 UTC (rev 2860)
@@ -7,10 +7,12 @@
one of perl, python, tcl, php
Sword 1.5.8 or newer
-First run ./autogen.sh to generate this directory
+First run
+./autogen.sh
+./configure
+
Then, e.g.,:
-./configure
make perlswig
make perl_make
cd perl
Modified: trunk/bindings/swig/package/configure.ac
===================================================================
--- trunk/bindings/swig/package/configure.ac 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/configure.ac 2013-07-08 08:57:38 UTC (rev 2860)
@@ -1,11 +1,12 @@
# ---------------------------------------------------------------------
# Initialisation
# ---------------------------------------------------------------------
-AC_INIT([swordbindings],[1.6.1+svn$Rev$],[sword-bugs at crosswire.org])
+AC_INIT([swordbindings],[1.6.2])
AC_CONFIG_SRCDIR(sword.i)
AC_PREREQ(2.59)
AC_REVISION($Revision$)
-AM_INIT_AUTOMAKE(swordbindings,1.5.11)
+AM_INIT_AUTOMAKE
+AC_CONFIG_MACRO_DIR([m4])
# ---------------------------------------------------------------------
# Check Programs
Modified: trunk/bindings/swig/package/perl.m4
===================================================================
--- trunk/bindings/swig/package/perl.m4 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/perl.m4 2013-07-08 08:57:38 UTC (rev 2860)
@@ -2,7 +2,7 @@
# Look for Perl5
#----------------------------------------------------------------
-AC_DEFUN(SW_FIND_PERL,
+AC_DEFUN([SW_FIND_PERL],
[
Modified: trunk/bindings/swig/package/php4.m4
===================================================================
--- trunk/bindings/swig/package/php4.m4 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/php4.m4 2013-07-08 08:57:38 UTC (rev 2860)
@@ -2,7 +2,7 @@
# Look for Php4
#-------------------------------------------------------------------------
-AC_DEFUN(SW_FIND_PHP4,
+AC_DEFUN([SW_FIND_PHP4],
[
PHP4BIN=
Modified: trunk/bindings/swig/package/python.m4
===================================================================
--- trunk/bindings/swig/package/python.m4 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/python.m4 2013-07-08 08:57:38 UTC (rev 2860)
@@ -2,7 +2,7 @@
# Look for Python
#----------------------------------------------------------------
-AC_DEFUN(SW_FIND_PYTHON,
+AC_DEFUN([SW_FIND_PYTHON],
[
PYINCLUDE=
Modified: trunk/bindings/swig/package/swig.m4
===================================================================
--- trunk/bindings/swig/package/swig.m4 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/swig.m4 2013-07-08 08:57:38 UTC (rev 2860)
@@ -2,7 +2,7 @@
# Look for SWIG
#----------------------------------------------------------------
-AC_DEFUN(SW_PROG_SWIG,
+AC_DEFUN([SW_PROG_SWIG],
[
AC_ARG_WITH(swigbin,[ --with-swigbin=path Set location of swig executable],[ SWIGBIN="$withval"], [SWIGBIN=])
Modified: trunk/bindings/swig/package/sword.m4
===================================================================
--- trunk/bindings/swig/package/sword.m4 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/sword.m4 2013-07-08 08:57:38 UTC (rev 2860)
@@ -7,7 +7,7 @@
dnl first parameter is the required version
dnl second is whether to use static sword library
dnl ----------------------------------------------------------------------
-AC_DEFUN(SW_CHECK_SWORD,
+AC_DEFUN([SW_CHECK_SWORD],
[
dnl AC_MSG_CHECKING([for a Sword installation])
Modified: trunk/bindings/swig/package/tcl.m4
===================================================================
--- trunk/bindings/swig/package/tcl.m4 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/tcl.m4 2013-07-08 08:57:38 UTC (rev 2860)
@@ -2,7 +2,7 @@
# Try to locate the Tcl package
#--------------------------------------------------------------------
-AC_DEFUN(SW_FIND_TCL,
+AC_DEFUN([SW_FIND_TCL],
[
Modified: trunk/bindings/swig/package/zlib.m4
===================================================================
--- trunk/bindings/swig/package/zlib.m4 2013-07-08 05:31:35 UTC (rev 2859)
+++ trunk/bindings/swig/package/zlib.m4 2013-07-08 08:57:38 UTC (rev 2860)
@@ -1,7 +1,7 @@
## -*- autoconf -*-
-AC_DEFUN(AC_FIND_ZLIB,
+AC_DEFUN([AC_FIND_ZLIB],
[
AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
AC_MSG_CHECKING([for libz])
@@ -34,7 +34,7 @@
fi
])
-AC_DEFUN(KDE_CHECK_EXTRA_LIBS,
+AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
[
AC_MSG_CHECKING(for extra includes)
AC_ARG_WITH(extra-includes, [ --with-extra-includes=DIR
@@ -93,7 +93,7 @@
dnl Find a file (or one of more files in a list of dirs)
dnl ------------------------------------------------------------------------
dnl
-AC_DEFUN(AC_FIND_FILE,
+AC_DEFUN([AC_FIND_FILE],
[
$3=NO
for i in $2;