diff --git a/Makefile.in b/Makefile.in index 69af6c1..6cfe9aa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -307,6 +307,7 @@ clean: @make -C src/pw3270 clean @make -C src/tools clean @make -C src/plugins/remotectl clean + @make -C src/plugins/rx3270 clean @rm -f $(PACKAGE_NAME).png @rm -f $(PACKAGE_NAME)-logo.png @rm -f *.log @@ -339,3 +340,9 @@ $(BINDIR)/Debug/plugins/remotectl@DLLEXT@: src/plugins/remotectl/* $(BINDIR)/Deb $(BINDIR)/Release/plugins/remotectl@DLLEXT@: src/plugins/remotectl/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) @make BINDIR="../../../$(BINDIR)" PW3270_LIBS="-L../../../$(BINDIR)/Release@DLLDIR@ -l3270 -lpw3270" PW3270_CFLAGS="-I../../../src/include" -C $(dir $<) Release +$(BINDIR)/Debug/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) + @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Debug -C $(dir $<) Debug + +$(BINDIR)/Release/plugins/rx3270@DLLEXT@: src/plugins/rx3270/* $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) + @make BINDIR="../../../$(BINDIR)" LIB3270_MODE=Release -C $(dir $<) Release + diff --git a/configure.ac b/configure.ac index 3fa625a..d4caa33 100644 --- a/configure.ac +++ b/configure.ac @@ -59,11 +59,7 @@ AC_PROG_INSTALL AC_PROG_MKDIR_P AC_PROG_LN_S -AC_PATH_TOOL([REXXC], [rexxc], [cp]) -AC_SUBST(REXXC) - AC_PATH_TOOL([VALGRIND], [valgrind], [no]) -AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no]) AC_PATH_TOOL([MAKENSIS], [makensis], [no]) AC_PATH_TOOL([WINDRES], [windres], [no]) @@ -256,7 +252,7 @@ fi #--[ Check For Java ]----------------------------------------------------------------------------------------------------------------------------------------- -AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java extension & plugin])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ]) +AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java integration])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ]) # Check for JDK_HOME if test "_$JDK_HOME" = "_" ; then @@ -347,6 +343,19 @@ fi AC_SUBST(PHPCONFIG) +AC_ARG_WITH([rexxconfig], [AS_HELP_STRING([--with-rexx-config], [Path to oorexx-config tool])], [ REXXCONFIG="$withval" ],[ AC_PATH_TOOL(REXXCONFIG, oorexx-config, , $PATH) ]) + +if test -z "${REXXCONFIG}"; then + AC_MSG_NOTICE([Program oorexx-config not found. Use --with-rexx-config=path to specify absolute path to the oorexx-config tool.]) +else + AC_DEFINE(HAVE_REXX) + AC_PATH_TOOL([REXXC], [rexxc], [cp], `$REXXCONFIG --prefix`/bin ) + PLUGINS="$PLUGINS rx3270" +fi + +AC_SUBST(REXXC) +AC_SUBST(REXXCONFIG) + #--[ Pre-reqs ]----------------------------------------------------------------------------------------------------------------------------------------------- AC_SUBST(LIB3270_REQUIRES) @@ -360,12 +369,14 @@ AC_CONFIG_FILES([ pw3270.spec pw3270.nsi src/include/rules.mak + src/include/plugin.mak src/lib3270/Makefile src/lib3270/mkversion.sh src/pw3270/Makefile src/pw3270/uiparser/Makefile src/tools/Makefile src/plugins/remotectl/Makefile + src/plugins/rx3270/Makefile man/Makefile makegtkruntime.sh ]) diff --git a/pw3270.cbp b/pw3270.cbp index ba350c7..7ec758c 100644 --- a/pw3270.cbp +++ b/pw3270.cbp @@ -9,8 +9,8 @@