Download as
Browse Code »

Commit 130ae6da8ee3dcbfdabcd41aea50d89e27823516

Authored by Perry Werneck
1 parent 43157c8e
Exists in master and in 1 other branch develop

Working on windows build with static lib3270.

Showing 2 changed files with 7 additions and 16 deletions   Show diff stats
configure.ac
  Diff comments   View file @130ae6d
... ... @@ -245,7 +245,7 @@ dnl ---------------------------------------------------------------------------
245 245 dnl Check for LIBV3270
246 246 dnl ---------------------------------------------------------------------------
247 247  
248   -PKG_CHECK_MODULES( [V3270], [libv3270], AC_DEFINE(HAVE_V3270), AC_MSG_ERROR([V3270 not present.]))
  248 +PKG_CHECK_MODULES( [V3270], [libv3270 lib3270], AC_DEFINE(HAVE_V3270), AC_MSG_ERROR([V3270 not present.]))
249 249  
250 250 AC_SUBST(V3270_LIBS)
251 251 AC_SUBST(V3270_CFLAGS)
... ...
server/Makefile.in
  Diff comments   View file @130ae6d
... ... @@ -102,15 +102,13 @@ CFLAGS= \
102 102 @GTK_CFLAGS@ \
103 103 @GLIB_CFLAGS@
104 104  
105   -GTK_LIBS=@GTK_LIBS@
106   -V3270_LIBS=@V3270_LIBS@
107   -GLIB_LIBS=@GLIB_LIBS@
108   -
109 105 LIBS= \
110 106 @LIBS@ \
111 107 @LIBICONV@ \
112 108 @INTL_LIBS@ \
113   - @LIB3270_LIBS@
  109 + @V3270_LIBS@ \
  110 + @GTK_LIBS@ \
  111 + @GLIB_LIBS@
114 112  
115 113 #---[ Debug Rules ]----------------------------------------------------------------------
116 114  
... ... @@ -201,9 +199,7 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
201 199 $(LDFLAGS) \
202 200 $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \
203 201 -L$(BINRLS) -l$(MODULE_NAME) \
204   - $(V3270_LIBS) \
205   - $(LIBS) \
206   - $(GTK_LIBS)
  202 + $(LIBS)
207 203  
208 204 $(BINRLS)/lib$(MODULE_NAME).a: \
209 205 $(foreach SRC, $(basename $(CORE_SOURCES)), $(OBJRLS)/$(SRC).o)
... ... @@ -267,10 +263,7 @@ $(BINDBG)/$(MODULE_NAME)@EXEEXT@: \
267 263 -L$(BINDBG) \
268 264 -Wl,-rpath,$(BINDBG) \
269 265 $(LDFLAGS) \
270   - $(LIBS) \
271   - $(V3270_LIBS) \
272   - $(GTK_LIBS) \
273   - $(GLIB_LIBS)
  266 + $(LIBS)
274 267  
275 268 $(BINDBG)/$(SERVICE_NAME)@EXEEXT@: \
276 269 $(foreach SRC, $(basename $(SERVICE_SOURCES)), $(OBJDBG)/$(SRC).o) \
... ... @@ -300,9 +293,7 @@ $(BINDBG)/$(MODULE_NAME)@DLLEXT@: \
300 293 $(LDFLAGS) \
301 294 $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \
302 295 -L$(BINDBG) -l$(MODULE_NAME) \
303   - $(V3270_LIBS) \
304   - $(LIBS) \
305   - $(GTK_LIBS)
  296 + $(LIBS)
306 297  
307 298  
308 299 run: \
... ...