From e74438e7e6a0b4c5675fd83ab78b1282358df260 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 3 Nov 2015 09:12:20 -0200
Subject: [PATCH] Mudando detecção do python para o pkg-config para ver se ajuda na compilação windows.

---
 .gitignore             |  4 +++-
 configure.ac           | 33 ++++++++++++++++++++++-----------
 po/pt_BR.po            |  2 +-
 pw3270.spec.in         |  2 +-
 src/python/Makefile.in |  7 +++----
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6bfab48..cccd517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,7 @@ src/pw3270/pw3270.png
 src/pw3270/v3270/marshal.c
 src/pw3270/v3270/marshal.h
 src/plugins/dbus3270/dbus-glue.h
-
+src/java/javadoc/
+src/loffice/.rdb/
+src/loffice/include/
 
diff --git a/configure.ac b/configure.ac
index 9eb26c3..c65cb1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,22 +588,33 @@ AC_SUBST(PHPCONFDIR)
 
 #--[ Python ]-----------------------------------------------------------------------------------------------------------------------------------------------
 
-AC_ARG_WITH([python-config], [AS_HELP_STRING([--with-python-config], [Path to python-config tool])], [ PYCONFIG="$withval" ],[ AC_PATH_TOOL(PYCONFIG, python-config, , $PATH) ])
-
-if test -z "${PYCONFIG}"; then
-
-	AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.])
-
-else
-
+#AC_ARG_WITH([python-config], [AS_HELP_STRING([--with-python-config], [Path to python-config tool])], [ PYCONFIG="$withval" ],[ AC_PATH_TOOL(PYCONFIG, python-config, , $PATH) ])
+#
+#if test -z "${PYCONFIG}"; then
+#
+#	AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.])
+#
+#else
+#
+#	AC_DEFINE(HAVE_PYTHON)
+#	EXTENSIONS="$EXTENSIONS python"
+#	AC_CONFIG_FILES(src/python/Makefile)
+#
+#fi
+#
+#AC_SUBST(PYCONFIG)
+
+PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1, AC_MSG_NOTICE([python-devel not present.]) )
+
+AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_CFLAGS)
+
+if test "$app_have_python" == "1"; then
 	AC_DEFINE(HAVE_PYTHON)
 	EXTENSIONS="$EXTENSIONS python"
 	AC_CONFIG_FILES(src/python/Makefile)
-
 fi
 
-AC_SUBST(PYCONFIG)
-
 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
 
 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d9be265..edc21f2 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: 2015-11-02 10:14-0200\n"
+"POT-Creation-Date: 2015-11-03 08:25-0200\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/pw3270.spec.in b/pw3270.spec.in
index f389c23..ce8c19f 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -379,7 +379,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/php%{phpmajor}/extensions/tn3270.so
 %endif
 
-%if 0%{?_php}
+%if 0%{?_python}
 %files -n python-tn3270
 %defattr(-,root,root)
 %{_libdir}/python/site-packages/py3270.so
diff --git a/src/python/Makefile.in b/src/python/Makefile.in
index c4d386a..b8ba749 100644
--- a/src/python/Makefile.in
+++ b/src/python/Makefile.in
@@ -44,7 +44,6 @@ MKDIR=@MKDIR_P@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 INSTALL_PROGRAM=@INSTALL_PROGRAM@
-PYCONFIG=@PYCONFIG@
 
 #---[ Paths ]------------------------------------------------------------------
 
@@ -66,7 +65,7 @@ include $(CLASSLIBDIR)/class.mak
 
 #---[ Build options ]----------------------------------------------------------
 
-CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ `$(PYCONFIG) --cflags` -I../include
+CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @PYTHON_CFLAGS@ -I../include
 
 #---[ Rules ]------------------------------------------------------------------
 
@@ -90,7 +89,7 @@ $(BINRLS)/py3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC
 				$(CLASS_RELEASE_OBJECTS)
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS)
+	@$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) @PYTHON_LIBS@
 
 
 #---[ Debug targets ]----------------------------------------------------------
@@ -101,7 +100,7 @@ $(BINDBG)/py3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC
 				$(CLASS_DEBUG_OBJECTS)
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS)
+	@$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) @PYTHON_LIBS@
 
 
 run: $(BINDBG)/py3270@DLLEXT@
--
libgit2 0.21.2