Download as
Browse Code »

Commit 8a2fa6deaa14b0a9f5d740d61f63d8ea0ca69335

Authored by Perry Werneck
1 parent cc676306
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing exports on the python extension.

Showing 2 changed files with 31 additions and 30 deletions   Show diff stats
@@ -278,6 +278,36 @@ if test $app_cv_fvisibility_ok = yes; then @@ -278,6 +278,36 @@ if test $app_cv_fvisibility_ok = yes; then
278 CXXFLAGS="$CXXFLAGS -fvisibility=hidden" 278 CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
279 fi 279 fi
280 280
  281 +#--[ Python ]-----------------------------------------------------------------------------------------------------------------------------------------------
  282 +
  283 +#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) ])
  284 +#
  285 +#if test -z "${PYCONFIG}"; then
  286 +#
  287 +# AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.])
  288 +#
  289 +#else
  290 +#
  291 +# AC_DEFINE(HAVE_PYTHON)
  292 +# EXTENSIONS="$EXTENSIONS python"
  293 +# AC_CONFIG_FILES(src/python/Makefile)
  294 +#
  295 +#fi
  296 +#
  297 +#AC_SUBST(PYCONFIG)
  298 +
  299 +PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1, AC_MSG_NOTICE([python-devel not present.]) )
  300 +
  301 +AC_SUBST(PYTHON_LIBS)
  302 +AC_SUBST(PYTHON_CFLAGS)
  303 +
  304 +if test "$app_have_python" == "1"; then
  305 + AC_DEFINE(HAVE_PYTHON)
  306 + EXTENSIONS="$EXTENSIONS python"
  307 + AC_CONFIG_FILES(src/python/Makefile)
  308 +fi
  309 +
  310 +
281 #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------ 311 #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------
282 312
283 AC_ARG_ENABLE([pic], 313 AC_ARG_ENABLE([pic],
@@ -598,35 +628,6 @@ AC_SUBST(PHPMAJOR) @@ -598,35 +628,6 @@ AC_SUBST(PHPMAJOR)
598 AC_SUBST(PHPCONFDIR) 628 AC_SUBST(PHPCONFDIR)
599 629
600 630
601 -#--[ Python ]-----------------------------------------------------------------------------------------------------------------------------------------------  
602 -  
603 -#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) ])  
604 -#  
605 -#if test -z "${PYCONFIG}"; then  
606 -#  
607 -# AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.])  
608 -#  
609 -#else  
610 -#  
611 -# AC_DEFINE(HAVE_PYTHON)  
612 -# EXTENSIONS="$EXTENSIONS python"  
613 -# AC_CONFIG_FILES(src/python/Makefile)  
614 -#  
615 -#fi  
616 -#  
617 -#AC_SUBST(PYCONFIG)  
618 -  
619 -PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1, AC_MSG_NOTICE([python-devel not present.]) )  
620 -  
621 -AC_SUBST(PYTHON_LIBS)  
622 -AC_SUBST(PYTHON_CFLAGS)  
623 -  
624 -if test "$app_have_python" == "1"; then  
625 - AC_DEFINE(HAVE_PYTHON)  
626 - EXTENSIONS="$EXTENSIONS python"  
627 - AC_CONFIG_FILES(src/python/Makefile)  
628 -fi  
629 -  
630 #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- 631 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
631 632
632 AC_PATH_TOOL([REXXC], [rexxc], [cp] ) 633 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
src/python/Makefile.in
  Diff comments   View file @8a2fa6d
@@ -68,7 +68,7 @@ include $(CLASSLIBDIR)/class.mak @@ -68,7 +68,7 @@ include $(CLASSLIBDIR)/class.mak
68 68
69 #---[ Build options ]---------------------------------------------------------- 69 #---[ Build options ]----------------------------------------------------------
70 70
71 -CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @PYTHON_CFLAGS@ -I../include 71 +CXXFLAGS=@PYTHON_CFLAGS@ @DLL_CFLAGS@ -I../include
72 72
73 #---[ Rules ]------------------------------------------------------------------ 73 #---[ Rules ]------------------------------------------------------------------
74 74