Changeset 5efd81 in git

Timestamp:

Jan 28, 2013, 5:40:13 PM (10 years ago)

Author:

Oleksandr Motsak <malex984@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

94fe43dac4252bd6a4378cca3be1e8b4f642d6b1

Parents:

687272a659feb32db61b3cd8137d48231f1d95a869e438f94fcd264daaddcb83dd3cee0e68006a38

Message:

Merge pull request #261 from alexanderdreyer/spielwiese-pyobject

Skip pyobject.so if linking to libpythonx.y breaks

File:

• m4/ax_python_with_version.m4 (modified) (1 diff)

m4/ax_python_with_version.m4

@@ -85 +85 @@
                       AC_MSG_RESULT([too recent, skipping python interface!])
                     ],
-                    [ ax_python_use=true
-                      si_embed_python=$si_try_embed
-                      AC_MSG_RESULT([no (ok)])
-                      AC_MSG_CHECKING(embedding python interface module)
-                      AC_MSG_RESULT($si_try_embed)
-                      AX_PYTHON_PREFIX( )
-                      AX_PYTHON_LSPEC( )
-                      AX_PYTHON_CSPEC( )
+                    [ AC_MSG_RESULT([no (ok)])
+                      ax_python_version=`$PYTHON -c "import sys; print '.'.join(sys.version.split('.')[[:2]])"`
+                      AC_CHECK_LIB([python${ax_python_version}],[main], [
+                          ax_python_use=true
+                          si_embed_python=$si_try_embed
+                          AC_MSG_CHECKING(embedding python interface module)
+                          AC_MSG_RESULT($si_try_embed)
+                          AX_PYTHON_PREFIX( )
+                          AX_PYTHON_LSPEC( )
+                          AX_PYTHON_CSPEC( )
+                        ],
+                        [ ax_python_use=false
+                          AC_MSG_RESULT([Cannot link to python, skipping python interface!])
+                        ]
+                      )
                     ])
                   ],