From fa7ea25a6f453a0f8d1c7e486b0ac4085b3a96c2 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 7 Jul 2015 11:04:39 +0000
Subject: [PATCH] Corrigindo detecção de rexx em windows

---
 configure.ac                   | 23 +++++++++--------------
 src/plugins/rx3270/Makefile.in |  6 +++++-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index a7c334e..28097d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -550,27 +550,22 @@ AC_SUBST(PHPCONFDIR)
 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
 
 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
-AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
 
 AC_ARG_ENABLE([rexx],[AS_HELP_STRING([--disable-rexx], [Disable ooRexx integration])],[ app_cv_rexx="$enableval" ],[ app_cv_rexx="yes" ])
 
 if test "$app_cv_rexx" == "yes"; then
 
-	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.])
-		fi
+	AC_PATH_TOOL([REXXCONFIG], [oorexx-config], [no])
 
+	if test "$REXXCONFIG" != "no"; then
+		app_cv_rexx='yes'
+		REXX_CFLAGS=`$REXXCONFIG --cflags`
+		REXX_LIBS=`$REXXCONFIG --libs`
+		REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
+		AC_MSG_NOTICE([Got settings from oorexx-config.])
 	else
-
-		REXX_HOME=`$PKG_CONFIG --variable=prefix ooRexx`/share/ooRexx
-
+		AC_MSG_NOTICE([Can't find oorexx-config.])
+		app_cv_rexx='no'
 	fi
 
 fi
diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in
index 7984378..c6b526c 100644
--- a/src/plugins/rx3270/Makefile.in
+++ b/src/plugins/rx3270/Makefile.in
@@ -44,7 +44,11 @@ include ../../include/plugin.mak
 include $(CLASSLIBDIR)/class.mak
 
 LIBS=@REXX_LIBS@ @LIBICONV@ @DBUS_LIBS@
-CFLAGS=@CFLAGS@ @REXX_CFLAGS@ @DBUS_CFLAGS@
+
+REXX_CFLAGS=@REXX_CFLAGS@
+DBUS_CFLAGS=@DBUS_CFLAGS@
+
+CFLAGS=@CFLAGS@ $(REXX_CFLAGS) $(DBUS_CFLAGS)
 REXX_HOME=@REXX_HOME@
 REXXLIBDIR=@REXX_LIBDIR@
 
--
libgit2 0.21.2