Download as
Browse Code »

Commit fa7ea25a6f453a0f8d1c7e486b0ac4085b3a96c2

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

Corrigindo detecção de rexx em windows

Showing 2 changed files with 14 additions and 15 deletions   Show diff stats
configure.ac
  Diff comments   View file @fa7ea25
... ... @@ -550,27 +550,22 @@ AC_SUBST(PHPCONFDIR)
550 550 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
551 551  
552 552 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
553   -AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
554 553  
555 554 AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx integration])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
556 555  
557 556 if test "$app_cv_rexx" == "yes"; then
558 557  
559   - PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
560   -
561   - if test "$app_cv_rexx" != "yes"; then
562   -
563   - if test "$REXXCONFIG" != "no"; then
564   - REXX_CFLAGS=`$REXXCONFIG --cflags`
565   - REXX_LIBS=`$REXXCONFIG --libs`
566   - REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
567   - AC_MSG_NOTICE([Got settings from oorexx-config.])
568   - fi
  558 + AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
569 559  
  560 + if test "$REXXCONFIG" != "no"; then
  561 + app_cv_rexx='yes'
  562 + REXX_CFLAGS=`$REXXCONFIG --cflags`
  563 + REXX_LIBS=`$REXXCONFIG --libs`
  564 + REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
  565 + AC_MSG_NOTICE([Got settings from oorexx-config.])
570 566 else
571   -
572   - REXX_HOME=`$PKG_CONFIG --variable=prefix ooRexx`/share/ooRexx
573   -
  567 + AC_MSG_NOTICE([Can't find oorexx-config.])
  568 + app_cv_rexx='no'
574 569 fi
575 570  
576 571 fi
... ...
src/plugins/rx3270/Makefile.in
  Diff comments   View file @fa7ea25
... ... @@ -44,7 +44,11 @@ include ../../include/plugin.mak
44 44 include $(CLASSLIBDIR)/class.mak
45 45  
46 46 LIBS=@REXX_LIBS@ @LIBICONV@ @DBUS_LIBS@
47   -CFLAGS=@CFLAGS@ @REXX_CFLAGS@ @DBUS_CFLAGS@
  47 +
  48 +REXX_CFLAGS=@REXX_CFLAGS@
  49 +DBUS_CFLAGS=@DBUS_CFLAGS@
  50 +
  51 +CFLAGS=@CFLAGS@ $(REXX_CFLAGS) $(DBUS_CFLAGS)
48 52 REXX_HOME=@REXX_HOME@
49 53 REXXLIBDIR=@REXX_LIBDIR@
50 54  
... ...