Download as
Browse Code »

Commit 7994290286099f2848fb97504afbe04621e2c0b9

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

Melhorando empacotamento do plugin rexx

Showing 1 changed file with 14 additions and 37 deletions   Show diff stats
configure.ac
  Diff comments   View file @7994290
... ... @@ -432,48 +432,25 @@ AC_SUBST(PHPCONFDIR)
432 432  
433 433 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
434 434  
435   -AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx plugin & extension])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
436   -AC_ARG_VAR([REXX_HOME], [ooRexx home])
437   -
438   -if test -z "${REXX_HOME}"; then
439   -
440   - REXX_HOME="\$(datarootdir)/ooRexx"
441   -
442   - AC_PATH_TOOL([REXXC], [rexxc], [cp] )
443   - AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
444   -
445   - PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
446   -
447   - if test "$REXXCONFIG" != "no"; then
448   - REXX_CFLAGS=`$REXXCONFIG --cflags`
449   - REXX_LIBS=`$REXXCONFIG --libs`
450   - REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
451   - AC_MSG_NOTICE([Got settings from oorexx-config.])
452   - else
453   - AC_MSG_NOTICE([ooRexx SDK is NOT available.])
454   - app_cv_rexx="no"
455   - fi
456   -
  435 +#AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx plugin & extension])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
  436 +#AC_ARG_VAR([REXX_HOME], [ooRexx home])
  437 +
  438 +AC_PATH_TOOL([REXXC], [rexxc], [cp] )
  439 +AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
  440 +
  441 +if test "$REXXCONFIG" != "no"; then
  442 + REXX_CFLAGS=`$REXXCONFIG --cflags`
  443 + REXX_LIBS=`$REXXCONFIG --libs`
  444 + REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
  445 + AC_MSG_NOTICE([Got settings from oorexx-config.])
  446 + app_cv_rexx="yes"
457 447 else
458   - if test -e "${REXX_HOME}/api/oorexxapi.h"; then
459   -
460   - AC_MSG_NOTICE([Setting rexx sdk from REXX_HOME])
461   -
462   - REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
463   - REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx"
464   -
465   - AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" )
466   -
467   - else
468   - AC_MSG_NOTICE([ooRexx SDK is NOT available.])
469   - app_cv_rexx="no"
470   - fi
471   -
  448 + PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
472 449 fi
473 450  
474 451 if test "$app_cv_rexx" == "yes"; then
475 452 AC_DEFINE(HAVE_REXX)
476   - AC_DEFINE(HAVE_OOREXXAPI_H)
  453 + AC_CHECK_HEADER(oorexxapi.h, AC_DEFINE(HAVE_OOREXXAPI_H))
477 454 PLUGINS="$PLUGINS rx3270"
478 455 AC_MSG_NOTICE([ooRexx plugin & extension are enabled.])
479 456 else
... ...