Changeset c1e7a6 in git for m4

Timestamp:

Dec 13, 2012, 4:14:38 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f4399e865a8d7da06b4d0e0a3d19e4c3acc2d8dc

Parents:

57dcd6dcce5b13d67c7a17d1b1dc57c9b4de98c9

git-author:

Alexander Dreyer <adreyer@gmx.de>2012-12-13 16:14:38+01:00

git-committer:

Alexander Dreyer <adreyer@gmx.de>2012-12-14 14:04:50+01:00

Message:

Optionally supporting python embedding

File:

• m4/ax_python_with_version.m4 (modified) (3 diffs)

m4/ax_python_with_version.m4

@@ -28 +28 @@
         AC_ARG_WITH(
             python,
-            AS_HELP_STRING([--with-python@<:@=PYTHON@:>@],
+            AS_HELP_STRING([--with-python@<:@=@<:@embed,@:>@PYTHON@:>@],
                 [absolute path name of Python executable]
             ),
             [],[withval="yes"]
         ) 
+        py_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+        for elt in $withval; do
+          IFS="$py_save_ifs"
+          case $elt in
+            embed|embedding)
+              si_try_embed=true
+            ;;
+            static|dynamic|shared|module)
+            ;;
+            *)
+            si_withval=$elt
+          esac 
+        done
+        IFS="$py_save_ifs"
+        if test x"$si_withval" = x""
+        then
+           withval="yes"
+        else
+           withval="$si_withval"
+        fi
+
         AC_MSG_RESULT($withval)
         if test "$withval" = "no"
@@ -59 +80 @@
                 AX_PYTHON_VERSION_CHECK([$1],
                                         [ ax_python_use=true
+                                          si_embed_python=$si_try_embed
                                           AC_MSG_RESULT(yes)
                                           AX_PYTHON_PREFIX( )
@@ -64 +86 @@
                                           AX_PYTHON_CSPEC( )
                                         ],
-                                        [ax_python_use=false; AC_MSG_RESULT([too old, skipping python interface!])]
+                                        [ax_python_use=false
+                                         AC_MSG_RESULT([too old, skipping python interface!])]
                 )
             fi
         fi   
         AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true")
+        AM_CONDITIONAL(SI_EMBED_PYTHON, test x"$si_embed_python" = x"true")
+
+        if  test x"$si_embed_python" = x"true"
+        then 
+          AC_DEFINE(EMBED_PYTHON,1,integrate python)
+          AC_SUBST(EMBED_PYOBJECT_CFLAGS,"\${PYTHON_CSPEC}")
+          AC_SUBST(EMBED_PYOBJECT_LDFLAGS,"\${PYTHON_LSPEC}")
+        fi
+
+        AM_CONDITIONAL(PYTHON_MODULE, test x"$si_embed_python" != x"true")
     fi