From 49b54cd919c655b12eda73402aa968c77286ba9b Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 5 Dec 2018 16:34:07 -0200
Subject: [PATCH] Compilando widget gtk como submódulo.

---
 Makefile.in            |  6 ------
 configure.ac           | 15 +++++++++++++--
 modules/lib3270        |  2 +-
 modules/libv3270       |  2 +-
 src/pw3270/Makefile.in |  4 ----
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 27f308c..a168748 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,9 +90,6 @@ $(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
 	@$(MKDIR) `dirname $@`
 	@$(MAKE) -C modules/lib3270 Debug
 
-	@$(MKDIR) $(BINDBG)
-	@cp ./modules/lib3270/.bin/Debug/* $(BINDBG)
-
 $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
 	modules/libv3270/* \
 	modules/libv3270/src/v3270/* \
@@ -102,9 +99,6 @@ $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
 	@$(MKDIR) `dirname $@`
 	@$(MAKE) -C modules/libv3270 Debug
 
-	@$(MKDIR) $(BINDBG)
-	@cp ./modules/libv3270/.bin/Debug/* $(BINDBG)
-
 $(BINDBG)/%@EXEEXT@: \
 	$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@ \
 	$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@ \
diff --git a/configure.ac b/configure.ac
index 7f6c610..4af374a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,6 @@ AC_INIT([pw3270], [5.2], [perry.werneck@gmail.com])
 
 dnl Place auxilliary scripts here.
 AC_CONFIG_AUX_DIR([scripts])
-AC_CONFIG_SUBDIRS([modules/lib3270])
-AC_CONFIG_SUBDIRS([modules/libv3270])
 
 dnl Compute the canonical host-system type
 AC_CANONICAL_HOST
@@ -418,6 +416,19 @@ AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
 AC_DEFINE(LIB3270_NAME,$app_cv_libname)
 AC_SUBST(LIB3270_NAME,$app_cv_libname)
 
+AX_SUBDIRS_CONFIGURE(
+	[modules/lib3270],
+	[--with-work-dir=$ac_pwd],
+	[--with-libname=$app_cv_libname]
+)
+
+AX_SUBDIRS_CONFIGURE(
+	[modules/libv3270],
+	[LIB3270_CFLAGS=-I$ac_pwd/modules/lib3270/src/include],
+	[LIB3270_LIBS=-l$app_cv_libname],
+	[--with-work-dir=$ac_pwd]
+)
+
 dnl ---------------------------------------------------------------------------
 dnl Check for headers
 dnl ---------------------------------------------------------------------------
diff --git a/modules/lib3270 b/modules/lib3270
index 7ee2d8e..fe3154f 160000
--- a/modules/lib3270
+++ b/modules/lib3270
@@ -1 +1 @@
-Subproject commit 7ee2d8ee2d5343d0879f4a2b11862502ed967ca5
+Subproject commit fe3154fe8908b53ec477dfe873243274b3fc9e2f
diff --git a/modules/libv3270 b/modules/libv3270
index 64bfb1a..40e11ff 160000
--- a/modules/libv3270
+++ b/modules/libv3270
@@ -1 +1 @@
-Subproject commit 64bfb1a610ab503c915cca28b791a5fdfefc5774
+Subproject commit 40e11ff247691dd2742c2e3112e1a87b0b77d69d
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index bbfc23b..9185dba 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -100,10 +100,6 @@ APP_LDFLAGS=@APP_LDFLAGS@
 
 DEPENDS=\
 	$(BASEDIR)/src/include/*.h \
-	@LIB3270_INCLUDEPATH@/*.h \
-	@LIB3270_INCLUDEPATH@/lib3270/*.h \
-	@LIBV3270_INCLUDEPATH@/*.h \
-	@LIB3270_INCLUDEPATH@/v3270/*.h \
 	*.h \
 	Makefile
 
--
libgit2 0.21.2