Download as
Browse Code »

Commit 589f599ace35f291b2793aea72f60cf016653e38

Authored by perry.werneck@gmail.com
1 parent d7deba33
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Mudando detecção da API rexx para usar o pkg-config

Showing 2 changed files with 22 additions and 35 deletions   Show diff stats
@@ -374,48 +374,35 @@ else @@ -374,48 +374,35 @@ else
374 fi 374 fi
375 375
376 AC_SUBST(PHPCONFIG) 376 AC_SUBST(PHPCONFIG)
377 - 377 +
378 AC_ARG_VAR([REXX_HOME], [ooRexx home]) 378 AC_ARG_VAR([REXX_HOME], [ooRexx home])
379 379
380 -AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable rexx scripting support])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ]) 380 +if test -z "${REXX_HOME}"; then
  381 +
  382 + PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([ooRexx integration not present.]) )
  383 + AC_PATH_TOOL([REXXC], [rexxc], [cp] )
  384 + REXX_HOME="\$(datarootdir)/ooRexx"
  385 +
  386 +else
  387 +
  388 + if test -e "${REXX_HOME}/api/oorexxapi.h"; then
  389 +
  390 + app_cv_rexx="yes"
  391 +
  392 + REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
  393 + REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx"
  394 + AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" )
381 395
382 -if test "$app_cv_rexx" == "yes"; then  
383 - AC_ARG_WITH([rexx-config], [AS_HELP_STRING([--with-rexx-config], [Path to oorexx-config tool])], [ REXXCONFIG="$withval" ],[ AC_PATH_TOOL(REXXCONFIG, oorexx-config, "no", path="$PATH:$REXX_HOME") ])  
384 -  
385 - if test "$REXXCONFIG" == "no" ; then  
386 -  
387 - if test -z "${REXX_HOME}"; then  
388 -  
389 - AC_MSG_NOTICE([Program oorexx-config not found. Use --with-rexx-config=path to specify absolute path to the oorexx-config tool.])  
390 - app_cv_rexx="no"  
391 -  
392 - else  
393 -  
394 - if test -e "${REXX_HOME}/api/oorexxapi.h"; then  
395 -  
396 - AC_DEFINE(HAVE_REXX)  
397 - AC_DEFINE(HAVE_OOREXXAPI_H)  
398 -  
399 - AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" )  
400 - REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""  
401 - REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx"  
402 -  
403 - else  
404 - AC_MSG_NOTICE([ooRexx SDK is NOT available.])  
405 - app_cv_rexx="no"  
406 - fi  
407 - fi  
408 else 396 else
409 - REXX_HOME="\${datarootdir}/ooRexx"  
410 - AC_DEFINE(HAVE_REXX)  
411 - AC_CHECK_HEADER(oorexxapi.h, AC_DEFINE(HAVE_OOREXXAPI_H))  
412 - AC_PATH_TOOL([REXXC], [rexxc], [cp], `$REXXCONFIG --prefix`/bin )  
413 - REXX_CFLAGS="$CFLAGS `$REXXCONFIG --cflags`"  
414 - REXX_LIBS="$LIBS `$REXXCONFIG --libs`" 397 + AC_MSG_NOTICE([ooRexx SDK is NOT available.])
  398 + app_cv_rexx="no"
415 fi 399 fi
  400 +
416 fi 401 fi
417 402
418 if test "$app_cv_rexx" == "yes"; then 403 if test "$app_cv_rexx" == "yes"; then
  404 + AC_DEFINE(HAVE_REXX)
  405 + AC_DEFINE(HAVE_OOREXXAPI_H)
419 PLUGINS="$PLUGINS rx3270" 406 PLUGINS="$PLUGINS rx3270"
420 fi 407 fi
421 408
src/plugins/rx3270/remote.cc
  Diff comments   View file @589f599
@@ -914,7 +914,7 @@ void remote::set_toggle(LIB3270_TOGGLE ix, bool value) @@ -914,7 +914,7 @@ void remote::set_toggle(LIB3270_TOGGLE ix, bool value)
914 914
915 if(hPipe != INVALID_HANDLE_VALUE) 915 if(hPipe != INVALID_HANDLE_VALUE)
916 { 916 {
917 - 917 + #warning Implementar
918 } 918 }
919 919
920 #elif defined(HAVE_DBUS) 920 #elif defined(HAVE_DBUS)