From 8a2fa6deaa14b0a9f5d740d61f63d8ea0ca69335 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 22 Feb 2016 16:05:11 -0300 Subject: [PATCH] Fixing exports on the python extension. --- configure.ac | 59 ++++++++++++++++++++++++++++++----------------------------- src/python/Makefile.in | 2 +- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index 4038d65..1212793 100644 --- a/configure.ac +++ b/configure.ac @@ -278,6 +278,36 @@ if test $app_cv_fvisibility_ok = yes; then CXXFLAGS="$CXXFLAGS -fvisibility=hidden" fi +#--[ Python ]----------------------------------------------------------------------------------------------------------------------------------------------- + +#AC_ARG_WITH([python-config], [AS_HELP_STRING([--with-python-config], [Path to python-config tool])], [ PYCONFIG="$withval" ],[ AC_PATH_TOOL(PYCONFIG, python-config, , $PATH) ]) +# +#if test -z "${PYCONFIG}"; then +# +# AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.]) +# +#else +# +# AC_DEFINE(HAVE_PYTHON) +# EXTENSIONS="$EXTENSIONS python" +# AC_CONFIG_FILES(src/python/Makefile) +# +#fi +# +#AC_SUBST(PYCONFIG) + +PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1, AC_MSG_NOTICE([python-devel not present.]) ) + +AC_SUBST(PYTHON_LIBS) +AC_SUBST(PYTHON_CFLAGS) + +if test "$app_have_python" == "1"; then + AC_DEFINE(HAVE_PYTHON) + EXTENSIONS="$EXTENSIONS python" + AC_CONFIG_FILES(src/python/Makefile) +fi + + #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------ AC_ARG_ENABLE([pic], @@ -598,35 +628,6 @@ AC_SUBST(PHPMAJOR) AC_SUBST(PHPCONFDIR) -#--[ Python ]----------------------------------------------------------------------------------------------------------------------------------------------- - -#AC_ARG_WITH([python-config], [AS_HELP_STRING([--with-python-config], [Path to python-config tool])], [ PYCONFIG="$withval" ],[ AC_PATH_TOOL(PYCONFIG, python-config, , $PATH) ]) -# -#if test -z "${PYCONFIG}"; then -# -# AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.]) -# -#else -# -# AC_DEFINE(HAVE_PYTHON) -# EXTENSIONS="$EXTENSIONS python" -# AC_CONFIG_FILES(src/python/Makefile) -# -#fi -# -#AC_SUBST(PYCONFIG) - -PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1, AC_MSG_NOTICE([python-devel not present.]) ) - -AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_CFLAGS) - -if test "$app_have_python" == "1"; then - AC_DEFINE(HAVE_PYTHON) - EXTENSIONS="$EXTENSIONS python" - AC_CONFIG_FILES(src/python/Makefile) -fi - #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- AC_PATH_TOOL([REXXC], [rexxc], [cp] ) diff --git a/src/python/Makefile.in b/src/python/Makefile.in index 1f53a17..21fcbb3 100644 --- a/src/python/Makefile.in +++ b/src/python/Makefile.in @@ -68,7 +68,7 @@ include $(CLASSLIBDIR)/class.mak #---[ Build options ]---------------------------------------------------------- -CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @PYTHON_CFLAGS@ -I../include +CXXFLAGS=@PYTHON_CFLAGS@ @DLL_CFLAGS@ -I../include #---[ Rules ]------------------------------------------------------------------ -- libgit2 0.21.2