Download as
Browse Code »

Commit e54afaf194e82044a8334afec32b94edb3f8e8dc

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

Ajustando deteccao do SDK ooRexx em windows

Showing 1 changed file with 33 additions and 11 deletions   Show diff stats
configure.ac
  Diff comments   View file @e54afaf
... ... @@ -373,15 +373,43 @@ else
373 373 fi
374 374  
375 375 AC_SUBST(PHPCONFIG)
  376 +
  377 +AC_ARG_VAR([REXX_HOME], [ooRexx home])
376 378  
377 379 AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable rexx scripting support])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
378 380  
379 381 if test "$app_cv_rexx" == "yes"; then
380   - AC_ARG_WITH([rexx-config], [AS_HELP_STRING([--with-rexx-config], [Path to oorexx-config tool])], [ REXXCONFIG="$withval" ],[ AC_PATH_TOOL(REXXCONFIG, oorexx-config, , $PATH) ])
381   -
382   - if test -z "${REXXCONFIG}"; then
383   - AC_MSG_NOTICE([Program oorexx-config not found. Use --with-rexx-config=path to specify absolute path to the oorexx-config tool.])
384   - app_cv_rexx="no"
  382 + 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") ])
  383 +
  384 + if test "$REXXCONFIG" == "no" ; then
  385 +
  386 + if test -z "${REXX_HOME}"; then
  387 +
  388 + AC_MSG_NOTICE([Program oorexx-config not found. Use --with-rexx-config=path to specify absolute path to the oorexx-config tool.])
  389 + app_cv_rexx="no"
  390 +
  391 + else
  392 +
  393 + if test -e "${REXX_HOME}/api/oorexxapi.h"; then
  394 +
  395 + AC_DEFINE(HAVE_REXX)
  396 + AC_DEFINE(HAVE_OOREXXAPI_H)
  397 +
  398 + AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" )
  399 + REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
  400 + REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx"
  401 +
  402 + else
  403 + AC_MSG_NOTICE([ooRexx SDK is NOT available.])
  404 + app_cv_rexx="no"
  405 + fi
  406 + fi
  407 + else
  408 + AC_DEFINE(HAVE_REXX)
  409 + AC_CHECK_HEADER(oorexxapi.h, AC_DEFINE(HAVE_OOREXXAPI_H))
  410 + AC_PATH_TOOL([REXXC], [rexxc], [cp], `$REXXCONFIG --prefix`/bin )
  411 + REXX_CFLAGS="$CFLAGS `$REXXCONFIG --cflags`"
  412 + REXX_LIBS="$LIBS `$REXXCONFIG --libs`"
385 413 fi
386 414 fi
387 415  
... ... @@ -390,13 +418,7 @@ if test "$app_cv_registry" == "yes"; then
390 418 fi
391 419  
392 420 if test "$app_cv_rexx" == "yes"; then
393   - AC_DEFINE(HAVE_REXX)
394   - AC_CHECK_HEADER(oorexxapi.h, AC_DEFINE(HAVE_OOREXXAPI_H))
395   -
396   - AC_PATH_TOOL([REXXC], [rexxc], [cp], `$REXXCONFIG --prefix`/bin )
397 421 PLUGINS="$PLUGINS rx3270"
398   - REXX_CFLAGS="$CFLAGS `$REXXCONFIG --cflags`"
399   - REXX_LIBS="$LIBS `$REXXCONFIG --libs`"
400 422 fi
401 423  
402 424 AC_SUBST(REXXC)
... ...