Download as
Browse Code »

Commit b6a0fe1650ba8f4edac4e552d496bcb5e086de17

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

Acertando empacotamento windows.

Showing 1 changed file with 19 additions and 30 deletions   Show diff stats
@@ -290,36 +290,6 @@ if test $app_cv_fvisibility_ok = yes; then @@ -290,36 +290,6 @@ if test $app_cv_fvisibility_ok = yes; then
290 CXXFLAGS="$CXXFLAGS -fvisibility=hidden" 290 CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
291 fi 291 fi
292 292
293 -#--[ Python ]-----------------------------------------------------------------------------------------------------------------------------------------------  
294 -  
295 -#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) ])  
296 -#  
297 -#if test -z "${PYCONFIG}"; then  
298 -#  
299 -# AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.])  
300 -#  
301 -#else  
302 -#  
303 -# AC_DEFINE(HAVE_PYTHON)  
304 -# EXTENSIONS="$EXTENSIONS python"  
305 -# AC_CONFIG_FILES(src/python/Makefile)  
306 -#  
307 -#fi  
308 -#  
309 -#AC_SUBST(PYCONFIG)  
310 -  
311 -PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1, AC_MSG_NOTICE([python-devel not present.]) )  
312 -  
313 -AC_SUBST(PYTHON_LIBS)  
314 -AC_SUBST(PYTHON_CFLAGS)  
315 -  
316 -if test "$app_have_python" == "1"; then  
317 - AC_DEFINE(HAVE_PYTHON)  
318 - EXTENSIONS="$EXTENSIONS python"  
319 - AC_CONFIG_FILES(src/python/Makefile)  
320 -fi  
321 -  
322 -  
323 #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------ 293 #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------
324 294
325 AC_ARG_ENABLE([pic], 295 AC_ARG_ENABLE([pic],
@@ -552,6 +522,25 @@ AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) ) @@ -552,6 +522,25 @@ AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) )
552 522
553 PKG_CHECK_EXISTS 523 PKG_CHECK_EXISTS
554 524
  525 +#--[ Python ]-----------------------------------------------------------------------------------------------------------------------------------------------
  526 +
  527 +AC_ARG_ENABLE([python],[AS_HELP_STRING([--disable-python], [Disable python integration])],[ app_cv_python="$enableval" ],[ app_cv_python="yes" ])
  528 +
  529 +if test "$app_cv_python" == "yes"; then
  530 +
  531 + PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1 )
  532 +
  533 +fi
  534 +
  535 +AC_SUBST(PYTHON_LIBS)
  536 +AC_SUBST(PYTHON_CFLAGS)
  537 +
  538 +if test "$app_have_python" == "1"; then
  539 + AC_DEFINE(HAVE_PYTHON)
  540 + EXTENSIONS="$EXTENSIONS python"
  541 + AC_CONFIG_FILES(src/python/Makefile)
  542 +fi
  543 +
555 #--[ GTK 2/3 check ]------------------------------------------------------------------------------------------------------------------------------------------ 544 #--[ GTK 2/3 check ]------------------------------------------------------------------------------------------------------------------------------------------
556 545
557 PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], [ GTK_VERSION="3.0" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.14 gthread-2.0 gmodule-2.0], [ GTK_VERSION="2.0" ] ) ], [ ] ) 546 PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], [ GTK_VERSION="3.0" ], [ PKG_CHECK_MODULES( [GTK], [gtk+-2.0 >= 2.14 gthread-2.0 gmodule-2.0], [ GTK_VERSION="2.0" ] ) ], [ ] )