From 4c0dc7b7077cc5c0e167febf4528e40f3d9e0f1f Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Sat, 12 Apr 2014 20:37:10 +0000
Subject: [PATCH] Ajustes para evitar que DLLs destinadas ao diretório de sistema do windows carreguem dependências do MinGW

---
 configure.ac                   | 28 +++++++++++++++++++++-------
 po/pt_BR.po                    |  2 +-
 src/plugins/hllapi/Makefile.in |  3 ++-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 958431d..cd58b7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,7 @@ AC_SUBST(PACKAGE_LEVEL,"APP_LEVEL")
 
 DLL_CFLAGS=""
 DLL_FLAGS="-shared"
+SYSDLL_FLAGS="-shared"
 SOCKET_LIBS=""
 LIB3270_REQUIRES=""
 
@@ -131,6 +132,10 @@ case "$host" in
 		CFLAGS="$CFLAGS -mms-bitfields"
 		localedir="locale"
 		DLL_FLAGS="-shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup"
+
+		# http://stackoverflow.com/questions/18138635/mingw-exe-requires-a-few-gcc-dlls-regardless-of-the-code
+		SYSDLL_FLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--add-stdcall-alias,--enable-stdcall-fixup"
+
 		LDSOFLAGS="-Wl,-soname,\`basename \$@\`"
 		LDAPPFLAGS="-mwindows"
 		LDLIBFLAGS="-Wl,--output-def,\$@.def"
@@ -249,11 +254,19 @@ AC_ARG_ENABLE([pic],
 [
 	app_cv_pic="$enableval"
 ],[
-	if test "$host_cpu" = "x86_64"; then
+	case "$host-$host_cpu" in
+        *-mingw32-*)
+		app_cv_pic="no"
+		;;
+
+	*-x86_64)
 		app_cv_pic="yes"
-	else
+		;;
+
+	*)
 		app_cv_pic="no"
-	fi
+	esac
+
 ])
 
 AC_ARG_ENABLE([registry],
@@ -394,6 +407,7 @@ AC_SUBST(PHPCONFIG)
 
 #--[ 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])
 
 if test -z "${REXX_HOME}"; then
@@ -406,7 +420,6 @@ if test -z "${REXX_HOME}"; then
 	PKG_CHECK_MODULES( [REXX], [ooRexx], app_cv_rexx=yes, AC_MSG_NOTICE([No ooRexx on pkg-config.]) )
 
 	if test "$REXXCONFIG" != "no"; then
-		app_cv_rexx=yes
 		REXX_CFLAGS=`$REXXCONFIG --cflags`
 		REXX_LIBS=`$REXXCONFIG --libs`
 		REXX_HOME=`$REXXCONFIG --prefix`/share/ooRexx
@@ -419,8 +432,6 @@ if test -z "${REXX_HOME}"; then
 else
 	if test -e "${REXX_HOME}/api/oorexxapi.h"; then
 
-		app_cv_rexx="yes"
-
 		AC_MSG_NOTICE([Setting rexx sdk from REXX_HOME])
 
 		REXX_CFLAGS="$CFLAGS -I\"$REXX_HOME/api\""
@@ -439,7 +450,9 @@ if test "$app_cv_rexx" == "yes"; then
 	AC_DEFINE(HAVE_REXX)
 	AC_DEFINE(HAVE_OOREXXAPI_H)
 	PLUGINS="$PLUGINS rx3270"
-	AC_MSG_NOTICE([Rexx plugin enabled.])
+	AC_MSG_NOTICE([ooRexx plugin & extension are enabled.])
+else
+	AC_MSG_NOTICE([ooRexx is NOT present or disabled.])
 fi
 
 AC_ARG_WITH([rexxlibdir], [AS_HELP_STRING([--with-rexxlibdir], [Path to rexx extension libs])], [ REXX_LIBDIR=$withval ],[ REXX_LIBDIR=$libdir ])
@@ -583,6 +596,7 @@ AC_SUBST(EXEEXT)
 AC_SUBST(DLLPREFIX)
 AC_SUBST(DLLEXT)
 AC_SUBST(DLL_FLAGS)
+AC_SUBST(SYSDLL_FLAGS)
 AC_SUBST(DLL_CFLAGS)
 AC_SUBST(DLLDIR)
 AC_SUBST(LDSOFLAGS)
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 912d745..07a3d95 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-04-11 15:48-0300\n"
+"POT-Creation-Date: 2014-04-12 07:51-0300\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
diff --git a/src/plugins/hllapi/Makefile.in b/src/plugins/hllapi/Makefile.in
index de9b72e..07b4cdf 100644
--- a/src/plugins/hllapi/Makefile.in
+++ b/src/plugins/hllapi/Makefile.in
@@ -58,7 +58,8 @@ XGETTEXT=@XGETTEXT@
 
 #---[ Rules ]------------------------------------------------------------------
 
-DLL_FLAGS=@DLL_FLAGS@
+DLL_FLAGS=@SYSDLL_FLAGS@
+
 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
 
 LIB3270_MODE ?= Default
--
libgit2 0.21.2