[sword-svn] r2875 - trunk/bindings/swig/package

[scribe at crosswire.org]

Author: scribe
Date: 2013-07-10 14:40:59 -0700 (Wed, 10 Jul 2013)
New Revision: 2875

Modified:
   trunk/bindings/swig/package/Makefile.am
   trunk/bindings/swig/package/configure.ac
Log:
more bindings work


Modified: trunk/bindings/swig/package/Makefile.am
===================================================================
--- trunk/bindings/swig/package/Makefile.am	2013-07-10 09:05:13 UTC (rev 2874)
+++ trunk/bindings/swig/package/Makefile.am	2013-07-10 21:40:59 UTC (rev 2875)
@@ -1,7 +1,7 @@
-AM_CPPFLAGS = $(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_LIBADD = @SWORD_LIBS@
 libsword_csharpsword_la_SOURCES = csharp/Sword.cxx
 
 EXTRA_DIST = *.i
@@ -27,7 +27,7 @@
 
 perlswig: sword.i
 	mkdir -p perl
-	$(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) $(SWORD_CFLAGS) $(top_srcdir)/sword.i
+	$(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
 
 perl_makebuild: $(PERLSWIG)
 	mkdir -p perl
@@ -41,9 +41,9 @@
 	@echo "WriteMakefile(" >> perl/Makefile.PL
 	@echo "		'NAME'		=> 'Sword'," >> perl/Makefile.PL
 	@echo "		'VERSION'	=> '$(VERSION)'," >> perl/Makefile.PL
-	@echo "		'INC'		=> '$(SWORD_CFLAGS) -I..'," >> perl/Makefile.PL
+	@echo "		'INC'		=> '@SWORD_CFLAGS@ -I..'," >> perl/Makefile.PL
 	@echo "		'DEFINE'	=> '-DSWIG'," >> perl/Makefile.PL
-	@echo "		'LIBS'		=> '$(LIB_SWORD) -lz -lsword -lstdc++'," >> perl/Makefile.PL
+	@echo "		'LIBS'		=> '@SWORD_LIBS@'," >> 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
@@ -70,14 +70,14 @@
 
 tclswig: sword.i
 	mkdir -p tcl
-	$(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) $(SWORD_CFLAGS) $(top_srcdir)/sword.i
+	$(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
 
 python_make: python_makebuild
 	cd python && $(PYTHON) setup.py build_ext $(LIB_SWORD)
 
 pythonswig: sword.i
 	mkdir -p python
-	$(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) $(SWORD_CFLAGS) $(top_srcdir)/sword.i
+	$(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
 
 python_makebuild: $(PYTHONSWIG)
 	mkdir -p python
@@ -101,14 +101,14 @@
 
 phpswig: sword.i
 	mkdir -p php
-	$(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) $(SWORD_CFLAGS) $(top_srcdir)/sword.i
+	$(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
 
 
 csharp/Sword.cxx: csharpswig
 
 csharpswig: sword.i
 	        mkdir -p csharp
-		        $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) $(SWORD_CFLAGS)  $(top_srcdir)/sword.i
+		        $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@  $(top_srcdir)/sword.i
 
 csharpmake:
 	        mcs -out:csharp/Sword.dll -target:library csharp/*.cs

Modified: trunk/bindings/swig/package/configure.ac
===================================================================
--- trunk/bindings/swig/package/configure.ac	2013-07-10 09:05:13 UTC (rev 2874)
+++ trunk/bindings/swig/package/configure.ac	2013-07-10 21:40:59 UTC (rev 2875)
@@ -21,6 +21,7 @@
 # ---------------------------------------------------------------------
 # Check libraries
 # ---------------------------------------------------------------------
+PKG_PROG_PKG_CONFIG
 PKG_CHECK_MODULES([SWORD], [sword >= 1.5.7],,true)
 
 # ---------------------------------------------------------------------