Download as
Browse Code »

Commit 8890c7f0bb44621024b1f4cee786ef392284ebbc

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

Fixing build of base library.

Showing 3 changed files with 22 additions and 3 deletions   Show diff stats
@@ -73,7 +73,8 @@ all: \ @@ -73,7 +73,8 @@ all: \
73 locale/$(PACKAGE_TARNAME).pot 73 locale/$(PACKAGE_TARNAME).pot
74 74
75 Release: \ 75 Release: \
76 - application 76 + application \
  77 + $(BINRLS)/libpw3270cpp.a
77 78
78 application: \ 79 application: \
79 $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \ 80 $(foreach MODULE, $(MODULES), $(BINRLS)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
@@ -194,7 +195,8 @@ $(POTDIR)/%.pot: \ @@ -194,7 +195,8 @@ $(POTDIR)/%.pot: \
194 #---[ Debug Targets ]-------------------------------------------------------------------- 195 #---[ Debug Targets ]--------------------------------------------------------------------
195 196
196 Debug: \ 197 Debug: \
197 - $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ 198 + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
  199 + $(BINDBG)/libpw3270cpp.a
198 200
199 publish-debug: \ 201 publish-debug: \
200 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ 202 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
@@ -381,6 +381,22 @@ if test "$app_cv_pic" == "yes"; then @@ -381,6 +381,22 @@ if test "$app_cv_pic" == "yes"; then
381 fi 381 fi
382 382
383 dnl --------------------------------------------------------------------------- 383 dnl ---------------------------------------------------------------------------
  384 +dnl Check for D-Bus
  385 +dnl ---------------------------------------------------------------------------
  386 +
  387 +PKG_CHECK_MODULES( [DBUS], [dbus-1], app_cv_libdbus=yes, AC_MSG_NOTICE([ No DBUS support.]) )
  388 +AC_SUBST(DBUS_LIBS)
  389 +AC_SUBST(DBUS_CFLAGS)
  390 +
  391 +PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GDBUS support.]) )
  392 +AC_SUBST(GDBUS_LIBS)
  393 +AC_SUBST(GDBUS_CFLAGS)
  394 +
  395 +if test "$app_cv_dbus" == "yes"; then
  396 + AC_DEFINE(HAVE_DBUS)
  397 +fi
  398 +
  399 +dnl ---------------------------------------------------------------------------
384 dnl Lib3270 flags 400 dnl Lib3270 flags
385 dnl --------------------------------------------------------------------------- 401 dnl ---------------------------------------------------------------------------
386 402
src/libpw3270cpp/remote.cc
  Diff comments   View file @8890c7f
@@ -36,7 +36,6 @@ @@ -36,7 +36,6 @@
36 #include <string.h> 36 #include <string.h>
37 #include <malloc.h> 37 #include <malloc.h>
38 #include <sys/types.h> 38 #include <sys/types.h>
39 - #include <unistd.h>  
40 #include <limits.h> 39 #include <limits.h>
41 40
42 #ifndef DBUS_TIMEOUT_INFINITE 41 #ifndef DBUS_TIMEOUT_INFINITE
@@ -50,6 +49,8 @@ @@ -50,6 +49,8 @@
50 #include <pw3270/ipcpackets.h> 49 #include <pw3270/ipcpackets.h>
51 #include <process.h> 50 #include <process.h>
52 #else 51 #else
  52 + #include <unistd.h>
  53 +
53 #define HLLAPI_PACKET_IS_CONNECTED "isConnected" 54 #define HLLAPI_PACKET_IS_CONNECTED "isConnected"
54 #define HLLAPI_PACKET_GET_CSTATE "getConnectionState" 55 #define HLLAPI_PACKET_GET_CSTATE "getConnectionState"
55 #define HLLAPI_PACKET_GET_PROGRAM_MESSAGE "getProgramMessage" 56 #define HLLAPI_PACKET_GET_PROGRAM_MESSAGE "getProgramMessage"