Download as
Browse Code »

Commit 9c37b5ee78e967b4fdc21ec27a55a8ce0e746fb1

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

Melhorando detecção do rexx

Showing 1 changed file with 21 additions and 3 deletions   Show diff stats
@@ -384,16 +384,34 @@ fi @@ -384,16 +384,34 @@ fi
384 384
385 AC_SUBST(PHPCONFIG) 385 AC_SUBST(PHPCONFIG)
386 386
  387 +#--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
  388 +
387 AC_ARG_VAR([REXX_HOME], [ooRexx home]) 389 AC_ARG_VAR([REXX_HOME], [ooRexx home])
388 390
389 if test -z "${REXX_HOME}"; then 391 if test -z "${REXX_HOME}"; then
390 392
391 - PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([ooRexx integration not present.]) )  
392 - AC_PATH_TOOL([REXXC], [rexxc], [cp] )  
393 REXX_HOME="\$(datarootdir)/ooRexx" 393 REXX_HOME="\$(datarootdir)/ooRexx"
394 394
395 -else 395 + AC_PATH_TOOL([REXXC], [rexxc], [cp] )
  396 + AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
396 397
  398 + PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
  399 +
  400 + if test "$app_cv_rexx" != "yes"; then
  401 +
  402 + if test "$REXXCONFIG" != "no"; then
  403 + app_cv_rexx=yes
  404 + REXX_CFLAGS=`$REXXCONFIG --cflags`
  405 + REXX_LIBS=`$REXXCONFIG --libs`
  406 + REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
  407 + AC_MSG_NOTICE([Got settings from oorexx-config.])
  408 + else
  409 + AC_MSG_NOTICE([ooRexx SDK is NOT available.])
  410 + app_cv_rexx="no"
  411 + fi
  412 + fi
  413 +
  414 +else
397 if test -e "${REXX_HOME}/api/oorexxapi.h"; then 415 if test -e "${REXX_HOME}/api/oorexxapi.h"; then
398 416
399 app_cv_rexx="yes" 417 app_cv_rexx="yes"