X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_swig.m4;h=89f12dd6bfbc414443159e3ac63266cb6498b659;hb=21f850c451cb7db8a0085ddcc892290ecac859eb;hp=07f57e2d90ae26da09fd5015abbcdbf4735cd0e2;hpb=1b18496b3d1399d90cfba1975f23aee9c747445a;p=awesomized%2Flibmemcached

diff --git a/m4/pandora_swig.m4 b/m4/pandora_swig.m4
index 07f57e2d..89f12dd6 100644
--- a/m4/pandora_swig.m4
+++ b/m4/pandora_swig.m4
@@ -3,7 +3,7 @@ dnl vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
 dnl   
 dnl pandora-build: A pedantic build system
 dnl Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; the Free Software Foundation
+dnl This file is free software; Sun Microsystem
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl
@@ -11,9 +11,10 @@ dnl From Monty Taylor
 
 AC_DEFUN([PANDORA_SWIG],[
 
-  AC_PROG_SWIG(1.3.36)
-  AC_DEFINE([SWIG_TYPE_TABLE],
-    [libgearman],
+  AC_PROG_SWIG(1.3.31)
+  
+  AC_DEFINE_UNQUOTED([SWIG_TYPE_TABLE],
+    [$PACKAGE],
     [Type Table name for SWIG symbol table])
 
   dnl Have to hard-code /usr/local/include and /usr/include into the path.
@@ -22,11 +23,17 @@ AC_DEFUN([PANDORA_SWIG],[
   AC_SUBST([SWIG])
 
 
-  AC_CACHE_CHECK([if swig supports Python3],
-    [ac_cv_swig_has_python3_],
-    [
-      AS_IF([swig -python3 2>&1 | grep "Unable to find" > /dev/null],
-        [ac_cv_swig_has_python3_=no],
-        [ac_cv_swig_has_python3_=yes])
-    ])
+])
+
+AC_DEFUN([PANDORA_SWIG_PYTHON3],[
+  AC_REQUIRE([PANDORA_SWIG])
+  AS_IF([test "x$SWIG" != "x"],[
+    AC_CACHE_CHECK([if swig supports Python3],
+      [ac_cv_swig_has_python3_],
+      [
+        AS_IF([$SWIG -python -help 2>&1 | grep py3 > /dev/null],
+          [ac_cv_swig_has_python3_=yes],
+          [ac_cv_swig_has_python3_=no])
+      ])
+  ])
 ])