Download as
Browse Code »

Commit e74438e7e6a0b4c5675fd83ab78b1282358df260

Authored by Perry Werneck
1 parent 7def549d
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Mudando detecção do python para o pkg-config para ver se ajuda na compilação windows.

Showing 5 changed files with 30 additions and 18 deletions   Show diff stats
@@ -40,5 +40,7 @@ src/pw3270/pw3270.png @@ -40,5 +40,7 @@ src/pw3270/pw3270.png
40 src/pw3270/v3270/marshal.c 40 src/pw3270/v3270/marshal.c
41 src/pw3270/v3270/marshal.h 41 src/pw3270/v3270/marshal.h
42 src/plugins/dbus3270/dbus-glue.h 42 src/plugins/dbus3270/dbus-glue.h
43 - 43 +src/java/javadoc/
  44 +src/loffice/.rdb/
  45 +src/loffice/include/
44 46
@@ -588,22 +588,33 @@ AC_SUBST(PHPCONFDIR) @@ -588,22 +588,33 @@ AC_SUBST(PHPCONFDIR)
588 588
589 #--[ Python ]----------------------------------------------------------------------------------------------------------------------------------------------- 589 #--[ Python ]-----------------------------------------------------------------------------------------------------------------------------------------------
590 590
591 -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) ])  
592 -  
593 -if test -z "${PYCONFIG}"; then  
594 -  
595 - AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.])  
596 -  
597 -else  
598 - 591 +#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) ])
  592 +#
  593 +#if test -z "${PYCONFIG}"; then
  594 +#
  595 +# AC_MSG_NOTICE([Program python-config not found. Use --with-python-config=path to specify absolute path to the python-config tool.])
  596 +#
  597 +#else
  598 +#
  599 +# AC_DEFINE(HAVE_PYTHON)
  600 +# EXTENSIONS="$EXTENSIONS python"
  601 +# AC_CONFIG_FILES(src/python/Makefile)
  602 +#
  603 +#fi
  604 +#
  605 +#AC_SUBST(PYCONFIG)
  606 +
  607 +PKG_CHECK_MODULES( [PYTHON], [python], app_have_python=1, AC_MSG_NOTICE([python-devel not present.]) )
  608 +
  609 +AC_SUBST(PYTHON_LIBS)
  610 +AC_SUBST(PYTHON_CFLAGS)
  611 +
  612 +if test "$app_have_python" == "1"; then
599 AC_DEFINE(HAVE_PYTHON) 613 AC_DEFINE(HAVE_PYTHON)
600 EXTENSIONS="$EXTENSIONS python" 614 EXTENSIONS="$EXTENSIONS python"
601 AC_CONFIG_FILES(src/python/Makefile) 615 AC_CONFIG_FILES(src/python/Makefile)
602 -  
603 fi 616 fi
604 617
605 -AC_SUBST(PYCONFIG)  
606 -  
607 #--[ ooRexx ]----------------------------------------------------------------------------------------------------------------------------------------------- 618 #--[ ooRexx ]-----------------------------------------------------------------------------------------------------------------------------------------------
608 619
609 AC_PATH_TOOL([REXXC], [rexxc], [cp] ) 620 AC_PATH_TOOL([REXXC], [rexxc], [cp] )
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2015-11-02 10:14-0200\n" 8 +"POT-Creation-Date: 2015-11-03 08:25-0200\n"
9 "PO-Revision-Date: 2014-02-17 08:05-0300\n" 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Portugues <>\n" 11 "Language-Team: Portugues <>\n"
pw3270.spec.in
  Diff comments   View file @e74438e
@@ -379,7 +379,7 @@ rm -rf $RPM_BUILD_ROOT @@ -379,7 +379,7 @@ rm -rf $RPM_BUILD_ROOT
379 %{_libdir}/php%{phpmajor}/extensions/tn3270.so 379 %{_libdir}/php%{phpmajor}/extensions/tn3270.so
380 %endif 380 %endif
381 381
382 -%if 0%{?_php} 382 +%if 0%{?_python}
383 %files -n python-tn3270 383 %files -n python-tn3270
384 %defattr(-,root,root) 384 %defattr(-,root,root)
385 %{_libdir}/python/site-packages/py3270.so 385 %{_libdir}/python/site-packages/py3270.so
src/python/Makefile.in
  Diff comments   View file @e74438e
@@ -44,7 +44,6 @@ MKDIR=@MKDIR_P@ @@ -44,7 +44,6 @@ MKDIR=@MKDIR_P@
44 INSTALL=@INSTALL@ 44 INSTALL=@INSTALL@
45 INSTALL_DATA=@INSTALL_DATA@ 45 INSTALL_DATA=@INSTALL_DATA@
46 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 46 INSTALL_PROGRAM=@INSTALL_PROGRAM@
47 -PYCONFIG=@PYCONFIG@  
48 47
49 #---[ Paths ]------------------------------------------------------------------ 48 #---[ Paths ]------------------------------------------------------------------
50 49
@@ -66,7 +65,7 @@ include $(CLASSLIBDIR)/class.mak @@ -66,7 +65,7 @@ include $(CLASSLIBDIR)/class.mak
66 65
67 #---[ Build options ]---------------------------------------------------------- 66 #---[ Build options ]----------------------------------------------------------
68 67
69 -CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ `$(PYCONFIG) --cflags` -I../include 68 +CXXFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @PYTHON_CFLAGS@ -I../include
70 69
71 #---[ Rules ]------------------------------------------------------------------ 70 #---[ Rules ]------------------------------------------------------------------
72 71
@@ -90,7 +89,7 @@ $(BINRLS)/py3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC @@ -90,7 +89,7 @@ $(BINRLS)/py3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC
90 $(CLASS_RELEASE_OBJECTS) 89 $(CLASS_RELEASE_OBJECTS)
91 @echo " LD `basename $@`" 90 @echo " LD `basename $@`"
92 @$(MKDIR) `dirname $@` 91 @$(MKDIR) `dirname $@`
93 - @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) 92 + @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) @PYTHON_LIBS@
94 93
95 94
96 #---[ Debug targets ]---------------------------------------------------------- 95 #---[ Debug targets ]----------------------------------------------------------
@@ -101,7 +100,7 @@ $(BINDBG)/py3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC @@ -101,7 +100,7 @@ $(BINDBG)/py3270@DLLEXT@: $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC
101 $(CLASS_DEBUG_OBJECTS) 100 $(CLASS_DEBUG_OBJECTS)
102 @echo " LD `basename $@`" 101 @echo " LD `basename $@`"
103 @$(MKDIR) `dirname $@` 102 @$(MKDIR) `dirname $@`
104 - @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) 103 + @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) -o $@ $^ $(CLASS_LIBS) @PYTHON_LIBS@
105 104
106 105
107 run: $(BINDBG)/py3270@DLLEXT@ 106 run: $(BINDBG)/py3270@DLLEXT@