From b932cd640044f4ccedaca201840f983acf4bef16 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Wed, 13 Oct 2010 16:41:44 -0600
Subject: add support for using Tcl and Guile as output languages

---
 config/gr_swig.m4 | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'config/gr_swig.m4')

diff --git a/config/gr_swig.m4 b/config/gr_swig.m4
index cdb28055c..826661f53 100644
--- a/config/gr_swig.m4
+++ b/config/gr_swig.m4
@@ -83,3 +83,27 @@ dnl		AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow])
 	fi
 	AC_SUBST(SWIG_PYTHON_CPPFLAGS,[$PYTHON_CPPFLAGS])
 ])
+
+AC_DEFUN([SWIG_TCL],[
+	AC_REQUIRE([SWIG_PROG])
+	AC_REQUIRE([TCL_DEVEL])
+	if test "$SWIG" != "false" ; then
+		AC_SUBST(SWIG_TCL_LIB,[-ltcl])
+dnl		test ! "x$1" = "xno" && swig_shadow=" -shadow" || swig_shadow=""
+dnl		AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow])
+		AC_SUBST(SWIG_TCL_OPT,[-tcl])
+	fi
+	AC_SUBST(SWIG_TCL_CPPFLAGS,[$TCL_CPPFLAGS])
+])
+
+AC_DEFUN([SWIG_GUILE],[
+	AC_REQUIRE([SWIG_PROG])
+	AC_REQUIRE([GUILE_DEVEL])
+	if test "$SWIG" != "false" ; then
+		AC_SUBST(SWIG_GUILE_LIB,[-lguile])
+dnl		test ! "x$1" = "xno" && swig_shadow=" -shadow" || swig_shadow=""
+dnl		AC_SUBST(SWIG_PYTHON_OPT,[-python$swig_shadow])
+		AC_SUBST(SWIG_GUILE_OPT,[-guile])
+	fi
+	AC_SUBST(SWIG_GUILE_CPPFLAGS,[$GUILE_CPPFLAGS])
+])
-- 
cgit 


From 6129a67cf6527a0f0dc8b83df108c4fe2147155b Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Wed, 17 Nov 2010 18:29:22 -0700
Subject: don't look for swig if no scripting language is specified.

---
 config/gr_swig.m4 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'config/gr_swig.m4')

diff --git a/config/gr_swig.m4 b/config/gr_swig.m4
index 826661f53..8a9c73268 100644
--- a/config/gr_swig.m4
+++ b/config/gr_swig.m4
@@ -26,7 +26,8 @@ dnl
 # is greater or equal to the value of the argument.  It should have the format:
 # N[.N[.N]] (N is a number between 0 and 999.  Only the first N is mandatory.)
 AC_DEFUN([SWIG_PROG],[
-	AC_REQUIRE([AC_PROG_MAKE_SET])
+    AC_REQUIRE([AC_PROG_MAKE_SET])
+    if test x${enable_python} = xyes -o x${enable_guile} = xyes; then
 	AC_CHECK_PROG(SWIG,swig,[`which swig`])
 	if test -z "$SWIG" ; then
 		AC_MSG_ERROR([Cannot find 'swig' program.  SWIG version >= $1 required])
@@ -48,6 +49,7 @@ AC_DEFUN([SWIG_PROG],[
 			AC_MSG_ERROR([cannot determine SWIG version])
 		fi
 	fi
+    fi
 ])
 
 # SWIG_ENABLE_CXX()
@@ -56,9 +58,11 @@ AC_DEFUN([SWIG_PROG],[
 AC_DEFUN([SWIG_ENABLE_CXX],[
 	AC_REQUIRE([SWIG_PROG])
 	AC_REQUIRE([AC_PROG_CXX])
-	if test "$SWIG" != "false" ; then
+	if test x${enable_python} = xyes -o x${enable_guile} = xyes; then
+	    if test "$SWIG" != "false" ; then
 		SWIG="$SWIG -c++"
-	fi
+	    fi
+        fi
 ])
 
 # SWIG_PYTHON([use-shadow-classes])
-- 
cgit 


From 48b0ffce87631d115bc363b21c4bf466f1bc6ae9 Mon Sep 17 00:00:00 2001
From: Rob Savoye
Date: Mon, 22 Nov 2010 10:37:16 -0700
Subject: always look for swig

---
 config/gr_swig.m4 | 2 --
 1 file changed, 2 deletions(-)

(limited to 'config/gr_swig.m4')

diff --git a/config/gr_swig.m4 b/config/gr_swig.m4
index 8a9c73268..e03390994 100644
--- a/config/gr_swig.m4
+++ b/config/gr_swig.m4
@@ -27,7 +27,6 @@ dnl
 # N[.N[.N]] (N is a number between 0 and 999.  Only the first N is mandatory.)
 AC_DEFUN([SWIG_PROG],[
     AC_REQUIRE([AC_PROG_MAKE_SET])
-    if test x${enable_python} = xyes -o x${enable_guile} = xyes; then
 	AC_CHECK_PROG(SWIG,swig,[`which swig`])
 	if test -z "$SWIG" ; then
 		AC_MSG_ERROR([Cannot find 'swig' program.  SWIG version >= $1 required])
@@ -49,7 +48,6 @@ AC_DEFUN([SWIG_PROG],[
 			AC_MSG_ERROR([cannot determine SWIG version])
 		fi
 	fi
-    fi
 ])
 
 # SWIG_ENABLE_CXX()
-- 
cgit 


From 5d92ead4644527b67bc8b94c9b12e7f085089fbe Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Sat, 4 Dec 2010 00:45:31 -0800
Subject: Copy fix from gr-howto-write-a-block/config/gr_swig.m4 to main

---
 config/gr_swig.m4 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'config/gr_swig.m4')

diff --git a/config/gr_swig.m4 b/config/gr_swig.m4
index e03390994..dcc2e72dc 100644
--- a/config/gr_swig.m4
+++ b/config/gr_swig.m4
@@ -56,10 +56,8 @@ AC_DEFUN([SWIG_PROG],[
 AC_DEFUN([SWIG_ENABLE_CXX],[
 	AC_REQUIRE([SWIG_PROG])
 	AC_REQUIRE([AC_PROG_CXX])
-	if test x${enable_python} = xyes -o x${enable_guile} = xyes; then
-	    if test "$SWIG" != "false" ; then
+    	if test "$SWIG" != "false" ; then
 		SWIG="$SWIG -c++"
-	    fi
         fi
 ])
 
-- 
cgit