Download as
Browse Code »

Commit de0644927270d333a821c0087bbb4587cefb98ef

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

Reativando detecção do rexx via pkg-config

Showing 2 changed files with 13 additions and 12 deletions   Show diff stats
@@ -432,20 +432,21 @@ AC_SUBST(PHPCONFDIR) @@ -432,20 +432,21 @@ AC_SUBST(PHPCONFDIR)
432 432
433 #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- 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 AC_PATH_TOOL([REXXC], [rexxc], [cp] ) 435 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
439 AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) 436 AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
440 437
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"  
447 -else  
448 - PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) ) 438 +PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
  439 +
  440 +if test "$app_cv_rexx" != "yes"; then
  441 +
  442 + if test "$REXXCONFIG" != "no"; then
  443 + REXX_CFLAGS=`$REXXCONFIG --cflags`
  444 + REXX_LIBS=`$REXXCONFIG --libs`
  445 + REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
  446 + AC_MSG_NOTICE([Got settings from oorexx-config.])
  447 + app_cv_rexx="yes"
  448 + fi
  449 +
449 fi 450 fi
450 451
451 if test "$app_cv_rexx" == "yes"; then 452 if test "$app_cv_rexx" == "yes"; then
src/plugins/rx3270/Makefile.in
  Diff comments   View file @de06449
@@ -70,7 +70,7 @@ $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$( @@ -70,7 +70,7 @@ $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(
70 $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS) 70 $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
71 @echo " CCLD `basename $@`" 71 @echo " CCLD `basename $@`"
72 @$(MKDIR) `dirname $@` 72 @$(MKDIR) `dirname $@`
73 - @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS) 73 + $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
74 74
75 install: 75 install:
76 @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins 76 @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins