From 31723167ba30edf95cfac70c5857ae8334ca17b0 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Tue, 15 Apr 2014 00:02:38 +0000
Subject: [PATCH] Removendo dependência da glib-dbus na biblioteca de classes

---
 configure.ac                     |  6 +++++-
 pw3270.cbp                       |  9 +++++++++
 src/classlib/class.mak.in        |  2 +-
 src/php/Makefile.in              |  4 ++--
 src/plugins/dbus3270/Makefile.in | 16 ++++++++--------
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b7e09a..73eacb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -366,10 +366,14 @@ AC_SUBST(GLIB_CFLAGS)
 
 #--[ Check DBUS ]---------------------------------------------------------------------------------------------------------------------------------------------
 
-PKG_CHECK_MODULES( [DBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No DBUS support.])  )
+PKG_CHECK_MODULES( [DBUS], [dbus-1] )
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 
+PKG_CHECK_MODULES( [GDBUS], [dbus-glib-1], app_cv_dbus=yes, AC_MSG_NOTICE([No GDBUS support.])  )
+AC_SUBST(GDBUS_LIBS)
+AC_SUBST(GDBUS_CFLAGS)
+
 if test "$app_cv_dbus" == "yes"; then
 	AC_DEFINE(HAVE_DBUS)
 	PLUGINS="$PLUGINS dbus3270"
diff --git a/pw3270.cbp b/pw3270.cbp
index eec56b7..45c4434 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -264,6 +264,15 @@
 		<Unit filename="src/oxt/pw3270.idl" />
 		<Unit filename="src/oxt/set.cxx" />
 		<Unit filename="src/oxt/testprogram.cxx" />
+		<Unit filename="src/php/Makefile.in" />
+		<Unit filename="src/php/get.cc" />
+		<Unit filename="src/php/init.cc" />
+		<Unit filename="src/php/main.cc" />
+		<Unit filename="src/php/misc.cc" />
+		<Unit filename="src/php/php.ini" />
+		<Unit filename="src/php/php3270.h" />
+		<Unit filename="src/php/sample.php" />
+		<Unit filename="src/php/set.cc" />
 		<Unit filename="src/plugins/dbus3270/Makefile.in" />
 		<Unit filename="src/plugins/dbus3270/daemon.c">
 			<Option compilerVar="CC" />
diff --git a/src/classlib/class.mak.in b/src/classlib/class.mak.in
index 6a56559..c51dc97 100644
--- a/src/classlib/class.mak.in
+++ b/src/classlib/class.mak.in
@@ -24,7 +24,7 @@
 # erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
 #
 
-CLASS_CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @DBUS_CFLAGS@ @GTK_CFLAGS@
+CLASS_CFLAGS=@CFLAGS@ @DLL_CFLAGS@ @DBUS_CFLAGS@
 CLASS_LIBS=@LIBICONV@ @DBUS_LIBS@
 
 CLASS_SRC=session.cc exception.cc local.cc remote.cc
diff --git a/src/php/Makefile.in b/src/php/Makefile.in
index 16a17b8..9498a58 100644
--- a/src/php/Makefile.in
+++ b/src/php/Makefile.in
@@ -90,7 +90,7 @@ $(BINRLS)/php3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SR
 				$(CLASS_RELEASE_OBJECTS)
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
+	@$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
 
 
 #---[ Debug targets ]----------------------------------------------------------
@@ -101,7 +101,7 @@ $(BINDBG)/php3270@DLLEXT@:	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SR
 				$(CLASS_DEBUG_OBJECTS)
 	@echo "  LD   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(CXX) -shared $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
+	@$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) $(OO_LDFLAGS) $(CLASS_LIBS) -o $@ $^
 
 
 run: $(BINDBG)/php3270@DLLEXT@
diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in
index 613feb9..c4d0747 100644
--- a/src/plugins/dbus3270/Makefile.in
+++ b/src/plugins/dbus3270/Makefile.in
@@ -73,11 +73,11 @@ DLL_FLAGS=-shared
 DLL_CFLAGS=@DLL_CFLAGS@
 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
 
-DBUS_CFLAGS=@DBUS_CFLAGS@
+GDBUS_CFLAGS=@GDBUS_CFLAGS@
 GLIB_CFLAGS=@GLIB_CFLAGS@
 GTK_CFLAGS=@GTK_CFLAGS@
 
-DBUS_LIBS=@DBUS_LIBS@
+GDBUS_LIBS=@GDBUS_LIBS@
 GLIB_LIBS=@GLIB_LIBS@
 GTK_LIBS=@GTK_LIBS@
 
@@ -107,12 +107,12 @@ endif
 $(OBJDBG)/%.o: %.c $(DEPENDS)
 	@echo "  CC   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(DEBUG_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
+	@$(CC) $(CFLAGS) $(DLL_CFLAGS) $(GDBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(DEBUG_CFLAGS) $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
 
 $(OBJRLS)/%.o: %.c $(DEPENDS)
 	@echo "  CC   `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CC) $(CFLAGS) $(DLL_CFLAGS) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)  $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
+	@$(CC) $(CFLAGS) $(DLL_CFLAGS) $(GDBUS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS)  $(LIB3270_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $<
 
 
 #---[ Release targets ]--------------------------------------------------------
@@ -122,12 +122,12 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so
 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS)
+	$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
 
 $(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CC) $(CFLAGS) -o $@ $^ $(DBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
+	@$(CC) $(CFLAGS) -o $@ $^ $(GDBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
 
 #---[ Debug targets ]----------------------------------------------------------
 
@@ -136,7 +136,7 @@ Debug: $(BINDBG)/plugins/$(MODULE_NAME).so
 $(BINDBG)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(LD) $(DLL_FLAGS) @DBGRPATH@ -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(DBUS_LIBS)
+	@$(LD) $(DLL_FLAGS) @DBGRPATH@ -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
 
 #---[ Misc targets ]-----------------------------------------------------------
 
@@ -153,7 +153,7 @@ dbus-glue.h: pw3270dbus.xml
 $(BINDBG)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJDBG)/$(SRC).o)
 	@echo "  CCLD `basename $@`"
 	@$(MKDIR) `dirname $@`
-	@$(CC) $(CFLAGS) -o $@ $^ $(DBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
+	@$(CC) $(CFLAGS) -o $@ $^ $(GDBUS_LIBS) $(GLIB_LIBS) $(LIB3270_LIBS)
 
 cleandebug-service: clean
 
--
libgit2 0.21.2