diff --git a/configure.ac b/configure.ac index dd9c4b1..00d3fa5 100644 --- a/configure.ac +++ b/configure.ac @@ -432,20 +432,21 @@ AC_SUBST(PHPCONFDIR) #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- -#AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx plugin & extension])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ]) -#AC_ARG_VAR([REXX_HOME], [ooRexx home]) - AC_PATH_TOOL([REXXC], [rexxc], [cp] ) AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) -if test "$REXXCONFIG" != "no"; then - REXX_CFLAGS=`$REXXCONFIG --cflags` - REXX_LIBS=`$REXXCONFIG --libs` - REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx - AC_MSG_NOTICE([Got settings from oorexx-config.]) - app_cv_rexx="yes" -else - PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) ) +PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) ) + +if test "$app_cv_rexx" != "yes"; then + + if test "$REXXCONFIG" != "no"; then + REXX_CFLAGS=`$REXXCONFIG --cflags` + REXX_LIBS=`$REXXCONFIG --libs` + REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx + AC_MSG_NOTICE([Got settings from oorexx-config.]) + app_cv_rexx="yes" + fi + fi if test "$app_cv_rexx" == "yes"; then diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in index d4769f3..73d18a1 100644 --- a/src/plugins/rx3270/Makefile.in +++ b/src/plugins/rx3270/Makefile.in @@ -70,7 +70,7 @@ $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$( $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS) + $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS) install: @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins -- libgit2 0.21.2