diff --git a/configure.ac b/configure.ac
index 0c6f4c2..ff3f0ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,48 +374,35 @@ else
 fi
 
 AC_SUBST(PHPCONFIG)
-
+
 AC_ARG_VAR([REXX_HOME], [ooRexx home])
 
-AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable rexx scripting support])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
+if test -z "${REXX_HOME}"; then
+
+	PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([ooRexx integration not present.]) )
+	AC_PATH_TOOL([REXXC], [rexxc], [cp] )
+	REXX_HOME="\$(datarootdir)/ooRexx"
+
+else
+
+	if test -e "${REXX_HOME}/api/oorexxapi.h"; then
+
+		app_cv_rexx="yes"
+
+		REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
+		REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx"
+		AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" )
 
-if test "$app_cv_rexx" == "yes"; then
-	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") ])
-
-	if test "$REXXCONFIG" == "no" ; then
-
-		if test -z "${REXX_HOME}"; then
-
-			AC_MSG_NOTICE([Program oorexx-config not found. Use --with-rexx-config=path to specify absolute path to the oorexx-config tool.])
-			app_cv_rexx="no"
-
-		else
-
-			if test -e "${REXX_HOME}/api/oorexxapi.h"; then
-
-				AC_DEFINE(HAVE_REXX)
-				AC_DEFINE(HAVE_OOREXXAPI_H)
-
-				AC_PATH_TOOL([REXXC], [rexxc], [cp], path="$PATH:$REXX_HOME" )
-				REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
-				REXX_LIBS="$LIBS -L\"$REXX_HOME\" -lrexxapi -lrexx"
-
-			else
-				AC_MSG_NOTICE([ooRexx SDK is NOT available.])
-				app_cv_rexx="no"
-			fi
-		fi
 	else
-		REXX_HOME="\${datarootdir}/ooRexx"
-		AC_DEFINE(HAVE_REXX)
-		AC_CHECK_HEADER(oorexxapi.h, AC_DEFINE(HAVE_OOREXXAPI_H))
-		AC_PATH_TOOL([REXXC], [rexxc], [cp], `$REXXCONFIG --prefix`/bin )
-		REXX_CFLAGS="$CFLAGS `$REXXCONFIG --cflags`"
-		REXX_LIBS="$LIBS `$REXXCONFIG --libs`"
+		AC_MSG_NOTICE([ooRexx SDK is NOT available.])
+		app_cv_rexx="no"
 	fi
+
 fi
 
 if test "$app_cv_rexx" == "yes"; then
+	AC_DEFINE(HAVE_REXX)
+	AC_DEFINE(HAVE_OOREXXAPI_H)
 	PLUGINS="$PLUGINS rx3270"
 fi
 
diff --git a/src/plugins/rx3270/remote.cc b/src/plugins/rx3270/remote.cc
index f8a1221..c307d82 100644
--- a/src/plugins/rx3270/remote.cc
+++ b/src/plugins/rx3270/remote.cc
@@ -914,7 +914,7 @@ void remote::set_toggle(LIB3270_TOGGLE ix, bool value)
 
 	if(hPipe != INVALID_HANDLE_VALUE)
 	{
-
+		#warning Implementar
 	}
 
 #elif defined(HAVE_DBUS)
--
libgit2 0.21.2